RubyGems - metanorma-iso - Versions diffs - 1.8.4 → 1.9.0.1 - Mend

metanorma-iso 1.8.4 → 1.9.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

checksums.yaml +4 -4
data/.github/workflows/rake.yml +1 -1
data/.rubocop.yml +1 -1
data/lib/asciidoctor/iso/cleanup.rb +0 -1
data/lib/asciidoctor/iso/isodoc.rng +50 -8
data/lib/asciidoctor/iso/isostandard.rng +7 -3
data/lib/asciidoctor/iso/section.rb +3 -0
data/lib/asciidoctor/iso/validate.rb +4 -17
data/lib/asciidoctor/iso/validate_section.rb +50 -34
data/lib/asciidoctor/iso/validate_style.rb +3 -3
data/lib/isodoc/iso/base_convert.rb +41 -16
data/lib/isodoc/iso/html/isodoc.css +475 -20
data/lib/isodoc/iso/html/isodoc.scss +456 -23
data/lib/isodoc/iso/html/wordstyle.css +202 -31
data/lib/isodoc/iso/html/wordstyle.scss +194 -32
data/lib/isodoc/iso/iso.amendment.xsl +480 -388
data/lib/isodoc/iso/iso.international-standard.xsl +480 -388
data/lib/isodoc/iso/isosts_convert.rb +12 -13
data/lib/isodoc/iso/metadata.rb +2 -2
data/lib/isodoc/iso/presentation_xml_convert.rb +62 -9
data/lib/isodoc/iso/sts_convert.rb +4 -5
data/lib/isodoc/iso/word_convert.rb +153 -39
data/lib/isodoc/iso/xref.rb +17 -1
data/lib/metanorma/iso/version.rb +1 -1
data/metanorma-iso.gemspec +4 -4
data/spec/asciidoctor/section_spec.rb +128 -7
data/spec/asciidoctor/validate_spec.rb +15 -15
data/spec/isodoc/amd_spec.rb +193 -201
data/spec/isodoc/blocks_spec.rb +100 -88
data/spec/isodoc/i18n_spec.rb +36 -36
data/spec/isodoc/inline_spec.rb +472 -2
data/spec/isodoc/iso_spec.rb +86 -138
data/spec/isodoc/postproc_spec.rb +19 -10
data/spec/isodoc/ref_spec.rb +6 -6
data/spec/isodoc/section_spec.rb +394 -276
data/spec/isodoc/table_spec.rb +166 -231
data/spec/isodoc/terms_spec.rb +11 -8
data/spec/isodoc/xref_spec.rb +147 -118
metadata +8 -8

data/spec/isodoc/inline_spec.rb CHANGED Viewed

@@ -318,7 +318,7 @@ RSpec.describe IsoDoc do
       <?xml version='1.0'?>
       <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <p>
               <eref bibitemid="IEV" citeas="IEV" type="inline">
                 <locality type="clause">
@@ -372,7 +372,7 @@ RSpec.describe IsoDoc do
           </foreword>
         </preface>
         <bibliography>
-          <references id="_normative_references" normative="true" obligation="informative">
+          <references id="_normative_references" normative="true" obligation="informative" displayorder="2">
             <title depth="1">1<tab/>
               Normative References</title>
             <bibitem id="ISO712" type="standard">
@@ -390,4 +390,474 @@ RSpec.describe IsoDoc do
       </iso-standard>
     OUTPUT
   end
+  it "processes concept markup" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+          <terms id="Terms">
+          <p>
+          <ul>
+                    <li><concept><refterm>term0</refterm>
+              <xref target='clause1'/>
+            </concept></li>
+            <li><concept><refterm>term1</refterm>
+              <renderterm>term</renderterm>
+              <xref target='clause1'/>
+            </concept></li>
+          <li><concept><refterm>term2</refterm>
+              <renderterm>w[o]rd</renderterm>
+              <xref target='clause1'>Clause #1</xref>
+            </concept></li>
+            <li><concept><refterm>term3</refterm>
+              <renderterm>term</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712"/>
+            </concept></li>
+            <li><concept><refterm>term4</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">The Aforementioned Citation</eref>
+            </concept></li>
+            <li><concept><refterm>term5</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+                <locality type='clause'>
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+                <locality type='figure'>
+                  <referenceFrom>a</referenceFrom>
+                </locality>
+              </eref>
+            </concept></li>
+            <li><concept><refterm>term6</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+              <localityStack>
+                <locality type='clause'>
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+              </localityStack>
+              <localityStack>
+                <locality type='figure'>
+                  <referenceFrom>b</referenceFrom>
+                </locality>
+              </localityStack>
+              </eref>
+            </concept></li>
+            <li><concept><refterm>term7</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+              <localityStack>
+                <locality type='clause'>
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+              </localityStack>
+              <localityStack>
+                <locality type='figure'>
+                  <referenceFrom>b</referenceFrom>
+                </locality>
+              </localityStack>
+              The Aforementioned Citation
+              </eref>
+            </concept></li>
+            <li><concept><refterm>term8</refterm>
+              <renderterm>word</renderterm>
+              <termref base='IEV' target='135-13-13'/>
+            </concept></li>
+            <li><concept><refterm>term9</refterm>
+              <renderterm>word</renderterm>
+              <termref base='IEV' target='135-13-13'>The IEV database</termref>
+            </concept></li>
+            <li><concept><refterm>term10</refterm>
+              <renderterm>word</renderterm>
+              <strong>error!</strong>
+            </concept></li>
+            </ul>
+          </p>
+          </terms>
+          <clause id="clause1"><title>Clause 1</title></clause>
+          </sections>
+          <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
+          <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 document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any 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>
+        <docidentifier type="ISO">ISO 712</docidentifier>
+        <contributor>
+          <role type="publisher"/>
+          <organization>
+            <name>International Organization for Standardization</name>
+          </organization>
+        </contributor>
+      </bibitem>
+      </references></bibliography>
+          </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+          <sections>
+          <terms id="Terms" displayorder="2"><title>2</title>
+          <p>
+          <ul>
+                    <li>
+              (<xref target="clause1">Clause 3</xref>)
+            </li>
+            <li>
+              <em>term</em>
+              (<xref target="clause1">Clause 3</xref>)
+            </li>
+          <li>
+              <em>w[o]rd</em>
+              (<xref target="clause1">Clause #1</xref>)
+            </li>
+            <li>
+              <em>term</em>
+              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712">ISO 712</eref>)
+            </li>
+            <li>
+              <em>word</em>
+              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712">The Aforementioned Citation</eref>)
+            </li>
+            <li>
+              <em>word</em>
+              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712"><locality type="clause">
+                  <referenceFrom>3.1</referenceFrom>
+                </locality><locality type="figure">
+                  <referenceFrom>a</referenceFrom>
+                </locality>ISO 712, 3.1, Figure a</eref>)
+            </li>
+            <li>
+              <em>word</em>
+              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712"><localityStack>
+                <locality type="clause">
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+              </localityStack><localityStack>
+                <locality type="figure">
+                  <referenceFrom>b</referenceFrom>
+                </locality>
+              </localityStack>ISO 712, 3.1; Figure b</eref>)
+            </li>
+            <li>
+              <em>word</em>
+              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+              <localityStack>
+                <locality type="clause">
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+              </localityStack>
+              <localityStack>
+                <locality type="figure">
+                  <referenceFrom>b</referenceFrom>
+                </locality>
+              </localityStack>
+              The Aforementioned Citation
+              </eref>)
+            </li>
+            <li>
+              <em>word</em>
+              [term defined in <termref base="IEV" target="135-13-13"/>]
+            </li>
+            <li>
+              <em>word</em>
+              [term defined in <termref base="IEV" target="135-13-13">The IEV database</termref>]
+            </li>
+            <li>
+              <em>word</em>
+              <strong>error!</strong>
+            </li>
+            </ul>
+          </p>
+          </terms>
+          <clause id="clause1" displayorder="3"><title depth="1">3<tab/>Clause 1</title></clause>
+          </sections>
+          <bibliography><references id="_normative_references" obligation="informative" normative="true" displayorder="1"><title depth="1">1<tab/>Normative References</title>
+          <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 document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any 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>
+        <docidentifier type="ISO">ISO 712</docidentifier>
+        <contributor>
+          <role type="publisher"/>
+          <organization>
+            <name>International Organization for Standardization</name>
+          </organization>
+        </contributor>
+      </bibitem>
+      </references></bibliography>
+          </iso-standard>
+    OUTPUT
+    output = <<~OUTPUT
+      #{HTML_HDR}
+             <p class='zzSTDTitle1'/>
+             <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
+                 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'>
+                 ISO 712,
+                 <i>Cereals and cereal products</i>
+               </p>
+             </div>
+             <div id='Terms'>
+               <h1>2</h1>
+               <p>
+                 <ul>
+                   <li>
+                      (
+                     <a href='#clause1'>Clause 3</a>
+                     )
+                   </li>
+                   <li>
+                     <i>term</i>
+                      (
+                     <a href='#clause1'>Clause 3</a>
+                     )
+                   </li>
+                   <li>
+                     <i>w[o]rd</i>
+                      (
+                     <a href='#clause1'>Clause #1</a>
+                     )
+                   </li>
+                   <li>
+                     <i>term</i>
+                      (
+                     <a href='#ISO712'>ISO 712</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'>The Aforementioned Citation</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'>ISO 712, 3.1, Figure a</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'>ISO 712, 3.1; Figure b</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'> The Aforementioned Citation </a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      [term defined in Termbase IEV, term ID 135-13-13]
+                   </li>
+                   <li>
+                     <i>word</i>
+                      [term defined in The IEV database]
+                   </li>
+                   <li>
+                     <i>word</i>
+                     <b>error!</b>
+                   </li>
+                 </ul>
+               </p>
+             </div>
+             <div id='clause1'>
+               <h1>3&#160; Clause 1</h1>
+             </div>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
+  end
+  it "processes concept markup by context" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface><foreword id="A">
+      <ul>
+      <li><concept><refterm>term1</refterm>
+          <renderterm>term</renderterm>
+          <xref target='clause1'/>
+        </concept></li>
+        </ul>
+      </foreword></preface>
+      <sections>
+      <terms id="Terms">
+      <term id="clause1">
+       <ul>
+      <li><concept><refterm>term1</refterm>
+          <renderterm>term</renderterm>
+          <xref target='clause1'/>
+        </concept></li>
+      <li><concept><refterm>term1</refterm>
+          <renderterm>term</renderterm>
+          <xref target='clause1'/>
+        </concept></li>
+        </ul>
+        </term>
+      </terms>
+      </sections>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <preface>
+          <foreword id='A' displayorder='1'>
+            <ul>
+              <li>term</li>
+            </ul>
+          </foreword>
+        </preface>
+        <sections>
+          <terms id='Terms' displayorder='2'>
+            <title>1</title>
+            <term id='clause1'>
+              <name>1.1</name>
+              <ul>
+                <li>
+                  <em>term</em>
+                   (
+                  <xref target='clause1'>1.1</xref>
+                  )
+                </li>
+                <li>term</li>
+              </ul>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+       .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
+  it "processes concept attributes" do
+    input = <<~INPUT
+       <iso-standard xmlns="http://riboseinc.com/isoxml">
+       <sections>
+       <clause id="clause1"><title>Clause 1</title></clause>
+       <terms id="A">
+       <p>
+       <ul>
+       <li>
+              <concept ital="true"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+         <li><concept ref="true"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+       <li><concept ital="true" ref="true"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+        <li><concept ital="false"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+         <li><concept ref="false"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+       <li><concept ital="false" ref="false"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+        </ul></p>
+       </terms>
+       </sections>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+           <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+        <sections>
+        <clause id="clause1" displayorder="1"><title depth="1">1<tab/>Clause 1</title></clause>
+        <terms id="A" displayorder="2"><title>2</title>
+        <p>
+        <ul>
+        <li>
+            <em>term</em>
+            (<xref target="clause1">Clause 1</xref>)
+          </li>
+          <li>
+            term
+            (<xref target="clause1">Clause 1</xref>)
+          </li>
+        <li>
+            <em>term</em>
+            (<xref target="clause1">Clause 1</xref>)
+          </li>
+         <li>
+            term
+          </li>
+          <li>
+            term
+          </li>
+        <li>
+            term
+          </li>
+         </ul></p>
+        </terms>
+        </sections>
+       </iso-standard>
+    OUTPUT
+    output = <<~OUTPUT
+    #{HTML_HDR}
+       <p class='zzSTDTitle1'/>
+       <div id='clause1'>
+         <h1>1&#160; Clause 1</h1>
+       </div>
+       <div id='A'>
+         <h1>2</h1>
+         <p>
+                          <ul>
+                   <li>
+                     <i>term</i>
+                      (
+                     <a href='#clause1'>Clause 1</a>
+                     )
+                   </li>
+                   <li>
+                      term (
+                     <a href='#clause1'>Clause 1</a>
+                     )
+                   </li>
+                   <li>
+                     <i>term</i>
+                      (
+                     <a href='#clause1'>Clause 1</a>
+                     )
+                   </li>
+                   <li> term </li>
+                   <li> term </li>
+                   <li> term </li>
+                 </ul>
+         </p>
+       </div>
+     </div>
+   </body>
+ </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
+  end
 end