isodoc 2.5.0 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15d6f1ca680a6bb801c444655ba27e347ca04a671c207b9a74ad4c6388596394
-  data.tar.gz: 02e6caa0ae2463bd2966ee14a9837c0d1b1b4cfac77596380bbb3856979ee142
+  metadata.gz: 35414cac7eab8ae893d39af33b9f3ecf591c33bd5013ea6340b13b26c23e73e1
+  data.tar.gz: b4820f7236dc69a3fadf213dcd7fef2eadddebbf85dc02a4ec7364c688baa4da
 SHA512:
-  metadata.gz: 857b7630d0a1146e5070b3ced33eb99b40089cf114181b6519cd1e26a5c17fc8b1e36dfe59ea115055fb2f8cbf901c57b7ad730fe39878e0cf589201eb06222a
-  data.tar.gz: 4ca7278d7571fc4aa64fa6443a373d77d352ffe64b79086ef142aad1260a25e57589023707a153bb54cae60bd4e441d2ed116a33f18db2905907b61b5c14875f
+  metadata.gz: 902033f59dc11d6f097e7477aa8ea44cc7eb199e085778a3eee2cfa771d7a40a85869176ff0c57e0cad88d1c270546a7d9419da2119fb3a6d435c629aeea6acc
+  data.tar.gz: 0f346f7277f8aab99189f29d2e1a35a6d36c593cfd52628d37f9245acb39e7ea0aa8761f6797e18dbb1b1069812ffbf2c2563f97e472cfa628047c6e84df0eb0

data/isodoc.gemspec

@@ -29,17 +29,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "asciimath"
-  spec.add_dependency "html2doc", "~> 1.4.3"
+  spec.add_dependency "html2doc", "~> 1.5.3"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
-  spec.add_dependency "liquid", "~> 4"
-  # spec.add_dependency "metanorma", ">= 1.2.0"
+  spec.add_dependency "liquid", "~> 5"
   spec.add_dependency "emf2svg"
-  spec.add_dependency "mathml2asciimath"
-  spec.add_dependency "metanorma-utils", "~> 1.4.5"
+  spec.add_dependency "plurimath"
+  spec.add_dependency "relaton-cli"
+  # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
   spec.add_dependency "mn2pdf"
   spec.add_dependency "mn-requirements", "~> 0.3.1"
+
   spec.add_dependency "relaton-render", "~> 0.5.2"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"

data/lib/isodoc/convert.rb

@@ -63,109 +63,6 @@ module IsoDoc
       init_arrangement(@options)
     end
 
-    def options_preprocess(options)
-      options.merge!(default_fonts(options)) do |_, old, new|
-        old || new
-      end.merge!(default_file_locations(options)) do |_, old, new|
-        old || new
-      end
-      options
-    end
-
-    def init_rendering(options)
-      @ulstyle = options[:ulstyle]
-      @olstyle = options[:olstyle]
-      @datauriimage = options[:datauriimage]
-      @suppressheadingnumbers = options[:suppressheadingnumbers]
-      @break_up_urls_in_tables = options[:breakupurlsintables]
-      @suppressasciimathdup = options[:suppressasciimathdup]
-      @aligncrosselements = options[:aligncrosselements]
-      @modspecidentifierbase = options[:modspecidentifierbase]
-      @sourcehighlighter = options[:sourcehighlighter]
-    end
-
-    def init_arrangement(options)
-      @sectionsplit = options[:sectionsplit] == "true"
-      @bare = options[:bare]
-      @semantic_xml_insert = options[:semanticxmlinsert] != "false"
-    end
-
-    def init_i18n(options)
-      @i18nyaml = options[:i18nyaml]
-      @lang = options[:language] || "en"
-      @script = options[:script] || "Latn"
-      @locale = options[:locale]
-      @localizenumber = options[:localizenumber]
-    end
-
-    def init_locations(options)
-      @libdir ||= File.dirname(__FILE__)
-      @baseassetpath = options[:baseassetpath]
-      @tmpimagedir_suffix = tmpimagedir_suffix
-      @tmpfilesdir_suffix = tmpfilesdir_suffix
-      @sourcefilename = options[:sourcefilename]
-      @files_to_delete = []
-      @tempfile_cache = []
-    end
-
-    def init_processing
-      @termdomain = ""
-      @termexample = false
-      @note = false
-      @sourcecode = false
-      @footnotes = []
-      @comments = []
-      @in_footnote = false
-      @in_comment = false
-      @in_table = false
-      @in_figure = false
-      @seen_footnote = Set.new
-      @c = HTMLEntities.new
-      @openmathdelim = "`"
-      @closemathdelim = "`"
-      @maxwidth = 1200
-      @maxheight = 800
-      @bookmarks_allocated = { "X" => true }
-      @fn_bookmarks = {}
-    end
-
-    def init_fonts(options)
-      @normalfontsize = options[:normalfontsize]
-      @smallerfontsize = options[:smallerfontsize]
-      @monospacefontsize = options[:monospacefontsize]
-      @footnotefontsize = options[:footnotefontsize]
-      @fontist_fonts = options[:fonts]
-      @fontlicenseagreement = options[:fontlicenseagreement]
-    end
-
-    def init_covers(options)
-      @header = options[:header]
-      @htmlcoverpage = options[:htmlcoverpage]
-      @wordcoverpage = options[:wordcoverpage]
-      @htmlintropage = options[:htmlintropage]
-      @wordintropage = options[:wordintropage]
-      @scripts = options[:scripts] ||
-        File.join(File.dirname(__FILE__), "base_style", "scripts.html")
-      @scripts_pdf = options[:scripts_pdf]
-      @scripts_override = options[:scripts_override]
-    end
-
-    def init_stylesheets(options)
-      @htmlstylesheet_name = options[:htmlstylesheet]
-      @wordstylesheet_name = options[:wordstylesheet]
-      @htmlstylesheet_override_name = options[:htmlstylesheet_override]
-      @wordstylesheet_override_name = options[:wordstylesheet_override]
-      @standardstylesheet_name = options[:standardstylesheet]
-    end
-
-    def init_toc(options)
-      @htmlToClevels = 2
-      @wordToClevels = 2
-      @tocfigures = options[:tocfigures]
-      @toctables = options[:toctables]
-      @tocrecommendations = options[:tocrecommendations]
-    end
-
     def tmpimagedir_suffix
       "_#{SecureRandom.hex(8)}_images"
     end
@@ -214,28 +111,52 @@ module IsoDoc
       convert_i18n_init(docxml)
       metadata_init(@lang, @script, @locale, @i18n)
       xref_init(@lang, @script, self, @i18n, { locale: @locale })
+      docxml = preprocess_xslt(docxml)
       toc_init(docxml)
       [docxml, filename, dir]
     end
 
+    def preprocess_xslt(docxml)
+      extract_preprocess_xslt(docxml).each do |x|
+        docxml = Nokogiri::XSLT(x).transform(docxml)
+      end
+      docxml
+    end
+
+    def extract_preprocess_xslt(docxml)
+      docxml.xpath(ns("//metanorma-extension/render/preprocess-xslt"))
+        .each_with_object([]) do |x, m|
+          formats = x["format"]&.split(",") || []
+          !formats.empty? && !formats.include?(@format.to_s) and next
+          m << x.children.to_xml
+        end
+    end
+
     def convert_i18n_init(docxml)
-      lang = docxml.at(ns("//bibdata/language")) and @lang = lang.text
-      script = docxml.at(ns("//bibdata/script")) and @script = script.text
-      locale = docxml.at(ns("//bibdata/locale")) and @locale = locale.text
+      convert_i18n_init1(docxml)
       i18n_init(@lang, @script, @locale)
       @reqt_models = requirements_processor
         .new({ default: "default", lang: @lang, script: @script, locale: @locale,
                labels: @i18n.get, modspecidentifierbase: @modspecidentifierbase })
     end
 
+    def convert_i18n_init1(docxml)
+      lang = docxml.at(ns("//bibdata/language")) and @lang = lang.text
+      if script = docxml.at(ns("//bibdata/script"))
+        @script = script.text
+      elsif lang
+        @script = ::Metanorma::Utils::default_script(@lang)
+      end
+      locale = docxml.at(ns("//bibdata/locale")) and @locale = locale.text
+    end
+
     def convert(input_filename, file = nil, debug = false,
                 output_filename = nil)
       file = File.read(input_filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)
       docxml, filename, dir = convert_init(file, input_filename, debug)
       result = convert1(docxml, filename, dir)
-      return result if debug
-
+      debug and return result
       output_filename ||= "#{filename}.#{@suffix}"
       postprocess(result, output_filename, dir)
       FileUtils.rm_rf dir

data/lib/isodoc/function/blocks.rb

@@ -76,6 +76,7 @@ module IsoDoc
         out.p **sourcecode_attrs(node) do |div|
           sourcecode_parse1(node, div)
         end
+        annotation_parse(node, out)
         sourcecode_name_parse(node, out, name)
       end
 
@@ -84,9 +85,10 @@ module IsoDoc
         node.at(ns(".//table[@class = 'rouge-line-table']")) ||
           node.at("./ancestor::xmlns:table[@class = 'rouge-line-table']") and
           @sourcecode = "table"
-        # !node.ancestors("table").empty? and
-        # @sourcecode = "table"
-        node.children.each { |n| parse(n, div) unless n.name == "name" }
+        node.children.each do |n|
+          %w(name dl).include?(n.name) and next
+          parse(n, div)
+        end
         @sourcecode = false
       end
 
@@ -95,17 +97,12 @@ module IsoDoc
       end
 
       def annotation_parse(node, out)
+        dl = node.at(ns("./dl")) or return
         @sourcecode = false
-        @annotation = true
+        # @annotation = true
         out.div class: "annotation" do |div|
-          # node.at("./preceding-sibling::*[local-name() = 'annotation']") or
-          #  div << "<br/>"
-          callout = node.at(ns("//callout[@target='#{node['id']}']"))
-          div << "<span class='c'>&lt;#{callout.text}&gt;</span> "
-          div << "<span class='c'>#{node.children&.text&.strip}</span>"
-          node.at("./following-sibling::*[local-name() = 'annotation']") and
-            div << "<br/>"
-          @annotation = false
+          parse(dl, div)
+          # @annotation = false
         end
       end
 
@@ -203,6 +200,14 @@ module IsoDoc
           node.children.each { |n| parse(n, div) }
         end
       end
+
+      def source_parse(node, out)
+        out.div class: "BlockSource" do |d|
+          d.p do |p|
+            node.children.each { |n| parse(n, p) }
+          end
+        end
+      end
     end
   end
 end

data/lib/isodoc/function/cleanup.rb

@@ -194,11 +194,12 @@ module IsoDoc
       end
 
       def table_note_cleanup(docxml)
-        docxml.xpath("//table[div[@class = 'Note' or " \
-                     "@class = 'TableFootnote']]").each do |t|
+        docxml.xpath("//table[dl or div[@class = 'Note' or @class = 'BlockSource' " \
+                     "or @class = 'TableFootnote']]").each do |t|
           tfoot = table_get_or_make_tfoot(t)
           insert_here = new_fullcolspan_row(t, tfoot)
-          t.xpath("div[@class = 'Note' or @class = 'TableFootnote']")
+          t.xpath("dl | div[@class = 'Note' or @class = 'BlockSource' or " \
+                  "@class = 'TableFootnote']")
             .each do |d|
             d.parent = insert_here
           end

data/lib/isodoc/function/lists.rb

@@ -3,7 +3,7 @@ module IsoDoc
     module Lists
       def list_title_parse(node, out)
         name = node.at(ns("./name")) or return
-        out.p **{ class: "ListTitle" } do |p|
+        out.p class: "ListTitle" do |p|
           name&.children&.each { |n| parse(n, p) }
         end
       end
@@ -61,10 +61,10 @@ module IsoDoc
       def li_parse(node, out)
         out.li **attr_code(id: node["id"]) do |li|
           if node["uncheckedcheckbox"] == "true"
-            li << '<span class="zzMoveToFollowing">'\
+            li << '<span class="zzMoveToFollowing">' \
                   '<input type="checkbox" checked="checked"/></span>'
           elsif node["checkedcheckbox"] == "true"
-            li << '<span class="zzMoveToFollowing">'\
+            li << '<span class="zzMoveToFollowing">' \
                   '<input type="checkbox"/></span>'
           end
           node.children.each { |n| parse(n, li) }

data/lib/isodoc/function/reqt.rb

@@ -4,7 +4,7 @@ module IsoDoc
       def recommendation_name(name, out)
         return if name.nil?
 
-        out.p **{ class: "RecommendationTitle" } do |p|
+        out.p class: "RecommendationTitle" do |p|
           name.children.each { |n| parse(n, p) }
         end
       end

data/lib/isodoc/function/section.rb

@@ -38,8 +38,7 @@ module IsoDoc
           out.div **attr_code(annex_attrs(c)) do |s|
             c.elements.each do |c1|
               if c1.name == "title" then annex_name(c, c1, s)
-              else
-                parse(c1, s)
+              else parse(c1, s)
               end
             end
           end

data/lib/isodoc/function/table.rb

@@ -20,10 +20,11 @@ module IsoDoc
       end
 
       def tbody_parse(node, table)
-        tbody = node.at(ns("./tbody")) || return
+        tbody = node.at(ns("./tbody")) or return
+        rowcount = tbody.xpath(ns("./tr")).size
         table.tbody do |h|
           tbody.element_children.each_with_index do |n, i|
-            tr_parse(n, h, i, tbody.xpath(ns("./tr")).size, false)
+            tr_parse(n, h, i, rowcount, false)
           end
         end
       end
@@ -76,12 +77,17 @@ module IsoDoc
         table_title_parse(node, out)
         out.table **table_attrs(node) do |t|
           table_parse_core(node, t)
-          (dl = node.at(ns("./dl"))) && parse(dl, out)
-          node.xpath(ns("./note")).each { |n| parse(n, out) }
+          table_parse_tail(node, t)
         end
         @in_table = false
       end
 
+      def table_parse_tail(node, out)
+        (dl = node.at(ns("./dl"))) && parse(dl, out)
+        node.xpath(ns("./source")).each { |n| parse(n, out) }
+        node.xpath(ns("./note")).each { |n| parse(n, out) }
+      end
+
       def table_parse_core(node, out)
         tcaption(node, out)
         colgroup(node, out)

data/lib/isodoc/function/terms.rb

@@ -11,20 +11,19 @@ module IsoDoc
       end
 
       def deprecated_term_parse(node, out)
-        out.p **{ class: "DeprecatedTerms", style: "text-align:left;" } do |p|
-          p << l10n("#{@i18n.deprecated}: ")
+        out.p class: "DeprecatedTerms", style: "text-align:left;" do |p|
           node.children.each { |c| parse(c, p) }
         end
       end
 
       def admitted_term_parse(node, out)
-        out.p **{ class: "AltTerms", style: "text-align:left;" } do |p|
+        out.p class: "AltTerms", style: "text-align:left;" do |p|
           node.children.each { |c| parse(c, p) }
         end
       end
 
       def term_parse(node, out)
-        out.p **{ class: "Terms", style: "text-align:left;" } do |p|
+        out.p class: "Terms", style: "text-align:left;" do |p|
           node.children.each { |c| parse(c, p) }
         end
       end
@@ -63,7 +62,7 @@ module IsoDoc
 
       def termdef_parse(node, out)
         name = node&.at(ns("./name"))&.remove
-        out.p **{ class: "TermNum", id: node["id"] } do |p|
+        out.p class: "TermNum", id: node["id"] do |p|
           name&.children&.each { |n| parse(n, p) }
         end
         set_termdomain("")

data/lib/isodoc/function/to_word_html.rb

@@ -176,6 +176,7 @@ module IsoDoc
           when "fn" then footnote_parse(node, out)
           when "p" then para_parse(node, out)
           when "quote" then quote_parse(node, out)
+          when "source" then source_parse(node, out)
           when "tr" then tr_parse(node, out)
           when "note" then note_parse(node, out)
           when "review" then review_note_parse(node, out)
@@ -205,11 +206,6 @@ module IsoDoc
           when "recommendation" then recommendation_parse(node, out)
           when "permission" then permission_parse(node, out)
           when "div" then div_parse(node, out)
-          # when "subject", "classification"
-          #  requirement_skip_parse(node, out)
-          # when "inherit", "description", "specification", "measurement-target",
-          # "verification", "import", "component"
-          # requirement_component_parse(node, out)
           when "index" then index_parse(node, out)
           when "index-xref" then index_xref_parse(node, out)
           when "termref" then termrefelem_parse(node, out)

data/lib/isodoc/html_function/html.rb

@@ -96,6 +96,7 @@ module IsoDoc
         out.send tag, **attr do |div|
           sourcecode_parse1(node, div)
         end
+        annotation_parse(node, out)
         sourcecode_name_parse(node, out, name)
       end
 

data/lib/isodoc/i18n.rb

@@ -9,7 +9,7 @@ module IsoDoc
 
     def load_yaml1(lang, script)
       case lang
-      when "en", "fr", "ru", "de", "es", "ar"
+      when "en", "fr", "ru", "de", "es", "ar", "ja"
         load_yaml2(lang)
       when "zh"
         if script == "Hans" then load_yaml2("zh-Hans")

data/lib/isodoc/init.rb

@@ -26,5 +26,108 @@ module IsoDoc
       n = docxml.at(ns(x.sub(/TOC/, "HTML TOC"))) and
         @htmlToClevels = n.text.to_i
     end
+
+    def options_preprocess(options)
+      options.merge!(default_fonts(options)) do |_, old, new|
+        old || new
+      end.merge!(default_file_locations(options)) do |_, old, new|
+        old || new
+      end
+      options
+    end
+
+    def init_rendering(options)
+      @ulstyle = options[:ulstyle]
+      @olstyle = options[:olstyle]
+      @datauriimage = options[:datauriimage]
+      @suppressheadingnumbers = options[:suppressheadingnumbers]
+      @break_up_urls_in_tables = options[:breakupurlsintables]
+      @suppressasciimathdup = options[:suppressasciimathdup]
+      @aligncrosselements = options[:aligncrosselements]
+      @modspecidentifierbase = options[:modspecidentifierbase]
+      @sourcehighlighter = options[:sourcehighlighter]
+    end
+
+    def init_arrangement(options)
+      @sectionsplit = options[:sectionsplit] == "true"
+      @bare = options[:bare]
+      @semantic_xml_insert = options[:semanticxmlinsert] != "false"
+    end
+
+    def init_i18n(options)
+      @i18nyaml = options[:i18nyaml]
+      @lang = options[:language] || "en"
+      @script = options[:script] || "Latn"
+      @locale = options[:locale]
+      @localizenumber = options[:localizenumber]
+    end
+
+    def init_locations(options)
+      @libdir ||= File.dirname(__FILE__)
+      @baseassetpath = options[:baseassetpath]
+      @tmpimagedir_suffix = tmpimagedir_suffix
+      @tmpfilesdir_suffix = tmpfilesdir_suffix
+      @sourcefilename = options[:sourcefilename]
+      @files_to_delete = []
+      @tempfile_cache = []
+    end
+
+    def init_processing
+      @termdomain = ""
+      @termexample = false
+      @note = false
+      @sourcecode = false
+      @footnotes = []
+      @comments = []
+      @in_footnote = false
+      @in_comment = false
+      @in_table = false
+      @in_figure = false
+      @seen_footnote = Set.new
+      @c = HTMLEntities.new
+      @openmathdelim = "`"
+      @closemathdelim = "`"
+      @maxwidth = 1200
+      @maxheight = 800
+      @bookmarks_allocated = { "X" => true }
+      @fn_bookmarks = {}
+    end
+
+        def init_fonts(options)
+      @normalfontsize = options[:normalfontsize]
+      @smallerfontsize = options[:smallerfontsize]
+      @monospacefontsize = options[:monospacefontsize]
+      @footnotefontsize = options[:footnotefontsize]
+      @fontist_fonts = options[:fonts]
+      @fontlicenseagreement = options[:fontlicenseagreement]
+    end
+
+    def init_covers(options)
+      @header = options[:header]
+      @htmlcoverpage = options[:htmlcoverpage]
+      @wordcoverpage = options[:wordcoverpage]
+      @htmlintropage = options[:htmlintropage]
+      @wordintropage = options[:wordintropage]
+      @scripts = options[:scripts] ||
+        File.join(File.dirname(__FILE__), "base_style", "scripts.html")
+      @scripts_pdf = options[:scripts_pdf]
+      @scripts_override = options[:scripts_override]
+    end
+
+    def init_stylesheets(options)
+      @htmlstylesheet_name = options[:htmlstylesheet]
+      @wordstylesheet_name = options[:wordstylesheet]
+      @htmlstylesheet_override_name = options[:htmlstylesheet_override]
+      @wordstylesheet_override_name = options[:wordstylesheet_override]
+      @standardstylesheet_name = options[:standardstylesheet]
+    end
+
+    def init_toc(options)
+      @htmlToClevels = 2
+      @wordToClevels = 2
+      @tocfigures = options[:tocfigures]
+      @toctables = options[:toctables]
+      @tocrecommendations = options[:tocrecommendations]
+    end
   end
 end

data/lib/isodoc/presentation_function/bibdata.rb

@@ -5,6 +5,7 @@ module IsoDoc
     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)
@@ -14,11 +15,30 @@ module IsoDoc
         "</localized-strings>"
     end
 
+    def extension_insert(docxml, path = [])
+      ins = docxml.at(ns("//metanorma-extension")) ||
+        docxml.at(ns("//bibdata")).after("<metanorma-extension/>").next_element
+      path.each do |n|
+        ins = ins.at(ns("./#{n}")) || ins.add_child("<#{n}/>").first
+      end
+      ins
+    end
+
+    def preprocess_xslt_insert(docxml)
+      content = preprocess_xslt_read or return
+      ins = extension_insert(docxml, %w(render))
+      ins << File.read(content)
+    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)
       return unless @tocfigures || @toctables || @tocrecommendations
 
-      ins = docxml.at(ns("//metanorma-extension"))  ||
-        docxml.at(ns("//bibdata")).after("<metanorma-extension/>").next_element
+      ins = extension_insert(docxml)
       @tocfigures and
         ins << "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
       @toctables and

data/lib/isodoc/presentation_function/block.rb

@@ -178,5 +178,32 @@ module IsoDoc
       node.replace(@reqt_models.model(node["model"])
         .requirement_render1(node))
     end
+
+    def source(docxml)
+      docxml.xpath(ns("//source/modification")).each do |f|
+        source_modification(f)
+      end
+      docxml.xpath(ns("//table/source")).each { |f| tablesource(f) }
+      docxml.xpath(ns("//figure/source")).each { |f| figuresource(f) }
+    end
+
+    def tablesource(elem)
+      source1(elem)
+    end
+
+    def figuresource(elem)
+      source1(elem)
+    end
+
+    def source1(elem)
+      while elem&.next_element&.name == "source"
+        elem << "; #{to_xml(elem.next_element.remove.children)}"
+      end
+      elem.children = l10n("[#{@i18n.source}: #{to_xml(elem.children).strip}]")
+    end
+
+    def source_modification(mod)
+      termsource_modification(mod)
+    end
   end
 end

data/lib/isodoc/presentation_function/math.rb

@@ -1,6 +1,6 @@
 require "twitter_cldr"
 require "bigdecimal"
-require "mathml2asciimath"
+require "plurimath"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -20,7 +20,7 @@ module IsoDoc
         num = BigDecimal(x.text)
         precision = /\./.match?(x.text) ? x.text.sub(/^.*\./, "").size : 0
         x.children = localized_number(num, locale, precision)
-      rescue ArgumentError => e
+      rescue ArgumentError
       end
     end
 
@@ -90,17 +90,34 @@ module IsoDoc
     end
 
     def asciimath_dup(node)
-      return if @suppressasciimathdup
+      return if @suppressasciimathdup || node.parent.at(ns("./asciimath"))
+
+      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>"
+    rescue StandardError => e
+      warn "Failure to convert MathML to AsciiMath"
+      warn node.parent.to_xml
+      warn e
+    end
 
-      a = MathML2AsciiMath.m2a(node.to_xml)
-      node.next = "<!-- #{a} -->"
+    def maths_just_numeral(node)
+      mn = node.at("./m:mn", MATHML).children
+      if node.parent.name == "stem"
+        node.parent.replace(mn)
+      else
+        node.replace(mn)
+      end
     end
 
     def mathml1(node, locale)
       mathml_style_inherit(node)
-      asciimath_dup(node)
+      justnumeral = node.elements.size == 1 && node.elements.first.name == "mn"
+      justnumeral or asciimath_dup(node)
       localize_maths(node, locale)
-      mathml_number_to_number(node)
+      justnumeral and maths_just_numeral(node)
     end
 
     def mathml_style_inherit(node)