isodoc 1.7.7 → 1.8.0

data/spec/isodoc/i18n_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
-         <preferred>Term2</preferred>
+         <preferred><expression><name>Term2</name></expression></preferred>
        </term>
        </terms>
        <definitions id="K">
@@ -233,7 +233,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
-         <preferred>Term2</preferred>
+         <preferred><expression><name>Term2</name></expression></preferred>
        </term>
        </terms>
        <definitions id="K">
@@ -361,7 +361,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
-         <preferred>Term2</preferred>
+         <preferred><expression><name>Term2</name></expression></preferred>
        </term>
        </terms>
        <definitions id="K">
@@ -570,7 +570,7 @@ RSpec.describe IsoDoc do
              <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
                <title>Normal Terms</title>
                <term id="J">
-               <preferred>Term2</preferred>
+               <preferred><expression><name>Term2</name></expression></preferred>
              </term>
              </terms>
              <definitions id="K">
@@ -812,7 +812,7 @@ RSpec.describe IsoDoc do
              <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
                <title>Normal Terms</title>
                <term id="J">
-               <preferred>Term2</preferred>
+               <preferred><expression><name>Term2</name></expression></preferred>
              </term>
              </terms>
              <definitions id="K">

data/spec/isodoc/inline_spec.rb

@@ -625,6 +625,84 @@ RSpec.describe IsoDoc do
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
+  it "processes related terms" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <sections>
+      <terms id='A' obligation='normative'>
+            <title>Terms and definitions</title>
+            <term id='second'>
+        <preferred>
+          <expression>
+            <name>Second Term</name>
+          </expression>
+        </preferred>
+        <usageinfo>
+          <p id='B'>Usage Info 1.</p>
+        </usageinfo>
+        <definition><verbaldefinition>Definition 1</verbaldefinition></definition>
+      </term>
+      <term id="C">
+      <preferred language='fr' script='Latn' type='prefix'>
+                <expression>
+                  <name>First Designation</name>
+                  </expression></preferred>
+        <related type='contrast'>
+          <preferred>
+            <expression>
+              <name>Fifth Designation</name>
+              <grammar>
+                <gender>neuter</gender>
+              </grammar>
+            </expression>
+          </preferred>
+          <xref target='second'/>
+        </related>
+        <definition><verbaldefinition>Definition 2</verbaldefinition></definition>
+      </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+           <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>
+             <term id='second'>
+               <name>1.1.</name>
+               <preferred>Second Term</preferred>
+               <usageinfo>
+                 <p id='B'>Usage Info 1.</p>
+               </usageinfo>
+               <definition>Definition 1</definition>
+             </term>
+             <term id='C'>
+               <name>1.2.</name>
+               <preferred language='fr' script='Latn' type='prefix'>First Designation</preferred>
+               <p>
+                 <strong>CONTRAST:</strong>
+                 <em>
+                   <preferred>Fifth Designation neut</preferred>
+                 </em>
+                  (
+                 <xref target='second'>Clause 1.1</xref>
+                 )
+               </p>
+               <definition>Definition 2</definition>
+             </term>
+           </terms>
+         </sections>
+       </iso-standard>
+    OUTPUT
+   expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
+
   it "processes embedded inline formatting" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/isodoc/section_spec.rb

@@ -209,7 +209,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
-         <preferred>Term2</preferred>
+         <preferred><expression><name>Term2</name></expression></preferred>
        </term>
        </terms>
        <definitions id="K">
@@ -745,7 +745,7 @@ RSpec.describe IsoDoc do
          <title>Normal Terms</title>
          <variant-title type="sub">Variant 1</variant-title>
          <term id="J">
-         <preferred>Term2</preferred>
+         <preferred><expression><name>Term2</name></expression></preferred>
        </term>
        </terms>
        <definitions id="K">
@@ -1361,7 +1361,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
-         <preferred>Term2</preferred>
+         <preferred><expression><name>Term2</name></expression></preferred>
        </term>
        </terms>
        <definitions id="K">
@@ -1515,8 +1515,9 @@ RSpec.describe IsoDoc do
         </preface>
       </iso-standard>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({ suppressheadingnumbers: true })
-.convert("test", input, true))).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert
+      .new({ suppressheadingnumbers: true })
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes simple terms & definitions" do
@@ -1525,7 +1526,7 @@ RSpec.describe IsoDoc do
       <sections>
       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
         <term id="J">
-        <preferred>Term2</preferred>
+        <preferred><expression><name>Term2</name></expression></preferred>
       </term>
        </terms>
        </sections>
@@ -1786,7 +1787,7 @@ RSpec.describe IsoDoc do
         <title>Glossary</title>
         <terms id='PP1' obligation='normative'>
           <term id='term-glossary'>
-            <preferred>Glossary</preferred>
+            <preferred><expression><name>Glossary</name></expression></preferred>
           </term>
         </terms>
       </annex>
@@ -1795,13 +1796,13 @@ RSpec.describe IsoDoc do
                    <terms id='QQ1' obligation='normative'>
                      <title>Term Collection</title>
                      <term id='term-term-1'>
-                       <preferred>Term</preferred>
+                       <preferred><expression><name>Term</name></expression></preferred>
                      </term>
                    </terms>
                    <terms id='QQ2' obligation='normative'>
                      <title>Term Collection 2</title>
                      <term id='term-term-2'>
-                       <preferred>Term</preferred>
+                       <preferred><expression><name>Term</name></expression></preferred>
                      </term>
                    </terms>
                </annex>
@@ -1810,7 +1811,7 @@ RSpec.describe IsoDoc do
                    <terms id='RR1' obligation='normative'>
                      <title>Term Collection</title>
                      <term id='term-term-3'>
-                       <preferred>Term</preferred>
+                       <preferred><expression><name>Term</name></expression></preferred>
                      </term>
                    </terms>
                    <references id='RR2' obligation='normative'>