RubyGems - isodoc - Versions diffs - 1.0.27 → 1.0.28 - Mend

isodoc 1.0.27 → 1.0.28

Files changed (27) hide show

checksums.yaml +4 -4
data/isodoc.gemspec +1 -1
data/lib/isodoc/function/blocks.rb +1 -1
data/lib/isodoc/function/cleanup.rb +8 -4
data/lib/isodoc/function/inline.rb +45 -82
data/lib/isodoc/function/inline_simple.rb +72 -0
data/lib/isodoc/function/references.rb +2 -2
data/lib/isodoc/function/section.rb +1 -0
data/lib/isodoc/function/to_word_html.rb +19 -11
data/lib/isodoc/function/utils.rb +1 -1
data/lib/isodoc/html_function/footnotes.rb +1 -1
data/lib/isodoc/html_function/html.rb +12 -0
data/lib/isodoc/html_function/postprocess.rb +3 -3
data/lib/isodoc/metadata.rb +6 -0
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/word_function/footnotes.rb +1 -1
data/spec/assets/i18n.yaml +4 -1
data/spec/isodoc/blocks_spec.rb +4 -4
data/spec/isodoc/cleanup_spec.rb +135 -6
data/spec/isodoc/footnotes_spec.rb +20 -5
data/spec/isodoc/inline_spec.rb +54 -1
data/spec/isodoc/metadata_spec.rb +6 -3
data/spec/isodoc/postproc_spec.rb +5 -5
data/spec/isodoc/ref_spec.rb +118 -49
data/spec/isodoc/section_spec.rb +32 -18
data/spec/isodoc/table_spec.rb +2 -2
metadata +5 -4

data/lib/isodoc/html_function/postprocess.rb CHANGED

@@ -179,7 +179,7 @@ module IsoDoc::HtmlFunction
     def html_footnote_filter(docxml)
       seen = {}
       i = 1
-      docxml.xpath('//a[@epub:type = "footnote"]').each do |x|
+      docxml.xpath('//a[@class = "FootnoteRef"]').each do |x|
         fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
         i, seen = update_footnote_filter(fn, x, i, seen)
       end
@@ -188,7 +188,7 @@ module IsoDoc::HtmlFunction
     def footnote_backlinks(docxml)
       seen = {}
-      docxml.xpath('//a[@epub:type = "footnote"]').each_with_index do |x, i|
+      docxml.xpath('//a[@class = "FootnoteRef"]').each_with_index do |x, i|
         seen[x["href"]] and next or seen[x["href"]] = true
         fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
         xdup = x.dup
@@ -201,7 +201,7 @@ module IsoDoc::HtmlFunction
     end
     def footnote_format(docxml)
-      docxml.xpath("//a[@epub:type = 'footnote']/sup").each do |x|
+      docxml.xpath("//a[@class = 'FootnoteRef']/sup").each do |x|
         footnote_reference_format(x)
       end
       docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\

data/lib/isodoc/metadata.rb CHANGED

@@ -218,5 +218,11 @@ module IsoDoc
       a = xml.at(ns("//bibdata/uri[@type = 'pdf']")) and set(:pdf, a.text)
       a = xml.at(ns("//bibdata/uri[@type = 'doc']")) and set(:doc, a.text)
     end
+    def keywords(isoxml, _out)
+      ret = []
+      isoxml.xpath(ns("//bibdata/keyword")).each { |kw| ret << kw.text }
+      set(:keywords, ret)
+    end
   end
 end

data/lib/isodoc/version.rb CHANGED

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.27".freeze
+  VERSION = "1.0.28".freeze
 end

data/lib/isodoc/word_function/footnotes.rb CHANGED

@@ -84,7 +84,7 @@ module IsoDoc::WordFunction
       return seen_footnote_parse(node, out, fn) if @seen_footnote.include?(fn)
       @fn_bookmarks[fn] = bookmarkid
       out.span **{style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}"} do |s|
-        s.a **{ "epub:type": "footnote", href: "#ftn#{fn}" } do |a|
+        s.a **{ "class": "FootnoteRef", "epub:type": "footnote", href: "#ftn#{fn}" } do |a|
           a.sup { |sup| sup << fn }
         end
       end

data/spec/assets/i18n.yaml CHANGED

@@ -1,2 +1,5 @@
 foreword: Enkonduko
+clause: klaŭzo
+table: Tabelo
+source: SOURCE
+modified: modified

data/spec/isodoc/blocks_spec.rb CHANGED

@@ -355,7 +355,7 @@ B
        </div></aside>
          <p  style='page-break-after:avoid;'><b>Key</b></p><dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
        <p class="FigureTitle" style="text-align:center;">Figure 1&#160;&#8212; Split-it-right <i>sample</i> divider
-       <a rel='footnote' href='#fn:1' epub:type='footnote'>
+       <a class='FootnoteRef' href='#fn:1'>
   <sup>1</sup>
 </a>
         </p></div>
@@ -426,7 +426,7 @@ B
           <p class='FigureTitle' style='text-align:center;'>
    Figure 1&#160;&#8212; Split-it-right sample divider
    <span style='mso-bookmark:_Ref'>
-     <a href='#ftn1' epub:type='footnote'>
+     <a href='#ftn1' epub:type='footnote' class='FootnoteRef'>
        <sup>1</sup>
      </a>
    </span>
@@ -681,7 +681,7 @@ Que?
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div class="Admonition"><p class="AdmonitionTitle" style="text-align:center;">CAUTION</p>
+                 <div class="Admonition" id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a'><p class="AdmonitionTitle" style="text-align:center;">CAUTION</p>
          <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
        </div>
                </div>
@@ -707,7 +707,7 @@ Que?
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div class="Admonition"><p class="AdmonitionTitle" style="text-align:center;">Title</p>
+                 <div class="Admonition" id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a"><p class="AdmonitionTitle" style="text-align:center;">Title</p>
          <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
        </div>
                </div>

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">
@@ -1056,4 +1056,133 @@ INPUT
                      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>

data/spec/isodoc/inline_spec.rb CHANGED

@@ -549,6 +549,59 @@ OUTPUT
     OUTPUT
     end
+it "cases xrefs" do
+  expect(xmlpp(IsoDoc::HtmlConvert.new({i18nyaml: "spec/assets/i18n.yaml"}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <sections>
+    <clause id="A">
+    <table id="B">
+    </table>
+    </clause>
+    <clause id="C">
+    <p>This is <xref target="A"/> and <xref target="B"/>.
+    This is <xref target="A" case="capital"/> and <xref target="B" case="lowercase"/>.
+    <xref target="A"/> is clause <em>initial.</em><br/>
+    <xref target="A"/> is too.  </p>
+    <p><xref target="A"/> is also.</p>
+</clause>
+</sections>
+</iso-standard>
+INPUT
+        #{HTML_HDR}
+      <p class='zzSTDTitle1'/>
+      <div id='A'>
+        <h1>1.&#160; </h1>
+        <p class='TableTitle' style='text-align:center;'>Tabelo 1</p>
+        <table id='B' class='MsoISOTable' style='border-width:1px;border-spacing:0;'/>
+      </div>
+      <div id='C'>
+        <h1>2.&#160; </h1>
+        <p>
+          This is
+          <a href='#A'>kla&#365;zo 1</a>
+           and
+          <a href='#B'>Tabelo 1</a>
+          . This is
+          <a href='#A'>Kla&#365;zo 1</a>
+           and
+          <a href='#B'>tabelo 1</a>
+          .
+          <a href='#A'>Kla&#365;zo 1</a>
+           is clause
+          <i>initial.</i>
+          <br/>
+          <a href='#A'>Kla&#365;zo 1</a>
+           is too.
+        </p>
+        <p>
+          <a href='#A'>Kla&#365;zo 1</a>
+           is also.
+        </p>
+      </div>
+    </div>
+  </body>
+</html>
+OUTPUT
+end
 end

data/spec/isodoc/metadata_spec.rb CHANGED

@@ -88,13 +88,16 @@ RSpec.describe IsoDoc do
       </organization>
     </owner>
   </copyright>
+  <keyword>KW2</keyword>
+  <keyword>KW1</keyword>
+  <keyword>KW3</keyword>
   <ext>
   <doctype>international-standard</doctype>
   </ext>
 </bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :circulateddate=>"2015", :confirmeddate=>"2017", :copieddate=>"2016", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :html=>"URL B", :implementeddate=>"XXX", :issueddate=>"XXX", :iteration=>"2", :obsoleteddate=>"2014", :pdf=>"URL D", :publisheddate=>"2011", :publisher=>"", :receiveddate=>"XXX", :revdate=>"2016-05-01", :revdate_monthyear=>"May 2016", :stage=>"Committee draft", :stageabbr=>"CD", :substage=>"Withdrawn", :transmitteddate=>"2020", :unchangeddate=>"2019", :unpublished=>true, :updateddate=>"2018", :url=>"URL A", :vote_endeddate=>"2022", :vote_starteddate=>"2021", :xml=>"URL C"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :circulateddate=>"2015", :confirmeddate=>"2017", :copieddate=>"2016", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :html=>"URL B", :implementeddate=>"XXX", :issueddate=>"XXX", :iteration=>"2", :keywords=>["KW2", "KW1", "KW3"], :obsoleteddate=>"2014", :pdf=>"URL D", :publisheddate=>"2011", :publisher=>"", :receiveddate=>"XXX", :revdate=>"2016-05-01", :revdate_monthyear=>"May 2016", :stage=>"Committee draft", :stageabbr=>"CD", :substage=>"Withdrawn", :transmitteddate=>"2020", :unchangeddate=>"2019", :unpublished=>true, :updateddate=>"2018", :url=>"URL A", :vote_endeddate=>"2022", :vote_starteddate=>"2021", :xml=>"URL C"}
 OUTPUT
   end
@@ -168,7 +171,7 @@ OUTPUT
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC/IEEE", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05)", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"2011-01", :publisher=>"International Organization for Standardization, International Electrotechnical Commission and Institute of Electrical and Electronics Engineers", :receiveddate=>"XXX", :revdate=>"2016-05", :revdate_monthyear=>"May 2016", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX", :vote_endeddate=>"XXX", :vote_starteddate=>"XXX"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC/IEEE", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05)", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :keywords=>[], :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"2011-01", :publisher=>"International Organization for Standardization, International Electrotechnical Commission and Institute of Electrical and Electronics Engineers", :receiveddate=>"XXX", :revdate=>"2016-05", :revdate_monthyear=>"May 2016", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX", :vote_endeddate=>"XXX", :vote_starteddate=>"XXX"}
 OUTPUT
   end
@@ -227,7 +230,7 @@ OUTPUT
 </bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :publisheddate=>"2011-01", :publisher=>"International Organization for Standardization et International Electrotechnical Commission", :receiveddate=>"XXX", :revdate=>"2016-05", :revdate_monthyear=>"Mai 2016", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX", :vote_endeddate=>"XXX", :vote_starteddate=>"XXX"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :keywords=>[], :obsoleteddate=>"XXX", :publisheddate=>"2011-01", :publisher=>"International Organization for Standardization et International Electrotechnical Commission", :receiveddate=>"XXX", :revdate=>"2016-05", :revdate_monthyear=>"Mai 2016", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX", :vote_endeddate=>"XXX", :vote_starteddate=>"XXX"}
 OUTPUT
 end

data/spec/isodoc/postproc_spec.rb CHANGED

@@ -558,25 +558,25 @@ TOCLEVEL
              <p class="zzSTDTitle1"></p>
              <div id="A">
                <h1>1.&#xA0; Clause 4</h1>
-               <a rel="footnote" href="#fn:3" epub:type="footnote" id="fnref:1">
+               <a class='FootnoteRef' href='#fn:3' id='fnref:1'>
                  <sup>1</sup>
                </a>
                <div id="N">
-                <h2>1.1.&#160; Introduction to this<a rel="footnote" href="#fn:2" epub:type="footnote" id="fnref:2"><sup>2</sup></a></h2>
+                <h2>1.1.&#160; Introduction to this<a class='FootnoteRef' href='#fn:2' id='fnref:2'><sup>2</sup></a></h2>
               </div>
                <div id="O">
                 <h2>1.2.&#160; Clause 4.2</h2>
-                <p>A<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
+                <p>A<a class='FootnoteRef' href='#fn:2'><sup>2</sup></a></p>
               </div>
              </div>
              <aside id="fn:3" class="footnote">
-         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:3" epub:type="footnote">
+         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a class='FootnoteRef' href='#fn:3'>
                  <sup>1</sup>
                </a>This is a footnote.</p>
        <a href="#fnref:1">&#x21A9;</a></aside>
              <aside id="fn:2" class="footnote">
-         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a>Formerly denoted as 15 % (m/m).</p>
+         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a class='FootnoteRef' href='#fn:2'><sup>2</sup></a>Formerly denoted as 15 % (m/m).</p>
        <a href="#fnref:2">&#x21A9;</a></aside>
            </main>

data/spec/isodoc/ref_spec.rb CHANGED

@@ -125,55 +125,124 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     #{HTML_HDR}
-             <br/>
-             <div>
-               <h1 class="ForewordTitle">Foreword</h1>
-               <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
-         <a href="#ISO712">[110]</a>
-         <a href="#ISBN">[1]</a>
-         <a href="#ISSN">[2]</a>
-         <a href="#ISO16634">ISO 16634:-- (all parts)</a>
-         <a href="#ref1">ICC 167</a>
-         <a href="#ref10">[10]</a>
-         <a href="#ref12">Citn</a>
-         <a href='#zip_ffs'>[5]</a>
-         </p>
-             </div>
-             <p class="zzSTDTitle1"/>
-             <div>
-               <h1>1.&#160; Normative references</h1>
-               <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
-               <p id="ISO712" class="NormRef">[110], ISO 712, <i>Cereals and cereal products</i></p>
-               <p id="ISO16634" class="NormRef">ISO 16634:-- (all parts)<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a>, <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
-               <p id="ISO20483" class="NormRef">ISO 20483:2013-2014, <i>Cereals and pulses</i></p>
-               <p id="ref1" class="NormRef">ICC 167, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
-               <div id="" class="Note">
-                 <p><span class="note_label">NOTE</span>&#160; This is an annotation of ISO 20483:2013-2014</p>
-               </div>
-               <p id='zip_ffs' class='NormRef'>[5], Title 5</p>
-             </div>
-             <br/>
-             <div>
-               <h1 class="Section3">Bibliography</h1>
-               <p id="ISBN" class="Biblio">[1]&#160; <i>Chemicals for analytical laboratory use</i></p>
-               <p id="ISSN" class="Biblio">[2]&#160; <i>Instruments for analytical laboratory use</i></p>
-               <div id="" class="Note">
-  <p><span class="note_label">NOTE</span>&#160; This is an annotation of document ISSN.</p>
-</div>
-<div id="" class="Note">
-  <p><span class="note_label">NOTE</span>&#160; This is another annotation of document ISSN.</p>
-</div>
-               <p id="ISO3696" class="Biblio">[3]&#160; ISO 3696, <i>Water for analytical laboratory use</i></p>
-               <p id="ref10" class="Biblio">[10]&#160; <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
-               <p id="ref11" class="Biblio">[5]&#160; IETF RFC 10, <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i></p>
-               <p id="ref12" class="Biblio">[6]&#160; Citn, IETF RFC 20, CitationWorks. 2019. <i>How to cite a reference</i>.</p>
-             </div>
-             <aside id="fn:1" class="footnote">
-         <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
-       </aside>
-           </div>
-         </body>
-       </html>
+          <br/>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+          <a href='#ISO712'>[110]</a>
+          <a href='#ISBN'>[1]</a>
+          <a href='#ISSN'>[2]</a>
+          <a href='#ISO16634'>ISO 16634:-- (all parts)</a>
+          <a href='#ref1'>ICC 167</a>
+          <a href='#ref10'>[10]</a>
+          <a href='#ref12'>Citn</a>
+          <a href='#zip_ffs'>[5]</a>
+        </p>
+      </div>
+      <p class='zzSTDTitle1'/>
+      <div>
+        <h1>1.&#160; Normative references</h1>
+        <p>
+          The following documents are referred to in the text in such a way that
+          some or all of their content constitutes requirements of this
+          document. For dated references, only the edition cited applies. For
+          undated references, the latest edition of the referenced document
+          (including any amendments) applies.
+        </p>
+        <p id='ISO712' class='NormRef'>
+          [110], ISO 712,
+          <i>Cereals and cereal products</i>
+        </p>
+        <p id='ISO16634' class='NormRef'>
+          ISO 16634:-- (all parts)
+          <a class='FootnoteRef' href='#fn:1'>
+            <sup>1</sup>
+          </a>
+          ,
+          <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
+        </p>
+        <p id='ISO20483' class='NormRef'>
+          ISO 20483:2013-2014,
+          <i>Cereals and pulses</i>
+        </p>
+        <p id='ref1' class='NormRef'>
+          ICC 167,
+          <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
+          .
+          <i>
+            Determination of the protein content in cereal and cereal products
+            for food and animal feeding stuffs according to the Dumas combustion
+            method
+          </i>
+           (see
+          <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
+          )
+        </p>
+        <div id='' class='Note'>
+          <p>
+            <span class='note_label'>NOTE</span>
+            &#160; This is an annotation of ISO 20483:2013-2014
+          </p>
+        </div>
+        <p id='zip_ffs' class='NormRef'>[5], Title 5</p>
+      </div>
+      <br/>
+      <div>
+        <h1 class='Section3'>Bibliography</h1>
+        <p id='ISBN' class='Biblio'>
+          [1]&#160;
+          <i>Chemicals for analytical laboratory use</i>
+        </p>
+        <p id='ISSN' class='Biblio'>
+          [2]&#160;
+          <i>Instruments for analytical laboratory use</i>
+        </p>
+        <div id='' class='Note'>
+          <p>
+            <span class='note_label'>NOTE</span>
+            &#160; This is an annotation of document ISSN.
+          </p>
+        </div>
+        <div id='' class='Note'>
+          <p>
+            <span class='note_label'>NOTE</span>
+            &#160; This is another annotation of document ISSN.
+          </p>
+        </div>
+        <p id='ISO3696' class='Biblio'>
+          [3]&#160; ISO 3696,
+          <i>Water for analytical laboratory use</i>
+        </p>
+        <p id='ref10' class='Biblio'>
+          [10]&#160;
+          <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
+          .
+          <i>
+            Determination of the protein content in cereal and cereal products
+            for food and animal feeding stuffs according to the Dumas combustion
+            method
+          </i>
+           (see
+          <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
+          )
+        </p>
+        <p id='ref11' class='Biblio'>
+          [5]&#160; IETF RFC 10,
+          <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
+        </p>
+        <p id='ref12' class='Biblio'>
+          [6]&#160; Citn, IETF RFC 20, CitationWorks. 2019.
+          <i>How to cite a reference</i>
+          .
+        </p>
+      </div>
+      <aside id='fn:1' class='footnote'>
+        <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
+      </aside>
+    </div>
+  </body>
+</html>
     OUTPUT
   end