diff --git a/Gemfile.devel b/Gemfile.devel
new file mode 100644
index 00000000..e15cb95d
--- /dev/null
+++ b/Gemfile.devel
@@ -0,0 +1 @@
+gem "html2doc", git: "https://github.com/metanorma/html2doc", branch: "main"
diff --git a/lib/isodoc/function/inline.rb b/lib/isodoc/function/inline.rb
index 1202a2fc..94bfb4ec 100644
--- a/lib/isodoc/function/inline.rb
+++ b/lib/isodoc/function/inline.rb
@@ -87,12 +87,14 @@ def stem_parse(node, out)
       MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
 
       def mathml_parse(node)
-        node.at("./m:math", MATHML)&.to_xml
+        # node.xpath("./m:math", MATHML).map(&:to_xml).join
+        node.xpath(ns("./asciimath | ./latexmath")).each(&:remove)
+        node.xpath(ns("./br")).each { |e| e.namespace = nil }
+        node.elements
       end
 
       def asciimath_parse(node)
         a = node.at(ns("./asciimath"))&.text || node.text
-
         "#{@openmathdelim}#{HTMLEntities.new.encode(a)}" \
           "#{@closemathdelim}"
       end
diff --git a/lib/isodoc/html_function/html.rb b/lib/isodoc/html_function/html.rb
index 114a3f01..22e3fa85 100644
--- a/lib/isodoc/html_function/html.rb
+++ b/lib/isodoc/html_function/html.rb
@@ -15,6 +15,11 @@ def convert1(docxml, filename, dir)
         end.join("\n")
       end
 
+      def preprocess_xslt(docxml)
+
+        super
+      end
+
       def make_body1(body, _docxml)
         return if @bare
 
diff --git a/lib/isodoc/presentation_function/bibdata.rb b/lib/isodoc/presentation_function/bibdata.rb
index 98b91568..2087d128 100644
--- a/lib/isodoc/presentation_function/bibdata.rb
+++ b/lib/isodoc/presentation_function/bibdata.rb
@@ -3,84 +3,10 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def bibdata(docxml)
-      toc_metadata(docxml)
-      fonts_metadata(docxml)
-      preprocess_xslt_insert(docxml)
       docid_prefixes(docxml)
       a = bibdata_current(docxml) or return
       address_precompose(a)
       bibdata_i18n(a)
-      a.next =
-        "<localized-strings>#{i8n_name(trim_hash(@i18n.get), '').join}" \
-        "</localized-strings>"
-    end
-
-    def extension_insert(xml, path = [])
-      ins = extension_insert_pt(xml)
-      path.each do |n|
-        ins = ins.at(ns("./#{n}")) || ins.add_child("<#{n}/>").first
-      end
-      ins
-    end
-
-    def extension_insert_pt(xml)
-      xml.at(ns("//metanorma-extension")) ||
-        xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")
-          &.next_element ||
-        xml.root.elements.first.before("<metanorma-extension/>")
-          .previous_element
-    end
-
-    def preprocess_xslt_insert(docxml)
-      content = ""
-      p = passthrough_xslt and content += p
-      p = preprocess_xslt_read and content += File.read(p)
-      content.empty? and return
-      ins = extension_insert(docxml, %w(render))
-      ins << content
-    end
-
-    def passthrough_xslt
-      @output_formats.nil? and return nil
-      @output_formats.empty? and return nil
-      @output_formats.each_key.with_object([]) do |k, m|
-        m << <<~XSLT
-          <preprocess-xslt format="#{k}">
-            <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-              <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
-              <xsl:template match="@* | node()">
-              <xsl:copy>
-                <xsl:apply-templates select="@* | node()"/>
-              </xsl:copy>
-            </xsl:template>
-              <xsl:template match="*[local-name() = 'passthrough']">
-                <xsl:if test="contains(@formats,',#{k},')"> <!-- delimited -->
-              <xsl:copy>
-                  <xsl:apply-templates select="@* | node()"/>
-              </xsl:copy>
-                </xsl:if>
-              </xsl:template>
-            </xsl:stylesheet>
-          </preprocess-xslt>
-        XSLT
-      end.join("\n")
-    end
-
-    # read in from file, but with `<preprocess-xslt @format="">` wrapper
-    def preprocess_xslt_read
-      html_doc_path("preprocess.xslt")
-    end
-
-    def toc_metadata(docxml)
-      @tocfigures || @toctables || @tocrecommendations or return
-      ins = extension_insert(docxml)
-      @tocfigures and
-        ins << "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
-      @toctables and
-        ins << "<toc type='table'><title>#{@i18n.toc_tables}</title></toc>"
-      @tocfigures and
-        ins << "<toc type='recommendation'><title>#{@i18n.toc_recommendations}" \
-        "</title></toc>"
     end
 
     def address_precompose(bib)
@@ -92,26 +18,6 @@ def address_precompose(bib)
       end
     end
 
-    def fonts_metadata(xmldoc)
-      ins = presmeta_insert_pt(xmldoc)
-      @fontist_fonts and CSV.parse_line(@fontist_fonts, col_sep: ";")
-        .map(&:strip).reverse.each do |f|
-        ins.next = presmeta("fonts", f)
-      end
-      @fontlicenseagreement and
-        ins.next = presmeta("font-license-agreement", @fontlicenseagreement)
-    end
-
-    def presmeta_insert_pt(xmldoc)
-      xmldoc.at(ns("//presentation-metadata")) ||
-        xmldoc.at(ns("//metanorma-extension")) || xmldoc.at(ns("//bibdata"))
-    end
-
-    def presmeta(name, value)
-      "<presentation-metadata><name>#{name}</name><value>#{value}</value>" \
-        "</presentation-metadata>"
-    end
-
     def address_precompose1(addr)
       ret = []
       addr.xpath(ns("./street")).each { |s| ret << to_xml(s.children) }
@@ -176,67 +82,5 @@ def tag_translate(tag, lang, value)
       tag.next["language"] = lang
       tag.next.children = value
     end
-
-    def i18n_tag(key, value)
-      "<localized-string key='#{key}' language='#{@lang}'>#{value}" \
-        "</localized-string>"
-    end
-
-    def i18n_safe(key)
-      key.to_s.gsub(/\s|\./, "_")
-    end
-
-    def i8n_name(hash, pref)
-      case hash
-      when Hash then i8n_name1(hash, pref)
-      when Array
-        hash.reject { |a| blank?(a) }.each_with_object([])
-          .with_index do |(v1, g), i|
-            i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
-          end
-      else [i18n_tag(pref, hash)]
-      end
-    end
-
-    def i8n_name1(hash, pref)
-      hash.reject { |_k, v| blank?(v) }.each_with_object([]) do |(k, v), g|
-        case v
-        when Hash then i8n_name(v, i18n_safe(k)).each { |x| g << x }
-        when Array
-          v.reject { |a| blank?(a) }.each_with_index do |v1, i|
-            i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
-          end
-        else
-          g << i18n_tag("#{pref}#{pref.empty? ? '' : '.'}#{i18n_safe(k)}", v)
-        end
-      end
-    end
-
-    # https://stackoverflow.com/a/31822406
-    def blank?(elem)
-      elem.nil? || (elem.respond_to?(:empty?) && elem.empty?)
-    end
-
-    def trim_hash(hash)
-      loop do
-        h_new = trim_hash1(hash)
-        break hash if hash == h_new
-
-        hash = h_new
-      end
-    end
-
-    def trim_hash1(hash)
-      hash.is_a?(Hash) or return hash
-      hash.each_with_object({}) do |(k, v), g|
-        blank?(v) and next
-        g[k] = case v
-               when Hash then trim_hash1(hash[k])
-               when Array
-                 hash[k].map { |a| trim_hash1(a) }.reject { |a| blank?(a) }
-               else v
-               end
-      end
-    end
   end
 end
diff --git a/lib/isodoc/presentation_function/math.rb b/lib/isodoc/presentation_function/math.rb
index fd468b60..34c9c84f 100644
--- a/lib/isodoc/presentation_function/math.rb
+++ b/lib/isodoc/presentation_function/math.rb
@@ -7,8 +7,9 @@ class PresentationXMLConvert < ::IsoDoc::Convert
     MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
 
     def mathml(docxml)
+      docxml.xpath("//m:math", MATHML).each { |f| mathml_linebreak(f) }
       locale = twitter_cldr_localiser
-      docxml.xpath("//m:math", MATHML).each do |f|
+      docxml.xpath("//m:math", MATHML).each do |f| # rubocop:disable Style/CombinableLoops
         mathml1(f, locale)
       end
     end
@@ -77,8 +78,7 @@ def twitter_cldr_localiser
     end
 
     def parse_localize_number
-      return {} unless @localizenumber
-
+      @localizenumber or return {}
       m = %r{(?<group>[^#])?(?<groupdigits>#+0)(?<decimal>.)(?<fractdigits>#+)(?<fractgroup>[^#])?}
         .match(@localizenumber) or return {}
       ret = { decimal: m[:decimal], group_digits: m[:groupdigits].size,
@@ -90,17 +90,13 @@ def parse_localize_number
     end
 
     def asciimath_dup(node)
-      return if @suppressasciimathdup || node.parent.at(ns("./asciimath"))
-
+      @suppressasciimathdup || node.parent.at(ns("./asciimath")) and return
       math = node.to_xml.gsub(/ xmlns=["'][^"']+["']/, "")
         .gsub(%r{<[^:/>]+:}, "<").gsub(%r{</[^:/>]+:}, "</")
       ret = Plurimath::Math.parse(math, "mathml").to_asciimath
-      ret = HTMLEntities.new.encode(ret, :basic)
-      node.next = "<asciimath>#{ret}</asciimath>"
+      node.next = "<asciimath>#{@c.encode(ret, :basic)}</asciimath>"
     rescue StandardError => e
-      warn "Failure to convert MathML to AsciiMath"
-      warn node.parent.to_xml
-      warn e
+      warn "Failure to convert MathML to AsciiMath\n#{node.parent.to_xml}\n#{e}"
     end
 
     def maths_just_numeral(node)
@@ -114,6 +110,23 @@ def maths_just_numeral(node)
 
     def mathml1(node, locale)
       mathml_style_inherit(node)
+      mathml_number(node, locale)
+    end
+
+    def mathml_linebreak(node)
+      node.at(".//*/@linebreak") or return
+      m = Plurimath::Math.parse(node.to_xml, :mathml)
+        .to_mathml(split_on_linebreak: true)
+      ret = Nokogiri::XML("<m>#{m}</m>").root
+      ret.elements.each_with_index do |e, i|
+        i.zero? or e.previous = "<br/>"
+      end
+      node.replace(<<~OUTPUT)
+        <math-with-linebreak>#{ret.children}</math-with-linebreak><math-no-linebreak>#{node.to_xml}</math-no-linebreak>
+      OUTPUT
+    end
+
+    def mathml_number(node, locale)
       justnumeral = node.elements.size == 1 && node.elements.first.name == "mn"
       justnumeral or asciimath_dup(node)
       localize_maths(node, locale)
diff --git a/lib/isodoc/presentation_function/metadata.rb b/lib/isodoc/presentation_function/metadata.rb
new file mode 100644
index 00000000..37162347
--- /dev/null
+++ b/lib/isodoc/presentation_function/metadata.rb
@@ -0,0 +1,184 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def metadata(docxml)
+      toc_metadata(docxml)
+      fonts_metadata(docxml)
+      preprocess_xslt_insert(docxml)
+      a = docxml.at(ns("//bibdata")) or return
+      a.next =
+        "<localized-strings>#{i8n_name(trim_hash(@i18n.get), '').join}" \
+        "</localized-strings>"
+    end
+
+    def extension_insert(xml, path = [])
+      ins = extension_insert_pt(xml)
+      path.each do |n|
+        ins = ins.at(ns("./#{n}")) || ins.add_child("<#{n}/>").first
+      end
+      ins
+    end
+
+    def extension_insert_pt(xml)
+      xml.at(ns("//metanorma-extension")) ||
+        xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")
+          &.next_element ||
+        xml.root.elements.first.before("<metanorma-extension/>")
+          .previous_element
+    end
+
+    def toc_metadata(docxml)
+      @tocfigures || @toctables || @tocrecommendations or return
+      ins = extension_insert(docxml)
+      @tocfigures and
+        ins << "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
+      @toctables and
+        ins << "<toc type='table'><title>#{@i18n.toc_tables}</title></toc>"
+      @tocfigures and
+        ins << "<toc type='recommendation'><title>#{@i18n.toc_recommendations}" \
+        "</title></toc>"
+    end
+
+    def fonts_metadata(xmldoc)
+      ins = presmeta_insert_pt(xmldoc)
+      @fontist_fonts and CSV.parse_line(@fontist_fonts, col_sep: ";")
+        .map(&:strip).reverse.each do |f|
+        ins.next = presmeta("fonts", f)
+      end
+      @fontlicenseagreement and
+        ins.next = presmeta("font-license-agreement", @fontlicenseagreement)
+    end
+
+    def presmeta_insert_pt(xmldoc)
+      xmldoc.at(ns("//presentation-metadata")) ||
+        xmldoc.at(ns("//metanorma-extension")) || xmldoc.at(ns("//bibdata"))
+    end
+
+    def presmeta(name, value)
+      "<presentation-metadata><name>#{name}</name><value>#{value}</value>" \
+        "</presentation-metadata>"
+    end
+
+    def preprocess_xslt_insert(docxml)
+      content = ""
+      p = passthrough_xslt and content += p
+      p = preprocess_xslt_read and content += File.read(p)
+      content.empty? and return
+      ins = extension_insert(docxml, %w(render))
+      ins << content
+    end
+
+    COPY_XSLT =
+      '<xsl:copy><xsl:apply-templates select="@* | node()"/></xsl:copy>'.freeze
+    COPY_CHILDREN_XSLT =
+      '<xsl:apply-templates select="node()"/>'.freeze
+
+    def xslt_template(content)
+      <<~XSLT
+        <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+          <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
+          <xsl:template match="@* | node()">#{COPY_XSLT}</xsl:template>
+        #{content}
+        </xsl:stylesheet>
+      XSLT
+    end
+
+    def passthrough_xslt
+      @output_formats.nil? and return nil
+      @output_formats.empty? and return nil
+      @output_formats.each_key.with_object([]) do |k, m|
+        m << <<~XSLT
+          <preprocess-xslt format="#{k}">
+            #{xslt_template(<<~XSLT1)
+              <xsl:template match="*[local-name() = 'passthrough']">
+                <xsl:if test="contains(@formats,',#{k},')"> <!-- delimited -->
+                #{COPY_XSLT}
+                </xsl:if>
+              </xsl:template>
+            XSLT1
+            }
+          </preprocess-xslt>
+        XSLT
+        m << <<~XSLT
+          <preprocess-xslt format="#{k}">
+            #{xslt_template(<<~XSLT1)
+              <xsl:template match="*[local-name() = 'math-with-linebreak']">
+              #{k == 'pdf' ? COPY_CHILDREN_XSLT : ''}
+              </xsl:template>
+              <xsl:template match="*[local-name() = 'math-no-linebreak']">
+              #{k == 'pdf' ? '' : COPY_CHILDREN_XSLT}
+              </xsl:template>
+            XSLT1
+            }
+          </preprocess-xslt>
+        XSLT
+      end.join("\n")
+    end
+
+    # read in from file, but with `<preprocess-xslt @format="">` wrapper
+    def preprocess_xslt_read
+      html_doc_path("preprocess.xslt")
+    end
+
+    def i18n_tag(key, value)
+      "<localized-string key='#{key}' language='#{@lang}'>#{value}" \
+        "</localized-string>"
+    end
+
+    def i18n_safe(key)
+      key.to_s.gsub(/\s|\./, "_")
+    end
+
+    def i8n_name(hash, pref)
+      case hash
+      when Hash then i8n_name1(hash, pref)
+      when Array
+        hash.reject { |a| blank?(a) }.each_with_object([])
+          .with_index do |(v1, g), i|
+            i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
+          end
+      else [i18n_tag(pref, hash)]
+      end
+    end
+
+    def i8n_name1(hash, pref)
+      hash.reject { |_k, v| blank?(v) }.each_with_object([]) do |(k, v), g|
+        case v
+        when Hash then i8n_name(v, i18n_safe(k)).each { |x| g << x }
+        when Array
+          v.reject { |a| blank?(a) }.each_with_index do |v1, i|
+            i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
+          end
+        else
+          g << i18n_tag("#{pref}#{pref.empty? ? '' : '.'}#{i18n_safe(k)}", v)
+        end
+      end
+    end
+
+    # https://stackoverflow.com/a/31822406
+    def blank?(elem)
+      elem.nil? || (elem.respond_to?(:empty?) && elem.empty?)
+    end
+
+    def trim_hash(hash)
+      loop do
+        h_new = trim_hash1(hash)
+        break hash if hash == h_new
+
+        hash = h_new
+      end
+    end
+
+    def trim_hash1(hash)
+      hash.is_a?(Hash) or return hash
+      hash.each_with_object({}) do |(k, v), g|
+        blank?(v) and next
+        g[k] = case v
+               when Hash then trim_hash1(hash[k])
+               when Array
+                 hash[k].map { |a| trim_hash1(a) }.reject { |a| blank?(a) }
+               else v
+               end
+      end
+    end
+  end
+end
diff --git a/lib/isodoc/presentation_xml_convert.rb b/lib/isodoc/presentation_xml_convert.rb
index 289fd083..866fffa7 100644
--- a/lib/isodoc/presentation_xml_convert.rb
+++ b/lib/isodoc/presentation_xml_convert.rb
@@ -8,6 +8,7 @@
 require_relative "presentation_function/math"
 require_relative "presentation_function/section"
 require_relative "presentation_function/bibdata"
+require_relative "presentation_function/metadata"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -35,6 +36,7 @@ def bibitem_lookup(docxml)
 
     def conversions(docxml)
       semantic_xml_insert(docxml)
+      metadata docxml
       bibdata docxml
       @xrefs.parse docxml
       section docxml
diff --git a/spec/isodoc/blocks_notes_spec.rb b/spec/isodoc/blocks_notes_spec.rb
new file mode 100644
index 00000000..45a08ce5
--- /dev/null
+++ b/spec/isodoc/blocks_notes_spec.rb
@@ -0,0 +1,710 @@
+require "spec_helper"
+
+RSpec.describe IsoDoc do
+  it "processes unlabelled notes" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <note id="A" keep-with-next="true" keep-lines-together="true">
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83e">These results are based on a study carried out on three different types of kernel.</p>
+      </note>
+          <note id="B" keep-with-next="true" keep-lines-together="true" notag="true" unnumbered="true">
+        <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
+    presxml = <<~OUTPUT
+          <?xml version='1.0'?>
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+        <preface>
+              <clause type="toc" id="_" displayorder="1">
+                <title depth="1">Table of contents</title>
+              </clause>
+          <foreword displayorder="2">
+                       <note id='A' keep-with-next='true' keep-lines-together='true'>
+               <name>NOTE 1</name>
+               <p id='_'>
+                 These results are based on a study carried out on three different
+                 types of kernel.
+               </p>
+             </note>
+             <note id='B' keep-with-next='true' keep-lines-together='true' notag='true' unnumbered='true'>
+               <p id='_'>
+                 These results are based on a study carried out on three different
+                 types of kernel.
+               </p>
+             </note>
+          </foreword>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+        <br/>
+        <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+                       <div id='A' class='Note' style='page-break-after: avoid;page-break-inside: avoid;'>
+                 <p>
+                   <span class='note_label'>NOTE 1</span>
+                   &#160; These results are based on a study carried out on three
+                   different types of kernel.
+                 </p>
+               </div>
+               <div id='B' class='Note' style='page-break-after: avoid;page-break-inside: avoid;'>
+                 <p>
+                   &#160; These results are based on a study carried out on three
+                   different types of kernel.
+                 </p>
+               </div>
+             </div>
+        </div>
+        </body>
+        </html>
+    OUTPUT
+    doc = <<~OUTPUT
+        <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+        <head><style/></head>
+        <body lang="EN-US" link="blue" vlink="#954F72">
+          <div class="WordSection1">
+            <p>&#160;</p>
+          </div>
+          <p class="section-break"><br clear="all" class="section"/></p>
+          <div class="WordSection2">
+            <p class="page-break"><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
+      <div class="TOC" id="_">
+        <p class="zzContents">Table of contents</p>
+      </div>
+                  <p class="page-break">
+        <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' style='page-break-after: avoid;page-break-inside: avoid;'>
+                 <p class='Note'>
+                   <span class='note_label'>NOTE 1</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 id='B' class='Note' style='page-break-after: avoid;page-break-inside: avoid;'>
+                 <p class='Note'>
+                   <span class='note_label'/>
+                   <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>
+            <p>&#160;</p>
+          </div>
+          <p class="section-break"><br clear="all" class="section"/></p>
+          <div class="WordSection3">
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+      .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)
+    expect(xmlpp(IsoDoc::WordConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(doc)
+  end
+
+  it "processes sequences of notes" do
+    input = <<~INPUT
+          <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
+    presxml = <<~OUTPUT
+      <?xml version='1.0'?>
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+        <preface>
+              <clause type="toc" id="_" displayorder="1">
+                <title depth="1">Table of contents</title>
+              </clause>
+          <foreword displayorder="2">
+            <note id='note1'>
+              <name>NOTE 1</name>
+              <p id='_'>
+                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='_'>
+                These results are based on a study carried out on three different
+                types of kernel.
+              </p>
+            </note>
+          </foreword>
+        </preface>
+      </iso-standard>
+    OUTPUT
+
+    output = <<~OUTPUT
+      #{HTML_HDR}
+                   <br/>
+                   <div>
+                     <h1 class="ForewordTitle">Foreword</h1>
+                     <div id="note1" class="Note">
+                       <p><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+                     </div>
+                     <div id="note2" class="Note">
+                       <p><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+                     </div>
+                   </div>
+                 </div>
+               </body>
+           </html>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes multi-para notes" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface>
+          <clause type="toc" id="_" displayorder="1">
+              <title depth="1">Table of contents</title>
+          </clause>
+        <foreword displayorder="2">
+          <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>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      #{HTML_HDR}
+                <br/>
+                <div>
+                  <h1 class="ForewordTitle">Foreword</h1>
+                  <div 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>
+                    <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
+                  </div>
+                </div>
+              </div>
+            </body>
+        </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes non-para notes" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><clause type="toc" id="_" displayorder="1">
+              <title depth="1">Table of contents</title>
+            </clause><foreword displayorder="2">
+          <note id="A"><name>NOTE</name>
+          <dl>
+          <dt>A</dt>
+          <dd><p>B</p></dd>
+          </dl>
+          <ul>
+          <li>C</li></ul>
+      </note>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+                <br/>
+                <div>
+                  <h1 class="ForewordTitle">Foreword</h1>
+                  <div id="A" class="Note"><p><span class="note_label">NOTE</span>&#160; </p>
+            <dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
+            <ul>
+            <li>C</li></ul>
+        </div>
+                </div>
+              </div>
+            </body>
+        </html>
+
+    OUTPUT
+    doc = <<~OUTPUT
+          <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+        <head><style/></head>
+        <body lang="EN-US" link="blue" vlink="#954F72">
+          <div class="WordSection1">
+            <p>&#160;</p>
+          </div>
+          <p class="section-break"><br clear="all" class="section"/></p>
+          <div class="WordSection2">
+                <p class="page-break">
+        <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+      </p>
+      <div class="TOC" id="_">
+        <p class="zzContents">Table of contents</p>
+      </div>
+            <p class="page-break"><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"><p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span></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 class="Note">B</p></td></tr></table>
+          <ul>
+          <li>C</li></ul>
+      </div>
+            </div>
+            <p>&#160;</p>
+          </div>
+          <p class="section-break"><br clear="all" class="section"/></p>
+          <div class="WordSection3">
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::WordConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(doc)
+  end
+
+  it "processes paragraphs containing notes" do
+    input = <<~INPUT
+                <iso-standard xmlns="http://riboseinc.com/isoxml">
+            <preface>    <clause type="toc" id="_" displayorder="1">
+        <title depth="1">Table of contents</title>
+      </clause>
+        <foreword displayorder="2">
+            <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
+    html = <<~OUTPUT
+      #{HTML_HDR}
+                <br/>
+                <div>
+                  <h1 class='ForewordTitle'>Foreword</h1>
+                  <p id='A'>
+                    ABC
+                    <div id='B' class='Note'>
+                      <p>
+                        <span class='note_label'>NOTE 1</span>
+                        &#160; XYZ
+                      </p>
+                    </div>
+                    <div id='B1' class='Note'>
+                      <p>
+                        <span class='note_label'>NOTE 2</span>
+                        &#160; XYZ1
+                      </p>
+                    </div>
+                  </p>
+                </div>
+              </div>
+            </body>
+          </html>
+    OUTPUT
+
+    doc = <<~OUTPUT
+      <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+      <head>
+          <style/>
+        </head>
+                 <body lang="EN-US" link="blue" vlink="#954F72">
+           <div class="WordSection1">
+             <p> </p>
+           </div>
+           <p class="section-break">
+             <br clear="all" class="section"/>
+           </p>
+           <div class="WordSection2">
+             <p class="page-break">
+               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             </p>
+             <div class="TOC" id="_">
+               <p class="zzContents">Table of contents</p>
+             </div>
+             <p class="page-break">
+               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             </p>
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+               <p id="A">ABC
+         </p>
+               <div id="B" class="Note">
+                 <p class="Note"><span class="note_label">NOTE 1</span><span style="mso-tab-count:1">  </span>XYZ</p>
+               </div>
+               <div id="B1" class="Note">
+                 <p class="Note"><span class="note_label">NOTE 2</span><span style="mso-tab-count:1">  </span>XYZ1</p>
+               </div>
+             </div>
+             <p> </p>
+           </div>
+           <p class="section-break">
+             <br clear="all" class="section"/>
+           </p>
+           <div class="WordSection3">
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(doc)
+  end
+
+  it "converts notes and admonitions intended for coverpage" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <note id="FB" coverpage="true" unnumbered="true"><p>XYZ</p></note>
+          <admonition id="FC" coverpage="true" unnumbered="true" type="warning"><p>XYZ</p></admonition>
+      </foreword></preface>
+          </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+            <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+          <preface>
+              <clause type="toc" id="_" displayorder="1">
+        <title depth="1">Table of contents</title>
+      </clause>
+            <foreword displayorder='2'>
+              <note id='FB' coverpage='true' unnumbered='true'>
+                 <name>NOTE</name>
+                 <p>XYZ</p>
+               </note>
+               <admonition id='FC' coverpage='true' unnumbered='true' type='warning'>
+                 <name>WARNING</name>
+                 <p>XYZ</p>
+               </admonition>
+            </foreword>
+          </preface>
+        </iso-standard>
+    OUTPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+            <br/>
+            <div>
+              <h1 class='ForewordTitle'>Foreword</h1>
+                <div id='FB' class='Note' coverpage='true'>
+                 <p>
+                   <span class='note_label'>NOTE</span>
+                   &#160; XYZ
+                 </p>
+               </div>
+               <div id='FC' class='Admonition' coverpage='true'>
+                 <p class='AdmonitionTitle' style='text-align:center;'>WARNING</p>
+                 <p>XYZ</p>
+               </div>
+            </div>
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    doc = <<~OUTPUT
+                <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+            <head>
+                <style/>
+              </head>
+      <body lang='EN-US' link='blue' vlink='#954F72'>
+          <div class='WordSection1'>
+            <p>&#160;</p>
+          </div>
+          <p class="section-break">
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection2'>
+            <p class="page-break">
+              <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+            </p>
+            <div class="TOC" id="_">
+        <p class="zzContents">Table of contents</p>
+      </div>
+      <p class="page-break">
+        <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+      </p>
+      <div>
+              <h1 class='ForewordTitle'>Foreword</h1>
+                <div id='FB' class='Note' coverpage='true'>
+                 <p class='Note'>
+                   <span class='note_label'>NOTE</span>
+                   <span style='mso-tab-count:1'>&#160; </span>
+                   XYZ
+                 </p>
+               </div>
+               <div id='FC' class='Admonition' coverpage='true'>
+                 <p class='AdmonitionTitle' style='text-align:center;'>WARNING</p>
+                 <p>XYZ</p>
+               </div>
+            </div>
+            <p>&#160;</p>
+          </div>
+          <p class="section-break">
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection3'>
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({})
+      .convert("test", presxml, true)))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
+      .convert("test", presxml, true)))).to be_equivalent_to xmlpp(doc)
+  end
+
+  it "numbers notes in tables and figures separately from notes outside them" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <figure id="F"><note id="FB"><p>XYZ</p></note></figure>
+          <table id="T"><note id="TB"><p>XYZ</p></note></table>
+          <p id="A">ABC <note id="B"><p id="C">XYZ</p></note>
+      </foreword></preface>
+          </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+            <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+          <preface>
+              <clause type="toc" id="_" displayorder="1">
+        <title depth="1">Table of contents</title>
+      </clause>
+            <foreword displayorder='2'>
+              <figure id='F'>
+                <name>Figure 1</name>
+                <note id='FB'>
+                  <name>NOTE</name>
+                  <p>XYZ</p>
+                </note>
+              </figure>
+              <table id='T'>
+                <name>Table 1</name>
+                <note id='TB'>
+                  <name>NOTE</name>
+                  <p>XYZ</p>
+                </note>
+              </table>
+              <p id='A'>
+                ABC
+                <note id='B'>
+                  <name>NOTE</name>
+                  <p id='C'>XYZ</p>
+                </note>
+              </p>
+            </foreword>
+          </preface>
+        </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes admonitions" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution" keep-with-next="true" keep-lines-together="true">
+        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+      </admonition>
+          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6b" type="caution" keep-with-next="true" keep-lines-together="true" notag="true">
+        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+      </admonition>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    presxml = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml" type='presentation'>
+          <preface>
+             <clause type="toc" id="_" displayorder="1">
+              <title depth="1">Table of contents</title>
+            </clause>
+          <foreword displayorder="2">
+          <admonition id="_" type="caution" keep-with-next="true" keep-lines-together="true">
+          <name>CAUTION</name>
+        <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+      </admonition>
+          <admonition id="_" type="caution" keep-with-next="true" keep-lines-together="true" notag="true">
+        <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+      </admonition>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      #{HTML_HDR}
+      <br/>
+        <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <div class="Admonition" id='_' style='page-break-after: avoid;page-break-inside: avoid;'><p class="AdmonitionTitle" style="text-align:center;">CAUTION</p>
+        <p id='_'>Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+        </div>
+        <div id='_' class='Admonition' style='page-break-after: avoid;page-break-inside: avoid;'>
+        <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+        </div>
+        </div>
+        </div>
+        </body>
+      </html>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes empty admonitions" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
+      </admonition>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+        <preface>
+          <clause type="toc" id="_" displayorder="1">
+            <title depth="1">Table of contents</title>
+          </clause>
+          <foreword displayorder="2">
+            <admonition id="_" type="caution">
+              <name>CAUTION</name>
+            </admonition>
+          </foreword>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+        .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
+  end
+
+  it "processes admonitions with titles" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
+          <name>Title</name>
+        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+      </admonition>
+          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6b" type="caution" notag="true">
+          <name>Title</name>
+        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+      </admonition>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    presxml = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml" type='presentation'>
+          <preface>
+             <clause type="toc" id="_" displayorder="1">
+              <title depth="1">Table of contents</title>
+            </clause>
+          <foreword displayorder="2">
+          <admonition id="_" type="caution">
+          <name>Title</name>
+        <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+      </admonition>
+          <admonition id="_" type="caution" notag="true">
+          <name>Title</name>
+        <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+      </admonition>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      #{HTML_HDR}
+                  <br/>
+                  <div>
+                    <h1 class="ForewordTitle">Foreword</h1>
+                    <div class="Admonition" id="_">
+                             <p class='AdmonitionTitle' style='text-align:center;'>Title</p>
+         <p id='_'>Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+       </div>
+       <div id='_' class='Admonition'>
+         <p class='AdmonitionTitle' style='text-align:center;'>Title</p>
+            <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+          </div>
+                  </div>
+                </div>
+              </body>
+          </html>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes box admonitions" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="box">
+          <name>Title</name>
+        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+      </admonition>
+          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6b" type="box" notag="true">
+        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+      </admonition>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    presxml = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+         <preface>
+             <clause type="toc" id="_" displayorder="1">
+              <title depth="1">Table of contents</title>
+            </clause>
+           <foreword displayorder="2">
+             <admonition id="_" type="box">
+               <name>Box  1 — Title</name>
+               <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+             </admonition>
+             <admonition id="_" type="box" notag="true">
+               <name>Box  2</name>
+               <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+             </admonition>
+           </foreword>
+         </preface>
+       </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      #{HTML_HDR}
+             <br/>
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+               <div id="_" class="Admonition">
+                 <p class="AdmonitionTitle" style="text-align:center;">Box  1 — Title</p>
+                 <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+               </div>
+               <div id="_" class="Admonition">
+                 <p class="AdmonitionTitle" style="text-align:center;">Box  2</p>
+                 <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+               </div>
+             </div>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
+  end
+end
diff --git a/spec/isodoc/blocks_spec.rb b/spec/isodoc/blocks_spec.rb
index 377579df..0cf1044c 100644
--- a/spec/isodoc/blocks_spec.rb
+++ b/spec/isodoc/blocks_spec.rb
@@ -252,520 +252,6 @@
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
-  it "processes unlabelled notes" do
-    input = <<~INPUT
-          <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface><foreword>
-          <note id="A" keep-with-next="true" keep-lines-together="true">
-        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83e">These results are based on a study carried out on three different types of kernel.</p>
-      </note>
-          <note id="B" keep-with-next="true" keep-lines-together="true" notag="true" unnumbered="true">
-        <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
-    presxml = <<~OUTPUT
-          <?xml version='1.0'?>
-      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-        <preface>
-              <clause type="toc" id="_" displayorder="1">
-                <title depth="1">Table of contents</title>
-              </clause>
-          <foreword displayorder="2">
-                       <note id='A' keep-with-next='true' keep-lines-together='true'>
-               <name>NOTE 1</name>
-               <p id='_'>
-                 These results are based on a study carried out on three different
-                 types of kernel.
-               </p>
-             </note>
-             <note id='B' keep-with-next='true' keep-lines-together='true' notag='true' unnumbered='true'>
-               <p id='_'>
-                 These results are based on a study carried out on three different
-                 types of kernel.
-               </p>
-             </note>
-          </foreword>
-        </preface>
-      </iso-standard>
-    OUTPUT
-    html = <<~OUTPUT
-      #{HTML_HDR}
-        <br/>
-        <div>
-        <h1 class="ForewordTitle">Foreword</h1>
-                       <div id='A' class='Note' style='page-break-after: avoid;page-break-inside: avoid;'>
-                 <p>
-                   <span class='note_label'>NOTE 1</span>
-                   &#160; These results are based on a study carried out on three
-                   different types of kernel.
-                 </p>
-               </div>
-               <div id='B' class='Note' style='page-break-after: avoid;page-break-inside: avoid;'>
-                 <p>
-                   &#160; These results are based on a study carried out on three
-                   different types of kernel.
-                 </p>
-               </div>
-             </div>
-        </div>
-        </body>
-        </html>
-    OUTPUT
-    doc = <<~OUTPUT
-        <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
-        <head><style/></head>
-        <body lang="EN-US" link="blue" vlink="#954F72">
-          <div class="WordSection1">
-            <p>&#160;</p>
-          </div>
-          <p class="section-break"><br clear="all" class="section"/></p>
-          <div class="WordSection2">
-            <p class="page-break"><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
-      <div class="TOC" id="_">
-        <p class="zzContents">Table of contents</p>
-      </div>
-                  <p class="page-break">
-        <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' style='page-break-after: avoid;page-break-inside: avoid;'>
-                 <p class='Note'>
-                   <span class='note_label'>NOTE 1</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 id='B' class='Note' style='page-break-after: avoid;page-break-inside: avoid;'>
-                 <p class='Note'>
-                   <span class='note_label'/>
-                   <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>
-            <p>&#160;</p>
-          </div>
-          <p class="section-break"><br clear="all" class="section"/></p>
-          <div class="WordSection3">
-          </div>
-        </body>
-      </html>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .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)
-    expect(xmlpp(IsoDoc::WordConvert.new({})
-      .convert("test", presxml, true))).to be_equivalent_to xmlpp(doc)
-  end
-
-  it "processes sequences of notes" do
-    input = <<~INPUT
-          <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
-    presxml = <<~OUTPUT
-      <?xml version='1.0'?>
-      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-        <preface>
-              <clause type="toc" id="_" displayorder="1">
-                <title depth="1">Table of contents</title>
-              </clause>
-          <foreword displayorder="2">
-            <note id='note1'>
-              <name>NOTE 1</name>
-              <p id='_'>
-                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='_'>
-                These results are based on a study carried out on three different
-                types of kernel.
-              </p>
-            </note>
-          </foreword>
-        </preface>
-      </iso-standard>
-    OUTPUT
-
-    output = <<~OUTPUT
-      #{HTML_HDR}
-                   <br/>
-                   <div>
-                     <h1 class="ForewordTitle">Foreword</h1>
-                     <div id="note1" class="Note">
-                       <p><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
-                     </div>
-                     <div id="note2" class="Note">
-                       <p><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
-                     </div>
-                   </div>
-                 </div>
-               </body>
-           </html>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
-  end
-
-  it "processes multi-para notes" do
-    input = <<~INPUT
-          <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface>
-          <clause type="toc" id="_" displayorder="1">
-              <title depth="1">Table of contents</title>
-          </clause>
-        <foreword displayorder="2">
-          <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>
-          </foreword></preface>
-          </iso-standard>
-    INPUT
-    output = <<~OUTPUT
-      #{HTML_HDR}
-                <br/>
-                <div>
-                  <h1 class="ForewordTitle">Foreword</h1>
-                  <div 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>
-                    <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
-                  </div>
-                </div>
-              </div>
-            </body>
-        </html>
-    OUTPUT
-    expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
-  end
-
-  it "processes non-para notes" do
-    input = <<~INPUT
-          <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface><clause type="toc" id="_" displayorder="1">
-              <title depth="1">Table of contents</title>
-            </clause><foreword displayorder="2">
-          <note id="A"><name>NOTE</name>
-          <dl>
-          <dt>A</dt>
-          <dd><p>B</p></dd>
-          </dl>
-          <ul>
-          <li>C</li></ul>
-      </note>
-          </foreword></preface>
-          </iso-standard>
-    INPUT
-    html = <<~OUTPUT
-      #{HTML_HDR}
-                <br/>
-                <div>
-                  <h1 class="ForewordTitle">Foreword</h1>
-                  <div id="A" class="Note"><p><span class="note_label">NOTE</span>&#160; </p>
-            <dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
-            <ul>
-            <li>C</li></ul>
-        </div>
-                </div>
-              </div>
-            </body>
-        </html>
-
-    OUTPUT
-    doc = <<~OUTPUT
-          <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
-        <head><style/></head>
-        <body lang="EN-US" link="blue" vlink="#954F72">
-          <div class="WordSection1">
-            <p>&#160;</p>
-          </div>
-          <p class="section-break"><br clear="all" class="section"/></p>
-          <div class="WordSection2">
-                <p class="page-break">
-        <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-      </p>
-      <div class="TOC" id="_">
-        <p class="zzContents">Table of contents</p>
-      </div>
-            <p class="page-break"><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"><p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span></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 class="Note">B</p></td></tr></table>
-          <ul>
-          <li>C</li></ul>
-      </div>
-            </div>
-            <p>&#160;</p>
-          </div>
-          <p class="section-break"><br clear="all" class="section"/></p>
-          <div class="WordSection3">
-          </div>
-        </body>
-      </html>
-    OUTPUT
-    expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", input, true))).to be_equivalent_to xmlpp(html)
-    expect(xmlpp(IsoDoc::WordConvert.new({})
-      .convert("test", input, true))).to be_equivalent_to xmlpp(doc)
-  end
-
-  it "processes paragraphs containing notes" do
-    input = <<~INPUT
-                <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface>    <clause type="toc" id="_" displayorder="1">
-        <title depth="1">Table of contents</title>
-      </clause>
-        <foreword displayorder="2">
-            <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
-    html = <<~OUTPUT
-      #{HTML_HDR}
-                <br/>
-                <div>
-                  <h1 class='ForewordTitle'>Foreword</h1>
-                  <p id='A'>
-                    ABC
-                    <div id='B' class='Note'>
-                      <p>
-                        <span class='note_label'>NOTE 1</span>
-                        &#160; XYZ
-                      </p>
-                    </div>
-                    <div id='B1' class='Note'>
-                      <p>
-                        <span class='note_label'>NOTE 2</span>
-                        &#160; XYZ1
-                      </p>
-                    </div>
-                  </p>
-                </div>
-              </div>
-            </body>
-          </html>
-    OUTPUT
-
-    doc = <<~OUTPUT
-      <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
-      <head>
-          <style/>
-        </head>
-                 <body lang="EN-US" link="blue" vlink="#954F72">
-           <div class="WordSection1">
-             <p> </p>
-           </div>
-           <p class="section-break">
-             <br clear="all" class="section"/>
-           </p>
-           <div class="WordSection2">
-             <p class="page-break">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-             </p>
-             <div class="TOC" id="_">
-               <p class="zzContents">Table of contents</p>
-             </div>
-             <p class="page-break">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-             </p>
-             <div>
-               <h1 class="ForewordTitle">Foreword</h1>
-               <p id="A">ABC
-         </p>
-               <div id="B" class="Note">
-                 <p class="Note"><span class="note_label">NOTE 1</span><span style="mso-tab-count:1">  </span>XYZ</p>
-               </div>
-               <div id="B1" class="Note">
-                 <p class="Note"><span class="note_label">NOTE 2</span><span style="mso-tab-count:1">  </span>XYZ1</p>
-               </div>
-             </div>
-             <p> </p>
-           </div>
-           <p class="section-break">
-             <br clear="all" class="section"/>
-           </p>
-           <div class="WordSection3">
-           </div>
-         </body>
-       </html>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({})
-      .convert("test", input, true)))).to be_equivalent_to xmlpp(html)
-    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
-      .convert("test", input, true)))).to be_equivalent_to xmlpp(doc)
-  end
-
-  it "converts notes and admonitions intended for coverpage" do
-    input = <<~INPUT
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface><foreword>
-          <note id="FB" coverpage="true" unnumbered="true"><p>XYZ</p></note>
-          <admonition id="FC" coverpage="true" unnumbered="true" type="warning"><p>XYZ</p></admonition>
-      </foreword></preface>
-          </iso-standard>
-    INPUT
-    presxml = <<~OUTPUT
-            <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-          <preface>
-              <clause type="toc" id="_" displayorder="1">
-        <title depth="1">Table of contents</title>
-      </clause>
-            <foreword displayorder='2'>
-              <note id='FB' coverpage='true' unnumbered='true'>
-                 <name>NOTE</name>
-                 <p>XYZ</p>
-               </note>
-               <admonition id='FC' coverpage='true' unnumbered='true' type='warning'>
-                 <name>WARNING</name>
-                 <p>XYZ</p>
-               </admonition>
-            </foreword>
-          </preface>
-        </iso-standard>
-    OUTPUT
-    html = <<~OUTPUT
-      #{HTML_HDR}
-            <br/>
-            <div>
-              <h1 class='ForewordTitle'>Foreword</h1>
-                <div id='FB' class='Note' coverpage='true'>
-                 <p>
-                   <span class='note_label'>NOTE</span>
-                   &#160; XYZ
-                 </p>
-               </div>
-               <div id='FC' class='Admonition' coverpage='true'>
-                 <p class='AdmonitionTitle' style='text-align:center;'>WARNING</p>
-                 <p>XYZ</p>
-               </div>
-            </div>
-          </div>
-        </body>
-      </html>
-    OUTPUT
-    doc = <<~OUTPUT
-                <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
-            <head>
-                <style/>
-              </head>
-      <body lang='EN-US' link='blue' vlink='#954F72'>
-          <div class='WordSection1'>
-            <p>&#160;</p>
-          </div>
-          <p class="section-break">
-            <br clear='all' class='section'/>
-          </p>
-          <div class='WordSection2'>
-            <p class="page-break">
-              <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-            </p>
-            <div class="TOC" id="_">
-        <p class="zzContents">Table of contents</p>
-      </div>
-      <p class="page-break">
-        <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-      </p>
-      <div>
-              <h1 class='ForewordTitle'>Foreword</h1>
-                <div id='FB' class='Note' coverpage='true'>
-                 <p class='Note'>
-                   <span class='note_label'>NOTE</span>
-                   <span style='mso-tab-count:1'>&#160; </span>
-                   XYZ
-                 </p>
-               </div>
-               <div id='FC' class='Admonition' coverpage='true'>
-                 <p class='AdmonitionTitle' style='text-align:center;'>WARNING</p>
-                 <p>XYZ</p>
-               </div>
-            </div>
-            <p>&#160;</p>
-          </div>
-          <p class="section-break">
-            <br clear='all' class='section'/>
-          </p>
-          <div class='WordSection3'>
-          </div>
-        </body>
-      </html>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({})
-      .convert("test", presxml, true)))).to be_equivalent_to xmlpp(html)
-    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
-      .convert("test", presxml, true)))).to be_equivalent_to xmlpp(doc)
-  end
-
-  it "numbers notes in tables and figures separately from notes outside them" do
-    input = <<~INPUT
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface><foreword>
-          <figure id="F"><note id="FB"><p>XYZ</p></note></figure>
-          <table id="T"><note id="TB"><p>XYZ</p></note></table>
-          <p id="A">ABC <note id="B"><p id="C">XYZ</p></note>
-      </foreword></preface>
-          </iso-standard>
-    INPUT
-    output = <<~OUTPUT
-            <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-          <preface>
-              <clause type="toc" id="_" displayorder="1">
-        <title depth="1">Table of contents</title>
-      </clause>
-            <foreword displayorder='2'>
-              <figure id='F'>
-                <name>Figure 1</name>
-                <note id='FB'>
-                  <name>NOTE</name>
-                  <p>XYZ</p>
-                </note>
-              </figure>
-              <table id='T'>
-                <name>Table 1</name>
-                <note id='TB'>
-                  <name>NOTE</name>
-                  <p>XYZ</p>
-                </note>
-              </table>
-              <p id='A'>
-                ABC
-                <note id='B'>
-                  <name>NOTE</name>
-                  <p id='C'>XYZ</p>
-                </note>
-              </p>
-            </foreword>
-          </preface>
-        </iso-standard>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .convert("test", input, true)))).to be_equivalent_to xmlpp(output)
-  end
-
   it "processes examples" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -919,199 +405,6 @@
       .convert("test", input, true)))).to be_equivalent_to xmlpp(output)
   end
 
-  it "processes admonitions" do
-    input = <<~INPUT
-          <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface><foreword>
-          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution" keep-with-next="true" keep-lines-together="true">
-        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-      </admonition>
-          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6b" type="caution" keep-with-next="true" keep-lines-together="true" notag="true">
-        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-      </admonition>
-          </foreword></preface>
-          </iso-standard>
-    INPUT
-    presxml = <<~INPUT
-          <iso-standard xmlns="http://riboseinc.com/isoxml" type='presentation'>
-          <preface>
-             <clause type="toc" id="_" displayorder="1">
-              <title depth="1">Table of contents</title>
-            </clause>
-          <foreword displayorder="2">
-          <admonition id="_" type="caution" keep-with-next="true" keep-lines-together="true">
-          <name>CAUTION</name>
-        <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-      </admonition>
-          <admonition id="_" type="caution" keep-with-next="true" keep-lines-together="true" notag="true">
-        <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-      </admonition>
-          </foreword></preface>
-          </iso-standard>
-    INPUT
-    output = <<~OUTPUT
-      #{HTML_HDR}
-      <br/>
-        <div>
-        <h1 class="ForewordTitle">Foreword</h1>
-        <div class="Admonition" id='_' style='page-break-after: avoid;page-break-inside: avoid;'><p class="AdmonitionTitle" style="text-align:center;">CAUTION</p>
-        <p id='_'>Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-        </div>
-        <div id='_' class='Admonition' style='page-break-after: avoid;page-break-inside: avoid;'>
-        <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-        </div>
-        </div>
-        </div>
-        </body>
-      </html>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
-  end
-
-  it "processes empty admonitions" do
-    input = <<~INPUT
-          <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface><foreword>
-          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
-      </admonition>
-          </foreword></preface>
-          </iso-standard>
-    INPUT
-    presxml = <<~OUTPUT
-      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
-        <preface>
-          <clause type="toc" id="_" displayorder="1">
-            <title depth="1">Table of contents</title>
-          </clause>
-          <foreword displayorder="2">
-            <admonition id="_" type="caution">
-              <name>CAUTION</name>
-            </admonition>
-          </foreword>
-        </preface>
-      </iso-standard>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-        .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
-  end
-
-  it "processes admonitions with titles" do
-    input = <<~INPUT
-          <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface><foreword>
-          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
-          <name>Title</name>
-        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-      </admonition>
-          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6b" type="caution" notag="true">
-          <name>Title</name>
-        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-      </admonition>
-          </foreword></preface>
-          </iso-standard>
-    INPUT
-    presxml = <<~INPUT
-          <iso-standard xmlns="http://riboseinc.com/isoxml" type='presentation'>
-          <preface>
-             <clause type="toc" id="_" displayorder="1">
-              <title depth="1">Table of contents</title>
-            </clause>
-          <foreword displayorder="2">
-          <admonition id="_" type="caution">
-          <name>Title</name>
-        <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-      </admonition>
-          <admonition id="_" type="caution" notag="true">
-          <name>Title</name>
-        <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-      </admonition>
-          </foreword></preface>
-          </iso-standard>
-    INPUT
-    output = <<~OUTPUT
-      #{HTML_HDR}
-                  <br/>
-                  <div>
-                    <h1 class="ForewordTitle">Foreword</h1>
-                    <div class="Admonition" id="_">
-                             <p class='AdmonitionTitle' style='text-align:center;'>Title</p>
-         <p id='_'>Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-       </div>
-       <div id='_' class='Admonition'>
-         <p class='AdmonitionTitle' style='text-align:center;'>Title</p>
-            <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-          </div>
-                  </div>
-                </div>
-              </body>
-          </html>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
-  end
-
-  it "processes box admonitions" do
-    input = <<~INPUT
-          <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface><foreword>
-          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="box">
-          <name>Title</name>
-        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-      </admonition>
-          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6b" type="box" notag="true">
-        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-      </admonition>
-          </foreword></preface>
-          </iso-standard>
-    INPUT
-    presxml = <<~INPUT
-      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
-         <preface>
-             <clause type="toc" id="_" displayorder="1">
-              <title depth="1">Table of contents</title>
-            </clause>
-           <foreword displayorder="2">
-             <admonition id="_" type="box">
-               <name>Box  1 — Title</name>
-               <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-             </admonition>
-             <admonition id="_" type="box" notag="true">
-               <name>Box  2</name>
-               <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-             </admonition>
-           </foreword>
-         </preface>
-       </iso-standard>
-    INPUT
-    output = <<~OUTPUT
-      #{HTML_HDR}
-             <br/>
-             <div>
-               <h1 class="ForewordTitle">Foreword</h1>
-               <div id="_" class="Admonition">
-                 <p class="AdmonitionTitle" style="text-align:center;">Box  1 — Title</p>
-                 <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-               </div>
-               <div id="_" class="Admonition">
-                 <p class="AdmonitionTitle" style="text-align:center;">Box  2</p>
-                 <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-               </div>
-             </div>
-           </div>
-         </body>
-       </html>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .convert("test", input, true)))).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
-  end
-
   it "processes formulae" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
diff --git a/spec/isodoc/inline_spec.rb b/spec/isodoc/inline_spec.rb
index 52fac4d1..99cbf7bd 100644
--- a/spec/isodoc/inline_spec.rb
+++ b/spec/isodoc/inline_spec.rb
@@ -763,7 +763,7 @@
                    <p>
          <span class="stem">(#(&lt;A&gt;)#)</span>
          <span class="stem">(#(&lt;A&gt;)#)</span>
-         <span class="stem"><m:math>
+         <span class="stem"><m:math xmlns:m="http://www.w3.org/1998/Math/MathML">
            <m:row>X</m:row>
          </m:math></span>
          <span class="stem">Latex?</span>
diff --git a/spec/isodoc/presentation_xml_maths_spec.rb b/spec/isodoc/presentation_xml_maths_spec.rb
new file mode 100644
index 00000000..2ea1d7fa
--- /dev/null
+++ b/spec/isodoc/presentation_xml_maths_spec.rb
@@ -0,0 +1,532 @@
+require "spec_helper"
+RSpec.describe IsoDoc do
+  it "localises numbers in MathML" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata>
+           <title language="en">test</title>
+           </bibdata>
+           <preface>
+           <p>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>64212149677264515</mn></math></stem>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>642121496772645.15</mn></math></stem>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
+           </preface>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <bibdata>
+          <title language='en'>test</title>
+        </bibdata>
+        <preface>
+          <clause type="toc" id="_" displayorder="1"> <title depth="1">Table of contents</title> </clause>
+          <p displayorder="2">
+            64,212,149,677,264,515
+            642,121,496,772,645.15 30,000
+            <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1,000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1,000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math><asciimath>P (X ge X_(max)) = sum_(j = X_(max))^(1000) ([[1000], [j]]) p^(j) (1 - p)^(1.003 - j)</asciimath></stem></p>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  context "when twitter_cldr_localiser_symbols has additional options" do
+    let(:input) do
+      <<~INPUT
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata>
+            <title language="en">test</title>
+          </bibdata>
+          <preface>
+            <p>
+              <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
+              <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML">
+              <mi>P</mi>
+              <mfenced open="(" close=")">
+                <mrow>
+                  <mi>X</mi>
+                  <mo>≥</mo>
+                  <msub>
+                    <mrow>
+                      <mi>X</mi>
+                    </mrow>
+                    <mrow>
+                      <mo>max</mo>
+                    </mrow>
+                  </msub>
+                </mrow>
+              </mfenced>
+              <mo>=</mo>
+              <munderover>
+                <mrow>
+                  <mo>∑</mo>
+                </mrow>
+                <mrow>
+                  <mrow>
+                    <mi>j</mi>
+                    <mo>=</mo>
+                    <msub>
+                      <mrow>
+                        <mi>X</mi>
+                      </mrow>
+                      <mrow>
+                        <mo>max</mo>
+                      </mrow>
+                    </msub>
+                  </mrow>
+                </mrow>
+                <mrow>
+                  <mn>1000</mn>
+                </mrow>
+              </munderover>
+              <mfenced open="(" close=")">
+                <mtable>
+                  <mtr>
+                    <mtd>
+                      <mn>1000</mn>
+                    </mtd>
+                  </mtr>
+                  <mtr>
+                    <mtd>
+                      <mi>j</mi>
+                    </mtd>
+                  </mtr>
+                </mtable>
+              </mfenced>
+              <msup>
+                <mrow>
+                  <mi>p</mi>
+                </mrow>
+                <mrow>
+                  <mi>j</mi>
+                </mrow>
+              </msup>
+              <msup>
+                <mrow>
+                  <mfenced open="(" close=")">
+                    <mrow>
+                      <mn>1</mn>
+                      <mo>−</mo>
+                      <mi>p</mi>
+                    </mrow>
+                  </mfenced>
+                </mrow>
+                <mrow>
+                  <mrow>
+                    <mn>1.003</mn>
+                    <mo>−</mo>
+                    <mi>j</mi>
+                  </mrow>
+                </mrow>
+              </msup>
+              <msup>
+                <mrow>
+                  <mfenced open="(" close=")">
+                    <mrow>
+                      <mn>1</mn>
+                      <mo>−</mo>
+                      <mi>p</mi>
+                    </mrow>
+                  </mfenced>
+                </mrow>
+                <mrow>
+                  <mrow>
+                    <mn>459384.123456789</mn>
+                    <mo>−</mo>
+                    <mi>j</mi>
+                  </mrow>
+                </mrow>
+              </msup>
+            </math></stem>
+          </p>
+          </preface>
+        </iso-standard>
+      INPUT
+    end
+    let(:output) do
+      <<~OUTPUT
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+          <bibdata>
+            <title language='en'>test</title>
+          </bibdata>
+
+          <preface>
+              <clause type="toc" id="_" displayorder="1"> <title depth="1">Table of contents</title> </clause>
+            <p displayorder="2">
+              30,000
+              <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1,000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1,000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.00'3</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>459,384.12'34'56</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math><asciimath>P (X ge X_(max)) = sum_(j = X_(max))^(1000) ([[1000], [j]]) p^(j) (1 - p)^(1.003 - j) (1 - p)^(459384.123456789 - j)</asciimath></stem>
+            </p>
+          </preface>
+        </iso-standard>
+      OUTPUT
+    end
+    let(:additional_symbols) do
+      {
+        fraction_group_digits: 2,
+        fraction_group: "'",
+        precision: 5,
+      }
+    end
+
+    before do
+      allow_any_instance_of(IsoDoc::PresentationXMLConvert)
+        .to(receive(:twitter_cldr_localiser_symbols)
+        .and_return(additional_symbols))
+    end
+
+    it "Supports twitter_cldr_localiser_symbols fraction options" do
+      expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+        .convert("test", input, true))
+        .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+        .to(be_equivalent_to(xmlpp(output)))
+    end
+  end
+
+  it "localises numbers in MathML in French" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata>
+           <title language="en">test</title>
+           <language>fr</language>
+           </bibdata>
+           <preface>
+           <p><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
+           </preface>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <bibdata>
+          <title language='en'>test</title>
+          <language current='true'>fr</language>
+        </bibdata>
+        <preface>
+            <clause type="toc" id="_" displayorder="1">
+          <title depth="1">Sommaire</title>
+          </clause>
+          <p displayorder="2">
+            30&#x202F;000
+             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1 000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1 000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1,003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math><asciimath>P (X ge X_(max)) = sum_(j = X_(max))^(1000) ([[1000], [j]]) p^(j) (1 - p)^(1.003 - j)</asciimath></stem></p>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "customises localisation of numbers" do
+    mock_symbols
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata>
+           <title language="en">test</title>
+           <language>fr</language>
+           </bibdata>
+           <preface>
+           <p><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>0.0000032</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
+           </preface>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+             <bibdata>
+               <title language='en'>test</title>
+               <language current='true'>fr</language>
+             </bibdata>
+
+             <preface>
+                 <clause type="toc" id="_" displayorder="1"> <title depth="1">Sommaire</title> </clause>
+               <p displayorder="2">
+                 30'000
+                 <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1'000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1'000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>0,0000032</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1,003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math><asciimath>P (X ge X_(max)) = sum_(j = X_(max))^(1000) ([[1000], [j]]) p^(j) (0.0000032 - p)^(1.003 - j)</asciimath></stem></p>
+             </preface>
+           </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  context "overrides localisation of numbers in MathML" do
+    it "overrides localisation of numbers in MathML, with no grouping of digits" do
+      input = <<~INPUT
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata>
+             <title language="en">test</title>
+             <language>de</language>
+             </bibdata>
+             <preface>
+             <p>
+             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>...</mn></math></stem>
+             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>64212149677264515</mn></math></stem>
+             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>642121496772.64515</mn></math></stem>
+             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
+             </preface>
+        </iso-standard>
+      INPUT
+      output2 = <<~OUTPUT
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+           <bibdata>
+             <title language='en'>test</title>
+             <language current='true'>de</language>
+           </bibdata>
+
+           <preface>
+              <clause type="toc" id="_" displayorder="1"> <title depth="1">Inhaltsübersicht</title> </clause>
+             <p displayorder='2'> ... 64212149677264515 642121496772;64515 30000 </p>
+           </preface>
+         </iso-standard>
+      OUTPUT
+      TwitterCldr.reset_locale_fallbacks
+      expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert
+        .new({ localizenumber: "##0;###" }
+        .merge(presxml_options))
+          .convert("test", input, true))
+          .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+        .to be_equivalent_to xmlpp(output2)
+    end
+  end
+
+  context "overrides localisation of numbers in MathML" do
+    it "overrides localisation of numbers in MathML with grouping of digits" do
+      input = <<~INPUT
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata>
+             <title language="en">test</title>
+             </bibdata>
+             <preface>
+             <p>
+             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>...</mn></math></stem>
+             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>64212149677264515</mn></math></stem>
+             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>642121496772.64515</mn></math></stem>
+             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
+             </preface>
+        </iso-standard>
+      INPUT
+      output1 = <<~OUTPUT
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+           <bibdata>
+             <title language='en'>test</title>
+           </bibdata>
+           <preface>
+              <clause type="toc" id="_" displayorder="1"> <title depth="1">Table of contents</title> </clause>
+             <p displayorder='2'> ... 64=212=149=677=264=515 642=121=496=772;64$51$5 30=000 </p>
+           </preface>
+         </iso-standard>
+      OUTPUT
+      TwitterCldr.reset_locale_fallbacks
+      expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert
+    .new({ localizenumber: "#=#0;##$#" }
+        .merge(presxml_options))
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+        .to be_equivalent_to xmlpp(output1)
+    end
+  end
+
+  it "propagates boldface into MathML" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+                <preface><foreword>
+                <note>
+                <strong><stem type="MathML">
+        <math xmlns="http://www.w3.org/1998/Math/MathML">
+          <mfenced open="[" close="]">
+            <mrow>
+              <mi>a</mi>
+              <mo>,</mo>
+              <mi>b</mi>
+            </mrow>
+          </mfenced>
+        </math>
+        <asciimath>[a,b]</asciimath>
+      </stem></strong>
+      <stem type="MathML">
+        <math xmlns="http://www.w3.org/1998/Math/MathML">
+          <mfenced open="[" close="]">
+            <mrow>
+              <mi>a</mi>
+              <mo>,</mo>
+              <mi>b</mi>
+            </mrow>
+          </mfenced>
+        </math>
+        <asciimath>[a,b]</asciimath>
+      </stem>
+            </note>
+                </foreword></preface>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+        <preface>
+              <clause type="toc" id="_" displayorder="1"> <title depth="1">Table of contents</title> </clause>
+          <foreword displayorder="2">
+            <note>
+              <name>NOTE</name>
+              <strong>
+                <stem type="MathML">
+                  <math xmlns="http://www.w3.org/1998/Math/MathML">
+                    <mstyle mathvariant="bold">
+                      <mfenced open="[" close="]">
+                        <mrow>
+                          <mi>a</mi>
+                          <mo>,</mo>
+                          <mi>b</mi>
+                        </mrow>
+                      </mfenced>
+                    </mstyle>
+                  </math>
+                  <asciimath>[a,b]</asciimath>
+                </stem>
+              </strong>
+              <stem type="MathML">
+                <math xmlns="http://www.w3.org/1998/Math/MathML">
+                  <mfenced open="[" close="]">
+                    <mrow>
+                      <mi>a</mi>
+                      <mo>,</mo>
+                      <mi>b</mi>
+                    </mrow>
+                  </mfenced>
+                </math>
+                <asciimath>[a,b]</asciimath>
+              </stem>
+            </note>
+          </foreword>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+      .to be_equivalent_to xmlpp(presxml)
+  end
+
+  it "processes line breaks in MathML" do
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <sections><clause>
+      <formula id="_68a2b111-3543-80c0-2547-52e466ca633c"><stem type="MathML" block="true"><math xmlns="http://www.w3.org/1998/Math/MathML">
+        <mstyle displaystyle="true">
+          <mi>x</mi>
+          <mo>=</mo>
+          <mo linebreak="newline"/>
+          <mi>y</mi>
+        </mstyle>
+      </math>
+      <asciimath>x = \
+      y</asciimath></stem></formula>
+      </clause></sections>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+         <preface>
+           <clause type="toc" id="_" displayorder="1">
+             <title depth="1">Table of contents</title>
+           </clause>
+           </preface>
+                    <sections>
+           <clause displayorder="2">
+             <formula id="_">
+               <name>1</name>
+               <stem type="MathML" block="true">
+                 <math-with-linebreak>
+                   <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
+                     <mstyle displaystyle="true">
+                       <mrow>
+                         <mi>x</mi>
+                         <mo>=</mo>
+                       </mrow>
+                     </mstyle>
+                   </math>
+                   <asciimath>x =</asciimath>
+                   <br/>
+                   <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
+                     <mstyle displaystyle="true">
+                       <mi>y</mi>
+                     </mstyle>
+                   </math>
+                 </math-with-linebreak>
+                 <math-no-linebreak>
+                   <math xmlns="http://www.w3.org/1998/Math/MathML">
+                     <mstyle displaystyle="true">
+                       <mi>x</mi>
+                       <mo>=</mo>
+                       <mo linebreak="newline"/>
+                       <mi>y</mi>
+                     </mstyle>
+                   </math>
+                   <asciimath>x = \\
+         y</asciimath>
+                 </math-no-linebreak>
+                 <asciimath>x = y</asciimath>
+               </stem>
+             </formula>
+           </clause>
+         </sections>
+       </iso-standard>
+    OUTPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+             <div>
+               <h1/>
+               <div id="_">
+                 <div class="formula">
+                    <p><span class="stem"><math xmlns="http://www.w3.org/1998/Math/MathML"><mstyle displaystyle="true"><mi>x</mi><mo>=</mo><mo linebreak="newline"/><mi>y</mi></mstyle></math></span>  (1)</p>
+                 </div>
+               </div>
+             </div>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    word = <<~OUTPUT
+      #{WORD_HDR}
+                 <div>
+               <h1/>
+               <div id="_">
+                 <div class="formula">
+                 <p><span class="stem"><math xmlns="http://www.w3.org/1998/Math/MathML"><mstyle displaystyle="true"><mi>x</mi><mo>=</mo><mo linebreak="newline"/><mi>y</mi></mstyle></math></span><span style="mso-tab-count:1">  </span>(1)</p>
+                 </div>
+               </div>
+             </div>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    output = IsoDoc::PresentationXMLConvert.new(presxml_options
+      .merge(output_formats: { html: "html", doc: "doc" }))
+      .convert("test", input, true)
+    expect(xmlpp(strip_guid(output)
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")
+      .gsub(%r{<metanorma-extension>.*</metanorma-extension>}m, "")))
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({})
+      .convert("test", output, true))))
+      .to be_equivalent_to xmlpp(html)
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
+      .convert("test", output, true))))
+      .to be_equivalent_to xmlpp(word)
+  end
+
+  private
+
+  def mock_symbols
+    allow_any_instance_of(IsoDoc::PresentationXMLConvert)
+      .to receive(:twitter_cldr_localiser_symbols).and_return(group: "'")
+  end
+end
diff --git a/spec/isodoc/presentation_xml_spec.rb b/spec/isodoc/presentation_xml_spec.rb
index 1cb93ce5..731eb317 100644
--- a/spec/isodoc/presentation_xml_spec.rb
+++ b/spec/isodoc/presentation_xml_spec.rb
@@ -53,340 +53,6 @@
       .to be_equivalent_to xmlpp(output)
   end
 
-  it "localises numbers in MathML" do
-    input = <<~INPUT
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-      <bibdata>
-           <title language="en">test</title>
-           </bibdata>
-           <preface>
-           <p>
-           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>64212149677264515</mn></math></stem>
-           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>642121496772645.15</mn></math></stem>
-           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
-           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
-           </preface>
-      </iso-standard>
-    INPUT
-    output = <<~OUTPUT
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-        <bibdata>
-          <title language='en'>test</title>
-        </bibdata>
-        <preface>
-          <clause type="toc" id="_" displayorder="1"> <title depth="1">Table of contents</title> </clause>
-          <p displayorder="2">
-            64,212,149,677,264,515
-            642,121,496,772,645.15 30,000
-            <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1,000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1,000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math><asciimath>P (X ge X_(max)) = sum_(j = X_(max))^(1000) ([[1000], [j]]) p^(j) (1 - p)^(1.003 - j)</asciimath></stem></p>
-        </preface>
-      </iso-standard>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .convert("test", input, true))
-      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
-      .to be_equivalent_to xmlpp(output)
-  end
-
-  context "when twitter_cldr_localiser_symbols has additional options" do
-    let(:input) do
-      <<~INPUT
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <bibdata>
-            <title language="en">test</title>
-          </bibdata>
-          <preface>
-            <p>
-              <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
-              <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML">
-              <mi>P</mi>
-              <mfenced open="(" close=")">
-                <mrow>
-                  <mi>X</mi>
-                  <mo>≥</mo>
-                  <msub>
-                    <mrow>
-                      <mi>X</mi>
-                    </mrow>
-                    <mrow>
-                      <mo>max</mo>
-                    </mrow>
-                  </msub>
-                </mrow>
-              </mfenced>
-              <mo>=</mo>
-              <munderover>
-                <mrow>
-                  <mo>∑</mo>
-                </mrow>
-                <mrow>
-                  <mrow>
-                    <mi>j</mi>
-                    <mo>=</mo>
-                    <msub>
-                      <mrow>
-                        <mi>X</mi>
-                      </mrow>
-                      <mrow>
-                        <mo>max</mo>
-                      </mrow>
-                    </msub>
-                  </mrow>
-                </mrow>
-                <mrow>
-                  <mn>1000</mn>
-                </mrow>
-              </munderover>
-              <mfenced open="(" close=")">
-                <mtable>
-                  <mtr>
-                    <mtd>
-                      <mn>1000</mn>
-                    </mtd>
-                  </mtr>
-                  <mtr>
-                    <mtd>
-                      <mi>j</mi>
-                    </mtd>
-                  </mtr>
-                </mtable>
-              </mfenced>
-              <msup>
-                <mrow>
-                  <mi>p</mi>
-                </mrow>
-                <mrow>
-                  <mi>j</mi>
-                </mrow>
-              </msup>
-              <msup>
-                <mrow>
-                  <mfenced open="(" close=")">
-                    <mrow>
-                      <mn>1</mn>
-                      <mo>−</mo>
-                      <mi>p</mi>
-                    </mrow>
-                  </mfenced>
-                </mrow>
-                <mrow>
-                  <mrow>
-                    <mn>1.003</mn>
-                    <mo>−</mo>
-                    <mi>j</mi>
-                  </mrow>
-                </mrow>
-              </msup>
-              <msup>
-                <mrow>
-                  <mfenced open="(" close=")">
-                    <mrow>
-                      <mn>1</mn>
-                      <mo>−</mo>
-                      <mi>p</mi>
-                    </mrow>
-                  </mfenced>
-                </mrow>
-                <mrow>
-                  <mrow>
-                    <mn>459384.123456789</mn>
-                    <mo>−</mo>
-                    <mi>j</mi>
-                  </mrow>
-                </mrow>
-              </msup>
-            </math></stem>
-          </p>
-          </preface>
-        </iso-standard>
-      INPUT
-    end
-    let(:output) do
-      <<~OUTPUT
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-          <bibdata>
-            <title language='en'>test</title>
-          </bibdata>
-
-          <preface>
-              <clause type="toc" id="_" displayorder="1"> <title depth="1">Table of contents</title> </clause>
-            <p displayorder="2">
-              30,000
-              <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1,000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1,000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.00'3</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>459,384.12'34'56</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math><asciimath>P (X ge X_(max)) = sum_(j = X_(max))^(1000) ([[1000], [j]]) p^(j) (1 - p)^(1.003 - j) (1 - p)^(459384.123456789 - j)</asciimath></stem>
-            </p>
-          </preface>
-        </iso-standard>
-      OUTPUT
-    end
-    let(:additional_symbols) do
-      {
-        fraction_group_digits: 2,
-        fraction_group: "'",
-        precision: 5,
-      }
-    end
-
-    before do
-      allow_any_instance_of(IsoDoc::PresentationXMLConvert)
-        .to(receive(:twitter_cldr_localiser_symbols)
-        .and_return(additional_symbols))
-    end
-
-    it "Supports twitter_cldr_localiser_symbols fraction options" do
-      expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-        .convert("test", input, true))
-        .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
-        .to(be_equivalent_to(xmlpp(output)))
-    end
-  end
-
-  it "localises numbers in MathML in French" do
-    input = <<~INPUT
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-      <bibdata>
-           <title language="en">test</title>
-           <language>fr</language>
-           </bibdata>
-           <preface>
-           <p><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math>
-           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
-           </preface>
-      </iso-standard>
-    INPUT
-    output = <<~OUTPUT
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-        <bibdata>
-          <title language='en'>test</title>
-          <language current='true'>fr</language>
-        </bibdata>
-        <preface>
-            <clause type="toc" id="_" displayorder="1">
-          <title depth="1">Sommaire</title>
-          </clause>
-          <p displayorder="2">
-            30&#x202F;000
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1 000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1 000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1,003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math><asciimath>P (X ge X_(max)) = sum_(j = X_(max))^(1000) ([[1000], [j]]) p^(j) (1 - p)^(1.003 - j)</asciimath></stem></p>
-        </preface>
-      </iso-standard>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .convert("test", input, true))
-      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
-      .to be_equivalent_to xmlpp(output)
-  end
-
-  it "customises localisation of numbers" do
-    mock_symbols
-    input = <<~INPUT
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-      <bibdata>
-           <title language="en">test</title>
-           <language>fr</language>
-           </bibdata>
-           <preface>
-           <p><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
-           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>0.0000032</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
-           </preface>
-      </iso-standard>
-    INPUT
-    output = <<~OUTPUT
-      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-             <bibdata>
-               <title language='en'>test</title>
-               <language current='true'>fr</language>
-             </bibdata>
-
-             <preface>
-                 <clause type="toc" id="_" displayorder="1"> <title depth="1">Sommaire</title> </clause>
-               <p displayorder="2">
-                 30'000
-                 <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1'000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1'000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>0,0000032</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1,003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math><asciimath>P (X ge X_(max)) = sum_(j = X_(max))^(1000) ([[1000], [j]]) p^(j) (0.0000032 - p)^(1.003 - j)</asciimath></stem></p>
-             </preface>
-           </iso-standard>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .convert("test", input, true))
-      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
-      .to be_equivalent_to xmlpp(output)
-  end
-
-  context "overrides localisation of numbers in MathML" do
-    it "overrides localisation of numbers in MathML, with no grouping of digits" do
-      input = <<~INPUT
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <bibdata>
-             <title language="en">test</title>
-             <language>de</language>
-             </bibdata>
-             <preface>
-             <p>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>...</mn></math></stem>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>64212149677264515</mn></math></stem>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>642121496772.64515</mn></math></stem>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
-             </preface>
-        </iso-standard>
-      INPUT
-      output2 = <<~OUTPUT
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-           <bibdata>
-             <title language='en'>test</title>
-             <language current='true'>de</language>
-           </bibdata>
-
-           <preface>
-              <clause type="toc" id="_" displayorder="1"> <title depth="1">Inhaltsübersicht</title> </clause>
-             <p displayorder='2'> ... 64212149677264515 642121496772;64515 30000 </p>
-           </preface>
-         </iso-standard>
-      OUTPUT
-      TwitterCldr.reset_locale_fallbacks
-      expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert
-        .new({ localizenumber: "##0;###" }
-        .merge(presxml_options))
-          .convert("test", input, true))
-          .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
-        .to be_equivalent_to xmlpp(output2)
-    end
-  end
-
-  context "overrides localisation of numbers in MathML" do
-    it "overrides localisation of numbers in MathML with grouping of digits" do
-      input = <<~INPUT
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <bibdata>
-             <title language="en">test</title>
-             </bibdata>
-             <preface>
-             <p>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>...</mn></math></stem>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>64212149677264515</mn></math></stem>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>642121496772.64515</mn></math></stem>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
-             </preface>
-        </iso-standard>
-      INPUT
-      output1 = <<~OUTPUT
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-           <bibdata>
-             <title language='en'>test</title>
-           </bibdata>
-           <preface>
-              <clause type="toc" id="_" displayorder="1"> <title depth="1">Table of contents</title> </clause>
-             <p displayorder='2'> ... 64=212=149=677=264=515 642=121=496=772;64$51$5 30=000 </p>
-           </preface>
-         </iso-standard>
-      OUTPUT
-      TwitterCldr.reset_locale_fallbacks
-      expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert
-    .new({ localizenumber: "#=#0;##$#" }
-        .merge(presxml_options))
-      .convert("test", input, true))
-      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
-        .to be_equivalent_to xmlpp(output1)
-    end
-  end
-
   it "resolve address components" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -1557,87 +1223,6 @@
       .to be_equivalent_to xmlpp(presxml)
   end
 
-  it "propagates boldface into MathML" do
-    FileUtils.rm_f "test.doc"
-    FileUtils.rm_f "test.html"
-    input = <<~INPUT
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-                <preface><foreword>
-                <note>
-                <strong><stem type="MathML">
-        <math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mfenced open="[" close="]">
-            <mrow>
-              <mi>a</mi>
-              <mo>,</mo>
-              <mi>b</mi>
-            </mrow>
-          </mfenced>
-        </math>
-        <asciimath>[a,b]</asciimath>
-      </stem></strong>
-      <stem type="MathML">
-        <math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mfenced open="[" close="]">
-            <mrow>
-              <mi>a</mi>
-              <mo>,</mo>
-              <mi>b</mi>
-            </mrow>
-          </mfenced>
-        </math>
-        <asciimath>[a,b]</asciimath>
-      </stem>
-            </note>
-                </foreword></preface>
-      </iso-standard>
-    INPUT
-    presxml = <<~OUTPUT
-          <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
-        <preface>
-              <clause type="toc" id="_" displayorder="1"> <title depth="1">Table of contents</title> </clause>
-          <foreword displayorder="2">
-            <note>
-              <name>NOTE</name>
-              <strong>
-                <stem type="MathML">
-                  <math xmlns="http://www.w3.org/1998/Math/MathML">
-                    <mstyle mathvariant="bold">
-                      <mfenced open="[" close="]">
-                        <mrow>
-                          <mi>a</mi>
-                          <mo>,</mo>
-                          <mi>b</mi>
-                        </mrow>
-                      </mfenced>
-                    </mstyle>
-                  </math>
-                  <asciimath>[a,b]</asciimath>
-                </stem>
-              </strong>
-              <stem type="MathML">
-                <math xmlns="http://www.w3.org/1998/Math/MathML">
-                  <mfenced open="[" close="]">
-                    <mrow>
-                      <mi>a</mi>
-                      <mo>,</mo>
-                      <mi>b</mi>
-                    </mrow>
-                  </mfenced>
-                </math>
-                <asciimath>[a,b]</asciimath>
-              </stem>
-            </note>
-          </foreword>
-        </preface>
-      </iso-standard>
-    OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .convert("test", input, true))
-      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
-      .to be_equivalent_to xmlpp(presxml)
-  end
-
   it "sorts preface sections" do
     input = <<~INPUT
       <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic">
@@ -1874,7 +1459,7 @@
             <p>
             <passthrough formats="html">A</passthrough>
             <passthrough formats="word,html">A</passthrough>
-            <passthrough formats="word,html,pdf">A</passthrough>
+            <passthrough formats="word,html,other">A</passthrough>
             <passthrough>A</passthrough>
             <passthrough formats="all">A</passthrough>
             </p>
@@ -1882,8 +1467,8 @@
     INPUT
     presxml = <<~OUTPUT
       <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="presentation">
-        <metanorma-extension>
-           <render>
+         <metanorma-extension>
+                    <render>
              <preprocess-xslt format="html">
                <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
                  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
@@ -1896,12 +1481,28 @@
                    <xsl:if test="contains(@formats,',html,')">
                      <!-- delimited -->
                      <xsl:copy>
-                     <xsl:apply-templates select="@* | node()"/>
+                       <xsl:apply-templates select="@* | node()"/>
                      </xsl:copy>
                    </xsl:if>
                  </xsl:template>
                </xsl:stylesheet>
              </preprocess-xslt>
+             <preprocess-xslt format="html">
+               <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+                 <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
+                 <xsl:template match="@* | node()">
+                   <xsl:copy>
+                     <xsl:apply-templates select="@* | node()"/>
+                   </xsl:copy>
+                 </xsl:template>
+                 <xsl:template match="*[local-name() = 'math-with-linebreak']">
+
+       </xsl:template>
+                 <xsl:template match="*[local-name() = 'math-no-linebreak']">
+                     <xsl:apply-templates select="node()"/>
+                 </xsl:template>
+               </xsl:stylesheet>
+             </preprocess-xslt>
              <preprocess-xslt format="doc">
                <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
                  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
@@ -1914,38 +1515,85 @@
                    <xsl:if test="contains(@formats,',doc,')">
                      <!-- delimited -->
                      <xsl:copy>
+                       <xsl:apply-templates select="@* | node()"/>
+                     </xsl:copy>
+                   </xsl:if>
+                 </xsl:template>
+               </xsl:stylesheet>
+             </preprocess-xslt>
+             <preprocess-xslt format="doc">
+               <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+                 <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
+                 <xsl:template match="@* | node()">
+                   <xsl:copy>
                      <xsl:apply-templates select="@* | node()"/>
+                   </xsl:copy>
+                 </xsl:template>
+                 <xsl:template match="*[local-name() = 'math-with-linebreak']">
+
+       </xsl:template>
+                 <xsl:template match="*[local-name() = 'math-no-linebreak']">
+                     <xsl:apply-templates select="node()"/>
+                 </xsl:template>
+               </xsl:stylesheet>
+             </preprocess-xslt>
+             <preprocess-xslt format="pdf">
+               <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+                 <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
+                 <xsl:template match="@* | node()">
+                   <xsl:copy>
+                     <xsl:apply-templates select="@* | node()"/>
+                   </xsl:copy>
+                 </xsl:template>
+                 <xsl:template match="*[local-name() = 'passthrough']">
+                   <xsl:if test="contains(@formats,',pdf,')">
+                     <!-- delimited -->
+                     <xsl:copy>
+                       <xsl:apply-templates select="@* | node()"/>
                      </xsl:copy>
                    </xsl:if>
                  </xsl:template>
                </xsl:stylesheet>
              </preprocess-xslt>
+             <preprocess-xslt format="pdf">
+               <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+                 <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
+                 <xsl:template match="@* | node()">
+                   <xsl:copy>
+                     <xsl:apply-templates select="@* | node()"/>
+                   </xsl:copy>
+                 </xsl:template>
+                 <xsl:template match="*[local-name() = 'math-with-linebreak']">
+
+       </xsl:template>
+                 <xsl:template match="*[local-name() = 'math-no-linebreak']">
+                     <xsl:apply-templates select="node()"/>
+                 </xsl:template>
+               </xsl:stylesheet>
+             </preprocess-xslt>
            </render>
          </metanorma-extension>
-       <preface><clause type="toc" id="_" displayorder="1"><title depth="1">Table of contents</title></clause>
-          <foreword id="A" displayorder="2">
+         <preface>
+           <clause type="toc" id="_" displayorder="1">
+             <title depth="1">Table of contents</title>
+           </clause>
+           <foreword id="A" displayorder="2">
              <p>
                <passthrough formats=",html,">A</passthrough>
                <passthrough formats=",word,html,">A</passthrough>
-               <passthrough formats=",word,html,pdf,">A</passthrough>
-               <passthrough formats=",html,doc,">A</passthrough>
-               <passthrough formats=",html,doc,">A</passthrough>
+               <passthrough formats=",word,html,other,">A</passthrough>
+               <passthrough formats=",html,doc,pdf,">A</passthrough>
+               <passthrough formats=",html,doc,pdf,">A</passthrough>
              </p>
            </foreword>
          </preface>
        </standard-document>
     OUTPUT
     expect(xmlpp(strip_guid(IsoDoc::PresentationXMLConvert
-      .new(presxml_options.merge(output_formats: { html: "html", doc: "doc" }))
+      .new(presxml_options
+      .merge(output_formats: { html: "html", doc: "doc", pdf: "pdf" }))
       .convert("test", input, true))
        .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
       .to be_equivalent_to xmlpp(presxml)
   end
-
-  private
-
-  def mock_symbols
-    allow_any_instance_of(IsoDoc::PresentationXMLConvert)
-      .to receive(:twitter_cldr_localiser_symbols).and_return(group: "'")
-  end
 end
diff --git a/spec/isodoc/section_spec.rb b/spec/isodoc/section_spec.rb
index f283a09d..c5ba189d 100644
--- a/spec/isodoc/section_spec.rb
+++ b/spec/isodoc/section_spec.rb
@@ -420,140 +420,140 @@
     PRESXML
 
     html = <<~"OUTPUT"
-      #{HTML_HDR}
-                           <div class='authority'>
-                         <div class='boilerplate-copyright'>
-                           <div>
-                             <h1>Copyright</h1>
-                           </div>
+       #{HTML_HDR}
+                    <div class='authority'>
+                  <div class='boilerplate-copyright'>
+                    <div>
+                      <h1>Copyright</h1>
+                    </div>
+                  </div>
+                  <div class='boilerplate-license'>
+                    <div>
+                      <h1>License</h1>
+                    </div>
+                  </div>
+                  <div class='boilerplate-legal'>
+                    <div>
+                      <h1>Legal</h1>
+                    </div>
+                  </div>
+                  <div class='boilerplate-feedback'>
+                    <div>
+                      <h1>Feedback</h1>
+                    </div>
+                  </div>
+                </div>
+                    <br/>
+                        <div>
+                        <h1 class="AbstractTitle">Abstract</h1>
+                        </div>
+                                <br/>
+                                <div>
+                                  <h1 class="ForewordTitle">Foreword</h1>
+                                  <p id="A">This is a preamble</p>
+                                </div>
+                                <br/>
+                                <div class="Section3" id="B">
+                                  <h1 class="IntroTitle">Introduction</h1>
+                                  <div id="C">
+                           <h2>Introduction Subsection</h2>
                          </div>
-                         <div class='boilerplate-license'>
-                           <div>
-                             <h1>License</h1>
-                           </div>
+                                </div>
+                                <br/>
+                <div class='Section3' id='B1'>
+                  <h1 class='IntroTitle'>Dedication</h1>
+                </div>
+                <br/>
+                <div class='Section3' id='B2'>
+                  <h1 class='IntroTitle'>Note to reader</h1>
+                </div>
+                                <br/>
+                <div class='Section3' id=''>
+                  <h1 class='IntroTitle'>Acknowledgements</h1>
+                </div>
+                                 <div id='NN1' class='Note'>
+                   <p>
+                   <span class='note_label'>NOTE</span>
+                     &#160; Initial note
+                   </p>
+                 </div>
+                 <div id='NN2' class='Admonition'>
+                   <p class='AdmonitionTitle' style='text-align:center;'>WARNING</p>
+                   <p>Initial admonition</p>
+                 </div>
+                                <div id="D">
+                                  <h1>1.&#160; Scope</h1>
+                                  <p id="E">Text</p>
+                                </div>
+                                <div>
+                                  <h1>2.&#160; Normative References</h1>
+                                </div>
+                                <div id="H"><h1>3.&#160; Terms, Definitions, Symbols and Abbreviated Terms</h1>
+                        <div id="I">
+                           <h2>3.1.&#160; Normal Terms</h2>
+                           <p class="TermNum" id="J">3.1.1.</p>
+                           <p class="Terms" style="text-align:left;"><b>Term2</b></p>
+                         </div><div id="K"><h2>3.2.&#160; Definitions</h2>
+                           <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
+                         </div></div>
+                                <div id="L" class="Symbols">
+                                  <h1>4.&#160; Symbols and abbreviated terms</h1>
+                                  <dl>
+                                    <dt>
+                                      <p>Symbol</p>
+                                    </dt>
+                                    <dd>Definition</dd>
+                                  </dl>
+                                </div>
+                                <div id="M">
+                                  <h1>5.&#160; Clause 4</h1>
+                                  <div id="N">
+                           <h2>5.1.&#160; Introduction</h2>
                          </div>
-                         <div class='boilerplate-legal'>
-                           <div>
-                             <h1>Legal</h1>
-                           </div>
+                                  <div id="O">
+                           <h2>5.2.&#160; Clause 4.2</h2>
                          </div>
-                         <div class='boilerplate-feedback'>
-                           <div>
-                             <h1>Feedback</h1>
-                           </div>
+                                  <div id="O1">
+                           <h2>5.3.</h2>
                          </div>
-                       </div>
-                           <br/>
-                               <div>
-                               <h1 class="AbstractTitle">Abstract</h1>
-                               </div>
-                                       <br/>
-                                       <div>
-                                         <h1 class="ForewordTitle">Foreword</h1>
-                                         <p id="A">This is a preamble</p>
-                                       </div>
-                                       <br/>
-                                       <div class="Section3" id="B">
-                                         <h1 class="IntroTitle">Introduction</h1>
-                                         <div id="C">
-                                  <h2>Introduction Subsection</h2>
-                                </div>
-                                       </div>
-                                       <br/>
-                       <div class='Section3' id='B1'>
-                         <h1 class='IntroTitle'>Dedication</h1>
-                       </div>
-                       <br/>
-                       <div class='Section3' id='B2'>
-                         <h1 class='IntroTitle'>Note to reader</h1>
-                       </div>
-                                       <br/>
-                       <div class='Section3' id=''>
-                         <h1 class='IntroTitle'>Acknowledgements</h1>
-                       </div>
-                                        <div id='NN1' class='Note'>
-                          <p>
-                          <span class='note_label'>NOTE</span>
-                            &#160; Initial note
-                          </p>
-                        </div>
-                        <div id='NN2' class='Admonition'>
-                          <p class='AdmonitionTitle' style='text-align:center;'>WARNING</p>
-                          <p>Initial admonition</p>
-                        </div>
-                                       <div id="D">
-                                         <h1>1.&#160; Scope</h1>
-                                         <p id="E">Text</p>
-                                       </div>
-                                       <div>
-                                         <h1>2.&#160; Normative References</h1>
-                                       </div>
-                                       <div id="H"><h1>3.&#160; Terms, Definitions, Symbols and Abbreviated Terms</h1>
-                               <div id="I">
-                                  <h2>3.1.&#160; Normal Terms</h2>
-                                  <p class="TermNum" id="J">3.1.1.</p>
-                                  <p class="Terms" style="text-align:left;"><b>Term2</b></p>
-                                </div><div id="K"><h2>3.2.&#160; Definitions</h2>
-                                  <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
-                                </div></div>
-                                       <div id="L" class="Symbols">
-                                         <h1>4.&#160; Symbols and abbreviated terms</h1>
-                                         <dl>
-                                           <dt>
-                                             <p>Symbol</p>
-                                           </dt>
-                                           <dd>Definition</dd>
-                                         </dl>
-                                       </div>
-                                       <div id="M">
-                                         <h1>5.&#160; Clause 4</h1>
-                                         <div id="N">
-                                  <h2>5.1.&#160; Introduction</h2>
-                                </div>
-                                         <div id="O">
-                                  <h2>5.2.&#160; Clause 4.2</h2>
                                 </div>
-                                         <div id="O1">
-                                  <h2>5.3.</h2>
+                                <br/>
+                                <div id="P" class="Section3">
+                                  <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
+                                  <div id="Q">
+                           <h2>A.1.&#160; Annex A.1</h2>
+                           <div id="Q1">
+                           <h3>A.1.1.&#160; Annex A.1a</h3>
+                           </div>
+                           <div><h3 class="Section3">A.1.2.&#160; Annex Bibliography</h3></div>
+                         </div>
                                 </div>
-                                       </div>
-                                       <br/>
-                                       <div id="P" class="Section3">
-                                         <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
-                                         <div id="Q">
-                                  <h2>A.1.&#160; Annex A.1</h2>
-                                  <div id="Q1">
-                                  <h3>A.1.1.&#160; Annex A.1a</h3>
+                                 <br/>
+                 <div id='P1' class='Section3'>
+                   <h1 class='Annex'>
+                     <b>Annex B</b>
+                     <br/>
+                     (normative)
+                   </h1>
+                 </div>
+                                <br/>
+                                <div>
+                                  <h1 class="Section3">Bibliography</h1>
+                                  <div>
+                                    <h2 class="Section3">Bibliography Subsection</h2>
                                   </div>
-                                  <div><h3 class="Section3">A.1.2.&#160; Annex Bibliography</h3></div>
+                               </div>
+                                               <br/>
+      <div class="Section3" id="U1">
+        <h1 class="IntroTitle">Postface 1</h1>
+      </div>
+      <div class="Section3" id="U2">
+        <h1 class="IntroTitle">Postface 2</h1>
+      </div>
                                 </div>
-                                       </div>
-                                        <br/>
-                        <div id='P1' class='Section3'>
-                          <h1 class='Annex'>
-                            <b>Annex B</b>
-                            <br/>
-                            (normative)
-                          </h1>
-                        </div>
-                                       <br/>
-                                       <div>
-                                         <h1 class="Section3">Bibliography</h1>
-                                         <div>
-                                           <h2 class="Section3">Bibliography Subsection</h2>
-                                         </div>
-                                      </div>
-                                                      <br/>
-             <div class="Section3" id="U1">
-               <h1 class="IntroTitle">Postface 1</h1>
-             </div>
-             <div class="Section3" id="U2">
-               <h1 class="IntroTitle">Postface 2</h1>
-             </div>
-                                       </div>
-                                     </div>
-                                   </body>
-                               </html>
+                              </div>
+                            </body>
+                        </html>
     OUTPUT
 
     word = <<~OUTPUT