isodoc 1.2.4 → 1.3.0

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "presentation_function/block"
 require_relative "presentation_function/inline"
 require_relative "presentation_function/section"
+require_relative "presentation_function/bibdata"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -14,10 +15,12 @@ module IsoDoc
       @xrefs.parse docxml
       info docxml, nil
       conversions(docxml)
+      docxml.root["type"] = "presentation"
       docxml.to_xml
     end
 
     def conversions(docxml)
+      bibdata docxml
       section docxml
       block docxml
       inline docxml
@@ -48,7 +51,10 @@ module IsoDoc
       xref docxml
       eref docxml
       origin docxml
+      concept docxml
       quotesource docxml
+      mathml docxml
+      variant docxml
     end
 
     def postprocess(result, filename, dir)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.2.4".freeze
+  VERSION = "1.3.0".freeze
 end

data/lib/isodoc/word_convert.rb

@@ -4,26 +4,6 @@ require_relative "word_function/body.rb"
 require_relative "word_function/postprocess.rb"
 
 module IsoDoc
-
-=begin
-  module WordConvertModule
-    # http://tech.tulentsev.com/2012/02/ruby-how-to-override-class-method-with-a-module/
-    # https://www.ruby-forum.com/topic/148303
-    #
-    # The following is ugly indeed, but the only way I can split module override methods
-    # across files
-    def self.included base
-      base.class_eval do
-
-        eval File.open(File.join(File.dirname(__FILE__),"wordconvertmodule.rb")).read
-        eval File.open(File.join(File.dirname(__FILE__),"comments.rb")).read
-        eval File.open(File.join(File.dirname(__FILE__),"footnotes.rb")).read
-        eval File.open(File.join(File.dirname(__FILE__),"postprocess.rb")).read
-      end
-    end
-  end
-=end
-
   class WordConvert < ::IsoDoc::Convert
     include WordFunction::Comments
     include WordFunction::Footnotes

data/lib/isodoc/word_function/body.rb

@@ -196,6 +196,18 @@ module IsoDoc::WordFunction
       out.parent.at("./table")["class"] = "formula_dl"
     end
 
+    def formula_parse1(node, out)
+      out.div **attr_code(class: "formula") do |div|
+        div.p do |p|
+          parse(node.at(ns("./stem")), div)
+          insert_tab(div, 1)
+          if lbl = node&.at(ns("./name"))&.text
+            div << "(#{lbl})"
+          end
+        end
+      end
+    end
+
     def li_parse(node, out)
       out.li  **attr_code(id: node["id"]) do |li|
         if node["uncheckedcheckbox"] == "true"

data/lib/isodoc/word_function/postprocess.rb

@@ -183,7 +183,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def generate_header(filename, _dir)
       return nil unless @header
       template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
-      meta = @meta.get
+      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|

data/lib/isodoc/xref/xref_anchor.rb

@@ -35,11 +35,15 @@ module IsoDoc::XrefGen
     end
 
     def anchor_struct_xref(lbl, elem)
+      l10n("#{elem} #{anchor_struct_value(lbl, elem)}")
+    end
+
+    def anchor_struct_value(lbl, elem)
       case elem
-      when @labels["formula"] then l10n("#{elem} (#{lbl})")
-      when @labels["inequality"] then l10n("#{elem} (#{lbl})")
+      when @labels["formula"] then "(#{lbl})"
+      when @labels["inequality"] then "(#{lbl})"
       else
-        l10n("#{elem} #{lbl}")
+        lbl
       end
     end
 
@@ -50,6 +54,7 @@ module IsoDoc::XrefGen
       ret[:xref].gsub!(/ $/, "")
       ret[:container] = @klass.get_clause_id(container) unless container.nil?
       ret[:type] = type
+      ret[:value] = anchor_struct_value(lbl, elem)
       ret
     end
   end

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

@@ -36,7 +36,7 @@ module IsoDoc::XrefGen
           return if n["id"].nil? || n["id"].empty?
           c.increment(n)
           @anchors[n["id"]] =
-            { label: termnote_label(c.print), type: "termnote",
+            { label: termnote_label(c.print), type: "termnote", value: c.print,
               xref: l10n("#{anchor(t['id'], :xref)}, "\
                          "#{@labels["note_xref"]} #{c.print}") }
         end
@@ -52,7 +52,7 @@ module IsoDoc::XrefGen
           c.increment(n)
           idx = examples.size == 1 && !n["number"] ? "" : c.print
           @anchors[n["id"]] = {
-            type: "termexample", label: idx, 
+            type: "termexample", label: idx, value: c.print,
             xref: l10n("#{anchor(t['id'], :xref)}, "\
                        "#{@labels["example_xref"]} #{c.print}") }
         end
@@ -123,9 +123,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"]] =

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -113,7 +113,7 @@ module IsoDoc::XrefGen
 
     def annex_names(clause, num)
       @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
-                                 type: "clause",
+                                 type: "clause", value: num.to_s,
                                  xref: "#{@labels["annex"]} #{num}", level: 1 }
       if a = single_annex_special_section(clause)
         annex_names1(a, "#{num}", 1)

data/lib/isodoc/xslfo_convert.rb

@@ -23,6 +23,10 @@ module IsoDoc
       nil
     end
 
+    def pdf_options(docxml)
+      ""
+    end
+
     def convert(input_filename, file = nil, debug = false, output_filename = nil)
       file = File.read(input_filename, encoding: "utf-8") if file.nil?
       docxml, filename, dir = convert_init(file, input_filename, debug)
@@ -34,7 +38,8 @@ module IsoDoc
       FileUtils.rm_rf dir
       ::Metanorma::Output::XslfoPdf.new.convert(input_filename,
                                                 output_filename || "#{filename}.#{@suffix}", 
-                                               File.join(@libdir, pdf_stylesheet(docxml)))
+                                               File.join(@libdir, pdf_stylesheet(docxml)),
+                                               pdf_options(docxml))
     end
 
     def xref_parse(node, out)

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,16 +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,
+  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

@@ -84,19 +84,19 @@ RSpec.describe IsoDoc do
        </standard-document>
     INPUT
     presxml = <<~OUTPUT
-    <standard-document xmlns="https://www.metanorma.org/ns/standoc">
+    <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>
             <sections>
@@ -234,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
 
@@ -249,7 +249,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <note id='A' keep-with-next='true' keep-lines-together='true'>
@@ -352,7 +352,7 @@ OUTPUT
     </iso-standard>
 INPUT
 <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <note id='note1'>
@@ -640,7 +640,7 @@ B</pre>
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-     <iso-standard xmlns="http://riboseinc.com/isoxml">
+     <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
     <preface><foreword>
     <figure id="figureA-1" keep-with-next="true" keep-lines-together="true">
   <name>Figure 1&#xA0;&#x2014; Split-it-right <em>sample</em> divider<fn reference="1"><p>X</p></fn></name>
@@ -940,7 +940,7 @@ OUTPUT
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <example id='samplecode' keep-with-next='true' keep-lines-together='true'>
@@ -1056,7 +1056,7 @@ OUTPUT
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <example id='samplecode'>
@@ -1092,7 +1092,7 @@ Que?
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <sourcecode lang='ruby' id='samplecode'>
@@ -1330,7 +1330,7 @@ Que?
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <formula id='_be9158af-7e93-4ee2-90c5-26d31c181934' unnumbered='true' keep-with-next='true' keep-lines-together='true'>
@@ -1455,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>
@@ -1583,7 +1584,7 @@ it "processes blockquotes (Presentation XML)" do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <quote id='_044bd364-c832-4b78-8fea-92242402a1d1'>
@@ -1722,7 +1723,7 @@ it "processes blockquotes (Presentation XML)" do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <permission id='_' keep-with-next='true' keep-lines-together='true'>
@@ -2082,7 +2083,7 @@ Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
     </iso-standard>
     INPUT
      <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <requirement id='A' unnumbered='true' keep-with-next='true' keep-lines-together='true'>
@@ -2226,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>
@@ -2281,125 +2282,63 @@ end
     </foreword></preface>
     </iso-standard>
     INPUT
-    <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
-         <bibdata>
-           <language>fr</language>
-           <script>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>
+
+    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>
-    <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>
@@ -2432,6 +2371,7 @@ end
                    <div id='B'><div class='formula'>
                      <p>
                        <span class='stem'>(#(r/1 = 0)#)</span>
+                       &#160; (1)
                      </p>
                      </div>
                    </div>
@@ -2441,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>
@@ -2458,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
@@ -2513,7 +2453,7 @@ end
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <recommendation id='_' obligation='shall,could' keep-with-next='true' keep-lines-together='true'>
@@ -2664,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>
@@ -2676,59 +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'>
-  <bibdata>
-    <language>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>
+
+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>
-  <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>
@@ -2742,35 +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>
-  <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>