isodoc 1.1.4 → 1.2.4

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,3 +1,7 @@
+require_relative "presentation_function/block"
+require_relative "presentation_function/inline"
+require_relative "presentation_function/section"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def initialize(options)
@@ -9,21 +13,51 @@ module IsoDoc
     def convert1(docxml, filename, dir)
       @xrefs.parse docxml
       info docxml, nil
+      conversions(docxml)
       docxml.to_xml
     end
 
+    def conversions(docxml)
+      section docxml
+      block docxml
+      inline docxml
+    end
+
+    def section(docxml)
+      clause docxml
+      annex docxml
+      term docxml
+    end
+
+    def block(docxml)
+      amend docxml
+      table docxml
+      figure docxml
+      sourcecode docxml
+      formula docxml
+      example docxml
+      termexample docxml
+      note docxml
+      termnote docxml
+      permission docxml
+      requirement docxml
+      recommendation docxml
+    end
+
+    def inline(docxml)
+      xref docxml
+      eref docxml
+      origin docxml
+      quotesource docxml
+    end
+
     def postprocess(result, filename, dir)
-      #result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
       toXML(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }
     end
 
     def toXML(result, filename)
-      #result = (from_xhtml(html_cleanup(to_xhtml(result))))
-      #result = from_xhtml(move_images(to_xhtml(result)))
-      #result = html5(script_cdata(inject_script(result)))
       File.open(filename, "w:UTF-8") { |f| f.write(result) }
     end
   end
 end
-

data/lib/isodoc/version.rb

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

data/lib/isodoc/word_function/body.rb

@@ -27,6 +27,7 @@ module IsoDoc::WordFunction
     def make_body2(body, docxml)
       body.div **{ class: "WordSection2" } do |div2|
         boilerplate docxml, div2
+        preface_block docxml, div2
         abstract docxml, div2
         foreword docxml, div2
         introduction docxml, div2
@@ -111,7 +112,7 @@ module IsoDoc::WordFunction
     def figure_get_or_make_dl(t)
       dl = t.at(".//table[@class = 'dl']")
       if dl.nil?
-        t.add_child("<p><b>#{@key_lbl}</b></p><table class='dl'></table>")
+        t.add_child("<p><b>#{@i18n.key}</b></p><table class='dl'></table>")
         dl = t.at(".//table[@class = 'dl']")
       end
       dl
@@ -132,9 +133,10 @@ module IsoDoc::WordFunction
     end
 
     def note_p_parse(node, div)
+      name = node&.at(ns("./name"))&.remove
       div.p **{ class: "Note" } do |p|
         p.span **{ class: "note_label" } do |s|
-          s << note_label(node)
+          name and name.children.each { |n| parse(n, s) }
         end
         insert_tab(p, 1)
         node.first_element_child.children.each { |n| parse(n, p) }
@@ -143,9 +145,10 @@ module IsoDoc::WordFunction
     end
 
     def note_parse1(node, div)
+      name = node&.at(ns("./name"))&.remove
       div.p **{ class: "Note" } do |p|
         p.span **{ class: "note_label" } do |s|
-          s << note_label(node)
+          name and name.children.each { |n| parse(n, s) }
         end
         insert_tab(p, 1)
       end
@@ -153,12 +156,14 @@ module IsoDoc::WordFunction
     end
 
     def termnote_parse(node, out)
+      name = node&.at(ns("./name"))&.remove
       out.div **note_attrs(node) do |div|
-        first = node.first_element_child
         div.p **{ class: "Note" } do |p|
-          anchor = @xrefs.get[node['id']]
-          p << "#{anchor&.dig(:label) || '???'}: "
-          para_then_remainder(first, node, p, div)
+          if name
+            name.children.each { |n| parse(n, p) }
+            p << l10n(": ")
+          end
+          para_then_remainder(node.first_element_child, node, p, div)
         end
       end
     end
@@ -186,7 +191,7 @@ module IsoDoc::WordFunction
 
     def formula_where(dl, out)
       return unless dl
-      out.p { |p| p << @where_lbl }
+      out.p { |p| p << @i18n.where }
       parse(dl, out)
       out.parent.at("./table")["class"] = "formula_dl"
     end

data/lib/isodoc/word_function/inline.rb

@@ -69,7 +69,9 @@ module IsoDoc::WordFunction
     def xref_parse(node, out)
       target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".doc#") :
         "##{node["target"]}"
-        out.a(**{ "href": target }) { |l| l << get_linkend(node) }
+        out.a(**{ "href": target }) do |l|
+          node.children.each { |n| parse(n, l) }
+        end
     end
   end
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -127,7 +127,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def list_add(xpath, lvl)
       xpath.each do |list|
         (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |l|
-          l.xpath("./p | ./div").each_with_index do |p, i|
+          l.xpath("./p | ./div | ./table").each_with_index do |p, i|
             next if i == 0
             p.wrap(%{<div class="ListContLevel#{lvl}"/>})
           end

data/lib/isodoc/word_function/table.rb

@@ -29,7 +29,7 @@ module IsoDoc::WordFunction
         border-bottom:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
         mso-border-bottom-alt:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
       STYLE
-      { rowspan: td["rowspan"], colspan: td["colspan"],
+      { rowspan: td["rowspan"], colspan: td["colspan"], valign: td["valign"],
         align: td["align"], style: style.gsub(/\n/, "") }
     end
 
@@ -38,7 +38,8 @@ module IsoDoc::WordFunction
         summary: node["summary"],
         width: node["width"],
         style: "mso-table-anchor-horizontal:column;"\
-        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}"
+        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}",
+        class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable")
       }))
     end
 

data/lib/isodoc/xref.rb

@@ -11,13 +11,15 @@ module IsoDoc
     include XrefGen::Blocks
     include XrefGen::Sections
 
-     def initialize(lang, script, klass, labels, options = {})
+     def initialize(lang, script, klass, i18n, options = {})
       @anchors = {}
       @lang = lang
       @script = script
       @klass = klass
-      @labels = labels
       @options = options
+      @i18n = i18n
+      @labels = @i18n.get
+      @klass.i18n = @i18n
     end
 
     def get
@@ -39,6 +41,7 @@ module IsoDoc
 
     # extract names for all anchors, xref and label
     def parse(docxml)
+      amend_preprocess(docxml)
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
       # preempt clause notes with all other types of note (ISO default)
@@ -53,7 +56,7 @@ module IsoDoc
     end
 
     def l10n(a, lang = @lang, script = @script)
-      IsoDoc::Function::I18n::l10n(a, lang, script)
+      @i18n.l10n(a, lang, script)
     end
   end
 end

data/lib/isodoc/xref/xref_counter.rb

@@ -8,17 +8,20 @@ module IsoDoc::XrefGen
       @subseq = ""
       @letter_override = nil
       @number_override = nil
+      @base = ""
     end
 
     def new_subseq_increment(node)
       @subseq = node["subsequence"]
       @num += 1
       @letter = node["subsequence"] ? "a" : ""
+      @base = ""
       if node["number"]
-        /^(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
-        if n || a
-          @letter_override = @letter = a if a
-          @number_override = @num = n.to_i if n
+        /^(?<b>.*?)(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
+        if !n.empty? || !a.empty?
+          @letter_override = @letter = a unless a.empty?
+          @number_override = @num = n.to_i unless n.empty?
+          @base = b
         else
           @letter_override = node["number"]
           @letter = @letter_override if /^[a-z]$/.match(@letter_override)
@@ -28,8 +31,13 @@ module IsoDoc::XrefGen
 
     def sequence_increment(node)
       if node["number"]
+        @base = ""
         @number_override = node["number"]
-        @num = @number_override.to_i if /^\d+$/.match(@number_override)
+        /^(?<b>.*?)(?<n>\d+)$/ =~ node["number"]
+        unless n.nil? || n.empty?
+          @num = n.to_i
+          @base = b
+        end
       else
         @num += 1
       end
@@ -37,8 +45,14 @@ module IsoDoc::XrefGen
 
     def subsequence_increment(node)
       if node["number"]
+        @base = ""
         @letter_override = node["number"]
-        @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+        /^(?<b>.*?)(?<n>\d*)(?<a>[a-z]+)$/ =~ node["number"]
+        unless a.empty?
+          @letter = a
+          @base = b
+          @number_override = @num = n.to_i unless n.empty?
+        end
       else
         @letter = (@letter.ord + 1).chr.to_s
       end
@@ -59,7 +73,7 @@ module IsoDoc::XrefGen
     end
 
     def print
-      "#{@number_override || @num}#{@letter_override || @letter}"
+      "#{@base}#{@number_override || @num}#{@letter_override || @letter}"
     end
 
     def listlabel(depth)

data/lib/isodoc/xref/xref_gen.rb

@@ -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
@@ -27,7 +50,7 @@ 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, 
             xref: l10n("#{anchor(t['id'], :xref)}, "\
@@ -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

@@ -17,7 +17,7 @@ module IsoDoc::XrefGen
       d.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
       # potentially overridden in middle_section_asset_names()
       sequential_asset_names(d.xpath(ns("//preface/*")))
-      n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
+      n = section_names(d.at(ns("//clause[@type = 'scope']")), 0, 1)
       n = section_names(d.at(ns(@klass.norm_ref_xpath)), n, 1)
       n = section_names(d.at(ns("//sections/terms | "\
                                 "//sections/clause[descendant::terms]")), n, 1)
@@ -60,7 +60,7 @@ module IsoDoc::XrefGen
     end
 
     def middle_section_asset_names(d)
-      middle_sections = "//clause[title = 'Scope'] | "\
+      middle_sections = "//clause[@type = 'scope'] | "\
         "#{@klass.norm_ref_xpath} | "\
         "//sections/terms | //preface/* | "\
         "//sections/definitions | //clause[parent::sections]"
@@ -99,7 +99,7 @@ module IsoDoc::XrefGen
     def annex_name_lbl(clause, num)
       obl = l10n("(#{@labels["inform_annex"]})")
       obl = l10n("(#{@labels["norm_annex"]})") if clause["obligation"] == "normative"
-      l10n("<b>#{@labels["annex"]} #{num}</b><br/>#{obl}")
+      l10n("<strong>#{@labels["annex"]} #{num}</strong><br/>#{obl}")
     end
 
     def single_annex_special_section(clause)

data/spec/assets/i18n.yaml

@@ -1,5 +1,16 @@
-foreword: Enkonduko
+foreword: Antaŭparolo
+introduction: Enkonduko
 clause: klaŭzo
 table: Tabelo
 source: SOURCE
 modified: modified
+scope: Amplekso
+symbols: Simboloj kai mallongigitaj terminoj
+annex: Aldono
+normref: Normaj citaĵoj
+bibliography: Bibliografio
+inform_annex: informa
+all_parts: ĉiuj partoj
+locality: {
+  table: Tabelo
+}

data/spec/isodoc/blocks_spec.rb

@@ -1,8 +1,245 @@
 require "spec_helper"
 
 RSpec.describe IsoDoc do
-  it "processes unlabelled notes" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  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">
+            <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 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))).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">
     <preface><foreword>
     <note id="A" keep-with-next="true" keep-lines-together="true">
@@ -10,6 +247,39 @@ RSpec.describe IsoDoc do
 </note>
     </foreword></preface>
     </iso-standard>
+    INPUT
+    <?xml version='1.0'?>
+<iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <note id='A' keep-with-next='true' keep-lines-together='true'>
+        <name>NOTE</name>
+        <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>
+  </preface>
+</iso-standard>
+OUTPUT
+  end
+
+  it "processes unlabelled notes (HTML)" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <note id='A' keep-with-next='true' keep-lines-together='true'>
+        <name>NOTE</name>
+        <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>
+  </preface>
+</iso-standard>
     INPUT
     #{HTML_HDR}
                <br/>
@@ -28,13 +298,19 @@ RSpec.describe IsoDoc do
 
   it "processes unlabelled notes (Word)" do
     expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <preface><foreword>
-    <note id="A">
-  <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></preface>
-    </iso-standard>
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <note id='A' keep-with-next='true' keep-lines-together='true'>
+        <name>NOTE</name>
+        <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>
+  </preface>
+</iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head><style/></head>
@@ -47,7 +323,7 @@ RSpec.describe IsoDoc do
              <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
-               <div id="A" class="Note">
+               <div id="A" class="Note"  style='page-break-after: avoid;page-break-inside: avoid;'>
                  <p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span>These results are based on a study carried out on three different types of kernel.</p>
                </div>
              </div>
@@ -62,44 +338,65 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
-
-  it "processes labelled notes" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+     it "processes sequences of 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">
     <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></preface>
     </iso-standard>
 INPUT
-    #{HTML_HDR}
-               <br/>
-               <div>
-                 <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="note1" class="Note">
-                   <p><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 class="zzSTDTitle1"/>
-             </div>
-           </body>
-       </html>
-    OUTPUT
+<?xml version='1.0'?>
+<iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <note id='note1'>
+        <name>NOTE 1</name>
+        <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'>
+        <name>NOTE 2</name>
+        <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>
+  </preface>
+</iso-standard>
+OUTPUT
   end
 
-    it "processes sequences of notes" do
+    it "processes sequences of notes (HTML)" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <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></preface>
-    </iso-standard>
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <note id='note1'>
+        <name>NOTE 1</name>
+        <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'>
+        <name>NOTE 2</name>
+        <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>
+  </preface>
+</iso-standard>
 INPUT
     #{HTML_HDR}
                <br/>
@@ -124,6 +421,7 @@ INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
+    <name>NOTE</name>
   <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>
@@ -150,7 +448,7 @@ INPUT
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <note id="A">
+    <note id="A"><name>NOTE</name>
     <dl>
     <dt>A</dt>
     <dd><p>B</p></dd>
@@ -183,7 +481,7 @@ INPUT
     expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <note id="A">
+    <note id="A"><name>NOTE</name>
     <dl>
     <dt>A</dt>
     <dd><p>B</p></dd>
@@ -226,8 +524,8 @@ INPUT
         expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <p id="A">ABC <note id="B"><p id="C">XYZ</p></note>
-<note id="B1"><p id="C1">XYZ1</p></note></p>
+    <p id="A">ABC <note id="B"><name>NOTE 1</name><p id="C">XYZ</p></note>
+<note id="B1"><name>NOTE 2</name><p id="C1">XYZ1</p></note></p>
 </foreword></preface>
     </iso-standard>
 INPUT
@@ -262,8 +560,8 @@ OUTPUT
         expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <p id="A">ABC <note id="B"><p id="C">XYZ</p></note>
-<note id="B1"><p id="C1">XYZ1</p></note></p>
+    <p id="A">ABC <note id="B"><name>NOTE 1</name><p id="C">XYZ</p></note>
+<note id="B1"><name>NOTE 2</name><p id="C1">XYZ1</p></note></p>
 </foreword></preface>
     </iso-standard>
 INPUT
@@ -313,8 +611,8 @@ INPUT
 OUTPUT
   end
 
-  it "processes figures" do
-    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      it "processes figures (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">
     <preface><foreword>
     <figure id="figureA-1" keep-with-next="true" keep-lines-together="true">
@@ -337,6 +635,65 @@ B</pre>
 <figure id="figure-C" unnumbered="true">
 <pre>A &lt;
 B</pre>
+</figure>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    <?xml version='1.0'?>
+     <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <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>
+  <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" alt="alttext" title="titletxt"/>
+  <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f1" mimetype="image/png"/>
+  <image src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f2" mimetype="image/png"/>
+  <fn reference="a">
+  <p id="_ef2c85b8-5a5a-4ecd-a1e6-92acefaaa852">The time <stem type="AsciiMath">t_90</stem> was estimated to be 18,2 min for this example.</p>
+</fn>
+  <dl>
+  <dt>A</dt>
+  <dd><p>B</p></dd>
+  </dl>
+</figure>
+<figure id="figure-B">
+<name>Figure 2</name>
+<pre alt="A B">A &lt;
+B</pre>
+</figure>
+<figure id="figure-C" unnumbered="true">
+<pre>A &lt;
+B</pre>
+</figure>
+    </foreword></preface>
+    </iso-standard>
+OUTPUT
+      end
+
+  it "processes figures (HTML)" do
+    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+     <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <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>
+  <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" alt="alttext" title="titletxt"/>
+  <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f1" mimetype="image/png"/>
+  <image src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f2" mimetype="image/png"/>
+  <fn reference="a">
+  <p id="_ef2c85b8-5a5a-4ecd-a1e6-92acefaaa852">The time <stem type="AsciiMath">t_90</stem> was estimated to be 18,2 min for this example.</p>
+</fn>
+  <dl>
+  <dt>A</dt>
+  <dd><p>B</p></dd>
+  </dl>
+</figure>
+<figure id="figure-B">
+<name>Figure 2</name>
+<pre alt="A B">A &lt;
+B</pre>
+</figure>
+<figure id="figure-C" unnumbered="true">
+<pre>A &lt;
+B</pre>
 </figure>
     </foreword></preface>
     </iso-standard>
@@ -382,13 +739,13 @@ B</pre>
   it "processes figures (Word)" do
     FileUtils.rm_rf "spec/assets/odf1.emf"
     expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/['"][^'".]+\.gif['"]/, "'_.gif'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
+     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <figure id="figureA-1">
-  <name>Split-it-right sample divider<fn reference="1"><p>X</p></fn></name>
-  <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" alt="alttext" title="titletext"/>
-  <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
-  <image src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+    <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>
+  <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" alt="alttext" title="titletxt"/>
+  <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f1" mimetype="image/png"/>
+  <image src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f2" mimetype="image/png"/>
   <fn reference="a">
   <p id="_ef2c85b8-5a5a-4ecd-a1e6-92acefaaa852">The time <stem type="AsciiMath">t_90</stem> was estimated to be 18,2 min for this example.</p>
 </fn>
@@ -398,6 +755,11 @@ B</pre>
   </dl>
 </figure>
 <figure id="figure-B">
+<name>Figure 2</name>
+<pre alt="A B">A &lt;
+B</pre>
+</figure>
+<figure id="figure-C" unnumbered="true">
 <pre>A &lt;
 B</pre>
 </figure>
@@ -415,9 +777,8 @@ B</pre>
              <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
-               <div id="figureA-1" class="figure">
-
-         <img src="rice_images/rice_image1.png" height="20" width="30" alt="alttext" title="titletext"/>
+               <div id="figureA-1" class="figure"  style='page-break-after: avoid;page-break-inside: avoid;'>
+         <img src="rice_images/rice_image1.png" height="20" width="30" alt="alttext" title="titletxt"/>
          <img src="rice_images/rice_image1.png" height='20' width='auto'/>
          <img src='_.gif' height='20' width='auto'/>
          <a href="#_" class="TableFootnoteRef">a</a><aside><div id="ftn_"><span><span id="_" class="TableFootnoteRef">a</span><span style="mso-tab-count:1">&#160; </span></span>
@@ -425,7 +786,7 @@ B</pre>
        </div></aside>
          <p  style='page-break-after:avoid;'><b>Key</b></p><table class="dl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;">A</p></td><td valign="top"><p>B</p></td></tr></table>
           <p class='FigureTitle' style='text-align:center;'>
-   Figure 1&#160;&#8212; Split-it-right sample divider
+   Figure 1&#160;&#8212; Split-it-right <i>sample</i> divider
    <span style='mso-bookmark:_Ref'>
      <a href='#ftn1' epub:type='footnote' class='FootnoteRef'>
        <sup>1</sup>
@@ -437,6 +798,9 @@ B</pre>
 <pre>A &lt;
 B</pre>
              <p class="FigureTitle" style="text-align:center;">Figure 2</p>
+              </div>
+ <div id='figure-C' class='figure'>
+   <pre>A &lt; B</pre>
 </div>
              </div>
              <p>&#160;</p>
@@ -488,7 +852,6 @@ B</pre>
           <img src='spec/assets/odf.emf'/>
           <img src='spec/assets/odf1.emf'/>
           <img src='_.emf' height='auto' width='auto'/>
-          <p class='FigureTitle' style='text-align:center;'>Figure 1</p>
         </div>
       </div>
       <p>&#160;</p>
@@ -545,7 +908,6 @@ context "disable inkscape" do
           <img src='spec/assets/odf.emf'/>
           <img src='spec/assets/odf1.svg'/>
           <img src='_.svg' height='auto' width='auto'/>
-          <p class='FigureTitle' style='text-align:center;'>Figure 1</p>
         </div>
       </div>
       <p>&#160;</p>
@@ -563,9 +925,8 @@ OUTPUT
     end
    end
 
-
-  it "processes examples" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes examples (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">
     <preface><foreword>
     <example id="samplecode" keep-with-next="true" keep-lines-together="true">
@@ -577,6 +938,37 @@ OUTPUT
 </example>
     </foreword></preface>
     </iso-standard>
+    INPUT
+    <?xml version='1.0'?>
+<iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <example id='samplecode' keep-with-next='true' keep-lines-together='true'>
+        <name>EXAMPLE&#xA0;&#x2014; Title</name>
+        <p>Hello</p>
+        <sourcecode id='X'>
+          <name>Sample</name>
+        </sourcecode>
+      </example>
+    </foreword>
+  </preface>
+</iso-standard>
+OUTPUT
+  end
+
+  it "processes examples (HTML)" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <example id='samplecode' keep-with-next='true' keep-lines-together='true'>
+        <name>EXAMPLE&#xA0;&#x2014; Title</name>
+        <p>Hello</p>
+        <sourcecode id='X'><name>Sample</name></sourcecode>
+      </example>
+    </foreword>
+  </preface>
+</iso-standard>
     INPUT
         #{HTML_HDR}
                <br/>
@@ -585,12 +977,7 @@ OUTPUT
                  <div id="samplecode" class="example" style="page-break-after: avoid;page-break-inside: avoid;">
                  <p class="example-title">EXAMPLE&#160;&#8212; Title</p>
          <p>Hello</p>
-         <pre id='X' class='prettyprint '>
-  <br/>
-  &#160; 
-  <br/>
-  &#160; 
-</pre>
+         <pre id='X' class='prettyprint '/>
   <p class='SourceTitle' style='text-align:center;'>Sample</p>
                  </div>
                </div>
@@ -603,17 +990,17 @@ OUTPUT
 
    it "processes examples (Word)" do
     expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <preface><foreword>
-    <example id="samplecode" keep-with-next="true" keep-lines-together="true">
-    <name>Title</name>
-  <p>Hello</p>
-  <sourcecode id="X">
-  <name>Sample</name>
-  </sourcecode>
-</example>
-    </foreword></preface>
-    </iso-standard>
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <example id='samplecode' keep-with-next='true' keep-lines-together='true'>
+        <name>EXAMPLE&#xA0;&#x2014; Title</name>
+        <p>Hello</p>
+        <sourcecode id='X'><name>Sample</name></sourcecode>
+      </example>
+    </foreword>
+  </preface>
+</iso-standard>
     INPUT
     <html  xmlns:epub='http://www.idpf.org/2007/ops' lang='en'><head><style>
         </style>
@@ -634,12 +1021,7 @@ OUTPUT
         <div id='samplecode' class='example' style='page-break-after: avoid;page-break-inside: avoid;'>
           <p class='example-title'>EXAMPLE&#160;&#8212; Title</p>
           <p>Hello</p>
-          <p id='X' class='Sourcecode'>
-            <br/>
-            &#160;
-            <br/>
-            &#160;
-          </p>
+          <p id='X' class='Sourcecode'/>
           <p class='SourceTitle' style='text-align:center;'>Sample</p>
         </div>
       </div>
@@ -657,7 +1039,7 @@ OUTPUT
    end
 
   it "processes sequences of examples" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
@@ -673,32 +1055,30 @@ OUTPUT
     </foreword></preface>
     </iso-standard>
     INPUT
-        #{HTML_HDR}
-               <br/>
-               <div>
-                 <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="samplecode" class="example">
-                 <p class="example-title">EXAMPLE  1</p>
-         <p>Hello</p>
-                 </div>
-                 <div id="samplecode2" class="example">
-                 <p class="example-title">EXAMPLE  2&#160;&#8212; Title</p>
-                 <p>Hello</p>
-                 </div>
-                 <div id="samplecode3" class="example">
-                 <p class="example-title">EXAMPLE</p>
-                 <p>Hello</p>
-                 </div>
-               </div>
-               <p class="zzSTDTitle1"/>
-             </div>
-           </body>
-       </html>
+    <?xml version='1.0'?>
+<iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <example id='samplecode'>
+        <name>EXAMPLE 1</name>
+        <p>Hello</p>
+      </example>
+      <example id='samplecode2'>
+        <name>EXAMPLE 2&#xA0;&#x2014; Title</name>
+        <p>Hello</p>
+      </example>
+      <example id='samplecode3' unnumbered='true'>
+        <name>EXAMPLE</name>
+        <p>Hello</p>
+      </example>
+    </foreword>
+  </preface>
+</iso-standard>
     OUTPUT
   end
 
-  it "processes sourcecode" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+   it "processes sourcecode (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">
     <preface><foreword>
     <sourcecode lang="ruby" id="samplecode">
@@ -710,12 +1090,49 @@ Que?
 </sourcecode>
     </foreword></preface>
     </iso-standard>
+    INPUT
+    <?xml version='1.0'?>
+<iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <sourcecode lang='ruby' id='samplecode'>
+        <name>
+          Figure 1&#xA0;&#x2014; Ruby
+          <em>code</em>
+        </name>
+         puts x
+      </sourcecode>
+      <sourcecode unnumbered='true'> Que? </sourcecode>
+    </foreword>
+  </preface>
+</iso-standard>
+OUTPUT
+   end
+
+  it "processes sourcecode (HTML)" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <sourcecode lang='ruby' id='samplecode'>
+        <name>
+          Figure 1&#xA0;&#x2014; Ruby
+          <em>code</em>
+        </name>
+  puts x
+</sourcecode>
+      <sourcecode unnumbered='true'>
+Que?
+</sourcecode>
+    </foreword>
+  </preface>
+</iso-standard>
     INPUT
         #{HTML_HDR}
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <pre id="samplecode" class="prettyprint lang-rb"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/></pre>
+                 <pre id="samplecode" class="prettyprint lang-rb"><br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160; <br/>&#160; puts x<br/></pre>
                  <p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p>
                  <pre class='prettyprint '>
   <br/>
@@ -732,17 +1149,22 @@ Que?
 
   it "processes sourcecode (Word)" do
     expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <preface><foreword>
-    <sourcecode lang="ruby" id="samplecode">
-    <name>Ruby <em>code</em></name>
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <sourcecode lang='ruby' id='samplecode'>
+        <name>
+          Figure 1&#xA0;&#x2014; Ruby
+          <em>code</em>
+        </name>
   puts x
 </sourcecode>
-<sourcecode unnumbered="true">
+      <sourcecode unnumbered='true'>
 Que?
 </sourcecode>
-    </foreword></preface>
-    </iso-standard>
+    </foreword>
+  </preface>
+</iso-standard>
     INPUT
     <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head><style/></head>
@@ -759,7 +1181,7 @@ Que?
              </p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/></p><p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p>
+                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160; <br/>&#160; puts x<br/></p><p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p>
                  <p class='Sourcecode'>
   <br/>
   Que?
@@ -795,7 +1217,7 @@ Que?
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <pre id="samplecode" class="prettyprint "><br/>&#160;&#160;&#160; <br/>&#160; &lt;xml&gt;<br/></pre>
-                 <p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; XML code</p>
+                 <p class="SourceTitle" style="text-align:center;">XML code</p>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -824,7 +1246,6 @@ Que?
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <pre id="_" class="prettyprint ">puts "Hello, world."  &lt;1&gt;<br/>&#160;&#160; %w{a b c}.each do |x|<br/>&#160;&#160;&#160;&#160; puts x  &lt;2&gt;<br/>&#160;&#160; end<br/><br/>&lt;1&gt; This is one callout<br/>&lt;2&gt; This is another callout</pre>
-                  <p class='SourceTitle' style='text-align:center;'>Figure 1</p>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -884,8 +1305,64 @@ Que?
     OUTPUT
   end
 
+   it "processes formulae (PresentationXML)" do
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true"  keep-with-next="true" keep-lines-together="true">
+  <stem type="AsciiMath">r = 1 %</stem>
+<dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
+  <dt>
+    <stem type="AsciiMath">r</stem>
+  </dt>
+  <dd>
+    <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
+  </dd>
+</dl>
+    <note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
+  <p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
+</note>
+    </formula>
+    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181935">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </formula>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    <?xml version='1.0'?>
+<iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <formula id='_be9158af-7e93-4ee2-90c5-26d31c181934' unnumbered='true' keep-with-next='true' keep-lines-together='true'>
+        <stem type='AsciiMath'>r = 1 %</stem>
+        <dl id='_e4fe94fe-1cde-49d9-b1ad-743293b7e21d'>
+          <dt>
+            <stem type='AsciiMath'>r</stem>
+          </dt>
+          <dd>
+            <p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
+          </dd>
+        </dl>
+        <note id='_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0'>
+        <name>NOTE</name>
+          <p id='_511aaa98-4116-42af-8e5b-c87cdf5bfdc8'>
+            [durationUnits] is essentially a duration statement without the "P"
+            prefix. "P" is unnecessary because between "G" and "U" duration is
+            always expressed.
+          </p>
+        </note>
+      </formula>
+      <formula id='_be9158af-7e93-4ee2-90c5-26d31c181935'>
+        <name>1</name>
+        <stem type='AsciiMath'>r = 1 %</stem>
+      </formula>
+    </foreword>
+  </preface>
+</iso-standard>
+OUTPUT
+end
 
-  it "processes formulae" do
+  it "processes formulae (HTML)" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
@@ -900,10 +1377,11 @@ Que?
   </dd>
 </dl>
     <note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
+    <name>NOTE</name>
   <p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
 </note>
     </formula>
-    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181935">
+    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181935"><name>1</name>
   <stem type="AsciiMath">r = 1 %</stem>
   </formula>
     </foreword></preface>
@@ -946,10 +1424,11 @@ Que?
   </dd>
 </dl>
     <note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
+    <name>NOTE</name>
   <p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
 </note>
     </formula>
-    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181935">
+    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181935"><name>1</name>
   <stem type="AsciiMath">r = 1 %</stem>
   </formula>
     </foreword></preface>
@@ -1090,14 +1569,52 @@ World</p>
     OUTPUT
   end
 
+it "processes blockquotes (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">
+    <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></preface>
+    </iso-standard>
+    INPUT
+    <?xml version='1.0'?>
+       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+         <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>ISO 7301:2011, Clause 1
+               </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>
+         </preface>
+       </iso-standard>
+    OUTPUT
+  end
 
-  it "processes blockquotes" do
+  it "processes blockquotes (HTML)" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <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>
+  <source type="inline" bibitemid="ISO7301" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 7301:2011, Clause 1</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>
@@ -1127,7 +1644,7 @@ World</p>
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>
     <terms>
-    <term id="_extraneous_matter"><preferred>extraneous matter</preferred><admitted>EM</admitted>
+    <term id="_extraneous_matter"><name>1.1.</name><preferred>extraneous matter</preferred><admitted>EM</admitted>
 <domain>rice</domain>
 <definition><p id="_318b3939-be09-46c4-a284-93f9826b981e">organic and inorganic components other than whole or broken kernels</p></definition>
 </term>
@@ -1137,7 +1654,7 @@ World</p>
     INPUT
     #{HTML_HDR}
                <p class="zzSTDTitle1"/>
-               <div><h1>1.&#160; </h1>
+               <div><h1/>
        <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>
@@ -1148,8 +1665,8 @@ World</p>
     OUTPUT
   end
 
-  it "processes permissions" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+   it "processes permissions (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">
     <preface><foreword>
     <permission id="_"   keep-with-next="true" keep-lines-together="true">
@@ -1201,8 +1718,268 @@ World</p>
     <bibliography><references id="_bibliography" obligation="informative" normative="false">
 <title>Bibliography</title>
 <bibitem id="rfc2616" type="standard">  <fetched>2020-03-27</fetched>  <title format="text/plain" language="en" script="Latn">Hypertext Transfer Protocol — HTTP/1.1</title>  <uri type="xml">https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>  <uri type="src">https://www.rfc-editor.org/info/rfc2616</uri>  <docidentifier type="IETF">RFC 2616</docidentifier>  <docidentifier type="rfc-anchor">RFC2616</docidentifier>  <docidentifier type="DOI">10.17487/RFC2616</docidentifier>  <date type="published">    <on>1999-06</on>  </date>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">R. Fielding</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Gettys</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Mogul</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">H. Frystyk</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">L. Masinter</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">P. Leach</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">T. Berners-Lee</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <language>en</language>  <script>Latn</script>  <abstract format="text/plain" language="en" script="Latn">HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification defines the protocol referred to as “HTTP/1.1”, and is an update to RFC 2068.  [STANDARDS-TRACK]</abstract>  <series type="main">    <title format="text/plain" language="en" script="Latn">RFC</title>    <number>2616</number>  </series>  <place>Fremont, CA</place></bibitem>
+</references></bibliography>
+    </iso-standard>
+    INPUT
+    <?xml version='1.0'?>
+       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+         <preface>
+           <foreword>
+             <permission id='_' keep-with-next='true' keep-lines-together='true'>
+               <name>Permission 1</name>
+               <label>/ogc/recommendation/wfs/2</label>
+               <inherit>/ss/584/2015/level/1</inherit>
+               <inherit>
+                 <eref type='inline' bibitemid='rfc2616' citeas='RFC 2616'>RFC 2616 (HTTP/1.1)</eref>
+               </inherit>
+               <subject>user</subject>
+               <classification>
+                 <tag>control-class</tag>
+                 <value>Technical</value>
+               </classification>
+               <classification>
+                 <tag>priority</tag>
+                 <value>P0</value>
+               </classification>
+               <classification>
+                 <tag>family</tag>
+                 <value>System and Communications Protection</value>
+               </classification>
+               <classification>
+                 <tag>family</tag>
+                 <value>System and Communications Protocols</value>
+               </classification>
+               <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='_'>
+                   <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>
+             </permission>
+           </foreword>
+         </preface>
+         <bibliography>
+           <references id='_bibliography' obligation='informative' normative='false'>
+             <title depth="1">Bibliography</title>
+             <bibitem id='rfc2616' type='standard'>
+               <fetched>2020-03-27</fetched>
+               <title format='text/plain' language='en' script='Latn'>Hypertext Transfer Protocol&#x2009;&#x2014;&#x2009;HTTP/1.1</title>
+               <uri type='xml'>https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>
+               <uri type='src'>https://www.rfc-editor.org/info/rfc2616</uri>
+               <docidentifier type='IETF'>RFC 2616</docidentifier>
+               <docidentifier type='rfc-anchor'>RFC2616</docidentifier>
+               <docidentifier type='DOI'>10.17487/RFC2616</docidentifier>
+               <date type='published'>
+                 <on>1999-06</on>
+               </date>
+               <contributor>
+                 <role type='author'/>
+                 <person>
+                   <name>
+                     <completename language='en'>R. Fielding</completename>
+                   </name>
+                   <affiliation>
+                     <organization>
+                       <name>IETF</name>
+                       <abbreviation>IETF</abbreviation>
+                     </organization>
+                   </affiliation>
+                 </person>
+               </contributor>
+               <contributor>
+                 <role type='author'/>
+                 <person>
+                   <name>
+                     <completename language='en'>J. Gettys</completename>
+                   </name>
+                   <affiliation>
+                     <organization>
+                       <name>IETF</name>
+                       <abbreviation>IETF</abbreviation>
+                     </organization>
+                   </affiliation>
+                 </person>
+               </contributor>
+               <contributor>
+                 <role type='author'/>
+                 <person>
+                   <name>
+                     <completename language='en'>J. Mogul</completename>
+                   </name>
+                   <affiliation>
+                     <organization>
+                       <name>IETF</name>
+                       <abbreviation>IETF</abbreviation>
+                     </organization>
+                   </affiliation>
+                 </person>
+               </contributor>
+               <contributor>
+                 <role type='author'/>
+                 <person>
+                   <name>
+                     <completename language='en'>H. Frystyk</completename>
+                   </name>
+                   <affiliation>
+                     <organization>
+                       <name>IETF</name>
+                       <abbreviation>IETF</abbreviation>
+                     </organization>
+                   </affiliation>
+                 </person>
+               </contributor>
+               <contributor>
+                 <role type='author'/>
+                 <person>
+                   <name>
+                     <completename language='en'>L. Masinter</completename>
+                   </name>
+                   <affiliation>
+                     <organization>
+                       <name>IETF</name>
+                       <abbreviation>IETF</abbreviation>
+                     </organization>
+                   </affiliation>
+                 </person>
+               </contributor>
+               <contributor>
+                 <role type='author'/>
+                 <person>
+                   <name>
+                     <completename language='en'>P. Leach</completename>
+                   </name>
+                   <affiliation>
+                     <organization>
+                       <name>IETF</name>
+                       <abbreviation>IETF</abbreviation>
+                     </organization>
+                   </affiliation>
+                 </person>
+               </contributor>
+               <contributor>
+                 <role type='author'/>
+                 <person>
+                   <name>
+                     <completename language='en'>T. Berners-Lee</completename>
+                   </name>
+                   <affiliation>
+                     <organization>
+                       <name>IETF</name>
+                       <abbreviation>IETF</abbreviation>
+                     </organization>
+                   </affiliation>
+                 </person>
+               </contributor>
+               <language>en</language>
+               <script>Latn</script>
+               <abstract format='text/plain' language='en' script='Latn'>
+                 HTTP has been in use by the World-Wide Web global information
+                 initiative since 1990. This specification defines the protocol
+                 referred to as &#x201C;HTTP/1.1&#x201D;, and is an update to RFC 2068.
+                 [STANDARDS-TRACK]
+               </abstract>
+               <series type='main'>
+                 <title format='text/plain' language='en' script='Latn'>RFC</title>
+                 <number>2616</number>
+               </series>
+               <place>Fremont, CA</place>
+             </bibitem>
+           </references>
+         </bibliography>
+       </iso-standard>
+OUTPUT
+    end
 
-
+  it "processes permissions (HTML)" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <permission id="_"   keep-with-next="true" keep-lines-together="true">
+    <name>Permission 1</name>
+  <label>/ogc/recommendation/wfs/2</label>
+  <inherit>/ss/584/2015/level/1</inherit>
+  <inherit><eref type="inline" bibitemid="rfc2616" citeas="RFC 2616">RFC 2616 (HTTP/1.1)</eref></inherit>
+  <subject>user</subject>
+  <classification> <tag>control-class</tag> <value>Technical</value> </classification><classification> <tag>priority</tag> <value>P0</value> </classification><classification> <tag>family</tag> <value>System and Communications Protection</value> </classification><classification> <tag>family</tag> <value>System and Communications Protocols</value> </classification>
+  <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="_">
+      <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>
+</permission>
+    </foreword></preface>
+    <bibliography><references id="_bibliography" obligation="informative" normative="false">
+<title>Bibliography</title>
+<bibitem id="rfc2616" type="standard">  <fetched>2020-03-27</fetched>  <title format="text/plain" language="en" script="Latn">Hypertext Transfer Protocol — HTTP/1.1</title>  <uri type="xml">https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>  <uri type="src">https://www.rfc-editor.org/info/rfc2616</uri>  <docidentifier type="IETF">RFC 2616</docidentifier>  <docidentifier type="rfc-anchor">RFC2616</docidentifier>  <docidentifier type="DOI">10.17487/RFC2616</docidentifier>  <date type="published">    <on>1999-06</on>  </date>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">R. Fielding</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Gettys</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Mogul</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">H. Frystyk</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">L. Masinter</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">P. Leach</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">T. Berners-Lee</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <language>en</language>  <script>Latn</script>  <abstract format="text/plain" language="en" script="Latn">HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification defines the protocol referred to as “HTTP/1.1”, and is an update to RFC 2068.  [STANDARDS-TRACK]</abstract>  <series type="main">    <title format="text/plain" language="en" script="Latn">RFC</title>    <number>2616</number>  </series>  <place>Fremont, CA</place></bibitem>
 </references></bibliography>
     </iso-standard>
     INPUT
@@ -1227,7 +2004,7 @@ Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
   </div>
   <div class="requirement-measurement-target">
     <p id="_">The measurement target shall be measured as:</p>
-    <div id="_"><div class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div></div>
+    <div id="_"><div class="formula"><p><span class="stem">(#(r/1 = 0)#)</span></p></div></div>
 
 
   </div>
@@ -1253,11 +2030,122 @@ Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
     OUTPUT
   end
 
-    it "processes requirements" do
+   it "processes requirements (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">
+    <preface><foreword>
+    <requirement id="A" unnumbered="true"  keep-with-next="true" keep-lines-together="true">
+  <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"  keep-with-next="true" keep-lines-together="true">
+    <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
+     <?xml version='1.0'?>
+       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+         <preface>
+           <foreword>
+             <requirement id='A' unnumbered='true' keep-with-next='true' keep-lines-together='true'>
+               <name>Requirement</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' keep-with-next='true' keep-lines-together='true'>
+                 <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 (HTML)" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <requirement id="A" unnumbered="true"  keep-with-next="true" keep-lines-together="true">
+    <name>Requirement</name>
   <title>A New Requirement</title>
   <label>/ogc/recommendation/wfs/2</label>
   <inherit>/ss/584/2015/level/1</inherit>
@@ -1320,7 +2208,7 @@ Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
   </div>
   <div class="requirement-measurement-target"  style='page-break-after: avoid;page-break-inside: avoid;'>
     <p id="_">The measurement target shall be measured as:</p>
-    <div id="B"><div class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div></div>
+    <div id="B"><div class="formula"><p><span class="stem">(#(r/1 = 0)#)</span></p></div></div>
 
 
   </div>
@@ -1338,7 +2226,125 @@ Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
     OUTPUT
   end
 
-   it "processes requirements in French" do
+   it "processes requirements in French (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">
+    <bibdata>
+    <language>fr</language>
+    <script>Latn</script>
+    </bibdata>
+    <preface><foreword>
+    <requirement id="A" unnumbered="true">
+  <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
+    <?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>
+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>
@@ -1347,6 +2353,7 @@ Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
     </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>
@@ -1425,7 +2432,6 @@ Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
                    <div id='B'><div class='formula'>
                      <p>
                        <span class='stem'>(#(r/1 = 0)#)</span>
-                       &#160; (1)
                      </p>
                      </div>
                    </div>
@@ -1454,11 +2460,130 @@ Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
 OUTPUT
 end
 
-      it "processes recommendation" do
+ it "processes recommendation (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">
+    <preface><foreword>
+    <recommendation id="_" obligation="shall,could"   keep-with-next="true" keep-lines-together="true">
+  <label>/ogc/recommendation/wfs/2</label>
+  <inherit>/ss/584/2015/level/1</inherit>
+  <classification><tag>type</tag><value>text</value></classification>
+  <classification><tag>language</tag><value>BASIC</value></classification>
+  <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="_">
+      <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>
+</recommendation>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    <?xml version='1.0'?>
+       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+         <preface>
+           <foreword>
+             <recommendation id='_' obligation='shall,could' keep-with-next='true' keep-lines-together='true'>
+               <name>Recommendation 1</name>
+               <label>/ogc/recommendation/wfs/2</label>
+               <inherit>/ss/584/2015/level/1</inherit>
+               <classification>
+                 <tag>type</tag>
+                 <value>text</value>
+               </classification>
+               <classification>
+                 <tag>language</tag>
+                 <value>BASIC</value>
+               </classification>
+               <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='_'>
+                   <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>
+             </recommendation>
+           </foreword>
+         </preface>
+       </iso-standard>
+OUTPUT
+end
+
+      it "processes recommendation (HTML)" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <recommendation id="_" obligation="shall,could"   keep-with-next="true" keep-lines-together="true">
+    <name>Recommendation 1</name>
   <label>/ogc/recommendation/wfs/2</label>
   <inherit>/ss/584/2015/level/1</inherit>
   <classification><tag>type</tag><value>text</value></classification>
@@ -1521,7 +2646,7 @@ end
   </div>
   <div class="requirement-measurement-target">
     <p id="_">The measurement target shall be measured as:</p>
-    <div id="_"><div class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div></div>
+    <div id="_"><div class="formula"><p><span class="stem">(#(r/1 = 0)#)</span></p></div></div>
 
 
   </div>
@@ -1539,8 +2664,8 @@ end
     OUTPUT
   end
 
- it "processes pseudocode" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes pseudocode (Presentation XML)" do
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
 <itu-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata>
     <language>en</language>
@@ -1550,6 +2675,59 @@ end
         <smallcap>B</smallcap></p>
 <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>
+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_HDR}
              <br/>
@@ -1569,18 +2747,32 @@ OUTPUT
   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>
+    <itu-standard xmlns='http://riboseinc.com/isoxml'>
+  <bibdata>
     <language>en</language>
-    </bibdata>
-        <preface><foreword>
-  <figure id="_" class="pseudocode"><name>Label</name><p id="_">  <strong>A</strong><br/>
-        <smallcap>B</smallcap></p>
-<p id="_">  <em>C</em></p></figure>
-</preface></itu-standard>
+  </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( 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"><a name="_" id="_"></a><p class="pseudocode"><a name="_" id="_"></a>&#xA0;&#xA0;<b>A</b><br/>
+            <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>
        <p class="pseudocode" style="page-break-after:avoid;"><a name="_" id="_"></a>&#xA0;&#xA0;<i>C</i></p><p class="SourceTitle" style="text-align:center;">Figure 1&#xA0;&#x2014; Label</p></div>
 OUTPUT
@@ -1606,7 +2798,6 @@ INPUT
       <div>
       <h1 class='ForewordTitle'>Foreword</h1>
                <div class='example'>
-                 <p class='example-title'>EXAMPLE</p>
                  <pre id='B' class='prettyprint '>
                    A B C
                  </pre>