RubyGems - isodoc - Versions diffs - 1.7.6 → 1.8.1 - Mend

isodoc 1.7.6 → 1.8.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 (44) hide show

checksums.yaml +4 -4
data/isodoc.gemspec +1 -1
data/lib/isodoc/class_utils.rb +23 -0
data/lib/isodoc/convert.rb +9 -0
data/lib/isodoc/function/cleanup.rb +4 -0
data/lib/isodoc/function/inline.rb +2 -4
data/lib/isodoc/function/utils.rb +1 -1
data/lib/isodoc/html_function/html.rb +1 -0
data/lib/isodoc/html_function/postprocess.rb +4 -6
data/lib/isodoc/metadata_date.rb +13 -11
data/lib/isodoc/presentation_function/bibdata.rb +2 -2
data/lib/isodoc/presentation_function/block.rb +0 -36
data/lib/isodoc/presentation_function/inline.rb +14 -11
data/lib/isodoc/presentation_function/terms.rb +179 -0
data/lib/isodoc/presentation_xml_convert.rb +11 -4
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/word_function/body.rb +24 -14
data/lib/isodoc/word_function/comments.rb +0 -4
data/lib/isodoc/word_function/postprocess.rb +184 -176
data/lib/isodoc/xref/xref_gen.rb +18 -22
data/lib/isodoc/xref/xref_gen_seq.rb +10 -16
data/lib/isodoc/xref/xref_sect_gen.rb +134 -129
data/lib/isodoc/xslfo_convert.rb +11 -7
data/lib/isodoc-yaml/i18n-ar.yaml +22 -0
data/lib/isodoc-yaml/i18n-de.yaml +20 -0
data/lib/isodoc-yaml/i18n-en.yaml +20 -0
data/lib/isodoc-yaml/i18n-es.yaml +20 -0
data/lib/isodoc-yaml/i18n-fr.yaml +20 -0
data/lib/isodoc-yaml/i18n-ru.yaml +21 -1
data/lib/isodoc-yaml/i18n-zh-Hans.yaml +21 -0
data/lib/metanorma/output/xslfo.rb +4 -11
data/spec/assets/i18n.yaml +3 -1
data/spec/isodoc/blocks_spec.rb +14 -8
data/spec/isodoc/i18n_spec.rb +8 -8
data/spec/isodoc/inline_spec.rb +200 -6
data/spec/isodoc/lists_spec.rb +344 -222
data/spec/isodoc/section_spec.rb +11 -10
data/spec/isodoc/table_spec.rb +71 -73
data/spec/isodoc/terms_spec.rb +354 -34
data/spec/isodoc/xref_numbering_spec.rb +347 -0
data/spec/isodoc/xref_spec.rb +271 -350
data/spec/isodoc/xslfo_convert_spec.rb +34 -9
metadata +7 -6
data/lib/isodoc/presentation_function/concept.rb +0 -68

data/spec/isodoc/terms_spec.rb CHANGED Viewed

@@ -7,9 +7,16 @@ RSpec.describe IsoDoc do
           <sections>
           <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
           <p>For the purposes of this document, the following terms and definitions apply.</p>
-      <term id="paddy1"><preferred>paddy</preferred>
+      <term id="paddy1"><preferred><expression><name>paddy</name></expression>
+            <termsource status="modified">
+        <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+          <modification>
+          <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
+        </modification>
+      </termsource>
+      </preferred>
       <domain>rice</domain>
-      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
       <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892"  keep-with-next="true" keep-lines-together="true">
         <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
         <ul>
@@ -21,12 +28,6 @@ RSpec.describe IsoDoc do
         <li>A</li>
         </ul>
       </termexample>
-      <termsource status="modified">
-        <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
-          <modification>
-          <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
-        </modification>
-      </termsource>
       <termsource status='identical'>
           <origin citeas=''>
             <termref base='IEV' target='xyz'>t1</termref>
@@ -41,10 +42,11 @@ RSpec.describe IsoDoc do
           </modification>
         </termsource>
       </term>
-      <term id="paddy"><preferred>paddy</preferred><admitted>paddy rice</admitted>
-      <admitted>rough rice</admitted>
-      <deprecates>cargo rice</deprecates>
-      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+      <term id="paddy"><preferred><expression><name>paddy</name></expression></preferred>
+      <admitted><letter-symbol><name>paddy rice</name></letter-symbol></admitted>
+      <admitted><expression><name>rough rice</name></expression></admitted>
+      <deprecates><expression><name>cargo rice</name></expression></deprecates>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
       <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f893">
         <ul>
         <li>A</li>
@@ -78,6 +80,17 @@ RSpec.describe IsoDoc do
                    <p>For the purposes of this document, the following terms and definitions apply.</p>
                    <term id='paddy1'><name>1.1.</name>
                      <preferred>paddy</preferred>
+                                          <termsource status='modified'>
+                       <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'>
+        <referenceFrom>3.1</referenceFrom>
+      </locality>ISO 7301:2011, Clause 3.1</origin>
+                       <modification>
+                         <p id='_e73a417d-ad39-417d-a4c8-20e4e2529489'>
+                           The term "cargo rice" is shown as deprecated, and Note 1 to entry
+                           is not included here
+                         </p>
+                       </modification>
+                     </termsource>
                      <domain>rice</domain>
                      <definition>
                        <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
@@ -95,17 +108,6 @@ RSpec.describe IsoDoc do
                          <li>A</li>
                        </ul>
                      </termexample>
-                     <termsource status='modified'>
-                       <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'>
-        <referenceFrom>3.1</referenceFrom>
-      </locality>ISO 7301:2011, Clause 3.1</origin>
-                       <modification>
-                         <p id='_e73a417d-ad39-417d-a4c8-20e4e2529489'>
-                           The term "cargo rice" is shown as deprecated, and Note 1 to entry
-                           is not included here
-                         </p>
-                       </modification>
-                     </termsource>
                      <termsource status='identical'>
                        <origin citeas=''>
                          <termref base='IEV' target='xyz'>t1</termref>
@@ -173,6 +175,10 @@ RSpec.describe IsoDoc do
               <p>For the purposes of this document,
                  the following terms and definitions apply.</p>
              <p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
+                          <p>[TERMREF]
+               <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
+                 [MODIFICATION] The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
+             [/TERMREF]</p>
              <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
              <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"  style='page-break-after: avoid;page-break-inside: avoid;'><p class="example-title">EXAMPLE 1</p>
                <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
@@ -185,10 +191,6 @@ RSpec.describe IsoDoc do
                <li>A</li>
                </ul>
              </div>
-             <p>[TERMREF]
-               <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
-                 [MODIFICATION] The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
-             [/TERMREF]</p>
              <p>[TERMREF] t1 [/TERMREF]</p>
       <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
       <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
@@ -217,6 +219,10 @@ RSpec.describe IsoDoc do
                    <div id="_terms_and_definitions"><h1>1.<span style="mso-tab-count:1">&#160; </span>Terms and Definitions</h1><p>For the purposes of this document,
                  the following terms and definitions apply.</p>
              <p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
+                          <p>[TERMREF]
+               <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
+                 [MODIFICATION] The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
+             [/TERMREF]</p>
              <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
              <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"  style='page-break-after: avoid;page-break-inside: avoid;'><p class="example-title">EXAMPLE 1</p>
                <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
@@ -229,10 +235,6 @@ RSpec.describe IsoDoc do
                <li>A</li>
                </ul>
              </div>
-             <p>[TERMREF]
-               <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
-                 [MODIFICATION] The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
-             [/TERMREF]</p>
              <p>[TERMREF] t1 [/TERMREF]</p>
       <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
       <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
@@ -268,16 +270,17 @@ RSpec.describe IsoDoc do
           <sections>
           <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
           <p>For the purposes of this document, the following terms and definitions apply.</p>
-      <term id="paddy1"><preferred>paddy</preferred>
+      <term id="paddy1"><preferred><expression><name>paddy</name></expression></preferred>
       <domain>rice</domain>
-      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
-      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747e">rice retaining its husk after threshing, mark 2</p>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747e">rice retaining its husk after threshing, mark 2</p>
       <termsource status="modified">
         <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
           <modification>
           <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
         </modification>
       </termsource>
+      </verbaldefinition>
       </definition>
       <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892"  keep-with-next="true" keep-lines-together="true">
         <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
@@ -377,4 +380,321 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
   end
+  it "processes IsoXML term with multiple preferred terms" do
+    input = <<~"INPUT"
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+          <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+      <term id="paddy1">
+      <preferred><expression><name>paddy</name></expression></preferred>
+      <preferred><expression><name>muddy rice</name></expression></preferred>
+      <domain>rice</domain>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
+      </term>
+                </terms>
+        </sections>
+      </iso-standard>
+    INPUT
+    presxml = <<~PRESXML
+          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <sections>
+          <terms id='_terms_and_definitions' obligation='normative' displayorder='1'>
+            <title depth='1'>
+              1.
+              <tab/>
+              Terms and Definitions
+            </title>
+            <term id='paddy1'>
+              <name>1.1.</name>
+              <preferred>paddy; muddy rice</preferred>
+              <domain>rice</domain>
+              <definition>
+                <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
+              </definition>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    PRESXML
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
+  it "processes IsoXML term with grammatical information" do
+    input = <<~"INPUT"
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+          <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+      <term id="paddy1">
+      <preferred><expression><name>paddy</name>
+                  <grammar>
+              <gender>masculine</gender>
+              <gender>feminine</gender>
+              <isPreposition>false</isPreposition>
+              <isNoun>true</isNoun>
+              <grammarValue>irregular declension</grammarValue>
+            </grammar>
+      </expression></preferred>
+      <preferred><expression><name>muddy rice</name>
+                        <grammar>
+              <gender>neuter</gender>
+              <isNoun>true</isNoun>
+              <grammarValue>irregular declension</grammarValue>
+            </grammar>
+      </expression></preferred>
+      <domain>rice</domain>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
+      </term>
+                </terms>
+        </sections>
+      </iso-standard>
+    INPUT
+    presxml = <<~PRESXML
+          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <sections>
+          <terms id='_terms_and_definitions' obligation='normative' displayorder='1'>
+            <title depth='1'>
+              1.
+              <tab/>
+              Terms and Definitions
+            </title>
+            <term id='paddy1'>
+              <name>1.1.</name>
+              <preferred>paddy masc, fem, n; muddy rice neut, n</preferred>
+              <domain>rice</domain>
+              <definition>
+                <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
+              </definition>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    PRESXML
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
+  it "processes IsoXML term with empty or graphical designations" do
+    input = <<~"INPUT"
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+          <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+      <term id="paddy1">
+      <preferred><expression><name/></expression></preferred>
+      <preferred isInternational='true'><graphical-symbol><figure id='_'><pre id='_'>&lt;LITERAL&gt; FIGURATIVE</pre></figure>
+                 </graphical-symbol>
+               </preferred>
+      <domain>rice</domain>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
+      </term>
+                </terms>
+        </sections>
+      </iso-standard>
+    INPUT
+    presxml = <<~PRESXML
+      <?xml version='1.0'?>
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <sections>
+          <terms id='_terms_and_definitions' obligation='normative' displayorder='1'>
+            <title depth='1'>1.<tab/>Terms and Definitions</title>
+            <term id='paddy1'>
+              <name>1.1.</name>
+              <preferred>; <figure id='_'>
+                  <name>Figure 1</name>
+                  <pre id='_'>&lt;LITERAL&gt; FIGURATIVE</pre>
+                </figure>
+              </preferred>
+              <domain>rice</domain>
+              <definition>
+                <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
+              </definition>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    PRESXML
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
+  it "processes IsoXML term with nonverbal definitions" do
+    input = <<~"INPUT"
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+                    <sections>
+            <terms id='A' obligation='normative'>
+              <title>Terms and definitions</title>
+              <p id='B'>For the purposes of this document, the following terms and definitions apply.</p>
+              <term id='term-term'>
+                <preferred>
+                  <expression>
+                    <name>Term</name>
+                  </expression>
+                </preferred>
+                <definition>
+                  <verbaldefinition>
+                    <p id='C'>Definition</p>
+                    <termsource status='identical' type='authoritative'>
+                      <origin bibitemid='ISO2191' type='inline' citeas=''>
+                        <localityStack>
+                          <locality type='section'>
+                            <referenceFrom>1</referenceFrom>
+                          </locality>
+                        </localityStack>
+                      </origin>
+                    </termsource>
+                  </verbaldefinition>
+                  <nonverbalrepresentation>
+                    <table id='D'>
+                      <thead>
+                        <tr>
+                          <th valign='top' align='left'>A</th>
+                          <th valign='top' align='left'>B</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr>
+                          <td valign='top' align='left'>C</td>
+                          <td valign='top' align='left'>D</td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </nonverbalrepresentation>
+                </definition>
+                <termsource status='identical' type='authoritative'>
+                  <origin bibitemid='ISO2191' type='inline' citeas=''>
+                    <localityStack>
+                      <locality type='section'>
+                        <referenceFrom>2</referenceFrom>
+                      </locality>
+                    </localityStack>
+                  </origin>
+                </termsource>
+              </term>
+              <term id='term-term-2'>
+                <preferred>
+                  <expression>
+                    <name>Term 2</name>
+                  </expression>
+                </preferred>
+                <definition>
+                  <nonverbalrepresentation>
+                    <figure id='E'>
+                      <pre id='F'>Literal</pre>
+                    </figure>
+                    <formula id='G'>
+                      <stem type='MathML'>
+                        <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                          <mi>x</mi>
+                          <mo>=</mo>
+                          <mi>y</mi>
+                        </math>
+                      </stem>
+                    </formula>
+                    <termsource status='identical' type='authoritative'>
+                      <origin bibitemid='ISO2191' type='inline' citeas=''>
+                        <localityStack>
+                          <locality type='section'>
+                            <referenceFrom>3</referenceFrom>
+                          </locality>
+                        </localityStack>
+                      </origin>
+                    </termsource>
+                  </nonverbalrepresentation>
+                </definition>
+              </term>
+            </terms>
+          </sections>
+      </iso-standard>
+    INPUT
+presxml = <<~PRESXML
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <sections>
+           <terms id='A' obligation='normative' displayorder='1'>
+             <title depth='1'>
+               1.
+               <tab/>
+               Terms and definitions
+             </title>
+             <p id='B'>For the purposes of this document, the following terms and definitions apply.</p>
+             <term id='term-term'>
+               <name>1.1.</name>
+               <preferred>Term</preferred>
+               <definition>
+                 <p id='C'>Definition</p>
+                 <termsource status='identical' type='authoritative'>
+                   <origin bibitemid='ISO2191' type='inline' citeas=''>
+                     <localityStack>
+                       <locality type='section'>
+                         <referenceFrom>1</referenceFrom>
+                       </locality>
+                     </localityStack>
+                     , Section 1
+                   </origin>
+                 </termsource>
+                 <table id='D'>
+                   <name>Table 1</name>
+                   <thead>
+                     <tr>
+                       <th valign='top' align='left'>A</th>
+                       <th valign='top' align='left'>B</th>
+                     </tr>
+                   </thead>
+                   <tbody>
+                     <tr>
+                       <td valign='top' align='left'>C</td>
+                       <td valign='top' align='left'>D</td>
+                     </tr>
+                   </tbody>
+                 </table>
+               </definition>
+               <termsource status='identical' type='authoritative'>
+                 <origin bibitemid='ISO2191' type='inline' citeas=''>
+                   <localityStack>
+                     <locality type='section'>
+                       <referenceFrom>2</referenceFrom>
+                     </locality>
+                   </localityStack>
+                   , Section 2
+                 </origin>
+               </termsource>
+             </term>
+             <term id='term-term-2'>
+               <name>1.2.</name>
+               <preferred>Term 2</preferred>
+               <definition>
+                 <figure id='E'>
+                   <name>Figure 1</name>
+                   <pre id='F'>Literal</pre>
+                 </figure>
+                 <formula id='G'>
+                   <name>1</name>
+                   <stem type='MathML'>
+                     <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                       <mi>x</mi>
+                       <mo>=</mo>
+                       <mi>y</mi>
+                     </math>
+                     <!-- x = y -->
+                   </stem>
+                 </formula>
+                 <termsource status='identical' type='authoritative'>
+                   <origin bibitemid='ISO2191' type='inline' citeas=''>
+                     <localityStack>
+                       <locality type='section'>
+                         <referenceFrom>3</referenceFrom>
+                       </locality>
+                     </localityStack>
+                     , Section 3
+                   </origin>
+                 </termsource>
+               </definition>
+             </term>
+           </terms>
+         </sections>
+       </iso-standard>
+PRESXML
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
 end