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

isodoc 1.8.1 → 1.8.3

Files changed (37) hide show

checksums.yaml +4 -4
data/Gemfile +2 -0
data/isodoc.gemspec +1 -1
data/lib/isodoc/class_utils.rb +1 -1
data/lib/isodoc/function/cleanup.rb +1 -11
data/lib/isodoc/function/inline.rb +3 -3
data/lib/isodoc/function/terms.rb +0 -3
data/lib/isodoc/function/utils.rb +10 -5
data/lib/isodoc/i18n.rb +31 -10
data/lib/isodoc/presentation_function/block.rb +2 -3
data/lib/isodoc/presentation_function/image.rb +2 -2
data/lib/isodoc/presentation_function/terms.rb +95 -30
data/lib/isodoc/presentation_xml_convert.rb +2 -1
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/xref/xref_gen.rb +10 -7
data/lib/isodoc/xref/xref_gen_seq.rb +159 -148
data/lib/isodoc/xref/xref_sect_gen.rb +5 -10
data/lib/isodoc/xref.rb +2 -0
data/lib/isodoc/xslfo_convert.rb +23 -1
data/lib/isodoc-yaml/i18n-ar.yaml +3 -0
data/lib/isodoc-yaml/i18n-de.yaml +3 -0
data/lib/isodoc-yaml/i18n-en.yaml +8 -5
data/lib/isodoc-yaml/i18n-es.yaml +3 -0
data/lib/isodoc-yaml/i18n-fr.yaml +3 -0
data/lib/isodoc-yaml/i18n-ru.yaml +3 -0
data/lib/isodoc-yaml/i18n-zh-Hans.yaml +3 -0
data/spec/isodoc/cleanup_spec.rb +0 -129
data/spec/isodoc/i18n_spec.rb +53 -10
data/spec/isodoc/inline_spec.rb +33 -43
data/spec/isodoc/lists_spec.rb +64 -64
data/spec/isodoc/postproc_spec.rb +0 -73
data/spec/isodoc/section_spec.rb +12 -12
data/spec/isodoc/terms_spec.rb +317 -303
data/spec/isodoc/xref_spec.rb +80 -9
data/spec/isodoc/xslfo_convert_spec.rb +35 -0
data/spec/spec_helper.rb +1 -1
metadata +8 -8

data/spec/isodoc/cleanup_spec.rb CHANGED Viewed

@@ -1053,133 +1053,4 @@ RSpec.describe IsoDoc do
       </html>
     OUTPUT
   end
-  it "cleans up term sources" do
-    c = IsoDoc::HtmlConvert.new({ i18nyaml: "spec/assets/i18n.yaml" })
-    c.i18n_init("en", "Latn")
-    expect(xmlpp(c.textcleanup(<<~"INPUT").to_s)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-               #{HTML_HDR}
-                     <p class="zzSTDTitle1"/>
-                     <div id="_terms_and_definitions"><h1>1.&#160; 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 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"><p class="example-title">EXAMPLE 1</p>
-               <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
-               <ul>
-               <li>A</li>
-               </ul>
-             </div>
-             <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example"><p class="example-title">EXAMPLE 2</p>
-               <ul>
-               <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] Termbase IEV, term ID xyz [/TERMREF]</p>
-      <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION] [/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>
-             <p class="AltTerms" style="text-align:left;">rough rice</p>
-             <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
-             <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
-             <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><p class="example-title">EXAMPLE</p>
-               <ul>
-               <li>A</li>
-               </ul>
-             </div>
-             <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
-             <div class="Note"><p>Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
-             <p>[TERMREF]
-               <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
-             [/TERMREF]</p></div>
-                   </div>
-                 </body>
-             </html>
-    INPUT
-      <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
-        <head/>
-        <body lang='en'>
-          <div class='title-section'>
-            <p>&#160;</p>
-          </div>
-          <br/>
-          <div class='prefatory-section'>
-            <p>&#160;</p>
-          </div>
-          <br/>
-          <div class='main-section'>
-            <p class='zzSTDTitle1'/>
-            <div id='_terms_and_definitions'>
-              <h1>1.&#160; 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 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'>
-                <p class='example-title'>EXAMPLE 1</p>
-                <p id='_65c9a509-9a89-4b54-a890-274126aeb55c'>Foreign seeds, husks, bran, sand, dust.</p>
-                <ul>
-                  <li>A</li>
-                </ul>
-              </div>
-              <div id='_bd57bbf1-f948-4bae-b0ce-73c00431f894' class='example'>
-                <p class='example-title'>EXAMPLE 2</p>
-                <ul>
-                  <li>A</li>
-                </ul>
-              </div>
-              <p>
-                [SOURCE:
-                <a href='#ISO7301'>ISO 7301:2011, Clause 3.1</a>
-                , modified &mdash; The term "cargo rice" is shown as deprecated, and
-                Note 1 to entry is not included here; Termbase IEV, term ID xyz;
-                Termbase IEV, term ID xyz, modified; Termbase IEV, term ID xyz,
-      modified &mdash; with adjustments]
-              </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>
-              <p class='AltTerms' style='text-align:left;'>rough rice</p>
-              <p class='DeprecatedTerms' style='text-align:left;'>DEPRECATED: cargo rice</p>
-              <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
-              <div id='_bd57bbf1-f948-4bae-b0ce-73c00431f893' class='example'>
-                <p class='example-title'>EXAMPLE</p>
-                <ul>
-                  <li>A</li>
-                </ul>
-              </div>
-              <div class='Note'>
-                <p>
-                  Note 1 to entry: The starch of waxy rice consists almost entirely of
-                  amylopectin. The kernels have a tendency to stick together after
-                  cooking.
-                </p>
-              </div>
-              <div class='Note'>
-                <p>
-                  Note 2 to entry:
-                  <ul>
-                    <li>A</li>
-                  </ul>
-                  <p id='_19830f33-e46c-42cc-94ca-a5ef101132d5'>
-                    The starch of waxy rice consists almost entirely of amylopectin.
-                    The kernels have a tendency to stick together after cooking.
-                  </p>
-                </p>
-              </div>
-              <p>
-                [SOURCE:
-                <a href='#ISO7301'>ISO 7301:2011, Clause 3.1</a>
-                ]
-              </p>
-            </div>
-          </div>
-        </body>
-      </html>
-    OUTPUT
-  end
 end

data/spec/isodoc/i18n_spec.rb CHANGED Viewed

@@ -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>
@@ -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
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -1077,6 +1082,44 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to xmlpp(output)
   end
+  it "processes LTR within RTL" do
+    c = IsoDoc::Convert.new({})
+    c.convert_init(<<~"INPUT", "test", false)
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata type="standard">
+      <language>fa</language>
+      <script>Arab</script>
+      </bibdata>
+      </iso-standard>
+    INPUT
+    expect(c.i18n.l10n("hello!", "en", "Latn")).to eq "&#x200e;hello!&#x200e;"
+  end
+  it "processes Hebrew RTL within LTR" do
+    c = IsoDoc::Convert.new({})
+    c.convert_init(<<~"INPUT", "test", false)
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata type="standard">
+      <language>en</language>
+      </bibdata>
+      </iso-standard>
+    INPUT
+    expect(c.i18n.l10n("hello!", "he", "Hebr")).to eq "&#x200f;hello!&#x200f;"
+  end
+  it "processes Arabic RTL within LTR" do
+    c = IsoDoc::Convert.new({})
+    c.convert_init(<<~"INPUT", "test", false)
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata type="standard">
+      <language>en</language>
+      </bibdata>
+      </iso-standard>
+    INPUT
+    expect(c.i18n.l10n("hello!", "fa", "Arab")).to eq "&#x61c;hello!&#x61c;"
+  end
   private
   def mock_i18n

data/spec/isodoc/inline_spec.rb CHANGED Viewed

@@ -636,11 +636,10 @@ RSpec.describe IsoDoc do
           <expression>
             <name>Second Term</name>
           </expression>
+        <field-of-application>Field</field-of-application>
+        <usage-info>Usage Info 1</usage-info>
         </preferred>
-        <usageinfo>
-          <p id='B'>Usage Info 1.</p>
-        </usageinfo>
-        <definition><verbaldefinition>Definition 1</verbaldefinition></definition>
+        <definition><verbal-definition>Definition 1</verbal-definition></definition>
       </term>
       <term id="C">
       <preferred language='fr' script='Latn' type='prefix'>
@@ -658,49 +657,40 @@ RSpec.describe IsoDoc do
           </preferred>
           <xref target='second'/>
         </related>
-        <definition><verbaldefinition>Definition 2</verbaldefinition></definition>
+        <definition><verbal-definition>Definition 2</verbal-definition></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>
+       <?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>, &#x3c;Field, Usage Info 1&#x3e;</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)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
   it "processes embedded inline formatting" do
@@ -802,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>

data/spec/isodoc/lists_spec.rb CHANGED Viewed

@@ -397,70 +397,70 @@ RSpec.describe IsoDoc do
        </iso-standard>
     INPUT
     output = <<~OUTPUT
-          <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
-        <head>
-          <style>
-          </style>
-        </head>
-                 <body lang='EN-US' link='blue' vlink='#954F72'>
-           <div class='WordSection1'>
-             <p>&#160;</p>
-           </div>
-           <p>
-             <br clear='all' class='section'/>
-           </p>
-           <div class='WordSection2'>
-             <p>
-               <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-             </p>
-             <div>
-               <h1 class='ForewordTitle'>Foreword</h1>
-               <table class='dl'>
-                 <tr>
-                   <td valign='top' align='left'>
-                     <p align='left' style='margin-left:0pt;text-align:left;'>A Deflist</p>
-                   </td>
-                   <td valign='top'>
-                     <dl id='_732d3f57-4f88-40bf-9ae9-633891edc395'>
-                       <dt>
-                         <p align='left' style='margin-left:0pt;text-align:left;'>W</p>
-                       </dt>
-                       <dd>
-                         <p id='_05d81174-3a41-44af-94d8-c78b8d2e175d'>mass fraction of gelatinized kernels</p>
-                       </dd>
-                     </dl>
-                   </td>
-                 </tr>
-               </table>
-               <div align='center' class='table_container'>
-                                <table id='_732d3f57-4f88-40bf-9ae9-633891edc396' class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
-                   <tbody>
-                     <tr>
-                       <td style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>
-                         <dl id='_732d3f57-4f88-40bf-9ae9-633891edc397'>
-                           <dt>
-                             <p align='left' style='margin-left:0pt;text-align:left;'>X</p>
-                           </dt>
-                           <dd>
-                             <p id='_05d81174-3a41-44af-94d8-c78b8d2e175e'>expressed in per cent</p>
-                           </dd>
-                         </dl>
-                       </td>
-                     </tr>
-                   </tbody>
-                 </table>
-               </div>
-             </div>
-             <p>&#160;</p>
-           </div>
-           <p>
-             <br clear='all' class='section'/>
-           </p>
-           <div class='WordSection3'>
-             <p class='zzSTDTitle1'/>
-           </div>
-         </body>
-       </html>
+         <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+       <head>
+         <style>
+         </style>
+       </head>
+                <body lang='EN-US' link='blue' vlink='#954F72'>
+          <div class='WordSection1'>
+            <p>&#160;</p>
+          </div>
+          <p>
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection2'>
+            <p>
+              <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+            </p>
+            <div>
+              <h1 class='ForewordTitle'>Foreword</h1>
+              <table class='dl'>
+                <tr>
+                  <td valign='top' align='left'>
+                    <p align='left' style='margin-left:0pt;text-align:left;'>A Deflist</p>
+                  </td>
+                  <td valign='top'>
+                    <dl id='_732d3f57-4f88-40bf-9ae9-633891edc395'>
+                      <dt>
+                        <p align='left' style='margin-left:0pt;text-align:left;'>W</p>
+                      </dt>
+                      <dd>
+                        <p id='_05d81174-3a41-44af-94d8-c78b8d2e175d'>mass fraction of gelatinized kernels</p>
+                      </dd>
+                    </dl>
+                  </td>
+                </tr>
+              </table>
+              <div align='center' class='table_container'>
+                               <table id='_732d3f57-4f88-40bf-9ae9-633891edc396' class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
+                  <tbody>
+                    <tr>
+                      <td style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>
+                        <dl id='_732d3f57-4f88-40bf-9ae9-633891edc397'>
+                          <dt>
+                            <p align='left' style='margin-left:0pt;text-align:left;'>X</p>
+                          </dt>
+                          <dd>
+                            <p id='_05d81174-3a41-44af-94d8-c78b8d2e175e'>expressed in per cent</p>
+                          </dd>
+                        </dl>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+            <p>&#160;</p>
+          </div>
+          <p>
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection3'>
+            <p class='zzSTDTitle1'/>
+          </div>
+        </body>
+      </html>
     OUTPUT
     expect(xmlpp(IsoDoc::WordConvert.new({})
       .convert("test", input, true)))

data/spec/isodoc/postproc_spec.rb CHANGED Viewed

@@ -446,42 +446,6 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
-  it "populates Word template with terms reference labels" do
-    FileUtils.rm_f "test.doc"
-    FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new(
-      { wordstylesheet: "spec/assets/word.css",
-        htmlstylesheet: "spec/assets/html.scss" },
-    ).convert("test", <<~"INPUT", false)
-              <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <sections>
-          <terms id="_terms_and_definitions" obligation="normative"><title>1.<tab/>Terms and Definitions</title>
-      <term id="paddy1"><name>1.1.</name><preferred>paddy</preferred>
-      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
-      <termsource status="modified">
-        <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011">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></term>
-      </terms>
-      </sections>
-      </iso-standard>
-    INPUT
-    word = File.read("test.doc")
-      .sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">')
-      .sub(%r{<div style="mso-element:footnote-list"/>.*$}m, "")
-    expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-          <div class="WordSection3">
-              <p class="zzSTDTitle1"></p>
-              <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1.<span style="mso-tab-count:1">&#xA0; </span>Terms and Definitions</h1>
-      <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
-      <p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
-      <p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>, modified &#x2014; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
-            </div>
-    OUTPUT
-  end
   it "populates Word header" do
     FileUtils.rm_f "test.doc"
     IsoDoc::WordConvert.new(
@@ -1220,43 +1184,6 @@ RSpec.describe IsoDoc do
     expect(html).to match(%r{<h2 class="TermNum" id="paddy">1\.2\.</h2>})
   end
-  it "processes empty term modifications" do
-    FileUtils.rm_f "test.html"
-    FileUtils.rm_f "test.doc"
-    IsoDoc::HtmlConvert.new(options)
-      .convert("test", <<~"INPUT", false)
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <sections>
-            <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
-        <term id="paddy1"><preferred>paddy</preferred>
-        <domain>rice</domain>
-        <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
-        <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
-          <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
-          <ul>
-          <li>A</li>
-          </ul>
-        </termexample>
-        <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f894">
-          <ul>
-          <li>A</li>
-          </ul>
-        </termexample>
-        <termsource status="modified">
-          <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011">ISO 7301:2011, Clause 3.1</origin>
-            <modification>
-            <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489"/>
-          </modification>
-        </termsource></term>
-        </terms>
-        </sections>
-        </iso-standard>
-      INPUT
-    expect(File.exist?("test.html")).to be true
-    html = File.read("test.html")
-    expect(html).to include '[SOURCE: <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>, modified]'
-  end
   it "creates continuation styles for multiparagraph list items in Word" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"