isodoc 1.0.22 → 1.0.27

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>
@@ -92,7 +94,7 @@ RSpec.describe IsoDoc do
 </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", :receiveddate=>"XXX", :revdate=>"2016-05-01", :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", :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
 
@@ -108,6 +110,10 @@ OUTPUT
   <title language="en" format="text/plain">Cereals and pulses</title>
   <docidentifier>17301-1-3</docidentifier>
   <docnumber>17301</docnumber>
+  <date type="published"><on>2011-01</on></date>
+  <version>
+  <revision-date>2016-05</revision-date>
+</version>
   <contributor>
     <role type="author"/>
     <organization>
@@ -117,14 +123,23 @@ OUTPUT
   <contributor>
     <role type="publisher"/>
     <organization>
+      <name>International Organization for Standardization</name>
       <abbreviation>ISO</abbreviation>
      </organization>
   </contributor>
   <contributor>
     <role type="publisher"/>
     <organization>
+      <name>International Electrotechnical Commission</name>
       <abbreviation>IEC</abbreviation>
     </organization>
+  </contributor>
+   <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>Institute of Electrical and Electronics Engineers</name>
+      <abbreviation>IEEE</abbreviation>
+    </organization>
   </contributor>
   <language>en</language>
   <script>Latn</script>
@@ -153,8 +168,68 @@ OUTPUT
 </version>
 </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", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :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", :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
 
+    it "processes IsoXML metadata in French" do
+        c = IsoDoc::Convert.new({})
+    arr = c.convert_init(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata type="standard">
+  <language>fr</language>
+  <script>Latn</script>
+  </bibdata>
+  </iso-standard>
+    INPUT
+  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata type="standard">
+  <title language="fr" format="text/plain">Céréales et légumineuses</ti>
+  <title language="en" format="text/plain">Cereals and pulses</title>
+  <docidentifier>17301-1-3</docidentifier>
+  <docnumber>17301</docnumber>
+  <date type="published"><on>2011-01</on></date>
+  <version>
+  <revision-date>2016-05</revision-date>
+</version>
+  <contributor>
+    <role type="author"/>
+    <organization>
+      <name>ISO</name>
+    </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+     </organization>
+  </contributor>
+   <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Electrotechnical Commission</name>
+      <abbreviation>IEC</abbreviation>
+    </organization>
+  </contributor>
+  <language>fr</language>
+  <script>Latn</script>
+  <status><stage>Published</stage></status>
+  <copyright>
+    <from>2016</from>
+    <owner>
+      <organization>
+        <name>International Organization for Standardization</name>
+      </organization>
+    </owner>
+  </copyright>
+</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"}
+OUTPUT
+end
+
+
 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>
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <div align="center" class="table_container">
-                 <table class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;"><a name="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7" id="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7"></a>
+                 <table class="MsoISOTable" style="mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;"><a name="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7" id="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7"></a>
                    <thead>
                      <tr>
                        <td rowspan="2" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;">
          <div>
            <h1 class='ForewordTitle'>Foreword</h1>
            <div align='center' class="table_container">
-             <table class='MsoISOTable' style='mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
+             <table class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
                <a name='_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7' id='_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7'/>
                <thead>
                  <tr>
@@ -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'>
@@ -1351,7 +1357,7 @@ expect(xmlpp(html.sub(/^.*.*$}m, ""))).
          </div>
          <div class='WordSection2_1'>
            <div align='center' class='table_container'>
-             <table class='MsoISOTable' style='mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
+             <table class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
                <tbody>
                  <tr>
                    <td style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>A</td>
@@ -1396,10 +1402,10 @@ 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-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
+             <table class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
                <a name='_c09a7e60-b0c7-4418-9bfc-2ef0bc09a249' id='_c09a7e60-b0c7-4418-9bfc-2ef0bc09a249'/>
                <thead>
                  <tr>
@@ -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>

data/spec/isodoc/ref_spec.rb

@@ -16,14 +16,16 @@ RSpec.describe IsoDoc do
   <eref bibitemid="ref1"/>
   <eref bibitemid="ref10"/>
   <eref bibitemid="ref12"/>
+  <eref bibitemid="zip_ffs"/>
   </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>
     <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>
   <title type="main" format="text/plain">Cereals and cereal products</title>
   <docidentifier type="ISO">ISO 712</docidentifier>
+  <docidentifier type="metanorma">[110]</docidentifier>
   <contributor>
     <role type="publisher"/>
     <organization>
@@ -64,8 +66,10 @@ RSpec.describe IsoDoc do
   <docidentifier type="ICC">167</docidentifier>
 </bibitem>
 <note><p>This is an annotation of ISO 20483:2013-2014</p></note>
+    <bibitem id="zip_ffs"><formattedref format="application/x-isodoc+xml">Title 5</formattedref><docidentifier type="metanorma">[5]</docidentifier></bibitem>
 
-</references><references id="_bibliography" obligation="informative">
+
+</references><references id="_bibliography" obligation="informative" normative="false">
   <title>Bibliography</title>
 <bibitem id="ISBN" type="ISBN">
   <title format="text/plain">Chemicals for analytical laboratory use</title>
@@ -125,26 +129,28 @@ RSpec.describe IsoDoc do
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
-         <a href="#ISO712">ISO 712</a>
+         <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="#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">ISO 712, <i>Cereals and cereal products</i></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>
@@ -160,7 +166,7 @@ RSpec.describe IsoDoc do
                <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, CitationWorks. 2019. <i>How to cite a reference</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>

data/spec/isodoc/section_spec.rb

@@ -112,16 +112,16 @@ RSpec.describe IsoDoc do
          <clause id="Q1" inline-header="false" obligation="normative">
          <title>Annex A.1a</title>
          </clause>
-         <references id="Q2"><title>Annex Bibliography</title></references>
+         <references id="Q2" normative="false"><title>Annex Bibliography</title></references>
        </clause>
        </annex>
        <annex id="P1" inline-header="false" obligation="normative">
        </annex>
-        <bibliography><references id="R" obligation="informative">
+        <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>
@@ -188,7 +188,7 @@ RSpec.describe IsoDoc do
                 <div>
                   <h1>2.&#160; Normative references</h1>
                 </div>
-                <div id="H"><h1>3.&#160; Terms, definitions, symbols and abbreviated terms</h1>
+                <div id="H"><h1>3.&#160; Terms, Definitions, Symbols and Abbreviated Terms</h1>
         <div id="I">
            <h2>3.1.&#160; Normal Terms</h2>
            <p class="TermNum" id="J">3.1.1.</p>
@@ -342,11 +342,11 @@ OUTPUT
        </annex>
  <annex id="P1" inline-header="false" obligation="normative">
        </annex>
-        <bibliography><references id="R" obligation="informative">
+        <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>
@@ -429,7 +429,7 @@ OUTPUT
                <div>
                  <h1>2.<span style="mso-tab-count:1">&#160; </span>Normative references</h1>
                </div>
-               <div id="H"><h1>3.<span style="mso-tab-count:1">&#160; </span>Terms, definitions, symbols and abbreviated terms</h1>
+               <div id="H"><h1>3.<span style="mso-tab-count:1">&#160; </span>Terms, Definitions, Symbols and Abbreviated Terms</h1>
        <div id="I">
           <h2>3.1.<span style="mso-tab-count:1">&#160; </span>Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1.</p>
@@ -579,210 +579,225 @@ OUTPUT
          <clause id="Q1" inline-header="false" obligation="normative">
          <title>Annex A.1a<fn reference="17"><p>A</p></fn></title>
          </clause>
-         <references id="Q2"><title>Annex Bibliography<fn reference="18"><p>A</p></fn></title></references>
+         <references id="Q2" normative="false"><title>Annex Bibliography<fn reference="18"><p>A</p></fn></title></references>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References<fn reference="19"><p>A</p></fn></title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography<fn reference="20"><p>A</p></fn></title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection<fn reference="21"><p>A</p></fn></title>
        </references>
        </clause>
        </bibliography>
        </iso-standard>
     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'>
-      <div class='authority'>
-        <div class='boilerplate-copyright'>
-          <div>
-            <h1>
-              Copyright
-              <a rel='footnote' href='#fn:1' epub:type='footnote'>
-                <sup>1</sup>
-              </a>
-            </h1>
-          </div>
-        </div>
-        <div class='boilerplate-license'>
-          <div>
-            <h1>
-              License
-              <a rel='footnote' href='#fn:2' epub:type='footnote'>
-                <sup>2</sup>
-              </a>
-            </h1>
-          </div>
-        </div>
-        <div class='boilerplate-legal'>
-          <div>
-            <h1>
-              Legal
-              <a rel='footnote' href='#fn:3' epub:type='footnote'>
-                <sup>3</sup>
-              </a>
-            </h1>
-          </div>
-        </div>
-        <div class='boilerplate-feedback'>
-          <div>
-            <h1>
-              Feedback
-              <a rel='footnote' href='#fn:4' epub:type='footnote'>
-                <sup>4</sup>
-              </a>
-            </h1>
-          </div>
-        </div>
-      </div>
-      <br/>
-      <div>
-        <h1 class='AbstractTitle'>Abstract</h1>
-      </div>
-      <br/>
-      <div>
-        <h1 class='ForewordTitle'>Foreword</h1>
-        <p id='A'>This is a preamble</p>
-      </div>
-      <br/>
-      <div class='Section3' id='B'>
-        <h1 class='IntroTitle'>Introduction</h1>
-        <div id='C'>
-          <h2>
-            Introduction Subsection
-            <a rel='footnote' href='#fn:8' epub:type='footnote'>
-              <sup>8</sup>
-            </a>
-          </h2>
-        </div>
-      </div>
-      <p class='zzSTDTitle1'/>
-      <div id='H'>
-        <h1>1.&#160; Terms, definitions, symbols and abbreviated terms</h1>
-        <div id='I'>
-          <h2>
-            1.1.&#160; Normal Terms
-            <a rel='footnote' href='#fn:11' epub:type='footnote'>
-              <sup>11</sup>
-            </a>
-          </h2>
-          <p class='TermNum' id='J'>1.1.1.</p>
-          <p class='Terms' style='text-align:left;'>Term2</p>
-        </div>
-        <div id='K'>
-          <h2>
-            1.2.&#160; Definitions
-            <a rel='footnote' href='#fn:12' epub:type='footnote'>
-              <sup>12</sup>
-            </a>
-          </h2>
-          <dl>
-            <dt>
-              <p>Symbol</p>
-            </dt>
-            <dd>Definition</dd>
-          </dl>
-        </div>
-      </div>
-      <div id='L' class='Symbols'>
-        <h1>2.&#160; Symbols and abbreviated terms</h1>
-        <dl>
-          <dt>
-            <p>Symbol</p>
-          </dt>
-          <dd>Definition</dd>
-        </dl>
-      </div>
-      <div id='D'>
-        <h1>
-          3.&#160; Scope
-          <a rel='footnote' href='#fn:9' epub:type='footnote'>
-            <sup>9</sup>
-          </a>
-        </h1>
-        <p id='E'>Text</p>
-      </div>
-      <div id='M'>
-        <h1>
-          4.&#160; Clause 4
-          <a rel='footnote' href='#fn:13' epub:type='footnote'>
-            <sup>13</sup>
-          </a>
-        </h1>
-        <div id='N'>
-          <h2>
-            4.1.&#160; Introduction
-            <a rel='footnote' href='#fn:1' epub:type='footnote'>
-              <sup>1</sup>
-            </a>
-          </h2>
-        </div>
-        <div id='O'>
-          <h2>
-            4.2.&#160; Clause 4.2
-            <a rel='footnote' href='#fn:14' epub:type='footnote'>
-              <sup>14</sup>
-            </a>
-          </h2>
-        </div>
-        <div id='O1'>
-          <h2>4.3.&#160; </h2>
-        </div>
-      </div>
-      <br/>
-      <div id='P' class='Section3'>
-        <h1 class='Annex'>
-          <b>Annex A</b>
-          <br/>
-          (normative)
-          <br/>
-          <br/>
-          <b>
-            Annex
-            <a rel='footnote' href='#fn:15' epub:type='footnote'>
-              <sup>15</sup>
-            </a>
-          </b>
-        </h1>
-        <div id='Q'>
-          <h2>
-            A.1.&#160; Annex A.1
-            <a rel='footnote' href='#fn:16' epub:type='footnote'>
-              <sup>16</sup>
-            </a>
-          </h2>
-          <div id='Q1'>
-            <h3>
-              A.1.1.&#160; Annex A.1a
-              <a rel='footnote' href='#fn:17' epub:type='footnote'>
-                <sup>17</sup>
-              </a>
-            </h3>
-          </div>
-          <div>
-            <h3>
-              A.1.2.&#160; Annex Bibliography
-              <a rel='footnote' href='#fn:18' epub:type='footnote'>
-                <sup>18</sup>
-              </a>
-            </h3>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
+     <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'>
+             <div class='authority'>
+               <div class='boilerplate-copyright'>
+                 <div>
+                   <h1>
+                     Copyright
+                     <a rel='footnote' href='#fn:1' epub:type='footnote'>
+                       <sup>1</sup>
+                     </a>
+                   </h1>
+                 </div>
+               </div>
+               <div class='boilerplate-license'>
+                 <div>
+                   <h1>
+                     License
+                     <a rel='footnote' href='#fn:2' epub:type='footnote'>
+                       <sup>2</sup>
+                     </a>
+                   </h1>
+                 </div>
+               </div>
+               <div class='boilerplate-legal'>
+                 <div>
+                   <h1>
+                     Legal
+                     <a rel='footnote' href='#fn:3' epub:type='footnote'>
+                       <sup>3</sup>
+                     </a>
+                   </h1>
+                 </div>
+               </div>
+               <div class='boilerplate-feedback'>
+                 <div>
+                   <h1>
+                     Feedback
+                     <a rel='footnote' href='#fn:4' epub:type='footnote'>
+                       <sup>4</sup>
+                     </a>
+                   </h1>
+                 </div>
+               </div>
+             </div>
+             <br/>
+             <div>
+               <h1 class='AbstractTitle'>Abstract</h1>
+             </div>
+             <br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p id='A'>This is a preamble</p>
+             </div>
+             <br/>
+             <div class='Section3' id='B'>
+               <h1 class='IntroTitle'>Introduction</h1>
+               <div id='C'>
+                 <h2>
+                   Introduction Subsection
+                   <a rel='footnote' href='#fn:8' epub:type='footnote'>
+                     <sup>8</sup>
+                   </a>
+                 </h2>
+               </div>
+             </div>
+             <p class='zzSTDTitle1'/>
+             <div>
+               <h1>1.&#160; Normative references</h1>
+             </div>
+             <div id='H'>
+               <h1>
+                 2.&#160; Terms, Definitions, Symbols and Abbreviated Terms
+                 <a rel='footnote' href='#fn:10' epub:type='footnote'>
+                   <sup>10</sup>
+                 </a>
+               </h1>
+               <div id='I'>
+                 <h2>
+                   2.1.&#160; Normal Terms
+                   <a rel='footnote' href='#fn:11' epub:type='footnote'>
+                     <sup>11</sup>
+                   </a>
+                 </h2>
+                 <p class='TermNum' id='J'>2.1.1.</p>
+                 <p class='Terms' style='text-align:left;'>Term2</p>
+               </div>
+               <div id='K'>
+                 <h2>
+                   2.2.&#160; Definitions
+                   <a rel='footnote' href='#fn:12' epub:type='footnote'>
+                     <sup>12</sup>
+                   </a>
+                 </h2>
+                 <dl>
+                   <dt>
+                     <p>Symbol</p>
+                   </dt>
+                   <dd>Definition</dd>
+                 </dl>
+               </div>
+             </div>
+             <div id='L' class='Symbols'>
+               <h1>3.&#160; Symbols and abbreviated terms</h1>
+               <dl>
+                 <dt>
+                   <p>Symbol</p>
+                 </dt>
+                 <dd>Definition</dd>
+               </dl>
+             </div>
+             <div id='D'>
+               <h1>
+                 4.&#160; Scope
+                 <a rel='footnote' href='#fn:9' epub:type='footnote'>
+                   <sup>9</sup>
+                 </a>
+               </h1>
+               <p id='E'>Text</p>
+             </div>
+             <div id='M'>
+               <h1>
+                 5.&#160; Clause 4
+                 <a rel='footnote' href='#fn:13' epub:type='footnote'>
+                   <sup>13</sup>
+                 </a>
+               </h1>
+               <div id='N'>
+                 <h2>
+                   5.1.&#160; Introduction
+                   <a rel='footnote' href='#fn:1' epub:type='footnote'>
+                     <sup>1</sup>
+                   </a>
+                 </h2>
+               </div>
+               <div id='O'>
+                 <h2>
+                   5.2.&#160; Clause 4.2
+                   <a rel='footnote' href='#fn:14' epub:type='footnote'>
+                     <sup>14</sup>
+                   </a>
+                 </h2>
+               </div>
+               <div id='O1'>
+                 <h2>5.3.&#160; </h2>
+               </div>
+             </div>
+             <br/>
+             <div id='P' class='Section3'>
+               <h1 class='Annex'>
+                 <b>Annex A</b>
+                 <br/>
+                 (normative)
+                 <br/>
+                 <br/>
+                 <b>
+                   Annex
+                   <a rel='footnote' href='#fn:15' epub:type='footnote'>
+                     <sup>15</sup>
+                   </a>
+                 </b>
+               </h1>
+               <div id='Q'>
+                 <h2>
+                   A.1.&#160; Annex A.1
+                   <a rel='footnote' href='#fn:16' epub:type='footnote'>
+                     <sup>16</sup>
+                   </a>
+                 </h2>
+                 <div id='Q1'>
+                   <h3>
+                     A.1.1.&#160; Annex A.1a
+                     <a rel='footnote' href='#fn:17' epub:type='footnote'>
+                       <sup>17</sup>
+                     </a>
+                   </h3>
+                 </div>
+                 <div>
+                   <h3>
+                     A.1.2.&#160; Annex Bibliography
+                     <a rel='footnote' href='#fn:18' epub:type='footnote'>
+                       <sup>18</sup>
+                     </a>
+                   </h3>
+                 </div>
+               </div>
+             </div>
+             <br/>
+             <div>
+               <h1 class='Section3'>Bibliography</h1>
+               <div>
+                 <h2 class='Section3'>Bibliography SubsectionA</h2>
+               </div>
+             </div>
+           </div>
+         </body>
+       </html>
 OUTPUT
   end
 
@@ -840,11 +855,11 @@ OUTPUT
          <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>
@@ -872,7 +887,7 @@ OUTPUT
              <div>
                <h1>Normative references</h1>
              </div>
-             <div id="H"><h1>Terms, definitions, symbols and abbreviated terms</h1>
+             <div id="H"><h1>Terms, Definitions, Symbols and Abbreviated Terms</h1>
        <div id="I"><h2>Normal Terms</h2>
 
           <p class="TermNum" id="J">3.1.1.</p>
@@ -964,7 +979,7 @@ OUTPUT
     INPUT
     #{HTML_HDR}
                <p class="zzSTDTitle1"/>
-               <div id="H"><h1>1.&#160; Terms and definitions</h1>
+               <div id="H"><h1>1.&#160; Terms, Definitions, Symbols and Abbreviated Terms</h1>
        <p class="TermNum" id="J">1.1.</p>
          <p class="Terms" style="text-align:left;">Term2</p>
        </div>