isodoc 1.7.6.1 → 1.8.2

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">
@@ -88,7 +88,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title depth="2">3.1.<tab/>Normal Terms</title>
          <term id="J"><name>3.1.1.</name>
-         <preferred>Term2</preferred>
+         <preferred><strong>Term2</strong></preferred>
        </term>
        </terms>
        <definitions id="K"><title>3.2.</title>
@@ -159,7 +159,7 @@ RSpec.describe IsoDoc do
              <div id="I">
                 <h2>3.1.&#160; Normal Terms</h2>
                 <p class="TermNum" id="J">3.1.1.</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
+                <p class="Terms" style="text-align:left;"><b>Term2</b></p>
               </div><div id="K"><h2>3.2.</h2>
                 <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
               </div></div>
@@ -211,7 +211,7 @@ RSpec.describe IsoDoc do
   end
 
   it "defaults to English" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>tlh</language>
@@ -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">
@@ -275,6 +275,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
     INPUT
+    output = <<~OUTPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
       <bibdata>
       <language current="true">tlh</language>
@@ -295,7 +296,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title depth="2">3.1.<tab/>Normal Terms</title>
          <term id="J"><name>3.1.1.</name>
-         <preferred>Term2</preferred>
+         <preferred><strong>Term2</strong></preferred>
        </term>
        </terms>
        <definitions id="K"><title>3.2.</title>
@@ -336,6 +337,10 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
     OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes French" do
@@ -361,7 +366,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">
@@ -425,7 +430,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title depth="2">3.1.<tab/>Normal Terms</title>
          <term id="J"><name>3.1.1.</name>
-         <preferred>Term2</preferred>
+         <preferred><strong>Term2</strong></preferred>
        </term>
        </terms>
        <definitions id="K"><title>3.2.</title>
@@ -496,7 +501,7 @@ RSpec.describe IsoDoc do
              <div id="I">
                 <h2>3.1.&#160; Normal Terms</h2>
                 <p class="TermNum" id="J">3.1.1.</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
+                <p class="Terms" style="text-align:left;"><b>Term2</b></p>
               </div><div id="K"><h2>3.2.</h2>
                 <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
               </div></div>
@@ -570,7 +575,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">
@@ -644,7 +649,7 @@ RSpec.describe IsoDoc do
              <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
                <title depth="2">3.1.<tab/>Normal Terms</title>
                <term id="J"><name>3.1.1.</name>
-               <preferred>Term2</preferred>
+               <preferred><strong>Term2</strong></preferred>
              </term>
              </terms>
              <definitions id="K"><title>3.2.</title>
@@ -728,7 +733,7 @@ RSpec.describe IsoDoc do
              <div id="I">
                       <h2>3.1.&#12288;Normal Terms</h2>
                       <p class="TermNum" id="J">3.1.1.</p>
-                      <p class="Terms" style="text-align:left;">Term2</p>
+                      <p class="Terms" style="text-align:left;"><b>Term2</b></p>
                     </div><div id="K"><h2>3.2.</h2>
                       <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
                     </div></div>
@@ -812,7 +817,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">
@@ -877,7 +882,7 @@ RSpec.describe IsoDoc do
             <ext>
             <doctype language="">brochure</doctype><doctype language="eo">bro&#x15D;uro</doctype>
             </ext>
-            </bibdata><localized-strings><localized-string key="foreword" language="eo">Anta&#x16D;parolo</localized-string><localized-string key="introduction" language="eo">Enkonduko</localized-string><localized-string key="clause" language="eo">kla&#x16D;zo</localized-string><localized-string key="table" language="eo">tabelo</localized-string><localized-string key="source" language="eo">SOURCE</localized-string><localized-string key="modified" language="eo">modified</localized-string><localized-string key="scope" language="eo">Amplekso</localized-string><localized-string key="symbols" language="eo">Simboloj kai mallongigitaj terminoj</localized-string><localized-string key="annex" language="eo">Aldono</localized-string><localized-string key="normref" language="eo">Normaj cita&#x135;oj</localized-string><localized-string key="bibliography" language="eo">Bibliografio</localized-string><localized-string key="inform_annex" language="eo">informa</localized-string><localized-string key="all_parts" language="eo">&#x109;iuj partoj</localized-string><localized-string key="norm_annex" language="eo">normative</localized-string><localized-string key="note" language="eo">NOTO</localized-string><localized-string key="locality.table" language="eo">Tabelo</localized-string><localized-string key="doctype_dict.brochure" language="eo">bro&#x15D;uro</localized-string><localized-string key="doctype_dict.conference_proceedings" language="eo">konferencaktoj</localized-string><localized-string key="stage_dict.published" language="eo">publikigita</localized-string><localized-string key="substage_dict.withdrawn" language="eo">fortirita</localized-string><localized-string key="array.0" language="eo">elem1</localized-string><localized-string key="array.1" language="eo">elem2</localized-string><localized-string key="array.2.elem3" language="eo">elem4</localized-string><localized-string key="array.2.elem5" language="eo">elem6</localized-string><localized-string key="language" language="eo">eo</localized-string><localized-string key="script" language="eo">Latn</localized-string></localized-strings>
+            </bibdata><localized-strings><localized-string key="foreword" language="eo">Anta&#x16D;parolo</localized-string><localized-string key="introduction" language="eo">Enkonduko</localized-string><localized-string key="clause" language="eo">kla&#x16D;zo</localized-string><localized-string key="table" language="eo">tabelo</localized-string><localized-string key="source" language="eo">SOURCE</localized-string><localized-string key="modified" language="eo">modified</localized-string><localized-string key="scope" language="eo">Amplekso</localized-string><localized-string key="symbols" language="eo">Simboloj kai mallongigitaj terminoj</localized-string><localized-string key="annex" language="eo"><strong>aldono</strong></localized-string><localized-string key="normref" language="eo">Normaj cita&#x135;oj</localized-string><localized-string key="bibliography" language="eo">Bibliografio</localized-string><localized-string key="inform_annex" language="eo">informa</localized-string><localized-string key="all_parts" language="eo">&#x109;iuj partoj</localized-string><localized-string key="norm_annex" language="eo">normative</localized-string><localized-string key='figure' language='eo'>figur-etikedo duvorta</localized-string><localized-string key='example' language='eo'>Ekzempl-etikedo Duvorta</localized-string><localized-string key="note" language="eo">NOTO</localized-string><localized-string key="locality.table" language="eo">Tabelo</localized-string><localized-string key="doctype_dict.brochure" language="eo">bro&#x15D;uro</localized-string><localized-string key="doctype_dict.conference_proceedings" language="eo">konferencaktoj</localized-string><localized-string key="stage_dict.published" language="eo">publikigita</localized-string><localized-string key="substage_dict.withdrawn" language="eo">fortirita</localized-string><localized-string key="array.0" language="eo">elem1</localized-string><localized-string key="array.1" language="eo">elem2</localized-string><localized-string key="array.2.elem3" language="eo">elem4</localized-string><localized-string key="array.2.elem5" language="eo">elem6</localized-string><localized-string key="language" language="eo">eo</localized-string><localized-string key="script" language="eo">Latn</localized-string></localized-strings>
             <preface>
             <foreword obligation="informative" displayorder="1">
                <title>Foreword</title>
@@ -896,7 +901,7 @@ RSpec.describe IsoDoc do
              <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
                <title depth="2">3.1.<tab/>Normal Terms</title>
                <term id="J"><name>3.1.1.</name>
-               <preferred>Term2</preferred>
+               <preferred><strong>Term2</strong></preferred>
              </term>
              </terms>
              <definitions id="K"><title>3.2.</title>
@@ -920,7 +925,7 @@ RSpec.describe IsoDoc do
                <title depth="2">5.2.<tab/>Clause 4.2</title>
              </clause></clause>
              </sections><annex id="P" inline-header="false" obligation="normative" displayorder="8">
-               <title><strong>Aldono A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
+               <title><strong><strong>Aldono</strong> A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
                <clause id="Q" inline-header="false" obligation="normative">
                <title depth="2">A.1.<tab/>Annex A.1</title>
                <clause id="Q1" inline-header="false" obligation="normative">
@@ -1002,7 +1007,7 @@ RSpec.describe IsoDoc do
                      <div id='I'>
                        <h2>3.1.&#160; Normal Terms</h2>
                        <p class='TermNum' id='J'>3.1.1.</p>
-                       <p class='Terms' style='text-align:left;'>Term2</p>
+                       <p class='Terms' style='text-align:left;'><b>Term2</b></p>
                      </div>
                      <div id='K'>
                        <h2>3.2.</h2>
@@ -1041,7 +1046,7 @@ RSpec.describe IsoDoc do
                    <br/>
                    <div id='P' class='Section3'>
                      <h1 class='Annex'>
-                       <b>Aldono A</b>
+                       <b><b>Aldono</b> A</b>
                        <br/>
                        (normative)
                        <br/>

data/spec/isodoc/inline_spec.rb

@@ -625,6 +625,74 @@ 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>
+        <field-of-application>Field</field-of-application>
+        <usage-info>Usage Info 1</usage-info>
+        </preferred>
+        <definition><verbal-definition>Definition 1</verbal-definition></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><verbal-definition>Definition 2</verbal-definition></definition>
+      </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+       <?xml version='1.0'?>
+          <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><strong>Second Term</strong>, &lt;Field, Usage Info 1&gt;</preferred>
+              <definition>Definition 1</definition>
+            </term>
+            <term id='C'>
+              <name>1.2.</name>
+              <preferred language='fr' script='Latn' type='prefix'><strong>First Designation</strong></preferred>
+              <p>
+                <strong>CONTRAST:</strong>
+                <em>
+                  <preferred><strong>Fifth Designation</strong>, n</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">
@@ -724,9 +792,9 @@ RSpec.describe IsoDoc do
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <preface><foreword>
       <p>
-      <link updatetype="true" target="http://example.com"/>
-      <link updatetype="true" target="list.adoc">example</link>
-      <link updatetype="true" target="list" alt="tip">example</link>
+      <link update-type="true" target="http://example.com"/>
+      <link update-type="true" target="list.adoc">example</link>
+      <link update-type="true" target="list" alt="tip">example</link>
       </p>
       </foreword></preface>
       <sections>
@@ -1505,6 +1573,122 @@ RSpec.describe IsoDoc do
   end
 
   it "cases xrefs" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface>
+          <clause id="CC"><title>Introduction</title></clause>
+          <sections>
+          <clause id="A">
+          <table id="B">
+          </table>
+          <figure id="B1"/>
+          <example id="B2"/>
+          </clause>
+          <clause id="C">
+          <p>This is <xref target="A"/> and <xref target="B"/>.
+          This is <xref target="A" case="capital"/> and <xref target="B" case="lowercase"/>.
+          This is <xref target="A" case="lowercase"/> and <xref target="B" case="capital"/>.
+          Downcasing an xref affects only the first letter: <xref target="B2" case="lowercase"/>.
+          Capitalising an xref affects only the first letter: <xref target="B1" case="capital"/>.
+          <xref target="A"/> is clause <em>initial.</em><br/>
+          <xref target="A"/> is too.  </p>
+          <p><xref target="A"/> is also.</p>
+          <p>Annex has formatting, and crossreferences ignore it when determining casing. <xref target="AA"/>.</p>
+          <p>Labels are not subject to casing: <xref target="CC" case="lowercase"/>
+      </clause>
+      <annex id="AA">
+      <clause id="AA1"/>
+      </annex>
+      </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <preface>
+          <clause id='CC' displayorder='1'>
+            <title depth='1'>Introduction</title>
+          </clause>
+          <sections displayorder='2'>
+            <clause id='A' displayorder='3'>
+              <title>1.</title>
+              <table id='B'>
+                <name>Tabelo 1</name>
+              </table>
+              <figure id='B1'>
+                <name>Figur-etikedo duvorta 1</name>
+              </figure>
+              <example id='B2'>
+                <name>Ekzempl-etikedo Duvorta</name>
+              </example>
+            </clause>
+            <clause id='C' displayorder='4'>
+              <title>2.</title>
+              <p>
+                This is
+                <xref target='A'>kla&#x16D;zo 1</xref>
+                 and
+                <xref target='B'>tabelo 1</xref>
+                . This is
+                <xref target='A' case='capital'>Kla&#x16D;zo 1</xref>
+                 and
+                <xref target='B' case='lowercase'>tabelo 1</xref>
+                . This is
+                <xref target='A' case='lowercase'>kla&#x16D;zo 1</xref>
+                 and
+                <xref target='B' case='capital'>Tabelo 1</xref>
+                . Downcasing an xref affects only the first letter:
+                <xref target='B2' case='lowercase'>kla&#x16D;zo 1, Example</xref>
+                . Capitalising an xref affects only the first letter:
+                <xref target='B1' case='capital'>Figur-etikedo duvorta 1</xref>
+                .
+                <xref target='A'>Kla&#x16D;zo 1</xref>
+                 is clause
+                <em>initial.</em>
+                <br/>
+                <xref target='A'>Kla&#x16D;zo 1</xref>
+                 is too.
+              </p>
+              <p>
+                <xref target='A'>Kla&#x16D;zo 1</xref>
+                 is also.
+              </p>
+              <p>
+                Annex has formatting, and crossreferences ignore it when determining
+                casing.
+                <xref target='AA'>
+                  <strong>Aldono</strong>
+                   A
+                </xref>
+                .
+              </p>
+              <p>
+                Labels are not subject to casing:
+                <xref target='CC' case='lowercase'>Introduction</xref>
+              </p>
+              <annex id='AA' displayorder='5'>
+                <title>
+                  <strong>
+                    <strong>Aldono</strong>
+                     A
+                  </strong>
+                  <br/>
+                  (informa)
+                </title>
+                <clause id='AA1'>
+                  <title>A.1.</title>
+                </clause>
+              </annex>
+            </clause>
+          </sections>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert
+      .new({ i18nyaml: "spec/assets/i18n.yaml" })
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
+
+  it "ignores casing of xrefs in unicameral scripts" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <sections>
@@ -1541,23 +1725,23 @@ RSpec.describe IsoDoc do
                and
               <xref target='B'>tabelo 1</xref>
               . This is
-              <xref target='A' case='capital'>Kla&#x16D;zo 1</xref>
+              <xref target='A' case='capital'>kla&#x16D;zo 1</xref>
                and
               <xref target='B' case='lowercase'>tabelo 1</xref>
               . This is
               <xref target='A' case='lowercase'>kla&#x16D;zo 1</xref>
                and
-              <xref target='B' case='capital'>Tabelo 1</xref>
+              <xref target='B' case='capital'>tabelo 1</xref>
               .
-              <xref target='A'>Kla&#x16D;zo 1</xref>
+              <xref target='A'>kla&#x16D;zo 1</xref>
                is clause
               <em>initial.</em>
               <br/>
-              <xref target='A'>Kla&#x16D;zo 1</xref>
+              <xref target='A'>kla&#x16D;zo 1</xref>
                is too.
             </p>
             <p>
-              <xref target='A'>Kla&#x16D;zo 1</xref>
+              <xref target='A'>kla&#x16D;zo 1</xref>
                is also.
             </p>
           </clause>
@@ -1565,7 +1749,7 @@ RSpec.describe IsoDoc do
       </iso-standard>
     OUTPUT
     expect(xmlpp(IsoDoc::PresentationXMLConvert
-      .new({ i18nyaml: "spec/assets/i18n.yaml" })
+      .new({ i18nyaml: "spec/assets/i18n.yaml", script: "Hans" })
       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end