RubyGems - isodoc - Versions diffs - 1.6.0 → 1.6.5 - Mend

isodoc 1.6.0 → 1.6.5

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 (76) hide show

checksums.yaml +4 -4
data/.github/workflows/rake.yml +2 -12
data/.hound.yml +3 -1
data/.rubocop.yml +4 -8
data/Rakefile +2 -2
data/bin/rspec +1 -2
data/isodoc.gemspec +4 -3
data/lib/isodoc-yaml/i18n-ar.yaml +152 -0
data/lib/isodoc-yaml/i18n-de.yaml +149 -0
data/lib/isodoc-yaml/i18n-en.yaml +1 -0
data/lib/isodoc-yaml/i18n-es.yaml +151 -0
data/lib/isodoc-yaml/i18n-fr.yaml +1 -0
data/lib/isodoc-yaml/i18n-ru.yaml +154 -0
data/lib/isodoc-yaml/i18n-zh-Hans.yaml +1 -0
data/lib/isodoc.rb +0 -2
data/lib/isodoc/common.rb +2 -0
data/lib/isodoc/convert.rb +10 -4
data/lib/isodoc/css.rb +30 -26
data/lib/isodoc/function/blocks.rb +26 -8
data/lib/isodoc/function/blocks_example_note.rb +2 -2
data/lib/isodoc/function/cleanup.rb +53 -45
data/lib/isodoc/function/form.rb +51 -0
data/lib/isodoc/function/inline.rb +8 -7
data/lib/isodoc/function/references.rb +71 -77
data/lib/isodoc/function/section.rb +28 -16
data/lib/isodoc/function/table.rb +22 -22
data/lib/isodoc/function/terms.rb +6 -7
data/lib/isodoc/function/to_word_html.rb +19 -25
data/lib/isodoc/function/utils.rb +180 -160
data/lib/isodoc/gem_tasks.rb +36 -38
data/lib/isodoc/headlesshtml_convert.rb +8 -7
data/lib/isodoc/html_convert.rb +10 -4
data/lib/isodoc/html_function/comments.rb +14 -12
data/lib/isodoc/html_function/footnotes.rb +14 -7
data/lib/isodoc/html_function/form.rb +62 -0
data/lib/isodoc/html_function/html.rb +30 -26
data/lib/isodoc/html_function/postprocess.rb +191 -226
data/lib/isodoc/html_function/postprocess_footnotes.rb +59 -0
data/lib/isodoc/html_function/sectionsplit.rb +230 -0
data/lib/isodoc/i18n.rb +33 -31
data/lib/isodoc/metadata.rb +22 -20
data/lib/isodoc/metadata_contributor.rb +31 -28
data/lib/isodoc/pdf_convert.rb +11 -13
data/lib/isodoc/presentation_function/bibdata.rb +54 -30
data/lib/isodoc/presentation_function/block.rb +17 -8
data/lib/isodoc/presentation_function/inline.rb +72 -120
data/lib/isodoc/presentation_function/math.rb +84 -0
data/lib/isodoc/presentation_function/section.rb +55 -19
data/lib/isodoc/presentation_xml_convert.rb +2 -0
data/lib/isodoc/sassc_importer.rb +1 -1
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/word_function/body.rb +28 -24
data/lib/isodoc/word_function/footnotes.rb +22 -15
data/lib/isodoc/word_function/postprocess.rb +50 -36
data/lib/isodoc/xref.rb +11 -10
data/lib/isodoc/xref/xref_counter.rb +32 -17
data/lib/isodoc/xref/xref_gen.rb +33 -21
data/lib/isodoc/xref/xref_gen_seq.rb +60 -35
data/lib/isodoc/xref/xref_sect_gen.rb +37 -35
data/spec/assets/scripts_override.html +3 -0
data/spec/isodoc/blocks_spec.rb +2258 -2622
data/spec/isodoc/cleanup_spec.rb +1103 -1107
data/spec/isodoc/form_spec.rb +156 -0
data/spec/isodoc/i18n_spec.rb +802 -917
data/spec/isodoc/inline_spec.rb +1105 -921
data/spec/isodoc/lists_spec.rb +316 -315
data/spec/isodoc/metadata_spec.rb +384 -379
data/spec/isodoc/postproc_spec.rb +1783 -1549
data/spec/isodoc/presentation_xml_spec.rb +355 -278
data/spec/isodoc/ref_spec.rb +718 -723
data/spec/isodoc/section_spec.rb +216 -199
data/spec/isodoc/sectionsplit_spec.rb +190 -0
data/spec/isodoc/table_spec.rb +41 -42
data/spec/isodoc/terms_spec.rb +84 -84
data/spec/isodoc/xref_spec.rb +1024 -930
metadata +33 -7

data/spec/isodoc/sectionsplit_spec.rb ADDED Viewed

@@ -0,0 +1,190 @@
+require "spec_helper"
+RSpec.describe IsoDoc do
+  it "processes section split HTML" do
+    FileUtils.rm_f "test.xml"
+    FileUtils.rm_f "test.html.yaml"
+    FileUtils.rm_rf "test_collection"
+    FileUtils.rm_rf "test_files"
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata>
+      <title>ISO Title</title>
+      <docidentifier type="ISO">ISO 1</docidentifier>
+      </bibdata>
+      <preface>
+      <abstract id="A" displayorder='1'><title>abstract</title></abstract>
+      <introduction id="B" displayorder='2'><title>introduction</title></introduction>
+      </preface>
+      <sections>
+       <clause id="M" inline-header="false" obligation="normative" displayorder='4'>
+         <title>Clause 4</title>
+         <clause id="N" inline-header="false" obligation="normative">
+         <title>Introduction</title>
+         <p><xref target="A">HE</xref></p>
+         <p><eref bibitemid="R1">SHE</xref></p>
+         <svgmap>
+         <figure>
+           <svg xmlns="http://www.w3.org/2000/svg">
+             <a href="#A">A</a>
+             <a href="#B">B</a>
+           </svg>
+           <target href="B"><eref bibitemid="R1"/></target>
+         </figure>
+         </svgmap>
+         <figure>
+         <svg xmlns="http://www.w3.org/2000/svg">
+           <a href="#P">P</a>
+         </svg>
+         </figure>
+       </clause>
+       <clause id="O" inline-header="true" obligation="normative">
+         <title>Clause 4.2</title>
+       </clause></clause>
+       <admonition id="L" type="caution"><p>admonition</p></admonition>
+       </sections>
+       <annex id="P" inline-header="false" obligation="normative" displayorder='5'>
+         <title><strong>Annex</strong><br/>(informative)</title>
+         <clause id="Q" inline-header="false" obligation="normative">
+         <title>Annex A.1</title>
+         <clause id="Q1" inline-header="false" obligation="normative">
+         <title>Annex A.1a</title>
+         </clause>
+         <references id="Q2" normative="false">
+        <title>Annex Bibliography</title>
+        </references>
+       </clause>
+       </annex>
+       <annex id="P1" inline-header="false" obligation="normative" displayorder='6'>
+       </annex>
+        <bibliography><references id="R" obligation="informative" normative="true" displayorder='3'>
+         <title>Normative References</title>
+         <bibitem id="R1"><docidentifier>R1</docidentifier><title>Hello</title></bibitem>
+       </references><clause id="S" obligation="informative" displayorder='7'>
+         <title>Bibliography</title>
+         <references id="T" obligation="informative" normative="false">
+         <title>Bibliography Subsection</title>
+       </references>
+       </clause>
+       </bibliography>
+      </iso-standard>
+    INPUT
+    mock_render
+    IsoDoc::HtmlConvert.new({ sectionsplit: "true" })
+      .convert("test", input, true)
+    expect(File.exist?("test_collection/index.html")).to be true
+    expect(File.exist?("test_collection/test.0.html")).to be true
+    expect(File.exist?("test_collection/test.1.html")).to be true
+    expect(File.exist?("test_collection/test.2.html")).to be true
+    expect(File.exist?("test_collection/test.3.html")).to be false
+    expect(File.exist?("test_collection/test.4.html")).to be true
+    expect(File.exist?("test_collection/test.5.html")).to be true
+    expect(File.exist?("test_collection/test.6.html")).to be true
+    expect(File.exist?("test_collection/test.7.html")).to be true
+    expect(File.exist?("test_collection/test.8.html")).to be false
+    expect(File.exist?("test_files/cover.html")).to be true
+    expect(File.exist?("test_files/test.0.xml")).to be true
+    expect(File.exist?("test_files/test.1.xml")).to be true
+    expect(File.exist?("test_files/test.2.xml")).to be true
+    expect(File.exist?("test_files/test.3.xml")).to be true
+    expect(File.exist?("test_files/test.4.xml")).to be true
+    expect(File.exist?("test_files/test.5.xml")).to be true
+    expect(File.exist?("test_files/test.6.xml")).to be true
+    expect(File.exist?("test_files/test.7.xml")).to be true
+    expect(File.exist?("test_files/test.8.xml")).to be false
+    expect(File.exist?("test_files/test.html.yaml")).to be true
+    m = /type="([^"]+)"/.match(File.read("test_files/test.0.xml"))
+    file2 = Nokogiri::XML(File.read("test_files/test.2.xml"))
+    expect(xmlpp(file2
+     .at("//xmlns:eref[@bibitemid = '#{m[1]}_A']").to_xml))
+      .to be_equivalent_to xmlpp(<<~OUTPUT)
+        <eref bibitemid="#{m[1]}_A" type="#{m[1]}">HE<localityStack><locality type="anchor"><referenceFrom>A</referenceFrom></locality></localityStack></eref>
+      OUTPUT
+    expect(xmlpp(file2
+     .at("//xmlns:eref[@bibitemid = '#{m[1]}_R1']").to_xml))
+      .to be_equivalent_to xmlpp(<<~OUTPUT)
+        <eref bibitemid="#{m[1]}_R1" type="#{m[1]}">SHE<localityStack><locality type="anchor"><referenceFrom>#{m[1]}_R1</referenceFrom></locality></localityStack></eref>
+      OUTPUT
+    expect(xmlpp(file2
+     .at("//xmlns:bibitem[@id = '#{m[1]}_R1']").to_xml))
+      .to be_equivalent_to xmlpp(<<~OUTPUT)
+        <bibitem id="#{m[1]}_R1" type="internal">
+        <docidentifier type="repository">#{m[1]}/R1</docidentifier>
+        </bibitem>
+      OUTPUT
+    expect(xmlpp(file2
+     .at("//xmlns:bibitem[@id = '#{m[1]}_A']").to_xml))
+      .to be_equivalent_to xmlpp(<<~OUTPUT)
+        <bibitem id="#{m[1]}_A" type="internal">
+        <docidentifier type="repository">#{m[1]}/A</docidentifier>
+        </bibitem>
+      OUTPUT
+    expect(xmlpp(file2
+     .at("//xmlns:svgmap[1]").to_xml))
+      .to be_equivalent_to xmlpp(<<~OUTPUT)
+        <svgmap>
+        <figure>
+          <svg xmlns="http://www.w3.org/2000/svg">
+            <a href="A">A</a>
+            <a href="B">B</a>
+          </svg>
+          <target href="B"><eref bibitemid="#{m[1]}_R1" type="#{m[1]}"><localityStack><locality type="anchor"><referenceFrom>#{m[1]}_R1</referenceFrom></locality></localityStack></eref></target>
+        </figure>
+        <target href="A"><eref bibitemid="#{m[1]}_A" type="#{m[1]}"><localityStack><locality type="anchor"><referenceFrom>A</referenceFrom></locality></localityStack></eref></target><target href="B"><eref bibitemid="#{m[1]}_B" type="#{m[1]}"><localityStack><locality type="anchor"><referenceFrom>B</referenceFrom></locality></localityStack></eref></target></svgmap>
+      OUTPUT
+    expect(xmlpp(file2
+     .at("//xmlns:svgmap[2]").to_xml))
+      .to be_equivalent_to xmlpp(<<~OUTPUT)
+        <svgmap><figure>
+        <svg xmlns="http://www.w3.org/2000/svg">
+          <a href="P">P</a>
+        </svg>
+        </figure><target href="P"><eref bibitemid="#{m[1]}_P" type="#{m[1]}"><localityStack><locality type="anchor"><referenceFrom>P</referenceFrom></locality></localityStack></eref></target></svgmap>
+      OUTPUT
+    expect(File.read("test_files/test.html.yaml")).to be_equivalent_to <<~OUTPUT
+      ---
+      directives:
+      - presentation-xml
+      - bare-after-first
+      bibdata:
+        title:
+          type: title-main
+          language: en
+          content: ISO Title
+        type: collection
+        docid:
+          type: ISO
+          id: ISO 1
+      manifest:
+        level: collection
+        title: Collection
+        docref:
+        - fileref: test.3.xml
+          identifier: "[Untitled]"
+        - fileref: test.0.xml
+          identifier: abstract
+        - fileref: test.1.xml
+          identifier: introduction
+        - fileref: test.6.xml
+          identifier: Normative References
+        - fileref: test.2.xml
+          identifier: Clause 4
+        - fileref: test.4.xml
+          identifier: Annex (informative)
+        - fileref: test.5.xml
+          identifier: "[Untitled]"
+        - fileref: test.7.xml
+          identifier: Bibliography
+    OUTPUT
+  end
+  private
+  def mock_render
+    original_add = ::Metanorma::CollectionRenderer.method(:render)
+    allow(::Metanorma::CollectionRenderer)
+      .to receive(:render) do |col, opts|
+      original_add.call(col, opts.merge(compile: { no_install_fonts: true }))
+    end
+  end
+end

data/spec/isodoc/table_spec.rb CHANGED Viewed

@@ -62,7 +62,6 @@ RSpec.describe IsoDoc do
             </dl>
             <note><p>This is a table about rice</p></note>
             </table>
-      #{'      '}
             <table id="tableD-2" unnumbered="true">
             <tbody><tr><td>A</td></tr></tbody>
             </table>
@@ -74,7 +73,7 @@ RSpec.describe IsoDoc do
     presxml = <<~OUTPUT
             <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
               <preface>
-                <foreword>
+                <foreword displayorder="1">
                   <table id='tableD-1' alt='tool tip' summary='long desc' width='70%' keep-with-next='true' keep-lines-together='true'>
                     <name>
                       Table 1&#xA0;&#x2014; Repeatability and reproducibility of
@@ -406,46 +405,46 @@ RSpec.describe IsoDoc do
         <thead>
           <tr>
             <td>
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
-      Description Description Description Description Description Description Description Description Description#{' '}
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
+      Description Description Description Description Description Description Description Description Description
             </td>
             <td>Rice sample</td>
           </tr>

data/spec/isodoc/terms_spec.rb CHANGED Viewed

@@ -69,7 +69,7 @@ RSpec.describe IsoDoc do
     presxml = <<~"PRESXML"
              <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
                <sections>
-                 <terms id='_terms_and_definitions' obligation='normative'>
+                 <terms id='_terms_and_definitions' obligation='normative' displayorder="1">
                  <title depth='1'>
         1.
         <tab/>
@@ -166,93 +166,93 @@ RSpec.describe IsoDoc do
     PRESXML
     html = <<~"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"  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>
-                     <ul>
-                     <li>A</li>
-                     </ul>
+          #{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"  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>
+               <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]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" id='_671a1994-4783-40d0-bc81-987d06ffb74e' style='page-break-after: avoid;page-break-inside: avoid;'><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" id='_671a1994-4783-40d0-bc81-987d06ffb74f'><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, 3.1</a>
+              <a href='#ISO7301'>ISO 7301:2011, clause 3.1</a>
+             [/TERMREF]</p></div>
                    </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]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" id='_671a1994-4783-40d0-bc81-987d06ffb74e' style='page-break-after: avoid;page-break-inside: avoid;'><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" id='_671a1994-4783-40d0-bc81-987d06ffb74f'><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, 3.1</a>
-                    <a href='#ISO7301'>ISO 7301:2011, clause 3.1</a>
-                   [/TERMREF]</p></div>
-                         </div>
-                       </body>
-                   </html>
+                 </body>
+             </html>
     OUTPUT
     word = <<~"WORD"
-                #{WORD_HDR}
-                         <p class="zzSTDTitle1"/>
-                         <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 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>
-                     <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]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 id='_671a1994-4783-40d0-bc81-987d06ffb74e' class="Note"  style='page-break-after: avoid;page-break-inside: avoid;'><p class="Note">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 id='_671a1994-4783-40d0-bc81-987d06ffb74f' class="Note"><p class="Note">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, 3.1</a>
-                   <a href='#ISO7301'>ISO 7301:2011, clause 3.1</a>
-                   [/TERMREF]</p></div>
-                       </div>
-                     </body>
-                   </html>
+          #{WORD_HDR}
+                   <p class="zzSTDTitle1"/>
+                   <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 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>
+               <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]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 id='_671a1994-4783-40d0-bc81-987d06ffb74e' class="Note"  style='page-break-after: avoid;page-break-inside: avoid;'><p class="Note">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 id='_671a1994-4783-40d0-bc81-987d06ffb74f' class="Note"><p class="Note">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, 3.1</a>
+             <a href='#ISO7301'>ISO 7301:2011, clause 3.1</a>
+             [/TERMREF]</p></div>
+                 </div>
+               </body>
+             </html>
     WORD
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)