asciidoctor-iso 0.8.1 → 0.9.0

data/lib/asciidoctor/iso/section.rb

@@ -37,7 +37,11 @@ module Asciidoctor
           when "scope" then scope_parse(a, xml, node)
           when "normative references" then norm_ref_parse(a, xml, node)
           when "terms and definitions",
-            "terms, definitions, symbols and abbreviated terms"
+            "terms, definitions, symbols and abbreviated terms",
+            "terms, definitions, symbols and abbreviations",
+            "terms, definitions and symbols",
+            "terms, definitions and abbreviations",
+            "terms, definitions and abbreviated terms"
             @term_def = true
             term_def_parse(a, xml, node, true)
             @term_def = false
@@ -47,6 +51,8 @@ module Asciidoctor
           else
             if @term_def then term_def_subclause_parse(a, xml, node)
             elsif @biblio then bibliography_parse(a, xml, node)
+            elsif node.attr("style") == "bibliography" && node.level == 1
+              bibliography_parse(a, xml, node)
             elsif node.attr("style") == "appendix" && node.level == 1
               annex_parse(a, xml, node)
             elsif node.option? "appendix"
@@ -105,7 +111,7 @@ module Asciidoctor
           xml_section.title { |t| t << title }
           xml_section << node.content
         end
-        @biblio = true
+        @biblio = false
       end
 
       def symbols_parse(attrs, xml, node)

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "0.8.1".freeze
+    VERSION = "0.9.0".freeze
   end
 end

data/lib/metanorma/iso.rb

@@ -0,0 +1,7 @@
+require_relative "./iso/processor"
+
+module Metanorma
+  module Iso
+
+  end
+end

data/lib/metanorma/iso/processor.rb

@@ -0,0 +1,38 @@
+require "metanorma/processor"
+
+module Metanorma
+  module Iso
+    class Processor < Metanorma::Processor
+
+      def initialize
+        @short = :iso
+        @input_format = :asciidoc
+        @asciidoctor_backend = :iso
+      end
+
+      def output_formats
+        {
+          html: "html",
+          html_alt: "alt.html",
+          doc: "doc"
+        }
+      end
+
+      def input_to_isodoc(file)
+        Metanorma::Input::Asciidoc.new.process(file, @asciidoctor_backend)
+      end
+
+      def output(isodoc_node, outname, format, options={})
+        case format
+        when :html
+          IsoDoc::Iso::HtmlConvert.new(options).convert(outname, isodoc_node)
+        when :html_alt
+          IsoDoc::Iso::HtmlConvert.new(options.merge(alt: true)).convert(outname, isodoc_node)
+        when :doc
+          IsoDoc::Iso::WordConvert.new(options).convert(outname, isodoc_node)
+        end
+      end
+
+    end
+  end
+end

data/spec/asciidoctor-iso/base_spec.rb

@@ -88,7 +88,7 @@ RSpec.describe Asciidoctor::ISO do
            <title-part language="fr" format="text/plain">Part du Titre</title-part>
          </title>
          <docidentifier>
-           <project-number part="1">1000</project-number>
+           <project-number part="1">ISO 1000</project-number>
          </docidentifier>
          <contributor>
            <role type="author"/>
@@ -126,9 +126,15 @@ RSpec.describe Asciidoctor::ISO do
            <workgroup number="3" type="C">WG</workgroup>
            <secretariat>SECRETARIAT</secretariat>
          </editorialgroup>
-         <ics>1</ics>
-         <ics>2</ics>
-         <ics>3</ics>
+         <ics>
+  <code>1</code>
+</ics>
+<ics>
+  <code>2</code>
+</ics>
+<ics>
+  <code>3</code>
+</ics>
        </bibdata><version>
          <edition>2</edition>
          <revision-date>2000-01-01</revision-date>
@@ -152,7 +158,7 @@ RSpec.describe Asciidoctor::ISO do
       :tc-docnumber: 2000
       :language: el
       :script: Grek
-      :publisher: IEC,IETF
+      :publisher: IEC,IETF,ISO
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -164,7 +170,7 @@ RSpec.describe Asciidoctor::ISO do
 
          </title>
          <docidentifier>
-           <project-number part="1" subpart="1">1000</project-number>
+           <project-number part="1" subpart="1">ISO/IEC/IETF 1000</project-number>
            <tc-document-number>2000</tc-document-number>
          </docidentifier>
          <contributor>
@@ -180,6 +186,13 @@ RSpec.describe Asciidoctor::ISO do
              <name>IETF</name>
            </organization>
          </contributor>
+         <contributor>
+           <role type="author"/>
+           <organization>
+             <name>International Organization for Standardization</name>
+             <abbreviation>ISO</abbreviation>
+           </organization>
+         </contributor>
          <contributor>
            <role type="publisher"/>
            <organization>
@@ -193,6 +206,13 @@ RSpec.describe Asciidoctor::ISO do
              <name>IETF</name>
            </organization>
          </contributor>
+         <contributor>
+           <role type="publisher"/>
+           <organization>
+             <name>International Organization for Standardization</name>
+             <abbreviation>ISO</abbreviation>
+           </organization>
+         </contributor>
          <language>el</language>
          <script>Grek</script>
          <status>
@@ -203,8 +223,8 @@ RSpec.describe Asciidoctor::ISO do
            <from>2018</from>
            <owner>
              <organization>
-             <name>International Electrotechnical Commission</name>
-             <abbreviation>IEC</abbreviation>
+               <name>International Electrotechnical Commission</name>
+               <abbreviation>IEC</abbreviation>
              </organization>
            </owner>
          </copyright>
@@ -216,6 +236,15 @@ RSpec.describe Asciidoctor::ISO do
              </organization>
            </owner>
          </copyright>
+         <copyright>
+           <from>2018</from>
+           <owner>
+             <organization>
+               <name>International Organization for Standardization</name>
+               <abbreviation>ISO</abbreviation>
+             </organization>
+           </owner>
+         </copyright>
          <editorialgroup>
            <technical-committee/>
            <subcommittee/>

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -401,7 +401,7 @@ RSpec.describe Asciidoctor::ISO do
       === Term1
 
       [.source]
-      <<ISO2191,section 1>>
+      <<ISO2191,section=1>>
       INPUT
       #{BLANK_HDR}
        <sections>
@@ -427,7 +427,7 @@ RSpec.describe Asciidoctor::ISO do
       === Term1
 
       [.source]
-      <<ISO2191,section 1>>, with adjustments
+      <<ISO2191,section=1>>, with adjustments
       INPUT
       #{BLANK_HDR}
             <sections>

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -170,7 +170,6 @@ r = 1 %</stem>
   end
 
   it "converts xrefs to references into erefs" do
-    stub_fetch_ref
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
       <<iso216>>
@@ -183,58 +182,25 @@ r = 1 %</stem>
         <preface><foreword obligation="informative">
         <title>Foreword</title>
         <p id="_">
-        <eref type="inline" bibitemid="iso216" citeas="ISO 216: 2007"/>
+        <eref type="inline" bibitemid="iso216" citeas="ISO 216: 2001"/>
       </p>
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative">
         <title>Normative References</title>
-        <bibitem type="international-standard" id="ISO216">
-        <title format="text/plain" language="en" script="Latn">Writing paper and certain classes of printed matter -- Trimmed sizes -- A and B series, and indication of machine direction</title>
-        <title format="text/plain" language="fr" script="Latn">Papiers à écrire et certaines catégories d'imprimés -- Formats finis -- Séries A et B, et indication du sens machine</title>
-        <source type="src">https://www.iso.org/standard/36631.html</source>
-        <source type="obp">https://www.iso.org/obp/ui/#!iso:std:36631:en</source>
-        <source type="rss">https://www.iso.org/contents/data/standard/03/66/36631.detail.rss</source>
-        <docidentifier>ISO 216</docidentifier>
-        <date type="published">
-          <on>2007</on>
-        </date>
-        <contributor>
-          <role type="publisher"/>
-          <organization>
-            <name>International Organization for Standardization</name>
-            <abbreviation>ISO</abbreviation>
-            <uri>www.iso.org</uri>
-          </organization>
-        </contributor>
-        <edition>2</edition>
-        <language>en</language>
-        <language>fr</language>
-        <script>Latn</script>
-        <abstract format="plain" language="en" script="Latn">ISO 216:2007 specifies the trimmed sizes of writing paper and certain classes of printed matter.It applies to trimmed sizes of paper for administrative, commercial and technical use, and also to certain classes of printed matter, such as forms, catalogues, etc.It does not necessarily apply to newspapers, published books, posters or other special items which may be the subject of separate International Standards.ISO 216:2007 also specifies the method for the indication of the machine direction for trimmed sheets.</abstract>
-        <abstract format="plain" language="fr" script="Latn">L'ISO 216:2007 spécifie les formats finis des papiers à écrire et de certaines catégories d'imprimés.Elle s'applique aux formats finis de papier pour usages administratif, commercial et technique ainsi qu'à certaines catégories d'imprimés, tels que formulaires, catalogues, etc.Elle ne s'applique pas nécessairement au papier journal, à l'édition, aux affiches publicitaires ou aux usages particuliers qui pourront faire l'objet d'autres Normes internationales.L'ISO 216:2007 spécifie également la méthode permettant d'indiquer le sens machine des formats finis.</abstract>
-        <status>Published</status>
-        <copyright>
-          <from>2007</from>
-          <owner>
-            <organization>
-              <name>ISO</name>
-              <abbreviation/>
-            </organization>
-          </owner>
-        </copyright>
-        <relation type="obsoletes">
-          <bibitem>
-            <formattedref>ISO 216:1975</formattedref>
-            <docidentifier>ISO 216:1975</docidentifier>
-          </bibitem>
-        </relation>
-        <relation type="updates">
-          <bibitem>
-            <formattedref>ISO 216:2007</formattedref>
-            <docidentifier>ISO 216:2007</docidentifier>
-          </bibitem>
-        </relation>
-      </bibitem>
+        <bibitem id="iso216" type="standard">
+         <title format="text/plain">Reference</title>
+         <docidentifier>ISO 216</docidentifier>
+         <date type="published">
+           <on>2001</on>
+         </date>
+         <contributor>
+           <role type="publisher"/>
+           <organization>
+             <name>International Organization for Standardization</name>
+             <abbreviation>ISO</abbreviation>
+           </organization>
+         </contributor>
+       </bibitem>
       </references>
       </bibliography
       </iso-standard>
@@ -242,10 +208,9 @@ r = 1 %</stem>
   end
 
   it "extracts localities from erefs" do
-    stub_fetch_ref
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
-      <<iso216,whole,clause 3,example 9-11,locality:prelude 33,locality:entirety:the reference>>
+      <<iso216,whole,clause=3,example=9-11,locality:prelude=33,locality:entirety:the reference>>
 
       [bibliography]
       == Normative References
@@ -255,58 +220,22 @@ r = 1 %</stem>
       <preface><foreword obligation="informative">
         <title>Foreword</title>
         <p id="_">
-        <eref type="inline" bibitemid="iso216" citeas="ISO 216: 2007"><locality type="whole"/><locality type="clause"><referenceFrom>3</referenceFrom></locality><locality type="example"><referenceFrom>9</referenceFrom><referenceTo>11</referenceTo></locality><locality type="locality:prelude"><referenceFrom>33</referenceFrom></locality><locality type="locality:entirety"/>the reference</eref>
+        <eref type="inline" bibitemid="iso216" citeas="ISO 216"><locality type="whole"/><locality type="clause"><referenceFrom>3</referenceFrom></locality><locality type="example"><referenceFrom>9</referenceFrom><referenceTo>11</referenceTo></locality><locality type="locality:prelude"><referenceFrom>33</referenceFrom></locality><locality type="locality:entirety"/>the reference</eref>
         </p>
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative">
         <title>Normative References</title>
-        <bibitem type="international-standard" id="ISO216">
-        <title format="text/plain" language="en" script="Latn">Writing paper and certain classes of printed matter -- Trimmed sizes -- A and B series, and indication of machine direction</title>
-        <title format="text/plain" language="fr" script="Latn">Papiers à écrire et certaines catégories d'imprimés -- Formats finis -- Séries A et B, et indication du sens machine</title>
-        <source type="src">https://www.iso.org/standard/36631.html</source>
-        <source type="obp">https://www.iso.org/obp/ui/#!iso:std:36631:en</source>
-        <source type="rss">https://www.iso.org/contents/data/standard/03/66/36631.detail.rss</source>
-        <docidentifier>ISO 216</docidentifier>
-        <date type="published">
-          <on>2007</on>
-        </date>
-        <contributor>
-          <role type="publisher"/>
-          <organization>
-            <name>International Organization for Standardization</name>
-            <abbreviation>ISO</abbreviation>
-            <uri>www.iso.org</uri>
-          </organization>
-        </contributor>
-        <edition>2</edition>
-        <language>en</language>
-        <language>fr</language>
-        <script>Latn</script>
-        <abstract format="plain" language="en" script="Latn">ISO 216:2007 specifies the trimmed sizes of writing paper and certain classes of printed matter.It applies to trimmed sizes of paper for administrative, commercial and technical use, and also to certain classes of printed matter, such as forms, catalogues, etc.It does not necessarily apply to newspapers, published books, posters or other special items which may be the subject of separate International Standards.ISO 216:2007 also specifies the method for the indication of the machine direction for trimmed sheets.</abstract>
-        <abstract format="plain" language="fr" script="Latn">L'ISO 216:2007 spécifie les formats finis des papiers à écrire et de certaines catégories d'imprimés.Elle s'applique aux formats finis de papier pour usages administratif, commercial et technique ainsi qu'à certaines catégories d'imprimés, tels que formulaires, catalogues, etc.Elle ne s'applique pas nécessairement au papier journal, à l'édition, aux affiches publicitaires ou aux usages particuliers qui pourront faire l'objet d'autres Normes internationales.L'ISO 216:2007 spécifie également la méthode permettant d'indiquer le sens machine des formats finis.</abstract>
-        <status>Published</status>
-        <copyright>
-          <from>2007</from>
-          <owner>
-            <organization>
-              <name>ISO</name>
-              <abbreviation/>
-            </organization>
-          </owner>
-        </copyright>
-        <relation type="obsoletes">
-          <bibitem>
-            <formattedref>ISO 216:1975</formattedref>
-            <docidentifier>ISO 216:1975</docidentifier>
-          </bibitem>
-        </relation>
-        <relation type="updates">
-          <bibitem>
-            <formattedref>ISO 216:2007</formattedref>
-            <docidentifier>ISO 216:2007</docidentifier>
-          </bibitem>
-        </relation>
-      </bibitem>
+        <bibitem id="iso216" type="standard">
+         <title format="text/plain">Reference</title>
+         <docidentifier>ISO 216</docidentifier>
+         <contributor>
+           <role type="publisher"/>
+           <organization>
+             <name>International Organization for Standardization</name>
+             <abbreviation>ISO</abbreviation>
+           </organization>
+         </contributor>
+       </bibitem>
       </references>
       </bibliography>
       </iso-standard>
@@ -328,17 +257,23 @@ r = 1 %</stem>
        <foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">
-         <eref type="inline" bibitemid="iso216" citeas=""/>
+         <eref type="inline" bibitemid="iso216" citeas="ISO 216"/>
        </p>
        </foreword></preface><sections>
-       <clause id="_" inline-header="false" obligation="normative">
-         <title>Clause</title>
-         <ul id="_">
-         <li>
-           <ref id="iso216">[ISO 216]</ref><p id="_">, <em>Reference</em></p>
-         </li>
-       </ul>
-       </clause></sections>
+       </sections><bibliography><references id="_" obligation="informative">
+  <title>Bibliography</title>
+  <bibitem id="iso216" type="standard">
+  <title format="text/plain">Reference</title>
+  <docidentifier>ISO 216</docidentifier>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+    </organization>
+  </contributor>
+</bibitem>
+</references></bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -351,7 +286,7 @@ r = 1 %</stem>
       === Term1
 
       [.source]
-      <<ISO2191,section 1>>
+      <<ISO2191,section=1>>
       INPUT
               #{BLANK_HDR}
        <sections>
@@ -370,7 +305,6 @@ r = 1 %</stem>
   end
 
   it "removes extraneous material from Normative References" do
-    stub_fetch_ref
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
@@ -383,53 +317,18 @@ r = 1 %</stem>
       #{BLANK_HDR}
       <sections></sections>
       <bibliography><references id="_" obligation="informative"><title>Normative References</title>
-      <bibitem type="international-standard" id="ISO216">
-        <title format="text/plain" language="en" script="Latn">Writing paper and certain classes of printed matter -- Trimmed sizes -- A and B series, and indication of machine direction</title>
-        <title format="text/plain" language="fr" script="Latn">Papiers à écrire et certaines catégories d'imprimés -- Formats finis -- Séries A et B, et indication du sens machine</title>
-        <source type="src">https://www.iso.org/standard/36631.html</source>
-        <source type="obp">https://www.iso.org/obp/ui/#!iso:std:36631:en</source>
-        <source type="rss">https://www.iso.org/contents/data/standard/03/66/36631.detail.rss</source>
-        <docidentifier>ISO 216</docidentifier>
-        <date type="published">
-          <on>2007</on>
-        </date>
-        <contributor>
-          <role type="publisher"/>
-          <organization>
-            <name>International Organization for Standardization</name>
-            <abbreviation>ISO</abbreviation>
-            <uri>www.iso.org</uri>
-          </organization>
-        </contributor>
-        <edition>2</edition>
-        <language>en</language>
-        <language>fr</language>
-        <script>Latn</script>
-        <abstract format="plain" language="en" script="Latn">ISO 216:2007 specifies the trimmed sizes of writing paper and certain classes of printed matter.It applies to trimmed sizes of paper for administrative, commercial and technical use, and also to certain classes of printed matter, such as forms, catalogues, etc.It does not necessarily apply to newspapers, published books, posters or other special items which may be the subject of separate International Standards.ISO 216:2007 also specifies the method for the indication of the machine direction for trimmed sheets.</abstract>
-        <abstract format="plain" language="fr" script="Latn">L'ISO 216:2007 spécifie les formats finis des papiers à écrire et de certaines catégories d'imprimés.Elle s'applique aux formats finis de papier pour usages administratif, commercial et technique ainsi qu'à certaines catégories d'imprimés, tels que formulaires, catalogues, etc.Elle ne s'applique pas nécessairement au papier journal, à l'édition, aux affiches publicitaires ou aux usages particuliers qui pourront faire l'objet d'autres Normes internationales.L'ISO 216:2007 spécifie également la méthode permettant d'indiquer le sens machine des formats finis.</abstract>
-        <status>Published</status>
-        <copyright>
-          <from>2007</from>
-          <owner>
-            <organization>
-              <name>ISO</name>
-              <abbreviation/>
-            </organization>
-          </owner>
-        </copyright>
-        <relation type="obsoletes">
-          <bibitem>
-            <formattedref>ISO 216:1975</formattedref>
-            <docidentifier>ISO 216:1975</docidentifier>
-          </bibitem>
-        </relation>
-        <relation type="updates">
-          <bibitem>
-            <formattedref>ISO 216:2007</formattedref>
-            <docidentifier>ISO 216:2007</docidentifier>
-          </bibitem>
-        </relation>
-      </bibitem></references>
+             <bibitem id="iso216" type="standard">
+         <title format="text/plain">Reference</title>
+         <docidentifier>ISO 216</docidentifier>
+         <contributor>
+           <role type="publisher"/>
+           <organization>
+             <name>International Organization for Standardization</name>
+             <abbreviation>ISO</abbreviation>
+           </organization>
+         </contributor>
+       </bibitem>
+      </references>
       </bibliography>
       </iso-standard>
     OUTPUT
@@ -726,8 +625,6 @@ r = 1 %</stem>
   end
 
   it "numbers bibliographic notes and footnotes sequentially" do
-    stub_fetch_ref(no_year: true, note: "The standard is in press")
-
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
       footnote:[Footnote]
@@ -757,50 +654,21 @@ r = 1 %</stem>
       </p>
       </clause></sections><bibliography><references id="_" obligation="informative">
         <title>Normative References</title>
-        <bibitem type="international-standard" id="ISO123">
-        <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling -- </title>
-        <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Échantillonnage -- </title>
-        <source type="src">https://www.iso.org/standard/23281.html</source>
-        <source type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>
-        <source type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>
-        <docidentifier>ISO 123</docidentifier>
-        <date type="published"><on>--</on></date>
-        <contributor>
-          <role type="publisher"/>
-          <organization>
-            <name>International Organization for Standardization</name>
-            <abbreviation>ISO</abbreviation>
-            <uri>www.iso.org</uri>
-          </organization>
-        </contributor>
-        <edition>3</edition>
-        <language>en</language>
-        <language>fr</language>
-        <script>Latn</script>
-        <status>Published</status>
-        <copyright>
-          <from>2001</from>
-          <owner>
-            <organization>
-              <name>ISO</name>
-              <abbreviation/>
-            </organization>
-          </owner>
-        </copyright>
-        <relation type="obsoletes">
-          <bibitem>
-            <formattedref>ISO 123:1985</formattedref>
-            <docidentifier>ISO 123:1985</docidentifier>
-          </bibitem>
-        </relation>
-        <relation type="updates">
-          <bibitem>
-            <formattedref>ISO 123:2001</formattedref>
-            <docidentifier>ISO 123:2001</docidentifier>
-          </bibitem>
-        </relation>
-        <note format="text/plain" reference="2">ISO DATE: The standard is in press</note>
-      </bibitem>
+        <bibitem id="iso123" type="standard">
+         <title format="text/plain">Standard</title>
+         <docidentifier>ISO 123</docidentifier>
+         <date type="published">
+           <on>--</on>
+         </date>
+         <contributor>
+           <role type="publisher"/>
+           <organization>
+             <name>International Organization for Standardization</name>
+             <abbreviation>ISO</abbreviation>
+           </organization>
+         </contributor>
+         <note format="text/plain" reference="2">ISO DATE: The standard is in press</note>
+       </bibitem>
       </references>
       </bibliography>
       </iso-standard>