metanorma-rsd 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c5152e4335a14f4046d5f257d79a7c480e8c1ec1a6dc986436bac11fb02a5ae
-  data.tar.gz: a67ed2acc1cd9b63c44b835f295ad4f50e9301c2976302eda0c0b8bd9be5eaa0
+  metadata.gz: 6448706fcd04c9dc78d542e523bb0d92cda418aa51f14b68cbd28137d55c9616
+  data.tar.gz: 11e87ff974e0ef8eddbea3d8ab8c144ec006da5e6a5fa2d00ef82c3fd8af2a94
 SHA512:
-  metadata.gz: d27d521ed8ac4fb8e3d17ebbbf324b6f8243271f89ccaa62f2fc98499022855c67f0f6df3e61baa341a159e934767bce493b8bfa64c981eee703d451cb814ebf
-  data.tar.gz: fd42ea20421e77d073a575d37a19092f8399694e6d551cd24243bd66f715de682220e0a644c910a00620d113682e0aa5b001a7d2295d395f71b171cc7e8c35ef
+  metadata.gz: 16b371c9881cdeb3aef534616b92af25b04ee875e975fc13833022ad97e0d54b8b9906dbccba9886ebaff41338d1c3283cf4435c6746fa817e39849889735b66
+  data.tar.gz: 946fb2d9dc81cdb8733d72eb7f6af3d11116f103d3868ccf7596de609d3ec9395acc42da3a0b20b0a9aa79310d5cfa29213694f4c62c40a3aa4a52e40aa32d9e

data/lib/asciidoctor/rsd/converter.rb

@@ -100,7 +100,7 @@ module Asciidoctor
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</rsd-standard>"
-        result = textcleanup(result.flatten * "\n")
+        result = textcleanup(result)
         ret1 = cleanup(Nokogiri::XML(result))
         validate(ret1)
         ret1.root.add_namespace(nil, RSD_NAMESPACE)
@@ -117,13 +117,6 @@ module Asciidoctor
         d
       end
 
-      def pdf_convert(filename)
-        url = "#{Dir.pwd}/#{filename}.html"
-        pdfjs = File.join(File.dirname(__FILE__), 'pdf.js')
-        system "export NODE_PATH=$(npm root --quiet -g);
-                node #{pdfjs} file://#{url} #{filename}.pdf"
-      end
-
       def document(node)
         init(node)
         ret1 = makexml(node)
@@ -133,8 +126,8 @@ module Asciidoctor
             gsub(%r{^.*/}, "")
           File.open(filename, "w") { |f| f.write(ret) }
           html_converter(node).convert filename unless node.attr("nodoc")
+          pdf_converter(node).convert filename unless node.attr("nodoc")
           word_converter(node).convert filename unless node.attr("nodoc")
-          pdf_convert(filename.sub(/\.xml$/, "")) unless node.attr("nodoc")
         end
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
@@ -165,6 +158,10 @@ module Asciidoctor
         IsoDoc::Rsd::HtmlConvert.new(html_extract_attributes(node))
       end
 
+      def pdf_converter(node)
+        IsoDoc::Rsd::PdfConvert.new(html_extract_attributes(node))
+      end
+
       def word_converter(node)
         IsoDoc::Rsd::WordConvert.new(doc_extract_attributes(node))
       end

data/lib/asciidoctor/rsd/isodoc.rng

@@ -493,6 +493,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>

data/lib/isodoc/rsd/html/html_rsd_titlepage.html

@@ -45,7 +45,14 @@
   </div>
 
   <div class="coverpage-stage-block" >
-    <p><span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{% if unpublished %}{{ status }}{% endif %}</span></p>
+    <p><span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">
+      {%- if unpublished -%}
+      {{- status -}}
+      {%- else -%}
+      {%- if publisheddate and publisheddate != "XXXX" -%}
+      Published {{ publisheddate -}}
+      {%- endif -%}
+      {%- endif -%}</span></p>
 {% if security %}
 <p><span class="coverpage-maturity">Classification: {{ security }}</span></p>
 {% endif %}

data/lib/isodoc/rsd/html/htmlstyle.scss

@@ -633,6 +633,10 @@ p.Biblio, p.NormRef {
     margin-left:-1.5em;
 }
 
+.example .Sourcecode {
+      background: none;
+}
+
 /*
     3.9 Tables
 */

data/lib/isodoc/rsd/html/word_rsd_titlepage.html

@@ -17,7 +17,17 @@ margin-left:4.25pt;margin-right:4.25pt'>
 
 <p class="MsoNormal" align="center" style='text-align:center;border:none;
 mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-                     lang="EN-GB" style='font-size:16.0pt'>{% if unpublished %}{{ status }} {% endif %}{{ doctype }}</span></p>
+                     lang="EN-GB" style='font-size:16.0pt'>{%- if unpublished -%}
+      {{- status -}}
+      {%- else -%}
+      {%- if publisheddate and publisheddate != "XXXX" -%}
+      Published {{ publisheddate -}}
+      {%- endif -%}
+      {%- endif  %}</span></p>
+
+<p class="MsoNormal" align="center" style='text-align:center;border:none;
+mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
+                     lang="EN-GB" style='font-size:16.0pt'>Ribose {{ doctype }}</span></p>
 
 
 {% if security %}

data/lib/isodoc/rsd/html/wordstyle.scss

@@ -1075,6 +1075,107 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	margin-left:162.0pt;
 	text-indent:-18.0pt;}
 
+p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:18.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel2, li.ListContLevel2, div.ListContLevel2
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:36.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel3, li.ListContLevel3, div.ListContLevel3
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:54.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel4, li.ListContLevel4, div.ListContLevel4
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:72.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel5, li.ListContLevel5, div.ListContLevel5
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:90.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel6, li.ListContLevel6, div.ListContLevel6
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:108.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel7, li.ListContLevel7, div.ListContLevel7
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:126.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel8, li.ListContLevel8, div.ListContLevel8
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:144.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel9, li.ListContLevel9, div.ListContLevel9
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:162.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+
+
 table.MsoNormalTable
 	{mso-style-name:"Table Normal";
 	mso-tstyle-rowband-size:0;

data/lib/metanorma/rsd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Rsd
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-rsd
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -249,7 +249,6 @@ files:
 - lib/asciidoctor/rsd/converter.rb
 - lib/asciidoctor/rsd/isodoc.rng
 - lib/asciidoctor/rsd/isostandard.rng
-- lib/asciidoctor/rsd/pdf.js
 - lib/asciidoctor/rsd/rsd.rng
 - lib/isodoc/rsd/html/header.html
 - lib/isodoc/rsd/html/html_rsd_intro.html

data/lib/asciidoctor/rsd/pdf.js

@@ -1,31 +0,0 @@
-'use strict';
-
-try {
-    require.resolve("puppeteer");
-} catch(e) {
-    console.error("puppeteer Node library is not installed; will not generate PDF");
-    process.exit(e.code);
-}
-
-const puppeteer = require('puppeteer');
-
-const createPdf = async() => {
-  let browser;
-  try {
-    browser = await puppeteer.launch({args: ['--no-sandbox', '--disable-setuid-sandbox']});
-    const page = await browser.newPage();
-    await page.goto(process.argv[2], {waitUntil: 'networkidle2'});
-    await page.pdf({
-      path: process.argv[3],
-      format: 'A4'
-    });
-  } catch (err) {
-      console.log(err.message);
-  } finally {
-    if (browser) {
-      browser.close();
-    }
-    process.exit();
-  }
-};
-createPdf();