RubyGems - isodoc - Versions diffs - 1.0.24 → 1.0.29 - Mend

isodoc 1.0.24 → 1.0.29

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

checksums.yaml +4 -4
data/.github/workflows/macos.yml +14 -4
data/.github/workflows/ubuntu.yml +19 -5
data/.github/workflows/windows.yml +14 -4
data/isodoc.gemspec +1 -1
data/lib/isodoc-yaml/i18n-en.yaml +3 -1
data/lib/isodoc-yaml/i18n-fr.yaml +3 -1
data/lib/isodoc-yaml/i18n-zh-Hans.yaml +3 -1
data/lib/isodoc/convert.rb +1 -0
data/lib/isodoc/function/blocks.rb +43 -49
data/lib/isodoc/function/{blocks_example.rb → blocks_example_note.rb} +57 -2
data/lib/isodoc/function/cleanup.rb +16 -2
data/lib/isodoc/function/i18n.rb +1 -0
data/lib/isodoc/function/inline.rb +79 -77
data/lib/isodoc/function/inline_simple.rb +72 -0
data/lib/isodoc/function/lists.rb +12 -6
data/lib/isodoc/function/references.rb +51 -39
data/lib/isodoc/function/reqt.rb +13 -4
data/lib/isodoc/function/section.rb +19 -8
data/lib/isodoc/function/table.rb +3 -4
data/lib/isodoc/function/terms.rb +1 -1
data/lib/isodoc/function/to_word_html.rb +23 -13
data/lib/isodoc/function/utils.rb +13 -6
data/lib/isodoc/function/xref_counter.rb +43 -9
data/lib/isodoc/function/xref_gen.rb +2 -1
data/lib/isodoc/function/xref_gen_seq.rb +11 -10
data/lib/isodoc/function/xref_sect_gen.rb +24 -24
data/lib/isodoc/headlesshtml_convert.rb +5 -0
data/lib/isodoc/html_convert.rb +5 -0
data/lib/isodoc/html_function/footnotes.rb +3 -3
data/lib/isodoc/html_function/html.rb +16 -1
data/lib/isodoc/html_function/postprocess.rb +6 -5
data/lib/isodoc/metadata.rb +10 -3
data/lib/isodoc/metadata_date.rb +19 -7
data/lib/isodoc/pdf_convert.rb +5 -0
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/word_convert.rb +5 -0
data/lib/isodoc/word_function/body.rb +13 -51
data/lib/isodoc/word_function/footnotes.rb +3 -3
data/lib/isodoc/word_function/inline.rb +75 -0
data/lib/isodoc/word_function/postprocess.rb +13 -2
data/lib/isodoc/word_function/table.rb +3 -3
data/lib/isodoc/xslfo_convert.rb +5 -0
data/spec/assets/i18n.yaml +4 -1
data/spec/assets/odf.emf +0 -0
data/spec/assets/odf.svg +4 -0
data/spec/assets/odf1.svg +4 -0
data/spec/isodoc/blocks_spec.rb +274 -51
data/spec/isodoc/cleanup_spec.rb +317 -25
data/spec/isodoc/footnotes_spec.rb +20 -5
data/spec/isodoc/i18n_spec.rb +12 -12
data/spec/isodoc/inline_spec.rb +299 -4
data/spec/isodoc/lists_spec.rb +8 -8
data/spec/isodoc/metadata_spec.rb +112 -3
data/spec/isodoc/postproc_spec.rb +39 -21
data/spec/isodoc/ref_spec.rb +121 -52
data/spec/isodoc/section_spec.rb +236 -207
data/spec/isodoc/table_spec.rb +28 -28
data/spec/isodoc/terms_spec.rb +57 -13
data/spec/isodoc/xref_spec.rb +218 -71
metadata +10 -5

data/spec/isodoc/cleanup_spec.rb CHANGED

@@ -154,9 +154,9 @@ RSpec.describe IsoDoc do
     <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                <p>A.<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
-                <p>B.<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
-                <p>C.<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a></p>
+                <p>A.<a class="FootnoteRef" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
+                <p>B.<a class="FootnoteRef" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
+                <p>C.<a class="FootnoteRef" href="#fn:1" epub:type="footnote"><sup>1</sup></a></p>
                </div>
                <p class="zzSTDTitle1"/>
                              <aside id="fn:2" class="footnote">
@@ -173,9 +173,9 @@ RSpec.describe IsoDoc do
        <br/>
                   <div>
                     <h1 class="ForewordTitle">Foreword</h1>
-                   <p>A.<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>1</sup></a></p>
-                   <p>B.<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
-                   <p>C.<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>3</sup></a></p>
+                   <p>A.<a class="FootnoteRef" href="#fn:2" epub:type="footnote"><sup>1</sup></a></p>
+                   <p>B.<a class="FootnoteRef" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
+                   <p>C.<a class="FootnoteRef" href="#fn:1" epub:type="footnote"><sup>3</sup></a></p>
                   </div>
                   <p class="zzSTDTitle1"/>
                                 <aside id="fn:2" class="footnote">
@@ -715,7 +715,7 @@ INPUT
     OUTPUT
   end
-    it "breaks up very long strings in tables" do
+    it "does not break up very long strings in tables by default" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s)).to be_equivalent_to xmlpp(<<~"OUTPUT")
            <html xmlns:epub="http://www.idpf.org/2007/ops">
          <head>
@@ -739,6 +739,7 @@ INPUT
                        <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
                        <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">Rice sample</td>
                      </tr>
+                     </thead>
                      <tbody>
                      <tr>
                        <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
@@ -775,26 +776,102 @@ INPUT
                        <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
                        <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>Rice sample</td>
                      </tr>
+                     </thead>
                      <tbody>
                        <tr>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                         http://www.example.com/
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA/
-BBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                         http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                         http://www.example.com/
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAABBBBBBBBBBBBBBBBBBBBBB BBBBBB
+                         http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB </td>
+                         <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>
+                         www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                         </td>
+                       </tr>
+                     </tbody>
+                 </table>
+               </div>
+             </div>
+           </body>
+         </head>
+       </html>
+                     OUTPUT
+    end
+        it "does not break up very long strings in tables on request in HTML" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({break_up_urls_in_tables: "true"}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+           <html xmlns:epub="http://www.idpf.org/2007/ops">
+         <head>
+           <title>test</title>
+           <body lang="EN-US" link="blue" vlink="#954F72">
+             <div class="WordSection1">
+               <p>&#160;</p>
+             </div>
+             <br clear="all" class="section"/>
+             <div class="WordSection2">
+               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <div>
+                 <h1 class="ForewordTitle">Foreword</h1>
+                 <p class="TableTitle" align="center">
+                   <b>Table 1&#160;&#8212; Repeatability and reproducibility of husked rice yield</b>
+                 </p>
+                 <table id="tableD-1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
+                   <thead>
+                     <tr>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
+                       <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">Rice sample</td>
+                     </tr>
+                     </thead>
+                     <tbody>
+                     <tr>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                       <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                     </tr>
+                     </tbody>
+                     </table>
+                     </div>
+                     </div>
+                     </body>
+                     </html>
+                     INPUT
+                            <?xml version='1.0'?>
+       <html xmlns:epub='http://www.idpf.org/2007/ops'>
+         <head>
+           <title>test</title>
+           <body lang='EN-US' link='blue' vlink='#954F72'>
+             <div class='WordSection1'>
+               <p>&#xA0;</p>
+             </div>
+             <br clear='all' class='section'/>
+             <div class='WordSection2'>
+               <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+               <div>
+                 <h1 class='ForewordTitle'>Foreword</h1>
+                 <p class='TableTitle' align='center'>
+                   <b>Table 1&#xA0;&#x2014; Repeatability and reproducibility of husked rice yield</b>
+                 </p>
+                 <table id='tableD-1' class='MsoISOTable' border='1' cellspacing='0' cellpadding='0'>
+                   <thead>
+                     <tr>
+                       <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
+                       <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>Rice sample</td>
+                     </tr>
+                     </thead>
+                     <tbody>
+                       <tr>
+                         <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
+                         http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
+                         <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
+                         http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
                          <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>
-                         www.example.com/
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                         www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                        </tr>
                      </tbody>
-                   </thead>
                  </table>
                </div>
              </div>
@@ -804,7 +881,8 @@ ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                      OUTPUT
     end
-        it "breaks up very long strings in tables (Word)" do
+        it "does not break up very long strings in tables by default (Word)" do
     expect(xmlpp(IsoDoc::WordConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s)).to be_equivalent_to xmlpp(<<~"OUTPUT")
            <html xmlns:epub="http://www.idpf.org/2007/ops">
          <head>
@@ -828,16 +906,17 @@ ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                        <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
                        <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">Rice sample</td>
                      </tr>
+                     </thead>
                      <tbody>
                      <tr>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                           http://www.example.com/ &amp;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA/ BBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                           http://www.example.com/&amp;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                           http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAABBBBBBBBBBBBBBBBBBBBBB BBBBBB
+                           http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                          <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>
-                           www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                           www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                      </tr>
                      </tbody>
@@ -870,20 +949,20 @@ ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                        <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
                        <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>Rice sample</td>
                      </tr>
+                     </thead>
                      <tbody>
                        <tr>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                           http://www.example.com/ &amp;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA/ BBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                           http://www.example.com/&amp;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                           http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAABBBBBBBBBBBBBBBBBBBBBB BBBBBB
+                           http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                          <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>
-                           www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                           www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                        </tr>
                      </tbody>
-                   </thead>
                  </table>
                </div>
              </div>
@@ -893,4 +972,217 @@ ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                      OUTPUT
     end
+              it "breaks up very long strings in tables on request (Word)" do
+    expect(xmlpp(IsoDoc::WordConvert.new({break_up_urls_in_tables: "true"}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+           <html xmlns:epub="http://www.idpf.org/2007/ops">
+         <head>
+           <title>test</title>
+           <body lang="EN-US" link="blue" vlink="#954F72">
+             <div class="WordSection1">
+               <p>&#160;</p>
+             </div>
+             <br clear="all" class="section"/>
+             <div class="WordSection2">
+               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <div>
+                 <h1 class="ForewordTitle">Foreword</h1>
+                 <p class="TableTitle" align="center">
+                   <b>Table 1&#160;&#8212; Repeatability and reproducibility of husked rice yield</b>
+                 </p>
+                 <table id="tableD-1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
+                   <thead>
+                     <tr>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
+                       <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">Rice sample</td>
+                     </tr>
+                     </thead>
+                     <tbody>
+                     <tr>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                       <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                     </tr>
+                     </tbody>
+                     </table>
+                     </div>
+                     </div>
+                     </body>
+                     </html>
+                     INPUT
+                            <?xml version='1.0'?>
+       <html xmlns:epub='http://www.idpf.org/2007/ops'>
+         <head>
+           <title>test</title>
+           <body lang='EN-US' link='blue' vlink='#954F72'>
+             <div class='WordSection1'>
+               <p>&#xA0;</p>
+             </div>
+             <br clear='all' class='section'/>
+             <div class='WordSection2'>
+               <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+               <div>
+                 <h1 class='ForewordTitle'>Foreword</h1>
+                 <p class='TableTitle' align='center'>
+                   <b>Table 1&#xA0;&#x2014; Repeatability and reproducibility of husked rice yield</b>
+                 </p>
+                 <table id='tableD-1' class='MsoISOTable' border='1' cellspacing='0' cellpadding='0'>
+                   <thead>
+                     <tr>
+                       <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
+                       <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>Rice sample</td>
+                     </tr>
+                     </thead>
+                     <tbody>
+                       <tr>
+                         <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
+                           http://www.example.com/ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA/ BBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                         </td>
+                         <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
+                           http://www.example.com/ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAABBBBBBBBBBBBBBBBBBBBBB BBBBBB
+                         </td>
+                         <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>
+                           www.example.com/ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                         </td>
+                       </tr>
+                     </tbody>
+                 </table>
+               </div>
+             </div>
+           </body>
+         </head>
+       </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]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 &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/footnotes_spec.rb CHANGED

@@ -24,9 +24,24 @@ RSpec.describe IsoDoc do
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                <p>A.<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
-                <p>B.<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
-                <p>C.<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a></p>
+                 <p>
+                 A.
+                 <a class='FootnoteRef' href='#fn:2'>
+                   <sup>2</sup>
+                 </a>
+               </p>
+               <p>
+                 B.
+                 <a class='FootnoteRef' href='#fn:2'>
+                   <sup>2</sup>
+                 </a>
+               </p>
+               <p>
+                 C.
+                 <a class='FootnoteRef' href='#fn:1'>
+                   <sup>1</sup>
+                 </a>
+               </p>
                </div>
                <p class="zzSTDTitle1"/>
                              <aside id="fn:2" class="footnote">
@@ -80,7 +95,7 @@ RSpec.describe IsoDoc do
         <p>
           A.
           <span style='mso-bookmark:_Ref'>
-            <a href='#ftn2' epub:type='footnote'>
+            <a href='#ftn2' epub:type='footnote'  class='FootnoteRef'>
               <sup>2</sup>
             </a>
           </span>
@@ -96,7 +111,7 @@ RSpec.describe IsoDoc do
         <p>
           C.
           <span style='mso-bookmark:_Ref'>
-            <a href='#ftn1' epub:type='footnote'>
+            <a href='#ftn1' epub:type='footnote'  class='FootnoteRef'>
               <sup>1</sup>
             </a>
           </span>