isodoc 1.2.6 → 1.4.0

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -75,5 +75,60 @@ module IsoDoc::WordFunction
       toc.sub(/(<p class="MsoToc1">)/,
               %{\\1#{word_toc_preface(level)}}) +  WORD_TOC_SUFFIX1
     end
+
+    def authority_cleanup1(docxml, klass)
+      dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
+      auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or @class = 'boilerplate-#{klass}']")
+      auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each { |h| h.remove }
+      auth&.xpath(".//h1 | .//h2")&.each do |h|
+        h.name = "p"
+        h["class"] = "TitlePageSubhead"
+      end
+      dest and auth and dest.replace(auth.remove)
+    end
+
+    def authority_cleanup(docxml)
+      %w(copyright license legal feedback).each do |t|
+        authority_cleanup1(docxml, t)
+      end
+    end
+
+    def generate_header(filename, _dir)
+      return nil unless @header
+      template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
+      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
+      meta[:filename] = filename
+      params = meta.map { |k, v| [k.to_s, v] }.to_h
+      Tempfile.open(%w(header html), :encoding => "utf-8") do |f|
+        f.write(template.render(params))
+        f
+      end
+    end
+
+    def word_section_breaks(docxml)
+      @landscapestyle = ""
+      word_section_breaks1(docxml, "WordSection2")
+      word_section_breaks1(docxml, "WordSection3")
+      word_remove_pb_before_annex(docxml)
+      docxml.xpath("//br[@orientation]").each { |br| br.delete("orientation") }
+    end
+
+    def word_section_breaks1(docxml, sect)
+      docxml.xpath("//div[@class = '#{sect}']//br[@orientation]").reverse.
+        each_with_index do |br, i|
+        @landscapestyle += "\ndiv.#{sect}_#{i} {page:#{sect}#{br["orientation"] == "landscape" ? "L" : "P"};}\n"
+        split_at_section_break(docxml, sect, br, i)
+      end
+    end
+
+    def split_at_section_break(docxml, sect, br, i)
+      move = br.parent.xpath("following::node()") &
+        br.document.xpath("//div[@class = '#{sect}']//*")
+      ins = docxml.at("//div[@class = '#{sect}']").after("<div class='#{sect}_#{i}'/>").next_element
+      move.each do |m|
+        next if m.at("./ancestor::div[@class = '#{sect}_#{i}']")
+        ins << m.remove
+      end
+    end
   end
 end

data/lib/isodoc/word_function/table.rb

@@ -43,11 +43,21 @@ module IsoDoc::WordFunction
       }))
     end
 
+    def colgroup(node, t)
+      colgroup = node.at(ns("./colgroup")) or return
+      t.colgroup do |cg|
+        colgroup.xpath(ns("./col")).each do |c|
+          cg.col **{ width: c["width"] }
+        end
+      end
+    end
+
     def table_parse(node, out)
       @in_table = true
       table_title_parse(node, out)
       out.div **{ align: "center", class: "table_container" } do |div|
         div.table **table_attrs(node) do |t|
+          colgroup(node, t)
           thead_parse(node, t)
           tbody_parse(node, t)
           tfoot_parse(node, t)

data/lib/isodoc/xref.rb

@@ -49,6 +49,7 @@ module IsoDoc
       note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+      bookmark_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
     end
 
     def ns(xpath)

data/lib/isodoc/xref/xref_counter.rb

@@ -2,8 +2,8 @@ require "roman-numerals"
 
 module IsoDoc::XrefGen
   class Counter
-    def initialize
-      @num = 0
+    def initialize(num = 0)
+      @num = num
       @letter = ""
       @subseq = ""
       @letter_override = nil
@@ -76,13 +76,24 @@ module IsoDoc::XrefGen
       "#{@base}#{@number_override || @num}#{@letter_override || @letter}"
     end
 
-    def listlabel(depth)
-      return @num.to_s if [2, 7].include? depth
-      return (96 + @num).chr.to_s if [1, 6].include? depth
-      return (64 + @num).chr.to_s if [4, 9].include? depth
-      return RomanNumerals.to_roman(@num).downcase if [3, 8].include? depth
-      return RomanNumerals.to_roman(@num).upcase if [5, 10].include? depth
-      return @num.to_s
+    def ol_type(list, depth)
+      return list["type"].to_sym if list["type"]
+      return :arabic if [2, 7].include? depth
+      return :alphabet if [1, 6].include? depth
+      return :alphabet_upper if [4, 9].include? depth
+      return :roman if [3, 8].include? depth
+      return :roman_upper if [5, 10].include? depth
+      return :arabic
+    end
+
+    def listlabel(list, depth)
+      case ol_type(list, depth)
+      when :arabic then @num.to_s
+      when :alphabet then (96 + @num).chr.to_s
+      when :alphabet_upper then (64 + @num).chr.to_s
+      when :roman then RomanNumerals.to_roman(@num).downcase
+      when :roman_upper then RomanNumerals.to_roman(@num).upcase
+      end
     end
   end
 end

data/lib/isodoc/xref/xref_gen.rb

@@ -66,6 +66,10 @@ module IsoDoc::XrefGen
       "//sections/clause | //sections/definitions | "\
       "//bibliography/references | //bibliography/clause".freeze
 
+    def sections_xpath
+      SECTIONS_XPATH
+    end
+
     CHILD_NOTES_XPATH =
       "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
       "not(self::xmlns:terms) and not(self::xmlns:definitions)]//xmlns:note | "\
@@ -123,9 +127,9 @@ module IsoDoc::XrefGen
     end
 
     def list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
-      c = Counter.new
+      c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
       list.xpath(ns("./li")).each do |li|
-        label = c.increment(li).listlabel(depth)
+        label = c.increment(li).listlabel(list, depth)
         label = "#{prev_label}.#{label}" unless prev_label.empty?
         label = "#{list_anchor[:xref]} #{label}" if refer_list
         li["id"] and @anchors[li["id"]] =
@@ -136,5 +140,19 @@ module IsoDoc::XrefGen
         end
       end
     end
+
+    def bookmark_anchor_names(sections)
+      sections.each do |s|
+        notes = s.xpath(ns(".//bookmark")) - s.xpath(ns(".//clause//bookmark")) -
+          s.xpath(ns(".//appendix//bookmark"))
+        notes.each do |n|
+          next if n["id"].nil? || n["id"].empty?
+          @anchors[n["id"]] = {
+            type: "bookmark", label: nil, value: nil,
+            xref: @anchors[s["id"]][:xref] }
+        end
+        bookmark_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+      end
+    end
   end
 end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -68,7 +68,7 @@ module IsoDoc::XrefGen
     end
 
     def clause_names(docxml, sect_num)
-      docxml.xpath(ns(@klass.middle_clause)).each_with_index do |c, i|
+      docxml.xpath(ns(@klass.middle_clause(docxml))).each_with_index do |c, i|
         section_names(c, (i + sect_num), 1)
       end
     end

data/spec/assets/html.scss

@@ -3,4 +3,18 @@
 
 p {
   font-family: $bodyfont;
+  font-size: $normalfontsize;
+}
+code {
+  font-family: $monospacefont;
+  font-size: $monospacefontsize;
+}
+aside {
+  font-size: $footnotefontsize;
+}
+h1 {
+  font-family: $headerfont;
+}
+p.note {
+  font-size: $smallerfontsize;
 }

data/spec/assets/i18n.yaml

@@ -1,25 +1,33 @@
-foreword: Antaŭparolo
+foreword: Antaŭparolo
 introduction: Enkonduko
-clause: klaŭzo
-table: Tabelo
+clause: klaŭzo
+table: tabelo
 source: SOURCE
 modified: modified
 scope: Amplekso
 symbols: Simboloj kai mallongigitaj terminoj
 annex: Aldono
-normref: Normaj citaĵoj
+normref: Normaj citaĵoj
 bibliography: Bibliografio
 inform_annex: informa
-all_parts: ĉiuj partoj
+all_parts: ĉiuj partoj
+norm_annex: normative
+note: NOTO
 locality: {
   table: Tabelo
-  }
+}
 doctype_dict: {
-  brochure: broŝuro
-  }
+  brochure: broŝuro,
+  conference proceedings: konferencaktoj
+}
 stage_dict: {
   published: publikigita
 }
 substage_dict: {
   withdrawn: fortirita
-  }
+}
+array:
+    - elem1
+    - elem2
+    - {elem3: elem4, elem5: elem6}
+void:

data/spec/isodoc/blocks_spec.rb

@@ -87,32 +87,18 @@ RSpec.describe IsoDoc do
     <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="presentation">
             <bibdata type="standard">
               <title language="en" format="text/plain">Document title</title>
-              <language>en</language>
-              <script>Latn</script>
+              <language current="true">en</language>
+              <script current="true">Latn</script>
               <status>
-                <stage>published</stage>
+                <stage language="">published</stage>
               </status>
               <copyright>
                 <from>2020</from>
               </copyright>
               <ext>
-                <doctype>article</doctype>
+                <doctype language="">article</doctype>
               </ext>
             </bibdata>
-            <local_bibdata type='standard'>
-  <title language='en' format='text/plain'>Document title</title>
-  <language>en</language>
-  <script>Latn</script>
-  <status>
-    <stage>published</stage>
-  </status>
-  <copyright>
-    <from>2020</from>
-  </copyright>
-  <ext>
-    <doctype>article</doctype>
-  </ext>
-</local_bibdata>
             <sections>
               <clause id="A" inline-header="false" obligation="normative">
                 <title depth="1">1.<tab/>Change Clause</title>
@@ -248,7 +234,7 @@ RSpec.describe IsoDoc do
          </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
@@ -548,7 +534,7 @@ INPUT
       <div>
         <h1 class='ForewordTitle'>Foreword</h1>
         <p id='A'>
-          ABC 
+          ABC
           <div id='B' class='Note'>
             <p>
               <span class='note_label'>NOTE 1</span>
@@ -1469,6 +1455,7 @@ end
                <div id='_be9158af-7e93-4ee2-90c5-26d31c181934' style='page-break-after: avoid;page-break-inside: avoid;'><div class='formula'>
                  <p>
                    <span class='stem'>(#(r = 1 %)#)</span>
+                   <span style='mso-tab-count:1'>&#160; </span>
                  </p>
                </div>
                <p>where</p>
@@ -2240,8 +2227,8 @@ end
     OUTPUT
   end
 
-   it "processes requirements in French (Presentation XML)" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+   it "processes requirements in French" do
+   input = <<~INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata>
     <language>fr</language>
@@ -2295,133 +2282,63 @@ end
     </foreword></preface>
     </iso-standard>
     INPUT
-    <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-         <bibdata>
-           <language>fr</language>
-           <script>Latn</script>
-         </bibdata>
-         <local_bibdata>
-  <language>fr</language>
-  <script>Latn</script>
-</local_bibdata>
-         <preface>
-           <foreword>
-             <requirement id='A' unnumbered='true'>
-               <name>Exigence</name>
-               <title>A New Requirement</title>
-               <label>/ogc/recommendation/wfs/2</label>
-               <inherit>/ss/584/2015/level/1</inherit>
-               <subject>user</subject>
-               <description>
-                 <p id='_'>
-                   I recommend
-                   <em>this</em>
-                   .
-                 </p>
-               </description>
-               <specification exclude='true' type='tabular'>
-                 <p id='_'>This is the object of the recommendation:</p>
-                 <table id='_'>
-                   <tbody>
-                     <tr>
-                       <td style='text-align:left;'>Object</td>
-                       <td style='text-align:left;'>Value</td>
-                     </tr>
-                     <tr>
-                       <td style='text-align:left;'>Mission</td>
-                       <td style='text-align:left;'>Accomplished</td>
-                     </tr>
-                   </tbody>
-                 </table>
-               </specification>
-               <description>
-                 <p id='_'>As for the measurement targets,</p>
-               </description>
-               <measurement-target exclude='false'>
-                 <p id='_'>The measurement target shall be measured as:</p>
-                 <formula id='B'>
-                   <name>1</name>
-                   <stem type='AsciiMath'>r/1 = 0</stem>
-                 </formula>
-               </measurement-target>
-               <verification exclude='false'>
-                 <p id='_'>The following code will be run for verification:</p>
-                 <sourcecode id='_'>
-                   CoreRoot(success): HttpResponse if (success) recommendation(label:
-                   success-response) end
-                 </sourcecode>
-               </verification>
-               <import exclude='true'>
-                 <sourcecode id='_'>success-response()</sourcecode>
-               </import>
-             </requirement>
-           </foreword>
-         </preface>
-         </iso-standard>
+
+    presxml = <<~OUTPUT
+    <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+           <bibdata>
+           <language current="true">fr</language>
+           <script current="true">Latn</script>
+           </bibdata>
+           <preface><foreword>
+           <requirement id="A" unnumbered="true"><name>Exigence</name>
+         <title>A New Requirement</title>
+         <label>/ogc/recommendation/wfs/2</label>
+         <inherit>/ss/584/2015/level/1</inherit>
+         <subject>user</subject>
+         <description>
+           <p id="_">I recommend <em>this</em>.</p>
+         </description>
+         <specification exclude="true" type="tabular">
+           <p id="_">This is the object of the recommendation:</p>
+           <table id="_">
+             <tbody>
+               <tr>
+                 <td style="text-align:left;">Object</td>
+                 <td style="text-align:left;">Value</td>
+               </tr>
+               <tr>
+                 <td style="text-align:left;">Mission</td>
+                 <td style="text-align:left;">Accomplished</td>
+               </tr>
+             </tbody>
+           </table>
+         </specification>
+         <description>
+           <p id="_">As for the measurement targets,</p>
+         </description>
+         <measurement-target exclude="false">
+           <p id="_">The measurement target shall be measured as:</p>
+           <formula id="B"><name>1</name>
+             <stem type="AsciiMath">r/1 = 0</stem>
+           </formula>
+         </measurement-target>
+         <verification exclude="false">
+           <p id="_">The following code will be run for verification:</p>
+<sourcecode id="_">CoreRoot(success): HttpResponse
+  if (success)
+  recommendation(label: success-response)
+  end
+</sourcecode>
+         </verification>
+         <import exclude="true">
+           <sourcecode id="_">success-response()</sourcecode>
+         </import>
+       </requirement>
+           </foreword></preface>
+           </iso-standard>
 OUTPUT
-end
 
-   it "processes requirements in French (HTML)" 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>fr</language>
-    <script>Latn</script>
-    </bibdata>
-    <local_bibdata>
-  <language>fr</language>
-  <script>Latn</script>
-</local_bibdata>
-    <preface><foreword>
-    <requirement id="A" unnumbered="true">
-    <name>Exigence</name>
-  <title>A New Requirement</title>
-  <label>/ogc/recommendation/wfs/2</label>
-  <inherit>/ss/584/2015/level/1</inherit>
-  <subject>user</subject>
-  <description>
-    <p id="_">I recommend <em>this</em>.</p>
-  </description>
-  <specification exclude="true" type="tabular">
-    <p id="_">This is the object of the recommendation:</p>
-    <table id="_">
-      <tbody>
-        <tr>
-          <td style="text-align:left;">Object</td>
-          <td style="text-align:left;">Value</td>
-        </tr>
-        <tr>
-          <td style="text-align:left;">Mission</td>
-          <td style="text-align:left;">Accomplished</td>
-        </tr>
-      </tbody>
-    </table>
-  </specification>
-  <description>
-    <p id="_">As for the measurement targets,</p>
-  </description>
-  <measurement-target exclude="false">
-    <p id="_">The measurement target shall be measured as:</p>
-    <formula id="B">
-      <stem type="AsciiMath">r/1 = 0</stem>
-    </formula>
-  </measurement-target>
-  <verification exclude="false">
-    <p id="_">The following code will be run for verification:</p>
-    <sourcecode id="_">CoreRoot(success): HttpResponse
-      if (success)
-      recommendation(label: success-response)
-      end
-    </sourcecode>
-  </verification>
-  <import exclude="true">
-    <sourcecode id="_">success-response()</sourcecode>
-  </import>
-</requirement>
-    </foreword></preface>
-    </iso-standard>
-    INPUT
+html = <<~OUTPUT
 #{HTML_HDR.gsub(/"en"/, '"fr"')}
              <br/>
              <div>
@@ -2454,6 +2371,7 @@ end
                    <div id='B'><div class='formula'>
                      <p>
                        <span class='stem'>(#(r/1 = 0)#)</span>
+                       &#160; (1)
                      </p>
                      </div>
                    </div>
@@ -2463,14 +2381,12 @@ end
                    <pre id='_' class='prettyprint '>
                      CoreRoot(success): HttpResponse
                      <br/>
-                     &#160;&#160;&#160;&#160;&#160; if (success)
+                     &#160; if (success)
                      <br/>
-                     &#160;&#160;&#160;&#160;&#160; recommendation(label:
-                     success-response)
+                     &#160; recommendation(label: success-response)
                      <br/>
-                     &#160;&#160;&#160;&#160;&#160; end
+                     &#160; end
                      <br/>
-                     &#160;&#160;&#160;
                    </pre>
                  </div>
                </div>
@@ -2480,6 +2396,8 @@ end
          </body>
        </html>
 OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
 end
 
  it "processes recommendation (Presentation XML)" do
@@ -2686,8 +2604,8 @@ end
     OUTPUT
   end
 
-  it "processes pseudocode (Presentation XML)" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes pseudocode" do
+    input = <<~INPUT
 <itu-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata>
     <language>en</language>
@@ -2698,65 +2616,22 @@ end
 <p id="_">  <em>C</em></p></figure>
 </preface></itu-standard>
 INPUT
-<?xml version='1.0'?>
-<itu-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-  <bibdata>
-    <language>en</language>
-  </bibdata>
-  <local_bibdata>
-  <language>en</language>
-</local_bibdata>
-  <preface>
-    <foreword>
-      <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>
-        <name>Figure 1&#xA0;&#x2014; Label</name>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <strong>A</strong>
-          <br/>
-           &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
-          <smallcap>B</smallcap>
-        </p>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <em>C</em>
-        </p>
-      </figure>
-    </foreword>
-  </preface>
-</itu-standard>
+
+presxml = <<~OUTPUT
+       <itu-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+           <bibdata>
+           <language current="true">en</language>
+           </bibdata>
+               <preface><foreword>
+         <figure id="_" class="pseudocode" keep-with-next="true" keep-lines-together="true"><name>Figure 1&#xA0;&#x2014; Label</name><p id="_">&#xA0;&#xA0;<strong>A</strong><br/>
+       &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;<smallcap>B</smallcap></p>
+       <p id="_">&#xA0;&#xA0;<em>C</em></p></figure>
+       </foreword></preface>
+       </itu-standard>
+
 OUTPUT
-end
 
- it "processes pseudocode (HTML)" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-<itu-standard xmlns='http://riboseinc.com/isoxml'>
-  <bibdata>
-    <language>en</language>
-  </bibdata>
-  <local_bibdata>
-  <language>en</language>
-</local_bibdata>
-  <preface>
-    <foreword>
-      <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>
-        <name>Figure 1&#xA0;&#x2014; Label</name>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <strong>A</strong>
-          <br/>
-           &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
-          <smallcap>B</smallcap>
-        </p>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <em>C</em>
-        </p>
-      </figure>
-    </foreword>
-  </preface>
-</itu-standard>
-INPUT
+html = <<~OUTPUT
     #{HTML_HDR}
              <br/>
              <div>
@@ -2770,38 +2645,11 @@ INPUT
          </body>
 </html>
 OUTPUT
-  end
 
-  it "processes pseudocode (Word)" do
     FileUtils.rm_f "test.doc"
-    IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", false)
-    <itu-standard xmlns='http://riboseinc.com/isoxml'>
-  <bibdata>
-    <language>en</language>
-  </bibdata>
-  <local_bibdata>
-  <language>en</language>
-</local_bibdata>
-  <preface>
-    <foreword>
-      <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>
-        <name>Figure 1&#xA0;&#x2014; Label</name>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <strong>A</strong>
-          <br/>
-           &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
-          <smallcap>B</smallcap>
-        </p>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <em>C</em>
-        </p>
-      </figure>
-    </foreword>
-  </preface>
-</itu-standard>
-INPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+    IsoDoc::WordConvert.new({}).convert("test", presxml, false)
     expect(xmlpp( File.read("test.doc").gsub(%r{^.*<h1 class="ForewordTitle">Foreword</h1>}m, "").gsub(%r{</div>.*}m, "</div>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
             <div class="pseudocode"  style='page-break-after: avoid;page-break-inside: avoid;'><a name="_" id="_"></a><p class="pseudocode"><a name="_" id="_"></a>&#xA0;&#xA0;<b>A</b><br/>
        &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;<span style="font-variant:small-caps;">B</span></p>