isodoc 2.12.0 → 2.12.2

data/lib/isodoc/metadata_date.rb

@@ -42,7 +42,7 @@ module IsoDoc
 
     def bibdate(isoxml, _out)
       isoxml.xpath(ns("//bibdata/date")).each do |d|
-        set("#{d['type'].gsub(/-/, '_')}date".to_sym, Common::date_range(d))
+        set("#{d['type'].tr('-', '_')}date".to_sym, Common::date_range(d))
       end
     end
   end

data/lib/isodoc/presentation_function/autonum.rb

@@ -0,0 +1,139 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def prefix_name(node, delims, label, elem)
+      label, delims = prefix_name_defaults(node, delims, label)
+      name, ins, ids, number = prefix_name_prep(node, elem)
+      ins.next = fmt_xref_label(label, number, ids)
+      # autonum can be empty, e.g single note in clause: "NOTE []"
+      number and node["autonum"] = number.gsub(/<[^>]+>/, "")
+      !node.at(ns("./fmt-#{elem}")) &&
+        (c = fmt_caption(label, elem, name, ids, delims)) and ins.next = c
+      prefix_name_postprocess(node, elem)
+    end
+
+    def prefix_name_defaults(node, delims, label)
+      label&.empty? and label = nil
+      delims.nil? and delims = {}
+      [label, delims]
+    end
+
+    def prefix_name_prep(node, elem)
+      lbls = prefix_name_labels(node)
+      name = node.at(ns("./#{elem}")) and name["id"] = lbls[:name]
+      ins = name || node.add_first_child("<sentinel/>").elements.first
+      node["unnumbered"] or
+        number = @xrefs.anchor(node["id"], :value, false)&.strip
+      [name, ins, lbls, number]
+    end
+
+    def prefix_name_labels(node)
+      { elem: node["id"],
+        name: "_#{UUIDTools::UUID.random_create}" }
+    end
+
+    def prefix_name_postprocess(node, elem)
+      node.at(ns("./sentinel"))&.remove
+      strip_duplicate_ids(node, node.at(ns("./#{elem}")),
+                          node.at(ns("./fmt-#{elem}")))
+    end
+
+    def transfer_id(old, new)
+      old["id"] or return
+      new["id"] = old["id"]
+      old["original-id"] = old["id"]
+      old.delete("id")
+    end
+
+    def gather_all_ids(elem)
+      elem.xpath(".//*[@id]").each_with_object([]) do |i, m|
+        m << i["id"]
+      end
+    end
+
+    # remove ids duplicated between title and fmt-title
+    # index terms are assumed transferred to fmt-title from title
+    def strip_duplicate_ids(_node, sem_title, pres_title)
+      sem_title && pres_title or return
+      ids = gather_all_ids(pres_title)
+      sem_title.xpath(".//*[@id]").each do |x|
+        ids.include?(x["id"]) or next
+        x["original-id"] = x["id"]
+        x.delete("id")
+      end
+      sem_title.xpath(ns(".//index")).each(&:remove)
+    end
+
+    def semx(node, label, element = "autonum")
+      id = node["id"] || node[:id]
+      /<semx element='[^']+' source='#{id}'/.match?(label) and return label
+      l = stripsemx(label)
+      %(<semx element='#{element}' source='#{id}'>#{l}</semx>)
+    end
+
+    def autonum(id, num)
+      /<semx/.match?(num) and return num # already contains markup
+      "<semx element='autonum' source='#{id}'>#{num}</semx>"
+    end
+
+    def labelled_autonum(label, id, num)
+      elem = "<span class='fmt-element-name'>#{label}</span>"
+      num.blank? and return elem
+      l10n("#{elem} #{autonum(id, num)}")
+    end
+
+    def fmt_xref_label(label, _number, ids)
+      label or return ""
+      x = @xrefs.anchor(ids[:elem], :xref, false) or return ""
+      ret = "<fmt-xref-label>#{x}</fmt-xref-label>"
+      container = @xrefs.anchor(ids[:elem], :container, false)
+      y = prefix_container_fmt_xref_label(container, x)
+      y != x and
+        ret += "<fmt-xref-label container='#{container}'>#{y}</fmt-xref-label>"
+      ret
+    end
+
+    def prefix_container_fmt_xref_label(container, xref)
+      container or return xref
+      container_container = @xrefs.anchor(container, :container, false)
+      container_label =
+        prefix_container_fmt_xref_label(container_container,
+                                        @xrefs.anchor(container, :xref, false))
+      l10n(connectives_spans(@i18n.nested_xref
+        .sub("%1", "<span class='fmt-xref-container'>#{container_label}</span>")
+        .sub("%2", xref)))
+    end
+
+    # detect whether string which may contain XML markup is empty
+    def empty_xml?(str)
+      str.blank? and return true
+      x = Nokogiri::XML::DocumentFragment.parse(str)
+      x.to_str.strip.empty?
+    end
+
+    # Remove ".blank?" tests if want empty delim placeholders for manipulation
+    def fmt_caption(label, elem, name, ids, delims)
+      label = fmt_caption_label_wrap(label)
+      c = fmt_caption2(label, elem, name, ids, delims)
+      empty_xml?(c) and return
+      !delims[:label].blank? and
+        f = "<span class='fmt-label-delim'>#{delims[:label]}</span>"
+      "<fmt-#{elem}>#{c}#{f}</fmt-#{elem}>"
+    end
+
+    def fmt_caption_label_wrap(label)
+      empty_xml?(label) || %r{<span class=['"]fmt-caption-label['"]}.match?(label) or
+        label = "<span class='fmt-caption-label'>#{label}</span>"
+      label
+    end
+
+    def fmt_caption2(label, elem, name, ids, delims)
+      if name && !name.children.empty?
+        empty_xml?(label) or
+          d = "<span class='fmt-caption-delim'>#{delims[:caption]}</span>"
+        attr = " element='#{elem}' source='#{ids[:name]}'"
+        "#{label}#{d}<semx #{attr}>#{to_xml(name.children)}</semx>"
+      elsif label then label
+      end
+    end
+  end
+end

data/lib/isodoc/presentation_function/block.rb

@@ -1,31 +1,23 @@
 require_relative "image"
 require_relative "sourcecode"
+require_relative "autonum"
 require "rouge"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def lower2cap(text)
-      /^[[:upper:]][[:upper:]]/.match?(text) and return text
-      text&.capitalize
+      text.nil? and return text
+      x = Nokogiri::XML("<a>#{text}</a>")
+      firsttext = x.at(".//text()[string-length(normalize-space(.))>0]") or return text
+      /^[[:upper:]][[:upper:]]/.match?(firsttext.text) and return text
+      firsttext.replace(firsttext.text.capitalize)
+      to_xml(x.root.children)
     end
 
     def block_delim
       "&#xa0;&#x2014; "
     end
 
-    def prefix_name(node, delim, number, elem)
-      number.nil? || number.empty? and return
-      unless name = node.at(ns("./#{elem}"))
-        #(node.children.empty? and node.add_child("<#{elem}></#{elem}>")) or
-        #  node.children.first.previous = "<#{elem}></#{elem}>"
-        node.add_first_child "<#{elem}></#{elem}>"
-        name = node.children.first
-      end
-      if name.children.empty? then name.add_child(cleanup_entities(number.strip))
-      else (name.children.first.previous = "#{number.strip}#{delim}")
-      end
-    end
-
     def formula(docxml)
       docxml.xpath(ns("//formula")).each { |f| formula1(f) }
     end
@@ -33,7 +25,7 @@ module IsoDoc
     def formula1(elem)
       formula_where(elem.at(ns("./dl")))
       lbl = @xrefs.anchor(elem["id"], :label, false)
-      prefix_name(elem, "", lbl, "name")
+      lbl.nil? || lbl.empty? or prefix_name(elem, {}, lbl, "name")
     end
 
     def formula_where(dlist)
@@ -49,25 +41,27 @@ module IsoDoc
 
     def example1(elem)
       n = @xrefs.get[elem["id"]]
-      lbl = if n.nil? || n[:label].nil? || n[:label].empty?
-              @i18n.example
-            else l10n("#{@i18n.example} #{n[:label]}")
-            end
-      prefix_name(elem, block_delim, lbl, "name")
+      lbl = labelled_autonum(@i18n.example, elem["id"], n&.dig(:label))
+      prefix_name(elem, { caption: block_delim }, lbl, "name")
     end
 
     def note(docxml)
       docxml.xpath(ns("//note")).each { |f| note1(f) }
     end
 
+    def note_delim(_elem)
+      "<tab/>"
+    end
+
     def note1(elem)
       %w(bibdata bibitem).include?(elem.parent.name) ||
-        elem["notag"] == "true" and return
+        elem["notag"] == "true" or lbl = note_label(elem)
+      prefix_name(elem, { label: note_delim(elem) }, lbl, "name")
+    end
+
+    def note_label(elem)
       n = @xrefs.get[elem["id"]]
-      lbl = @i18n.note
-      (n.nil? || n[:label].nil? || n[:label].empty?) or
-        lbl = l10n("#{lbl} #{n[:label]}")
-      prefix_name(elem, "", lbl, "name")
+      labelled_autonum(@i18n.note, elem["id"], n&.dig(:label))
     end
 
     def admonition(docxml)
@@ -77,16 +71,30 @@ module IsoDoc
     def admonition1(elem)
       if elem["type"] == "box"
         admonition_numbered1(elem)
+      elsif elem["notag"] == "true" || elem.at(ns("./name"))
+        prefix_name(elem, { label: admonition_delim(elem) }, nil, "name")
       else
-        elem["notag"] == "true" || elem.at(ns("./name")) and return
-        prefix_name(elem, "", @i18n.admonition[elem["type"]]&.upcase, "name")
+        label = admonition_label(elem, nil)
+        prefix_name(elem, { label: admonition_delim(elem) }, label, "name")
       end
     end
 
     def admonition_numbered1(elem)
-      elem["unnumbered"] && !elem.at(ns("./name")) and return
-      n = @xrefs.anchor(elem["id"], :label, false)
-      prefix_name(elem, block_delim, l10n("#{@i18n.box} #{n}"), "name")
+      # elem["unnumbered"] && !elem.at(ns("./name")) and return
+      label = admonition_label(elem, @xrefs.anchor(elem["id"], :label, false))
+      prefix_name(elem, { caption: block_delim }, label, "name")
+    end
+
+    def admonition_label(elem, num)
+      lbl = if elem["type"] == "box" then @i18n.box
+            else @i18n.admonition[elem["type"]]&.upcase end
+      #lbl &&= "<span class='fmt-element-name'>#{lbl}</span>"
+      #num and lbl = l10n("#{lbl} #{autonum(elem['id'], num)}")
+      labelled_autonum(lbl, elem["id"], num)
+    end
+
+    def admonition_delim(_elem)
+      ""
     end
 
     def table(docxml)
@@ -95,11 +103,18 @@ module IsoDoc
     end
 
     def table1(elem)
+      table_fn(elem)
       labelled_ancestor(elem) and return
       elem["unnumbered"] && !elem.at(ns("./name")) and return
       n = @xrefs.anchor(elem["id"], :label, false)
-      prefix_name(elem, block_delim, l10n("#{lower2cap @i18n.table} #{n}"),
-                  "name")
+      #lbl = "<span class='fmt-element-name'>#{lower2cap @i18n.table}</span> "\
+        #"#{autonum(elem['id'], n)}"
+      lbl = labelled_autonum(lower2cap(@i18n.table), elem["id"], n)
+      prefix_name(elem, { caption: table_delim }, l10n(lbl), "name")
+    end
+
+    def table_delim
+      block_delim
     end
 
     def table_long_strings_cleanup(docxml)
@@ -113,6 +128,15 @@ module IsoDoc
       end
     end
 
+    def table_fn(elem)
+      (elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn")))
+        .each_with_index do |f, i|
+          table_fn1(elem, f, i)
+        end
+    end
+
+    def table_fn1(table, fnote, idx); end
+
     # we use this to eliminate the semantic amend blocks from rendering
     def amend(docxml)
       docxml.xpath(ns("//amend")).each { |f| amend1(f) }
@@ -126,6 +150,24 @@ module IsoDoc
       elem.replace(elem.children)
     end
 
+    def dl(docxml)
+      docxml.xpath(ns("//dl")).each { |f| dl1(f) }
+    end
+
+    def dl1(elem)
+      elem.at(ns("./name")) and
+        prefix_name(elem, {}, "", "name") # copy name to fmt-name
+    end
+
+    def ul(docxml)
+      docxml.xpath(ns("//ul")).each { |f| ul1(f) }
+    end
+
+    def ul1(elem)
+      elem.at(ns("./name")) and
+        prefix_name(elem, {}, "", "name") # copy name to fmt-name
+    end
+
     def ol(docxml)
       docxml.xpath(ns("//ol")).each { |f| ol1(f) }
       @xrefs.list_anchor_names(docxml.xpath(ns(@xrefs.sections_xpath)))
@@ -147,9 +189,8 @@ module IsoDoc
 
     def ol1(elem)
       elem["type"] ||= ol_depth(elem).to_s
-      elem.xpath(ns("./li")).each do |li|
-        li["id"] ||= "_#{UUIDTools::UUID.random_create}"
-      end
+      elem.at(ns("./name")) and
+        prefix_name(elem, {}, "", "name") # copy name to fmt-name
     end
 
     def ol_label(elem)
@@ -182,5 +223,23 @@ module IsoDoc
     def source_modification(mod)
       termsource_modification(mod.parent)
     end
+
+    def quote(docxml)
+      docxml.xpath(ns("//quote")).each { |f| quote1(f) }
+    end
+
+    def quote1(elem)
+      author = elem.at(ns("./author"))
+      source = elem.at(ns("./source"))
+      author.nil? && source.nil? and return
+      p = "&#x2014; "
+      p += author.remove.to_xml if author
+      p += ", " if author && source
+      if source
+        source.name = "eref"
+        p += source.remove.to_xml
+      end
+      elem << "<attribution><p>#{l10n p}</p></attribution>"
+    end
   end
 end

data/lib/isodoc/presentation_function/docid.rb

@@ -0,0 +1,78 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def docid_prefixes(docxml)
+      docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
+        i.children = docid_prefix(i["type"], to_xml(i.children))
+      end
+    end
+
+    def pref_ref_code(bib)
+      bib["suppress_identifier"] == "true" and return nil
+      ret = bib.xpath(ns("./docidentifier[@scope = 'biblio-tag']"))
+      ret.empty? or return ret.map(&:text)
+      ret = pref_ref_code_parse(bib) or return nil
+      ins = bib.at(ns("./docidentifier[last()]"))
+      ret.reverse_each do |r|
+        ins.next = "<docidentifier scope='biblio-tag'>#{docid_l10n(r)}</docidentifier>"
+      end
+      ret
+    end
+
+    def pref_ref_code_parse(bib)
+      data, = @bibrender.parse(bib)
+      ret = data[:authoritative_identifier] or return nil
+      ret.empty? and return nil
+      ret
+    end
+
+    # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
+    def bibitem_ref_code(bib)
+      id, id1, id2, id3 = bibitem_ref_code_prep(bib)
+      id || id1 || id2 || id3 and return [id, id1, id2, id3]
+      bib["suppress_identifier"] == "true" and return [nil, nil, nil, nil]
+      [nil, no_identifier(bib), nil, nil]
+    end
+
+    def bibitem_ref_code_prep(bib)
+      id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
+      id1 = pref_ref_code(bib)
+      id2 = bib.at(ns("./docidentifier[#{SKIP_DOCID}]"))
+      id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))
+      [id, id1, id2, id3]
+    end
+
+    def no_identifier(bib)
+      @i18n.no_identifier or return nil
+      id = Nokogiri::XML::Node.new("docidentifier", bib.document)
+      id << @i18n.no_identifier
+      id
+    end
+
+    def bracket_if_num(num)
+      num.nil? and return nil
+      num = num.text.sub(/^\[/, "").sub(/\]$/, "")
+      /^\d+$/.match?(num) and return "[#{num}]"
+      num
+    end
+
+    def unbracket1(ident)
+      ident.nil? and return nil
+      ident.is_a?(String) or ident = ident.text
+      ident.sub(/^\[/, "").sub(/\]$/, "")
+    end
+
+    def unbracket(ident)
+      if ident.respond_to?(:size)
+        ident.map { |x| unbracket1(x) }.join("&#xA0;/ ")
+      else unbracket1(ident)
+      end
+    end
+
+    def render_identifier(ident)
+      { metanorma: bracket_if_num(ident[0]),
+        sdo: unbracket(ident[1]),
+        doi: unbracket(ident[2]),
+        ordinal: bracket_if_num(ident[3]) }
+    end
+  end
+end

data/lib/isodoc/presentation_function/erefs.rb

@@ -3,9 +3,10 @@ require "metanorma-utils"
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def citeas(xmldoc)
-      xmldoc.xpath(ns("//eref | //origin | //quote/source")).each do |e|
+      xmldoc.xpath(ns("//eref | //origin | //quote//source")).each do |e|
         e["bibitemid"] && e["citeas"] or next
-        a = @xrefs.anchor(e["bibitemid"], :xref, false) and e["citeas"] = a
+        a = @xrefs.anchor(e["bibitemid"], :xref, false) and
+          e["citeas"] = a.gsub(%r{</?[^>]+>}, "")
       end
     end
 
@@ -87,7 +88,8 @@ module IsoDoc
       locs1 = []
       until locs.empty?
         if locs[1] == "to"
-          locs1 << @i18n.chain_to.sub("%1", locs[0]).sub("%2", locs[2])
+          locs1 << connectives_spans(@i18n.chain_to.sub("%1", locs[0])
+            .sub("%2", locs[2]))
           locs.shift(3)
         else locs1 << locs.shift
         end
@@ -178,7 +180,7 @@ module IsoDoc
     end
 
     def eref2link(docxml)
-      docxml.xpath(ns("//eref | //origin[not(termref)] | //quote/source"))
+      docxml.xpath(ns("//eref | //origin[not(termref)] | //quote//source"))
         .each do |e|
         href = eref_target(e) or next
         e.xpath(ns("./locality | ./localityStack")).each(&:remove)

data/lib/isodoc/presentation_function/image.rb

@@ -43,14 +43,50 @@ module IsoDoc
       elem.children = x
     end
 
+    def subfigure_delim
+      ""
+      # "<span class='fmt-label-delim'>)</span>"
+    end
+
+    def figure_delim(_elem)
+      block_delim
+    end
+
+    def figure_name(elem)
+      "<span class='fmt-element-name'>#{figure_label(elem)}</span> "
+    end
+
     def figure1(elem)
       elem["class"] == "pseudocode" || elem["type"] == "pseudocode" and
         return sourcecode1(elem)
-      figure_label?(elem) or return nil
-      lbl = @xrefs.anchor(elem["id"], :label, false) or return
-      # no xref, no label: this can be set in xref
-      prefix_name(elem, block_delim,
-                  l10n("#{figure_label(elem)} #{lbl}"), "name")
+      figure_fn(elem)
+      figure_key(elem.at(ns("./dl")))
+      lbl = @xrefs.anchor(elem["id"], :label, false)
+      lbl and a = autonum(elem["id"], lbl)
+      figname = figure_name(elem)
+      if elem.parent.name == "figure"
+        a += subfigure_delim
+      end
+      lbl && figure_label?(elem) and s = "#{figname}#{a}"
+      prefix_name(elem, { caption: figure_delim(elem) }, l10n(s&.strip), "name")
+    end
+
+    # move footnotes into key, and get rid of footnote reference
+    # since it is in diagram
+    def figure_fn(elem)
+      fn = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn"))
+      fn.empty? and return
+      dl = figure_key_insert_pt(elem)
+      fn.each do |f|
+        dl.previous = "<dt><p><sup>#{f['reference']}</sup></p></dt>" \
+          "<dd>#{f.remove.children.to_xml}</dd>"
+      end
+    end
+
+    def figure_key_insert_pt(elem)
+      elem.at(ns("//dl/name"))&.next ||
+        elem.at(ns("//dl"))&.children&.first ||
+        elem.add_child("<dl> </dl>").first.children.first
     end
 
     def figure_label?(elem)
@@ -64,6 +100,14 @@ module IsoDoc
       lower2cap klasslbl
     end
 
+    def figure_key(dlist)
+      dlist or return
+      dlist["class"] = "formula_dl"
+      dlist.at(ns("./name")) and return
+      dlist.previous =
+        "<p keep-with-next='true'><strong>#{@i18n.key}</strong></p>"
+    end
+
     def eps2svg(img)
       return unless eps?(img["mimetype"])
 
@@ -77,7 +121,7 @@ module IsoDoc
     def svg_emf_double(img)
       if emf?(img["mimetype"])
         img = emf_encode(img)
-        #img.children.first.previous = emf_to_svg(img)
+        # img.children.first.previous = emf_to_svg(img)
         img.add_first_child emf_to_svg(img)
       elsif img["mimetype"] == "image/svg+xml"
         src = svg_to_emf(img) or return
@@ -127,16 +171,11 @@ module IsoDoc
 
     def svg_to_emf(node)
       @output_formats[:doc] or return
-
       svg_impose_height_attr(node)
-
-      if node.elements&.first&.name == "svg" || %r{^data:}.match?(node["src"])
+      node.elements&.first&.name == "svg" || %r{^data:}.match?(node["src"]) and
         return svg_to_emf_from_node(node)
-      end
-
       target_path = imgfile_suffix(node["src"], "emf")
-      return target_path if File.exist?(target_path)
-
+      File.exist?(target_path) and return target_path
       svg_to_emf_from_node(node, target_path)
     end
 

data/lib/isodoc/presentation_function/inline.rb

@@ -13,7 +13,7 @@ module IsoDoc
       node["style"] == "id" and anchor_id_postprocess(node)
       xref_empty?(node) or return
       target = docid_l10n(node["target"]) ||
-        expand_citeas(docid_l10n(node["citeas"]))
+        docid_l10n(expand_citeas(node["citeas"]))
       link = anchor_linkend(node, target)
       link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
                               link, node)
@@ -54,8 +54,8 @@ module IsoDoc
     end
 
     def quotesource(docxml)
-      docxml.xpath(ns("//quote/source")).each { |f| xref1(f) }
-      docxml.xpath(ns("//quote/source//xref")).each do |f|
+      docxml.xpath(ns("//quote//source")).each { |f| xref1(f) }
+      docxml.xpath(ns("//quote//source//xref")).each do |f|
         f.replace(f.children)
       end
     end
@@ -164,9 +164,9 @@ module IsoDoc
     def passthrough1(elem, formats)
       (elem["formats"] && !elem["formats"].empty?) or elem["formats"] = "all"
       f = elem["formats"].split(",")
-      (f - formats).size == f.size or elem["formats"] = "all"
-      elem["formats"] == "all" and elem["formats"] = formats.join(",")
-      elem["formats"] = ",#{elem['formats']},"
+      (f - formats).size == f.size or f = "all"
+      f == ["all"] and f = formats.dup
+      elem["formats"] = " #{f.join(' ')} "
     end
 
     def extract_custom_charsets(docxml)

data/lib/isodoc/presentation_function/math.rb

@@ -7,7 +7,6 @@ module IsoDoc
     MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
 
     def mathml(docxml)
-      docxml.xpath("//m:math", MATHML).each { |f| mathml_linebreak(f) }
       locale = @lang.to_sym
       @numfmt = Plurimath::NumberFormatter
         .new(locale, localize_number: @localizenumber,
@@ -160,19 +159,6 @@ module IsoDoc
       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
-
     # convert any Ascii superscripts to correct(ish) MathML
     # Not bothering to match times, base of 1.0 x 10^-20, just ^-20
     def mn_to_msup(node)