isodoc 0.5.8 → 0.5.9

data/lib/isodoc/xref_gen.rb

@@ -36,11 +36,12 @@ module IsoDoc
 
     SECTIONS_XPATH =
       "//foreword | //introduction | //sections/terms | //annex | "\
-      "//sections/clause | //references[not(ancestor::clause)] | "\
-      "//clause[descendant::references][not(ancestor::clause)]".freeze
+      "//sections/clause | //bibliography/references | "\
+      "//bibliography/clause".freeze
 
     CHILD_NOTES_XPATH =
-      "./*[not(self::xmlns:subsection)]//xmlns:note | ./xmlns:note".freeze
+      "./*[not(self::xmlns:clause) and "\
+      "not(self::xmlns:appendix)]//xmlns:note | ./xmlns:note".freeze
 
     def note_anchor_names(sections)
       sections.each do |s|
@@ -51,13 +52,13 @@ module IsoDoc
           idx = notes.size == 1 ? "" : " #{i + 1}"
           @anchors[n["id"]] = anchor_struct(idx, s, @note_xref_lbl)
         end
-        note_anchor_names(s.xpath(ns("./subsection")))
+        note_anchor_names(s.xpath(ns("./clause | ./appendix")))
       end
     end
 
     CHILD_EXAMPLES_XPATH =
-      "./*[not(self::xmlns:subsection)]//xmlns:example | "\
-      "./xmlns:example".freeze
+      "./*[not(self::xmlns:clause) and not(self::xmlns:appendix)]//"\
+      "xmlns:example | ./xmlns:example".freeze
 
     def example_anchor_names(sections)
       sections.each do |s|
@@ -67,20 +68,20 @@ module IsoDoc
           idx = notes.size == 1 ? "" : " #{i + 1}"
           @anchors[n["id"]] = anchor_struct(idx, s, @example_xref_lbl)
         end
-        example_anchor_names(s.xpath(ns("./subsection")))
+        example_anchor_names(s.xpath(ns("./clause | ./appendix")))
       end
     end
 
     def list_anchor_names(sections)
       sections.each do |s|
-        notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//subsection//ol")) -
-          s.xpath(ns(".//ol//ol"))
+        notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
+          s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
         notes.each_with_index do |n, i|
           idx = notes.size == 1 ? "" : " #{i + 1}"
           @anchors[n["id"]] = anchor_struct(idx, s, @list_lbl)
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end
-        list_anchor_names(s.xpath(ns("./subsection")))
+        list_anchor_names(s.xpath(ns("./clause | ./appendix")))
       end
     end
 
@@ -106,22 +107,9 @@ module IsoDoc
       end
     end
 
-    def middle_anchor_names(docxml)
-      symbols_abbrevs = docxml.at(ns("//sections/symbols-abbrevs"))
-      sect_num = 4
-      if symbols_abbrevs
-        section_names(symbols_abbrevs, sect_num.to_s, 1)
-        sect_num += 1
-      end
-      clause_names(docxml, sect_num)
-      termnote_anchor_names(docxml)
-      termexample_anchor_names(docxml)
-    end
-
     # extract names for all anchors, xref and label
     def anchor_names(docxml)
       initial_anchor_names(docxml)
-      middle_anchor_names(docxml)
       back_anchor_names(docxml)
       # preempt clause notes with all other types of note
       note_anchor_names(docxml.xpath(ns("//table | //example | //formula | "\
@@ -144,10 +132,26 @@ module IsoDoc
       end
     end
 
+    def anchor_struct_label(lbl, elem)
+      case elem
+      when @appendix_lbl then l10n("#{elem} #{lbl}")
+      else
+        lbl.to_s
+      end
+    end
+
+    def anchor_struct_xref(lbl, elem)
+      case elem
+      when @formula_lbl then l10n("#{elem} (#{lbl})")
+      else
+        l10n("#{elem} #{lbl}")
+      end
+    end
+
     def anchor_struct(lbl, container, elem)
-      ret = { label: lbl.to_s }
-      ret[:xref] =
-        elem == "Formula" ? l10n("#{elem} (#{lbl})") : l10n("#{elem} #{lbl}")
+      ret = {}
+      ret[:label] = anchor_struct_label(lbl, elem)
+      ret[:xref] = anchor_struct_xref(lbl, elem)
       ret[:xref].gsub!(/ $/, "")
       ret[:container] = get_clause_id(container) unless container.nil?
       ret

data/lib/isodoc/xref_sect_gen.rb

@@ -11,11 +11,17 @@ module IsoDoc
 
     def initial_anchor_names(d)
       introduction_names(d.at(ns("//introduction")))
-      section_names(d.at(ns("//clause[title = 'Scope']")), "1", 1)
-      section_names(d.at(ns(
-        "//references[title = 'Normative References']")), "2", 1)
-      section_names(d.at(ns("//sections/terms | //sections/clause[descendant::terms]")), "3", 1)
+      n = 0
+      n = section_names(d.at(ns("//clause[title = 'Scope']")), n, 1)
+      n = section_names(d.at(ns(
+        "//references[title = 'Normative References']")), n, 1)
+      n = section_names(d.at(ns("//sections/terms | "\
+                                "//sections/clause[descendant::terms]")), n, 1)
+      n = section_names(d.at(ns("//sections/symbols-abbrevs")), n, 1)
       middle_section_asset_names(d)
+      clause_names(d, n)
+      termnote_anchor_names(d)
+      termexample_anchor_names(d)
     end
 
     def middle_section_asset_names(d)
@@ -27,34 +33,37 @@ module IsoDoc
     end
 
     def clause_names(docxml, sect_num)
-      q = "//clause[parent::sections][not(xmlns:title = 'Scope')][not(descendant::terms)]"
+      q = "//clause[parent::sections][not(xmlns:title = 'Scope')]"\
+        "[not(descendant::terms)]"
       docxml.xpath(ns(q)).each_with_index do |c, i|
-        section_names(c, (i + sect_num).to_s, 1)
+        section_names(c, (i + sect_num), 1)
       end
     end
 
     def introduction_names(clause)
       return if clause.nil?
-      clause.xpath(ns("./subsection")).each_with_index do |c, i|
+      clause.xpath(ns("./clause")).each_with_index do |c, i|
         section_names1(c, "0.#{i + 1}", 2)
       end
     end
 
     def section_names(clause, num, lvl)
-      return if clause.nil?
+      return num if clause.nil?
+      num = num + 1
       @anchors[clause["id"]] =
-        { label: num, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
-      clause.xpath(ns("./subsection | ./term  | ./terms | ./symbols-abbrevs")).
+        { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
+      clause.xpath(ns("./clause | ./term  | ./terms | ./symbols-abbrevs")).
         each_with_index do |c, i|
         section_names1(c, "#{num}.#{i + 1}", lvl + 1)
       end
+      num
     end
 
     def section_names1(clause, num, level)
       @anchors[clause["id"]] =
         { label: num, level: level, xref: num }
       # subclauses are not prefixed with "Clause"
-      clause.xpath(ns("./subsection | ./terms | ./term | ./symbols-abbrevs")).
+      clause.xpath(ns("./clause | ./terms | ./term | ./symbols-abbrevs")).
         each_with_index do |c, i|
         section_names1(c, "#{num}.#{i + 1}", level + 1)
       end
@@ -66,17 +75,26 @@ module IsoDoc
       label = l10n("<b>#{@annex_lbl} #{num}</b><br/>#{obl}")
       @anchors[clause["id"]] =
         { label: label, xref: "#{@annex_lbl} #{num}", level: 1 }
-      clause.xpath(ns("./subsection")).each_with_index do |c, i|
+      clause.xpath(ns("./clause")).each_with_index do |c, i|
         annex_names1(c, "#{num}.#{i + 1}", 2)
       end
+      appendix_names(clause, num)
       hierarchical_asset_names(clause, num)
     end
 
     def annex_names1(clause, num, level)
       @anchors[clause["id"]] = { label: num, xref: num, level: level }
-      clause.xpath(ns(".//subsection")).each_with_index do |c, i|
+      clause.xpath(ns(".//clause")).each_with_index do |c, i|
         annex_names1(c, "#{num}.#{i + 1}", level + 1)
       end
     end
+
+    def appendix_names(clause, num)
+      clause.xpath(ns("./appendix")).each_with_index do |c, i|
+        @anchors[c["id"]] = anchor_struct(i + 1, nil, @appendix_lbl)
+        @anchors[c["id"]][:level] = 2
+        @anchors[c["id"]][:container] = clause["id"]
+      end
+    end
   end
 end

data/spec/assets/scripts.html

@@ -0,0 +1 @@
+This is a script

data/spec/isodoc/blocks_spec.rb

@@ -4,11 +4,11 @@ RSpec.describe IsoDoc do
   it "processes unlabelled notes" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <note>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
 </note>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -24,7 +24,7 @@ RSpec.describe IsoDoc do
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="" class="Note">
-                   <p class="Note">NOTE&#160; These results are based on a study carried out on three different types of kernel.</p>
+                   <p class="Note"><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
                <p>&#160;</p>
@@ -42,11 +42,11 @@ RSpec.describe IsoDoc do
   it "processes labelled notes" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <note id="note1">
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
 </note>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
 INPUT
        <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -62,7 +62,7 @@ INPUT
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="note1" class="Note">
-                   <p class="Note">NOTE&#160; These results are based on a study carried out on three different types of kernel.</p>
+                   <p class="Note"><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
                <p>&#160;</p>
@@ -80,14 +80,14 @@ INPUT
     it "processes sequences of notes" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <note id="note1">
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
 </note>
     <note id="note2">
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
 </note>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
 INPUT
        <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -103,10 +103,10 @@ INPUT
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="note1" class="Note">
-                   <p class="Note">NOTE  1&#160; These results are based on a study carried out on three different types of kernel.</p>
+                   <p class="Note"><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                  <div id="note2" class="Note">
-                   <p class="Note">NOTE  2&#160; These results are based on a study carried out on three different types of kernel.</p>
+                   <p class="Note"><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
                <p>&#160;</p>
@@ -124,12 +124,12 @@ INPUT
   it "processes multi-para notes" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <note>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
 </note>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -145,7 +145,7 @@ INPUT
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="" class="Note">
-                   <p class="Note">NOTE&#160; These results are based on a study carried out on three different types of kernel.</p>
+                   <p class="Note"><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                    <p class="Note" id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
@@ -164,7 +164,7 @@ INPUT
   it "processes non-para notes" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <note>
     <dl>
     <dt>A</dt>
@@ -173,7 +173,7 @@ INPUT
     <ul>
     <li>C</li></ul>
 </note>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -188,7 +188,7 @@ INPUT
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="" class="Note"><p class="Note">NOTE&#160; </p>
+                 <div id="" class="Note"><p class="Note"><span class="note_label">NOTE</span>&#160; </p>
            <dl><dt><p class="Note">A</p></dt><dd><p class="Note">B</p></dd></dl>
            <ul>
            <li>C</li></ul>
@@ -210,7 +210,7 @@ INPUT
   it "processes figures" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <figure id="figureA-1">
   <name>Split-it-right sample divider</name>
   <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
@@ -219,7 +219,7 @@ INPUT
   <dd><p>B</p></dd>
   </dl>
 </figure>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -238,7 +238,7 @@ INPUT
 
          <img src="rice_images/rice_image1.png"/>
          <p><b>Key</b></p><dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
-       <p class="FigureTitle" align="center"><b>Figure 1&#160;&#8212; Split-it-right sample divider</b></p></div>
+       <p class="FigureTitle" align="center">Figure 1&#160;&#8212; Split-it-right sample divider</p></div>
                </div>
                <p>&#160;</p>
              </div>
@@ -255,11 +255,11 @@ INPUT
   it "processes examples" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <example id="samplecode">
   <p>Hello</p>
 </example>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -276,8 +276,8 @@ INPUT
                  <h1 class="ForewordTitle">Foreword</h1>
                  <table id="samplecode" class="example">
                    <tr>
-                     <td width="110pt" valign="top" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE</td>
-                     <td valign="top">
+                     <td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE</td>
+                     <td valign="top" class="example">
          <p>Hello</p>
        </td>
                    </tr>
@@ -299,14 +299,14 @@ INPUT
   it "processes sequences of examples" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <example id="samplecode">
   <p>Hello</p>
 </example>
-    <example id="samplecode2>
+    <example id="samplecode2">
   <p>Hello</p>
 </example>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -323,19 +323,20 @@ INPUT
                  <h1 class="ForewordTitle">Foreword</h1>
                  <table id="samplecode" class="example">
                    <tr>
-                     <td width="110pt" valign="top" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE  1</td>
-                     <td valign="top">
+                     <td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE  1</td>
+                     <td valign="top" class="example">
          <p>Hello</p>
        </td>
                    </tr>
                  </table>
-                 <table id="samplecode2&gt;   " class="example">
+                 <table id="samplecode2" class="example">
                    <tr>
-                     <td width="110pt" valign="top" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE  2</td>
-                     <td valign="top"/>
+                     <td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE  2</td>
+                     <td valign="top" class="example">
+                 <p>Hello</p>
+                 </td>
                    </tr>
                  </table>
-                 <p>Hello</p>
                </div>
                <p>&#160;</p>
              </div>
@@ -352,12 +353,12 @@ INPUT
   it "processes sourcecode" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <sourcecode id="samplecode">
     <name>Ruby code</name>
   puts x
 </sourcecode>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -372,7 +373,7 @@ INPUT
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160;&#160;<br/>&#160;&#160;puts&#160;x<br/><p class="FigureTitle" align="center"><b>Ruby code</b></p></p>
+                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160;&#160;<br/>&#160;&#160;puts&#160;x<br/><p class="FigureTitle" align="center">Ruby code</p></p>
                </div>
                <p>&#160;</p>
              </div>
@@ -389,7 +390,7 @@ INPUT
   it "processes sourcecode with annotations" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <sourcecode id="_">puts "Hello, world." <callout target="A">1</callout>
        %w{a b c}.each do |x|
          puts x <callout target="B">2</callout>
@@ -398,7 +399,7 @@ INPUT
        </annotation><annotation id="B">
          <p id="_">This is another callout</p>
        </annotation></sourcecode>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -434,11 +435,11 @@ INPUT
   it "processes admonitions" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
   <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
 </admonition>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -472,7 +473,7 @@ INPUT
   it "processes formulae" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934">
   <stem type="AsciiMath">r = 1 %</stem>
 <dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
@@ -483,7 +484,7 @@ INPUT
     <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
   </dd>
 </dl></formula>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -524,12 +525,12 @@ INPUT
   it "processes paragraph alignments" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <p align="left" id="_08bfe952-d57f-4150-9c95-5d52098cc2a8">Vache Equipment<br/>
 Fictitious<br/>
 World</p>
     <p align="justify">Justify</p>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -565,12 +566,12 @@ World</p>
     it "processes paragraph alignments (Word)" do
     expect(IsoDoc::WordConvert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <p align="left" id="_08bfe952-d57f-4150-9c95-5d52098cc2a8">Vache Equipment<br/>
 Fictitious<br/>
 World</p>
     <p align="justify">Justify</p>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -608,14 +609,14 @@ World</p>
   it "processes blockquotes" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
   <source type="inline" bibitemid="ISO7301" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality></source>
   <author>ISO</author>
   <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<em>Oryza sativa</em> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
 </quote>
 
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -675,7 +676,7 @@ World</p>
              <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
-               <div><h1>3.&#160; Terms and Definitions</h1><p>For the purposes of this document,
+               <div><h1>1.&#160; Terms and Definitions</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -686,7 +687,7 @@ World</p>
        <li> <p>IEC Electropedia: available at
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
        </p> </li> </ul>
-       <p class="TermNum" id="_extraneous_matter">3.1</p><p class="Terms">extraneous matter</p><p class="AltTerms">EM</p>
+       <p class="TermNum" id="_extraneous_matter">1.1</p><p class="Terms" style="text-align:left;">extraneous matter</p><p class="AltTerms" style="text-align:left;">EM</p>
 
        <p id="_318b3939-be09-46c4-a284-93f9826b981e">&lt;rice&gt; organic and inorganic components other than whole or broken kernels</p>
        </div>