isodoc 2.0.8.2 → 2.1.0

data/spec/isodoc/ref_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe IsoDoc do
           <bibitem id="zip_ffs"><formattedref format="application/x-isodoc+xml">Title 5</formattedref><docidentifier type="metanorma">[5]</docidentifier></bibitem>
       </references><references id="_bibliography" obligation="informative" normative="false">
         <title>Bibliography</title>
-      <bibitem id="ISBN" type="ISBN">
+      <bibitem id="ISBN" type="book">
         <title format="text/plain">Chemicals for analytical laboratory use</title>
         <docidentifier type="ISBN">ISBN</docidentifier>
         <contributor>
@@ -78,7 +78,7 @@ RSpec.describe IsoDoc do
           </organization>
         </contributor>
       </bibitem>
-      <bibitem id="ISSN" type="ISSN">
+      <bibitem id="ISSN" type="journal">
         <title format="text/plain">Instruments for analytical laboratory use</title>
         <docidentifier type="ISSN">ISSN</docidentifier>
         <contributor>
@@ -159,51 +159,18 @@ RSpec.describe IsoDoc do
               amendments) applies.
             </p>
             <bibitem id='ISO712' type='standard'>
-              <title format='text/plain'>Cereals or cereal products</title>
-              <title type='main' format='text/plain'>Cereals and cereal products</title>
+               <formattedref>International Organization for Standardization. <em>Cereals and cereal products</em>.</formattedref>
               <docidentifier type='ISO'>ISO 712</docidentifier>
               <docidentifier type='metanorma'>[110]</docidentifier>
-              <contributor>
-                <role type='publisher'/>
-                <organization>
-                  <name>International Organization for Standardization</name>
-                </organization>
-              </contributor>
             </bibitem>
             <bibitem id='ISO16634' type='standard'>
-              <title language='x' format='text/plain'>
-                Cereals, pulses, milled cereal products, xxxx, oilseeds and animal
-                feeding stuffs
-              </title>
-              <title language='en' format='text/plain'>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
+               <formattedref><em>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</em>.</formattedref>
               <docidentifier type='ISO'>ISO 16634:-- (all parts)</docidentifier>
-              <date type='published'>
-                <on>--</on>
-              </date>
-              <contributor>
-                <role type='publisher'/>
-                <organization>
-                  <abbreviation>ISO</abbreviation>
-                </organization>
-              </contributor>
               <note format='text/plain' type='Unpublished-Status' reference='1'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
-              <extent type='part'>
-                <referenceFrom>all</referenceFrom>
-              </extent>
             </bibitem>
             <bibitem id='ISO20483' type='standard'>
-              <title format='text/plain'>Cereals and pulses</title>
+              <formattedref>International Organization for Standardization. <em>Cereals and pulses</em>. 2013&#x2013;2014.</formattedref>
               <docidentifier type='ISO'>ISO 20483:2013-2014</docidentifier>
-              <date type='published'>
-                <from>2013</from>
-                <to>2014</to>
-              </date>
-              <contributor>
-                <role type='publisher'/>
-                <organization>
-                  <name>International Organization for Standardization</name>
-                </organization>
-              </contributor>
             </bibitem>
             <bibitem id='ref1'>
               <formattedref format='application/x-isodoc+xml'>
@@ -216,7 +183,7 @@ RSpec.describe IsoDoc do
                 </em>
                  (see
                 <link target='http://www.icc.or.at'/>
-                )
+                ) [ICC/167]
               </formattedref>
               <docidentifier type='ICC'>ICC/167</docidentifier>
             </bibitem>
@@ -231,27 +198,15 @@ RSpec.describe IsoDoc do
           </references>
           <references id='_bibliography' obligation='informative' normative='false' displayorder="3">
             <title depth="1">Bibliography</title>
-            <bibitem id='ISBN' type='ISBN'>
-              <title format='text/plain'>Chemicals for analytical laboratory use</title>
+            <bibitem id='ISBN' type='book'>
+              <formattedref><em>Chemicals for analytical laboratory use</em>. ISBN.</formattedref>
               <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
               <docidentifier type='ISBN'>ISBN</docidentifier>
-              <contributor>
-                <role type='publisher'/>
-                <organization>
-                  <abbreviation>ISBN</abbreviation>
-                </organization>
-              </contributor>
             </bibitem>
-            <bibitem id='ISSN' type='ISSN'>
-              <title format='text/plain'>Instruments for analytical laboratory use</title>
+            <bibitem id='ISSN' type='journal'>
+            <formattedref><em>Instruments for analytical laboratory use</em>. ISSN.</formattedref>
               <docidentifier type='metanorma-ordinal'>[2]</docidentifier>
               <docidentifier type='ISSN'>ISSN</docidentifier>
-              <contributor>
-                <role type='publisher'/>
-                <organization>
-                  <abbreviation>ISSN</abbreviation>
-                </organization>
-              </contributor>
             </bibitem>
             <note>
               <name>NOTE</name>
@@ -262,15 +217,9 @@ RSpec.describe IsoDoc do
               <p>This is another annotation of document ISSN.</p>
             </note>
             <bibitem id='ISO3696' type='standard'>
-              <title format='text/plain'>Water for analytical laboratory use</title>
+              <formattedref><em>Water for analytical laboratory use</em>.</formattedref>
               <docidentifier type='metanorma-ordinal'>[3]</docidentifier>
               <docidentifier type='ISO'>ISO 3696</docidentifier>
-              <contributor>
-                <role type='publisher'/>
-                <organization>
-                  <abbreviation>ISO</abbreviation>
-                </organization>
-              </contributor>
             </bibitem>
             <bibitem id='ref10'>
               <formattedref format='application/x-isodoc+xml'>
@@ -288,11 +237,11 @@ RSpec.describe IsoDoc do
               <docidentifier type='metanorma'>[10]</docidentifier>
             </bibitem>
             <bibitem id="ref10a" hidden="true">
-              <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
+            <formattedref><em>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</em>.</formattedref>
               <docidentifier type="IETF">IETF RFC 20</docidentifier>
             </bibitem>
             <bibitem id='ref11'>
-              <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
+            <formattedref><em>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</em>.</formattedref>
               <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
               <docidentifier type='IETF'>IETF RFC 10</docidentifier>
             </bibitem>
@@ -300,18 +249,18 @@ RSpec.describe IsoDoc do
               <formattedref format='application/x-isodoc+xml'>
                 CitationWorks. 2019.
                 <em>How to cite a reference</em>
-                .
+                . [IETF RFC 20]
               </formattedref>
               <docidentifier type='metanorma'>[Citn]</docidentifier>
               <docidentifier type='IETF'>IETF RFC 20</docidentifier>
             </bibitem>
             <bibitem id="ref10b">
-              <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
+            <formattedref><em>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</em>.</formattedref>
               <docidentifier type='metanorma-ordinal'>[5]</docidentifier>
               <docidentifier type="IETF">IETF RFC 20</docidentifier>
             </bibitem>
             <bibitem id='ref10c'>
-        <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
+            <formattedref><em>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</em>.</formattedref>
         <docidentifier type='metanorma-ordinal'>[6]</docidentifier>
         <docidentifier type='DOI'>DOI ABC 20</docidentifier>
       </bibitem>
@@ -321,8 +270,8 @@ RSpec.describe IsoDoc do
     PRESXML
 
     html = <<~OUTPUT
-          #{HTML_HDR}
-                <br/>
+         #{HTML_HDR}
+                      <br/>
             <div>
               <h1 class='ForewordTitle'>Foreword</h1>
               <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
@@ -340,15 +289,16 @@ RSpec.describe IsoDoc do
             <div>
               <h1>1.&#160; Normative References</h1>
               <p>
-                The following documents are referred to in the text in such a way that
-                some or all of their content constitutes requirements of this
+                 The following documents are referred to in the text in such a way
+                that some or all of their content constitutes requirements of this
                 document. For dated references, only the edition cited applies. For
                 undated references, the latest edition of the referenced document
                 (including any amendments) applies.
               </p>
               <p id='ISO712' class='NormRef'>
-                [110], ISO 712,
+                [110], ISO 712, International Organization for Standardization.
                 <i>Cereals and cereal products</i>
+                .
               </p>
               <p id='ISO16634' class='NormRef'>
                 ISO 16634:-- (all parts)
@@ -357,23 +307,25 @@ RSpec.describe IsoDoc do
                 </a>
                 ,
                 <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
+                .
               </p>
               <p id='ISO20483' class='NormRef'>
-                ISO 20483:2013-2014,
+                ISO 20483:2013-2014, International Organization for Standardization.
                 <i>Cereals and pulses</i>
+                . 2013&#8211;2014.
               </p>
               <p id='ref1' class='NormRef'>
                 ICC/167,
                 <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
-                .
+                 .
                 <i>
-                  Determination of the protein content in cereal and cereal products
+                   Determination of the protein content in cereal and cereal products
                   for food and animal feeding stuffs according to the Dumas combustion
                   method
                 </i>
                  (see
                 <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
-                )
+                 ) [ICC/167]
               </p>
               <div class='Note'>
                 <p>
@@ -389,10 +341,12 @@ RSpec.describe IsoDoc do
               <p id='ISBN' class='Biblio'>
                 [1]&#160;
                 <i>Chemicals for analytical laboratory use</i>
+                . ISBN.
               </p>
               <p id='ISSN' class='Biblio'>
                 [2]&#160;
                 <i>Instruments for analytical laboratory use</i>
+                . ISSN.
               </p>
               <div class='Note'>
                 <p>
@@ -409,37 +363,41 @@ RSpec.describe IsoDoc do
               <p id='ISO3696' class='Biblio'>
                 [3]&#160; ISO 3696,
                 <i>Water for analytical laboratory use</i>
+                .
               </p>
               <p id='ref10' class='Biblio'>
                 [10]&#160;
                 <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
-                .
+                 .
                 <i>
-                  Determination of the protein content in cereal and cereal products
+                   Determination of the protein content in cereal and cereal products
                   for food and animal feeding stuffs according to the Dumas combustion
                   method
                 </i>
                  (see
                 <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
-                )
+                 )
               </p>
               <p id='ref11' class='Biblio'>
                 [4]&#160; IETF RFC 10,
                 <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
+                .
               </p>
               <p id='ref12' class='Biblio'>
                 Citn&#160; IETF RFC 20, CitationWorks. 2019.
                 <i>How to cite a reference</i>
-                .
+                 . [IETF RFC 20]
               </p>
-                <p id='ref10b' class='Biblio'>
+              <p id='ref10b' class='Biblio'>
                 [5]&#160; IETF RFC 20,
                 <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
+                .
               </p>
               <p id='ref10c' class='Biblio'>
-          [6]&#160;
-          <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
-        </p>
+                [6]&#160;
+                <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
+                .
+              </p>
             </div>
             <aside id='fn:1' class='footnote'>
               <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
@@ -702,11 +660,7 @@ RSpec.describe IsoDoc do
                       </contributor>
                     </bibitem>
                     <bibitem id='ISO16634' type='standard'>
-                      <title language='x' format='text/plain'>
-                        Cereals, pulses, milled cereal products, xxxx, oilseeds and animal
-                        feeding stuffs
-                      </title>
-                      <title language='en' format='text/plain'>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
+                      <formattedref language='en' format='text/plain'><em>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</em></formattedref>
                       <docidentifier type='ISO'>ISO 16634:-- (all parts)</docidentifier>
                       <date type='published'>
                         <on>--</on>
@@ -880,16 +834,16 @@ RSpec.describe IsoDoc do
          <references id='_normative_references' obligation='informative' normative='false' displayorder='1'>
            <title depth='1'>Bibliography</title>
            <bibitem id='ref1' type='standard'>
-             <title format='text/plain'>Cereals or cereal products</title>
+             <formattedref><em>Cereals or cereal products</em>.</formattedref>
              <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
              <docidentifier type='IEC'>IEC 217</docidentifier>
            </bibitem>
            <bibitem id='ref2' type='standard'>
-             <title format='text/plain'>Cereals or cereal products</title>
+             <formattedref><em>Cereals or cereal products</em>.</formattedref>
              <docidentifier type='metanorma'>[3]</docidentifier>
            </bibitem>
            <bibitem id='ref3' type='standard'>
-             <title format='text/plain'>Cereals or cereal products</title>
+             <formattedref><em>Cereals or cereal products</em>.</formattedref>
              <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
              <docidentifier>ABC</docidentifier>
            </bibitem>
@@ -929,15 +883,15 @@ RSpec.describe IsoDoc do
         <references id='_normative_references' obligation='informative' normative='false' displayorder='1'>
           <title depth='1'>Bibliography</title>
           <bibitem id='ref1' type='standard'>
-            <title format='text/plain'>Cereals or cereal products</title>
+            <formattedref><em>Cereals or cereal products</em>.</formattedref>
             <docidentifier type='metanorma'>[1]</docidentifier>
           </bibitem>
           <bibitem id='ref2' type='standard' hidden='true'>
-            <title format='text/plain'>Cereals or cereal products</title>
+            <formattedref><em>Cereals or cereal products</em>.</formattedref>
             <docidentifier type='metanorma'>[2]</docidentifier>
           </bibitem>
           <bibitem id='ref3' type='standard'>
-            <title format='text/plain'>Cereals or cereal products</title>
+            <formattedref><em>Cereals or cereal products</em>.</formattedref>
             <docidentifier type='metanorma'>[3]</docidentifier>
           </bibitem>
         </references>
@@ -976,16 +930,16 @@ RSpec.describe IsoDoc do
         <references id='_normative_references' obligation='informative' normative='false' displayorder='1'>
           <title depth='1'>Bibliography</title>
           <bibitem id='ref1' type='standard'>
-            <title format='text/plain'>Cereals or cereal products</title>
+            <formattedref><em>Cereals or cereal products</em>.</formattedref>
             <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
             <docidentifier>ABC</docidentifier>
           </bibitem>
           <bibitem id='ref2' type='standard' hidden='true'>
-            <title format='text/plain'>Cereals or cereal products</title>
+            <formattedref><em>Cereals or cereal products</em>.</formattedref>
             <docidentifier>ABD</docidentifier>
           </bibitem>
           <bibitem id='ref3' type='standard'>
-            <title format='text/plain'>Cereals or cereal products</title>
+            <formattedref><em>Cereals or cereal products</em>.</formattedref>
             <docidentifier type='metanorma-ordinal'>[2]</docidentifier>
             <docidentifier>ABE</docidentifier>
           </bibitem>

data/spec/isodoc/section_spec.rb

@@ -45,7 +45,6 @@ RSpec.describe IsoDoc do
               </div>
               <p class='zzSTDTitle1'/>
               <div id='L' class='Admonition'>
-                <p class='AdmonitionTitle' style='text-align:center;'>CAUTION</p>
                 <p>admonition</p>
               </div>
               <div id='M'>
@@ -105,7 +104,6 @@ RSpec.describe IsoDoc do
             <div class='WordSection3'>
               <p class='zzSTDTitle1'/>
               <div id='L' class='Admonition'>
-                <p class='AdmonitionTitle' style='text-align:center;'>CAUTION</p>
                 <p>admonition</p>
               </div>
               <div id='M'>
@@ -201,7 +199,9 @@ RSpec.describe IsoDoc do
        </acknowledgements>
         </preface><sections>
         <note id="NN1"><p>Initial note</p></note>
-        <admonition id="NN2" type="warning"><p>Initial admonition</p></admonition>
+        <admonition id="NN2" type="warning">
+        <name>WARNING</name>
+        <p>Initial admonition</p></admonition>
        <clause id="D" obligation="normative" type="scope">
          <title>Scope</title>
          <p id="E">Text</p>
@@ -316,6 +316,7 @@ RSpec.describe IsoDoc do
             <p>Initial note</p>
           </note>
           <admonition id='NN2' type='warning'>
+            <name>WARNING</name>
             <p>Initial admonition</p>
           </admonition>
           <clause id='D' obligation='normative' type='scope' displayorder='7'>
@@ -2048,7 +2049,6 @@ RSpec.describe IsoDoc do
             <strong>Glossary</strong>
           </title>
           <terms id='PP1' obligation='normative'>
-            <title>A.</title>
             <term id='term-glossary'>
               <name>A.1.</name>
               <preferred><strong>Glossary</strong></preferred>

data/spec/isodoc/xref_numbering_spec.rb

@@ -344,4 +344,35 @@ RSpec.describe IsoDoc do
     a.increment({})
     expect(a.print).to eq "Bb"
   end
+
+  it "returns initial unincremented value" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface>
+      <foreword id="fwd">
+      <note id="A" unnumbered="true"/>
+      <note id="B" unnumbered="false"/>
+      <note id="C" unnumbered="true"/>
+      </foreword>
+      </preface>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+           <foreword id='fwd' displayorder='1'>
+         <note id='A' unnumbered='true'>
+           <name>NOTE </name>
+         </note>
+         <note id='B' unnumbered='false'>
+           <name>NOTE </name>
+         </note>
+         <note id='C' unnumbered='true'>
+           <name>NOTE </name>
+         </note>
+       </foreword>
+    OUTPUT
+    expect(xmlpp(Nokogiri::XML(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.0.8.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: emf2svg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: relaton-render
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -490,6 +504,8 @@ files:
 - lib/metanorma/output/base.rb
 - lib/metanorma/output/utils.rb
 - lib/metanorma/output/xslfo.rb
+- lib/relaton/render/config.yml
+- lib/relaton/render/general.rb
 - spec/assets/header.html
 - spec/assets/html.scss
 - spec/assets/html_override.css