RubyGems - isodoc - Versions diffs - 1.2.3 → 1.2.8 - Mend

isodoc 1.2.3 → 1.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (56) hide show

checksums.yaml +4 -4
data/.github/workflows/rake.yml +69 -0
data/README.adoc +1 -3
data/isodoc.gemspec +3 -1
data/lib/isodoc-yaml/i18n-en.yaml +1 -0
data/lib/isodoc-yaml/i18n-fr.yaml +9 -8
data/lib/isodoc-yaml/i18n-zh-Hans.yaml +1 -0
data/lib/isodoc/base_style/all.css +5 -1
data/lib/isodoc/base_style/metanorma_word.css +6 -0
data/lib/isodoc/base_style/metanorma_word.scss +6 -0
data/lib/isodoc/base_style/reset.css +5 -1
data/lib/isodoc/base_style/reset.scss +6 -1
data/lib/isodoc/convert.rb +1 -14
data/lib/isodoc/function/blocks.rb +1 -0
data/lib/isodoc/function/inline.rb +0 -33
data/lib/isodoc/function/references.rb +5 -3
data/lib/isodoc/function/table.rb +1 -0
data/lib/isodoc/function/to_word_html.rb +3 -2
data/lib/isodoc/function/utils.rb +1 -1
data/lib/isodoc/html_function/postprocess.rb +1 -0
data/lib/isodoc/i18n.rb +23 -52
data/lib/isodoc/metadata.rb +44 -111
data/lib/isodoc/metadata_contributor.rb +90 -0
data/lib/isodoc/metadata_date.rb +11 -0
data/lib/isodoc/presentation_function/bibdata.rb +96 -0
data/lib/isodoc/presentation_function/block.rb +28 -9
data/lib/isodoc/presentation_function/inline.rb +149 -34
data/lib/isodoc/presentation_xml_convert.rb +7 -0
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/word_function/body.rb +12 -0
data/lib/isodoc/word_function/postprocess.rb +2 -2
data/lib/isodoc/word_function/table.rb +3 -2
data/lib/isodoc/xref.rb +1 -0
data/lib/isodoc/xref/xref_anchor.rb +8 -3
data/lib/isodoc/xref/xref_counter.rb +21 -7
data/lib/isodoc/xref/xref_gen.rb +29 -6
data/lib/isodoc/xref/xref_sect_gen.rb +1 -1
data/lib/isodoc/xslfo_convert.rb +6 -1
data/spec/assets/i18n.yaml +22 -5
data/spec/isodoc/blocks_spec.rb +331 -215
data/spec/isodoc/footnotes_spec.rb +4 -5
data/spec/isodoc/i18n_spec.rb +89 -16
data/spec/isodoc/inline_spec.rb +185 -163
data/spec/isodoc/metadata_spec.rb +69 -19
data/spec/isodoc/postproc_spec.rb +40 -3
data/spec/isodoc/presentation_xml_spec.rb +584 -1
data/spec/isodoc/ref_spec.rb +5 -5
data/spec/isodoc/section_spec.rb +9 -9
data/spec/isodoc/table_spec.rb +306 -207
data/spec/isodoc/terms_spec.rb +1 -1
data/spec/isodoc/xref_spec.rb +46 -18
data/spec/spec_helper.rb +6 -0
metadata +35 -7
data/.github/workflows/macos.yml +0 -42
data/.github/workflows/ubuntu.yml +0 -62
data/.github/workflows/windows.yml +0 -44

data/lib/isodoc/xref/xref_gen.rb CHANGED

@@ -2,6 +2,29 @@ require_relative "xref_gen_seq.rb"
 module IsoDoc::XrefGen
   module Blocks
+    NUMBERED_BLOCKS = %w(termnote termexample note example requirement
+    recommendation permission figure table formula admonition sourcecode).freeze
+    def amend_preprocess(xmldoc)
+      xmldoc.xpath(ns("//amend[newcontent]")).each do |a|
+        autonum = amend_autonums(a)
+        NUMBERED_BLOCKS.each do |b|
+          a.xpath(ns("./newcontent//#{b}")).each_with_index do |e, i|
+            autonum[b] and i == 0 and e["number"] = autonum[b]
+            !autonum[b] and e["unnumbered"] = "true"
+          end
+        end
+      end
+    end
+    def amend_autonums(a)
+      autonum = {}
+      a.xpath(ns("./autonumber")).each do |n|
+        autonum[n["type"]] = n.text
+      end
+      autonum
+    end
     def termnote_label(n)
       @labels["termnote"].gsub(/%/, n.to_s)
     end
@@ -13,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
@@ -27,9 +50,9 @@ module IsoDoc::XrefGen
         examples.each do |n|
           return if n["id"].nil? || n["id"].empty?
           c.increment(n)
-          idx = examples.size == 1 ? "" : c.print
+          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
@@ -54,7 +77,7 @@ module IsoDoc::XrefGen
         c = Counter.new
         notes.each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
-          idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
+          idx = notes.size == 1 && !n["number"] ? "" : " #{c.increment(n).print}"
           @anchors[n["id"]] = anchor_struct(idx, n, @labels["note_xref"],
                                             "note", false)
         end
@@ -76,7 +99,7 @@ module IsoDoc::XrefGen
         notes.each do |n|
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
-          idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
+          idx = notes.size == 1 && !n["number"]  ? "" : " #{c.increment(n).print}"
           @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
                                             "example", n["unnumbered"])
         end
@@ -91,7 +114,7 @@ module IsoDoc::XrefGen
         c = Counter.new
         notes.each do |n|
           next if n["id"].nil? || n["id"].empty?
-          idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
+          idx = notes.size == 1 && !n["number"] ? "" : " #{c.increment(n).print}"
           @anchors[n["id"]] = anchor_struct(idx, n, @labels["list"], "list", false)
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end

data/lib/isodoc/xref/xref_sect_gen.rb CHANGED

@@ -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 CHANGED

@@ -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/i18n.yaml CHANGED

@@ -1,16 +1,33 @@
-foreword: Antaŭparolo
+foreword: Antaŭparolo
 introduction: Enkonduko
-clause: klaŭzo
-table: Tabelo
+clause: klaŭzo
+table: tabelo
 source: SOURCE
 modified: modified
 scope: Amplekso
 symbols: Simboloj kai mallongigitaj terminoj
 annex: Aldono
-normref: Normaj citaĵoj
+normref: Normaj citaĵoj
 bibliography: Bibliografio
 inform_annex: informa
-all_parts: ĉiuj partoj
+all_parts: ĉiuj partoj
+norm_annex: normative
+note: NOTO
 locality: {
   table: Tabelo
 }
+doctype_dict: {
+  brochure: broŝ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 CHANGED

@@ -1,6 +1,243 @@
 require "spec_helper"
 RSpec.describe IsoDoc do
+  it "processes amend blocks" do
+    input = <<~INPUT
+    <standard-document xmlns='https://www.metanorma.org/ns/standoc'>
+         <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>
+         </bibdata>
+         <sections>
+           <clause id='A' inline-header='false' obligation='normative'>
+             <title>Change Clause</title>
+             <amend id='B' change='modify' path='//table[2]' path_end='//table[2]/following-sibling:example[1]' title='Change'>
+               <autonumber type='table'>2</autonumber>
+               <autonumber type='example'>7</autonumber>
+               <description>
+                 <p id='C'>
+                   <em>
+                     This table contains information on polygon cells which are not
+                     included in ISO 10303-52. Remove table 2 completely and replace
+                     with:
+                   </em>
+                 </p>
+               </description>
+               <newcontent id='D'>
+                 <table id='E'>
+                   <name>Edges of triangle and quadrilateral cells</name>
+                   <tbody>
+                     <tr>
+                       <th colspan='2' valign='middle' align='center'>triangle</th>
+                       <th colspan='2' valign='middle' align='center'>quadrilateral</th>
+                     </tr>
+                     <tr>
+                       <td valign='middle' align='center'>edge</td>
+                       <td valign='middle' align='center'>vertices</td>
+                       <td valign='middle' align='center'>edge</td>
+                       <td valign='middle' align='center'>vertices</td>
+                     </tr>
+                     <tr>
+                       <td valign='middle' align='center'>1</td>
+                       <td valign='middle' align='center'>1, 2</td>
+                       <td valign='middle' align='center'>1</td>
+                       <td valign='middle' align='center'>1, 2</td>
+                     </tr>
+                     <tr>
+                       <td valign='middle' align='center'>2</td>
+                       <td valign='middle' align='center'>2, 3</td>
+                       <td valign='middle' align='center'>2</td>
+                       <td valign='middle' align='center'>2, 3</td>
+                     </tr>
+                     <tr>
+                       <td valign='middle' align='center'>3</td>
+                       <td valign='middle' align='center'>3, 1</td>
+                       <td valign='middle' align='center'>3</td>
+                       <td valign='middle' align='center'>3, 4</td>
+                     </tr>
+                     <tr>
+                       <td valign='top' align='left'/>
+                       <td valign='top' align='left'/>
+                       <td valign='middle' align='center'>4</td>
+                       <td valign='middle' align='center'>4, 1</td>
+                     </tr>
+                   </tbody>
+                 </table>
+                 <figure id="H"><name>Figure</name></figure>
+                 <example id='F'>
+                   <p id='G'>This is not generalised further.</p>
+                 </example>
+               </newcontent>
+             </amend>
+           </clause>
+         </sections>
+       </standard-document>
+    INPUT
+    presxml = <<~OUTPUT
+    <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="presentation">
+            <bibdata type="standard">
+              <title language="en" format="text/plain">Document title</title>
+              <language current="true">en</language>
+              <script current="true">Latn</script>
+              <status>
+                <stage language="">published</stage>
+              </status>
+              <copyright>
+                <from>2020</from>
+              </copyright>
+              <ext>
+                <doctype language="">article</doctype>
+              </ext>
+            </bibdata>
+            <sections>
+              <clause id="A" inline-header="false" obligation="normative">
+                <title depth="1">1.<tab/>Change Clause</title>
+                    <p id="C">
+                      <em>
+                        This table contains information on polygon cells which are not
+                        included in ISO 10303-52. Remove table 2 completely and replace
+                        with:
+                      </em>
+                    </p>
+                  <quote id="D">
+                    <table id="E" number="2">
+                      <name>Table 2&#xA0;&#x2014; Edges of triangle and quadrilateral cells</name>
+                      <tbody>
+                        <tr>
+                          <th colspan="2" valign="middle" align="center">triangle</th>
+                          <th colspan="2" valign="middle" align="center">quadrilateral</th>
+                        </tr>
+                        <tr>
+                          <td valign="middle" align="center">edge</td>
+                          <td valign="middle" align="center">vertices</td>
+                          <td valign="middle" align="center">edge</td>
+                          <td valign="middle" align="center">vertices</td>
+                        </tr>
+                        <tr>
+                          <td valign="middle" align="center">1</td>
+                          <td valign="middle" align="center">1, 2</td>
+                          <td valign="middle" align="center">1</td>
+                          <td valign="middle" align="center">1, 2</td>
+                        </tr>
+                        <tr>
+                          <td valign="middle" align="center">2</td>
+                          <td valign="middle" align="center">2, 3</td>
+                          <td valign="middle" align="center">2</td>
+                          <td valign="middle" align="center">2, 3</td>
+                        </tr>
+                        <tr>
+                          <td valign="middle" align="center">3</td>
+                          <td valign="middle" align="center">3, 1</td>
+                          <td valign="middle" align="center">3</td>
+                          <td valign="middle" align="center">3, 4</td>
+                        </tr>
+                        <tr>
+                          <td valign="top" align="left"/>
+                          <td valign="top" align="left"/>
+                          <td valign="middle" align="center">4</td>
+                          <td valign="middle" align="center">4, 1</td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <figure id="H" unnumbered="true"><name>Figure</name></figure>
+                    <example id="F" number="7"><name>EXAMPLE  7</name>
+                      <p id="G">This is not generalised further.</p>
+                    </example>
+                  </quote>
+              </clause>
+            </sections>
+          </standard-document>
+    OUTPUT
+    html = <<~OUTPUT
+    <html 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'>
+             <p class='zzSTDTitle1'>Document title</p>
+             <div id='A'>
+               <h1>1.&#160; Change Clause</h1>
+               <p id='C'>
+                 <i>
+                    This table contains information on polygon cells which are not
+                   included in ISO 10303-52. Remove table 2 completely and replace
+                   with:
+                 </i>
+               </p>
+               <div class='Quote' id="D">
+                 <p class='TableTitle' style='text-align:center;'>Table 2&#160;&#8212; Edges of triangle and quadrilateral cells</p>
+                 <table id='E' class='MsoISOTable' style='border-width:1px;border-spacing:0;'>
+                   <tbody>
+                     <tr>
+                       <th colspan='2' style='font-weight:bold;text-align:center;vertical-align:middle;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;' scope='row'>triangle</th>
+                       <th colspan='2' style='font-weight:bold;text-align:center;vertical-align:middle;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;' scope='row'>quadrilateral</th>
+                     </tr>
+                     <tr>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>edge</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>vertices</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>edge</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>vertices</td>
+                     </tr>
+                     <tr>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>1</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>1, 2</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>1</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>1, 2</td>
+                     </tr>
+                     <tr>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>2</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>2, 3</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>2</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>2, 3</td>
+                     </tr>
+                     <tr>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>3</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>3, 1</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>3</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>3, 4</td>
+                     </tr>
+                     <tr>
+                       <td style='text-align:left;vertical-align:top;border-top:none;border-bottom:solid windowtext 1.5pt;'/>
+                       <td style='text-align:left;vertical-align:top;border-top:none;border-bottom:solid windowtext 1.5pt;'/>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.5pt;'>4</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.5pt;'>4, 1</td>
+                     </tr>
+                   </tbody>
+                 </table>
+                 <div id='H' class='figure'>
+                   <p class='FigureTitle' style='text-align:center;'>Figure</p>
+                 </div>
+                 <div id='F' class='example'>
+                   <p class='example-title'>EXAMPLE 7</p>
+                   <p id='G'>This is not generalised further.</p>
+                 </div>
+               </div>
+             </div>
+           </div>
+         </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 unlabelled notes (Presentation XML)" do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -12,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'>
@@ -115,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'>
@@ -403,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>
@@ -703,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'>
@@ -819,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'>
@@ -855,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'>
@@ -1093,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'>
@@ -1218,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>
@@ -1346,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'>
@@ -1485,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'>
@@ -1845,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'>
@@ -1989,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>
@@ -2044,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>
@@ -2195,6 +2371,7 @@ end
                    <div id='B'><div class='formula'>
                      <p>
                        <span class='stem'>(#(r/1 = 0)#)</span>
+                       &#160; (1)
                      </p>
                      </div>
                    </div>
@@ -2204,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>
@@ -2221,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
@@ -2276,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'>
@@ -2427,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>
@@ -2439,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>
@@ -2505,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>