metanorma-iso 1.3.22 → 1.3.23

data/lib/isodoc/iso/metadata.rb

@@ -50,6 +50,8 @@ module IsoDoc
         set(:docnumber, dn&.text)
         tcdn = isoxml.xpath(ns("//bibdata/docidentifier[@type = 'iso-tc']"))
         set(:tc_docnumber, tcdn.map { |n| n.text })
+        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-with-lang']"))
+        set(:docnumber_lang, dn&.text)
       end
 
       # we don't leave this to i18n.rb, because we have both English and

data/lib/isodoc/iso/pdf_convert.rb

@@ -0,0 +1,32 @@
+require_relative "base_convert"
+require "isodoc"
+
+module IsoDoc
+  module Iso
+
+    # A {Converter} implementation that generates HTML output, and a document
+    # schema encapsulation of the document for validation
+    #
+    class PdfConvert < IsoDoc::XslfoPdfConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
+      end
+
+      def convert(filename, file = nil, debug = false)
+        file = File.read(filename, encoding: "utf-8") if file.nil?
+        docxml, outname_html, dir = convert_init(file, filename, debug)
+        /\.xml$/.match(filename) or
+          filename = Tempfile.open([outname_html, ".xml"], encoding: "utf-8") do |f|
+          f.write file
+          f.path
+        end
+        FileUtils.rm_rf dir
+        ::Metanorma::Output::XslfoPdf.new.convert(
+          filename, outname_html + ".pdf",
+          File.join(@libdir, "iso.international-standard.xsl"))
+      end
+    end
+  end
+end
+

data/lib/metanorma-iso.rb

@@ -3,6 +3,7 @@ require_relative "asciidoctor/iso/converter"
 require_relative "metanorma/iso/version"
 require_relative "isodoc/iso/html_convert"
 require_relative "isodoc/iso/word_convert"
+require_relative "isodoc/iso/pdf_convert"
 require "asciidoctor/extensions"
 
 if defined? Metanorma

data/lib/metanorma/iso/processor.rb

@@ -2,6 +2,10 @@ require "metanorma/processor"
 
 module Metanorma
   module Iso
+    def self.pdf_fonts
+      ["Cambria", "Times New Roman", "Cambria Math", "HanSans", "Courier"]
+    end
+
     class Processor < Metanorma::Processor
 
       def initialize
@@ -14,7 +18,8 @@ module Metanorma
         super.merge(
           html: "html",
           html_alt: "alt.html",
-          doc: "doc"
+          doc: "doc",
+          pdf: "pdf"
         )
       end
 
@@ -34,6 +39,8 @@ module Metanorma
           IsoDoc::Iso::HtmlConvert.new(options.merge(alt: true)).convert(outname, isodoc_node)
         when :doc
           IsoDoc::Iso::WordConvert.new(options).convert(outname, isodoc_node)
+        when :pdf
+          IsoDoc::Iso::PdfConvert.new(options).convert(outname, isodoc_node)
         else
           super
         end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.3.22".freeze
+    VERSION = "1.3.23".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -35,6 +35,7 @@ RSpec.describe Asciidoctor::ISO do
       :docfile: test.adoc
       :novalid:
       :no-isobib:
+      :no-pdf:
     INPUT
     #{BLANK_HDR}
 <sections/>
@@ -486,6 +487,7 @@ OUTPUT
       :docfile: test.adoc
       :novalid:
       :no-isobib:
+      :no-pdf:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r{<script>})
@@ -499,6 +501,7 @@ OUTPUT
       :docfile: test.adoc
       :novalid:
       :no-isobib:
+      :no-pdf:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
@@ -514,6 +517,7 @@ OUTPUT
       :docfile: test.adoc
       :novalid:
       :no-isobib:
+      :no-pdf:
     INPUT
     html = File.read("test_alt.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Space Mono", monospace;]m)
@@ -530,6 +534,7 @@ OUTPUT
       :novalid:
       :no-isobib:
       :script: Hans
+      :no-pdf:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
@@ -549,6 +554,7 @@ OUTPUT
       :body-font: Zapf Chancery
       :header-font: Comic Sans
       :monospace-font: Andale Mono
+      :no-pdf:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: Andale Mono;]m)
@@ -565,6 +571,7 @@ OUTPUT
       :docfile: test.adoc
       :novalid:
       :no-isobib:
+      :no-pdf:
     INPUT
     word = File.read("test.doc", encoding: "utf-8")
     html = File.read("test.html", encoding: "utf-8")

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -195,6 +195,7 @@ RSpec.describe Asciidoctor::ISO do
         <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
          <docidentifier>ISO 216:2001</docidentifier>
+         <docnumber>216</docnumber>
          <date type="published">
            <on>2001</on>
          </date>
@@ -237,6 +238,7 @@ RSpec.describe Asciidoctor::ISO do
         <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
          <docidentifier>ISO 216</docidentifier>
+         <docnumber>216</docnumber>
          <contributor>
            <role type="publisher"/>
            <organization>
@@ -274,6 +276,7 @@ RSpec.describe Asciidoctor::ISO do
   <bibitem id="iso216" type="standard">
   <title format="text/plain">Reference</title>
   <docidentifier>ISO 216</docidentifier>
+  <docnumber>216</docnumber>
   <contributor>
     <role type="publisher"/>
     <organization>
@@ -335,6 +338,7 @@ RSpec.describe Asciidoctor::ISO do
              <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
          <docidentifier>ISO 216</docidentifier>
+         <docnumber>216</docnumber>
          <contributor>
            <role type="publisher"/>
            <organization>
@@ -639,6 +643,7 @@ RSpec.describe Asciidoctor::ISO do
         <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
          <docidentifier>ISO 123:—</docidentifier>
+         <docnumber>123</docnumber>
          <date type="published">
            <on>–</on>
          </date>
@@ -789,36 +794,46 @@ RSpec.describe Asciidoctor::ISO do
     * [[[ref17,(A)]]], _Standard 30_
     INPUT
         #{BLANK_HDR}
-        <sections><clause id="_" inline-header="false" obligation="normative">
-         <title>Clause 1</title>
-         <p id="_"><eref type="inline" bibitemid="ref1" citeas="ISO 123"/>
-         <eref type='inline' bibitemid='ref1a' citeas='ISO 123-100'/>
-<eref type='inline' bibitemid='ref1b' citeas='ISO/TS 123-1'/>
-       <eref type="inline" bibitemid="ref2" citeas="ISO/IEC 123"/>
-       <eref type="inline" bibitemid="ref3" citeas="IEC 123"/>
-       <eref type="inline" bibitemid="ref4" citeas="GB 123"/>
-       <eref type="inline" bibitemid="ref5" citeas="[6]"/>
-       <eref type="inline" bibitemid="ref6" citeas="[B]"/>
-       <eref type="inline" bibitemid="ref7" citeas="[A]"/>
-       <xref target="ref8"/>
-       <xref target="ref9"/>
-       <eref type="inline" bibitemid="ref10" citeas="ISO/IEC 123"/></p>
-       </clause>
-       </sections><bibliography><clause id="_" obligation="informative"><title>Bibliography</title><references id="_" obligation="informative">
-         <title>Clause 1</title><bibitem id="ref1" type="standard">
-         <title format="text/plain">Standard ISO 123</title>
-         <docidentifier>ISO 123</docidentifier>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-             <abbreviation>ISO</abbreviation>
-           </organization>
-         </contributor>
-       </bibitem>
-        <bibitem id='ref2' type='standard'>
+        <sections>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause 1</title>
+             <p id='_'>
+               <eref type='inline' bibitemid='ref1' citeas='ISO 123'/>
+               <eref type='inline' bibitemid='ref1a' citeas='ISO 123-100'/>
+               <eref type='inline' bibitemid='ref1b' citeas='ISO/TS 123-1'/>
+               <eref type='inline' bibitemid='ref2' citeas='ISO/IEC 123'/>
+               <eref type='inline' bibitemid='ref3' citeas='IEC 123'/>
+               <eref type='inline' bibitemid='ref4' citeas='GB 123'/>
+               <eref type='inline' bibitemid='ref5' citeas='[6]'/>
+               <eref type='inline' bibitemid='ref6' citeas='[B]'/>
+               <eref type='inline' bibitemid='ref7' citeas='[A]'/>
+               <xref target='ref8'/>
+               <xref target='ref9'/>
+               <eref type='inline' bibitemid='ref10' citeas='ISO/IEC 123'/>
+             </p>
+           </clause>
+         </sections>
+         <bibliography>
+           <clause id='_' obligation='informative'>
+             <title>Bibliography</title>
+             <references id='_' obligation='informative'>
+               <title>Clause 1</title>
+               <bibitem id='ref1' type='standard'>
+                 <title format='text/plain'>Standard ISO 123</title>
+                 <docidentifier>ISO 123</docidentifier>
+                 <docnumber>123</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref2' type='standard'>
                  <title format='text/plain'>Standard ISO/IEC 123</title>
                  <docidentifier>ISO/IEC 123</docidentifier>
+                 <docnumber>123</docnumber>
                  <contributor>
                    <role type='publisher'/>
                    <organization>
@@ -834,140 +849,146 @@ RSpec.describe Asciidoctor::ISO do
                    </organization>
                  </contributor>
                </bibitem>
-       <bibitem id='ref1b' type='standard'>
-  <title format='text/plain'>Standard ISO 123</title>
-  <docidentifier>ISO/TS 123-1</docidentifier>
-  <contributor>
-    <role type='publisher'/>
-    <organization>
-      <name>International Organization for Standardization</name>
-      <abbreviation>ISO</abbreviation>
-    </organization>
-  </contributor>
-  <contributor>
-    <role type='publisher'/>
-    <organization>
-      <name>TS</name>
-    </organization>
-  </contributor>
-</bibitem>
-<bibitem id='ref1a' type='standard'>
-  <title format='text/plain'>Standard ISO 123</title>
-  <docidentifier>ISO 123-100</docidentifier>
-  <contributor>
-    <role type='publisher'/>
-    <organization>
-      <name>International Organization for Standardization</name>
-      <abbreviation>ISO</abbreviation>
-    </organization>
-  </contributor>
-</bibitem>
-       <bibitem id="ref3" type="standard">
-         <title format="text/plain">Standard IEC 123</title>
-         <docidentifier>IEC 123</docidentifier>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Electrotechnical Commission</name>
-             <abbreviation>IEC</abbreviation>
-           </organization>
-         </contributor>
-       </bibitem><bibitem id="ref5">
-         <formattedref format="application/x-isodoc+xml">
-           <em>Standard 10</em>
-         </formattedref>
-         <docidentifier type="metanorma">[6]</docidentifier>
-       </bibitem><bibitem id="ref4">
-         <formattedref format="application/x-isodoc+xml">
-           <em>Standard GB 123</em>
-         </formattedref>
-         <docidentifier>GB 123</docidentifier>
-       </bibitem><bibitem id="ref7">
-         <formattedref format="application/x-isodoc+xml">
-           <em>Standard 30</em>
-         </formattedref>
-         <docidentifier type="metanorma">[A]</docidentifier>
-       </bibitem><bibitem id="ref6">
-         <formattedref format="application/x-isodoc+xml">
-           <em>Standard 20</em>
-         </formattedref>
-         <docidentifier type="metanorma">[B]</docidentifier>
-       </bibitem>
-
-
-
-
-
-
-
-       </references>
-       <references id="_" obligation="informative">
-         <bibitem id="ref11" type="standard">
-         <title format="text/plain">Standard ISO 123</title>
-         <docidentifier>ISO 123</docidentifier>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-             <abbreviation>ISO</abbreviation>
-           </organization>
-         </contributor>
-       </bibitem><bibitem id="ref10" type="standard">
-         <title format="text/plain">Standard ISO/IEC 123</title>
-         <docidentifier>ISO/IEC 123</docidentifier>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-             <abbreviation>ISO</abbreviation>
-           </organization>
-         </contributor>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Electrotechnical Commission</name>
-             <abbreviation>IEC</abbreviation>
-           </organization>
-         </contributor>
-       </bibitem><bibitem id="ref13" type="standard">
-         <title format="text/plain">Standard IEC 123</title>
-         <docidentifier>IEC 123</docidentifier>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Electrotechnical Commission</name>
-             <abbreviation>IEC</abbreviation>
-           </organization>
-         </contributor>
-       </bibitem><bibitem id="ref15">
-         <formattedref format="application/x-isodoc+xml">
-           <em>Standard 10</em>
-         </formattedref>
-         <docidentifier type="metanorma">[13]</docidentifier>
-       </bibitem><bibitem id="ref14">
-         <formattedref format="application/x-isodoc+xml">
-           <em>Standard GB 123</em>
-         </formattedref>
-         <docidentifier>GB 123</docidentifier>
-       </bibitem><bibitem id="ref17">
-         <formattedref format="application/x-isodoc+xml">
-           <em>Standard 30</em>
-         </formattedref>
-         <docidentifier type="metanorma">[A]</docidentifier>
-       </bibitem><bibitem id="ref16">
-         <formattedref format="application/x-isodoc+xml">
-           <em>Standard 20</em>
-         </formattedref>
-         <docidentifier type="metanorma">[B]</docidentifier>
-       </bibitem>
-
-
-
-
-
-
-
-       </references></clause></bibliography>
+               <bibitem id='ref1b' type='standard'>
+                 <title format='text/plain'>Standard ISO 123</title>
+                 <docidentifier>ISO/TS 123-1</docidentifier>
+                 <docnumber>123-1</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </contributor>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>TS</name>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref1a' type='standard'>
+                 <title format='text/plain'>Standard ISO 123</title>
+                 <docidentifier>ISO 123-100</docidentifier>
+                 <docnumber>123-100</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref3' type='standard'>
+                 <title format='text/plain'>Standard IEC 123</title>
+                 <docidentifier>IEC 123</docidentifier>
+                 <docnumber>123</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Electrotechnical Commission</name>
+                     <abbreviation>IEC</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref5'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 10</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[6]</docidentifier>
+               </bibitem>
+               <bibitem id='ref6'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 20</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[B]</docidentifier>
+               </bibitem>
+               <bibitem id='ref7'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 30</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[A]</docidentifier>
+               </bibitem>
+               <bibitem id='ref4'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard GB 123</em>
+                 </formattedref>
+                 <docidentifier>GB 123</docidentifier>
+                 <docnumber>123</docnumber>
+               </bibitem>
+             </references>
+             <references id='_' obligation='informative'>
+               <bibitem id='ref11' type='standard'>
+                 <title format='text/plain'>Standard ISO 123</title>
+                 <docidentifier>ISO 123</docidentifier>
+                 <docnumber>123</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref10' type='standard'>
+                 <title format='text/plain'>Standard ISO/IEC 123</title>
+                 <docidentifier>ISO/IEC 123</docidentifier>
+                 <docnumber>123</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </contributor>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Electrotechnical Commission</name>
+                     <abbreviation>IEC</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref13' type='standard'>
+                 <title format='text/plain'>Standard IEC 123</title>
+                 <docidentifier>IEC 123</docidentifier>
+                 <docnumber>123</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Electrotechnical Commission</name>
+                     <abbreviation>IEC</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref15'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 10</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[13]</docidentifier>
+               </bibitem>
+               <bibitem id='ref16'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 20</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[B]</docidentifier>
+               </bibitem>
+               <bibitem id='ref17'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 30</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[A]</docidentifier>
+               </bibitem>
+               <bibitem id='ref14'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard GB 123</em>
+                 </formattedref>
+                 <docidentifier>GB 123</docidentifier>
+                 <docnumber>123</docnumber>
+               </bibitem>
+             </references>
+           </clause>
+         </bibliography>
        </iso-standard>
     OUTPUT
   end