isodoc 1.0.23 → 1.0.28

data/spec/isodoc/footnotes_spec.rb

@@ -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/i18n_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe IsoDoc do
          <p id="E">Text</p>
        </clause>
 
-       <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
+       <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
          <preferred>Term2</preferred>
@@ -55,11 +55,11 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -157,7 +157,7 @@ RSpec.describe IsoDoc do
          <p id="E">Text</p>
        </clause>
 
-       <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
+       <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
          <preferred>Term2</preferred>
@@ -191,11 +191,11 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -293,7 +293,7 @@ RSpec.describe IsoDoc do
          <p id="E">Text</p>
        </clause>
 
-       <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
+       <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
          <preferred>Term2</preferred>
@@ -327,11 +327,11 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -430,7 +430,7 @@ RSpec.describe IsoDoc do
          <p id="E"><eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality></eref></p>
        </clause>
 
-       <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
+       <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
          <preferred>Term2</preferred>
@@ -464,7 +464,7 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
          <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
@@ -478,7 +478,7 @@ RSpec.describe IsoDoc do
 </bibitem>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>

data/spec/isodoc/inline_spec.rb

@@ -126,13 +126,31 @@ RSpec.describe IsoDoc do
       </concept></li>
       <li><concept>
         <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+        <localityStack>
           <locality type='clause'>
             <referenceFrom>3.1</referenceFrom>
           </locality>
+        </localityStack>
+        <localityStack>
           <locality type='figure'>
-            <referenceFrom>a</referenceFrom>
+            <referenceFrom>b</referenceFrom>
+          </locality>
+        </localityStack>
+        </eref>
+      </concept></li>
+      <li><concept>
+        <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+        <localityStack>
+          <locality type='clause'>
+            <referenceFrom>3.1</referenceFrom>
+          </locality>
+        </localityStack>
+        <localityStack>
+          <locality type='figure'>
+            <referenceFrom>b</referenceFrom>
           </locality>
-          <em>word</em>
+        </localityStack>
+        <em>word</em>
         </eref>
       </concept></li>
       <li><concept term='term'>
@@ -147,7 +165,7 @@ RSpec.describe IsoDoc do
     <sections>
     <clause id="clause1"><title>Clause 1</title></clause>
     </sections>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
     <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>
 <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals or cereal products</title>
@@ -180,6 +198,9 @@ RSpec.describe IsoDoc do
                    <li>
                      [Term defined in <a href='#ISO712'>ISO 712, Clause 3.1, Figure a</a>]
                    </li>
+                   <li>
+                     [Term defined in <a href='#ISO712'>ISO 712, Clause 3.1; Figure b</a>]
+                   </li>
                    <li>
                      <i>word</i>
                    </li>
@@ -393,7 +414,7 @@ OUTPUT
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</stem>
     </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
 <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
   <docidentifier>ISO 712</docidentifier>
@@ -436,6 +457,8 @@ OUTPUT
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712"/>
     <eref type="inline" bibitemid="ISO712"/>
     <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom></locality></eref>
+    <eref type="inline" bibitemid="ISO712"><localityStack><locality type="table"><referenceFrom>1</referenceFrom></locality></localityStack></eref>
+    <eref type="inline" bibitemid="ISO712"><localityStack><locality type="table"><referenceFrom>1</referenceFrom></locality></localityStack><localityStack><locality type="clause"><referenceFrom>1</referenceFrom></locality></localityStack></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1</referenceFrom></locality><locality type="table"><referenceFrom>1</referenceFrom></locality></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1</referenceFrom></locality></eref>
@@ -446,7 +469,7 @@ OUTPUT
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</eref>
     </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
 <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
   <docidentifier>ISO 712</docidentifier>
@@ -469,6 +492,8 @@ OUTPUT
            <a href="#ISO712">ISO 712</a>
            <a href="#ISO712">ISO 712</a>
            <a href="#ISO712">ISO 712, Table 1</a>
+           <a href='#ISO712'>ISO 712, Table 1</a>
+<a href='#ISO712'>ISO 712, Table 1; Clause 1</a>
            <a href="#ISO712">ISO 712, Table 1&#8211;1</a>
            <a href="#ISO712">ISO 712, Clause 1, Table 1</a>
            <a href="#ISO712">ISO 712, Clause 1</a>
@@ -490,5 +515,93 @@ OUTPUT
     OUTPUT
   end
 
+    it "processes variant" do
+          expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata>
+    <language>en</language>
+    <script>Latn</script>
+    </bibdata>
+    <preface>
+        <clause id="A"><title><variant lang="en" script="Latn">ABC</variant><variant lang="fr" script="Latn">DEF</variant></title></clause>
+        <clause id="B"><title><variant lang="de" script="Latn">GHI</variant><variant lang="es" script="Latn">JKL</variant></title></clause>
+        <clause id="C"><title><variant lang="fr" script="Latn">ABC</variant><variant lang="en" script="Latn">DEF</variant></title></clause>
+    </preface>
+    </iso-standard>
+    INPUT
+        #{HTML_HDR}
+        <br/>
+      <div class='Section3' id='A'>
+        <h1 class='IntroTitle'>ABC</h1>
+          </div>
+  <br/>
+  <div class='Section3' id='B'>
+    <h1 class='IntroTitle'>GHI</h1>
+  </div>
+  <br/>
+  <div class='Section3' id='C'>
+    <h1 class='IntroTitle'>DEF</h1>
+  </div>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+    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

@@ -30,6 +30,8 @@ RSpec.describe IsoDoc do
   <date type="updated"><on>2018</on></date>
   <date type="unchanged"><on>2019</on></date>
   <date type="transmitted"><on>2020</on></date>
+  <date type="vote-started"><on>2021</on></date>
+  <date type="vote-ended"><on>2022</on></date>
   <edition>2</edition>
 <version>
   <revision-date>2016-05-01</revision-date>
@@ -86,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", :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
 
@@ -166,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"}
+{: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
 
@@ -225,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"}
+{: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

@@ -299,7 +299,7 @@ expect(File.exist?("test.doc")).to be true
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
            <div class="WordSection3">
                <p class="zzSTDTitle1"></p>
-               <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1.<span style="mso-tab-count:1">&#xA0; </span>Terms and definitions</h1>
+               <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1.<span style="mso-tab-count:1">&#xA0; </span>Terms and Definitions</h1>
        <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
        <p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
        <p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>, modified &#x2014; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
@@ -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>
@@ -1316,7 +1316,11 @@ OUTPUT
        <pagebreak orientation="portrait"/>
        <p>And up</p>
        </note>
+       <pagebreak orientation="portrait"/>
         </clause></sections>
+        <annex id="_level_1" inline-header="false" obligation="normative">
+        <title>Annex 1</title>
+        </annex>
        </standard-document>
    INPUT
    expect(File.exist?("test.doc")).to be true
@@ -1324,7 +1328,9 @@ OUTPUT
     expect(html).to include "div.WordSection2_0 {page:WordSection2P;}"
 expect(html).to include "div.WordSection2_1 {page:WordSection2L;}"
     expect(html).to include "div.WordSection3_0 {page:WordSection3P;}"
-expect(html).to include "div.WordSection3_1 {page:WordSection3L;}"
+expect(html).to include "div.WordSection3_1 {page:WordSection3P;}"
+expect(html).to include "div.WordSection3_2 {page:WordSection3L;}"
+
 
 expect(xmlpp(html.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
        <body lang='EN-US' xml:lang='EN-US' link='blue' vlink='#954F72'>
@@ -1335,9 +1341,9 @@ expect(xmlpp(html.sub(/^.*.*$}m, ""))).
            <br clear='all' class='section'/>
          </p>
          <div class='WordSection2'>
-           <p class='MsoNormal'>
-             <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-           </p>
+         <p class='MsoNormal'>
+  <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+</p>
            <div class='Section3' id=''>
              <h1 class='IntroTitle'>Introduction</h1>
              <p align='center' style='text-align:center' class='MsoNormal'>
@@ -1396,7 +1402,7 @@ expect(xmlpp(html.sub(/^.*.*$}m, ""))).
              </div>
            </div>
          </div>
-         <div class='WordSection3_1'>
+         <div class='WordSection3_2'>
            <p class='TableTitle' style='text-align:center;'>Table 1</p>
            <div align='center' class='table_container'>
              <table class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
@@ -1433,8 +1439,24 @@ expect(xmlpp(html.sub(/^.*.*$}m, ""))).
              <br clear='all' class='section'/>
            </p>
          </div>
-         <div class='WordSection3_0'>
+         <div class='WordSection3_1'>
            <p class='Note'>And up</p>
+              <p class='MsoNormal'>
+     <br clear='all' class='section'/>
+   </p>
+ </div>
+ <div class='WordSection3_0'>
+   <div class='Section3'>
+     <a name='_level_1' id='_level_1'/>
+     <h1 class='Annex'>
+       <b>Annex A</b>
+       <br/>
+       (normative)
+       <br/>
+       <br/>
+       <b>Annex 1</b>
+     </h1>
+   </div>
          </div>
          <div style='mso-element:footnote-list'/>
        </body>