isodoc 2.4.5 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cbb9d45ce42c28917d84ebd31912cd4218cd47f633d27cf58f1060396c14d67
-  data.tar.gz: 25872abe5383206f171fadb766688bd46e751cb83852fa0c09848cdb8a4a45a6
+  metadata.gz: 23f98744bc0bb65ad60168ed537e14fe7c42222751d9beb5889ef3f6774c5b2a
+  data.tar.gz: 126d7531a7f6dee506d40ec9495de1cbff43efbd8699c9913e3564698bce3b1e
 SHA512:
-  metadata.gz: 8734f21809f2c71d90bbb291c2da8e703cf25e06bebeb83cf3db464d2b97179dd2744be793e11b2657435309c2faf8a08d4d8d48a16c2fad34bdc8fe628a3b1d
-  data.tar.gz: ebbcfc1ca95fe1b7d3c8ec89a73823176ae72ad0cd3b43cdc9061a9eafc6dce8612832c0a6dc1fc3f3be4948367567e74fc8c78eb90d5e234a8bd6fbd9cd467a
+  metadata.gz: 70045efc243c466f1ad330ce1d3a5cdb4a0ec76d5575913c47ab3043b1242d4b8fbb319fe7993db211dd7ff1c8d3cce9e501bf745ee9e861330c9e793a35ba1f
+  data.tar.gz: bfba85e2ac12b48cc5f255a4f983201c6042f506590ac34300da79107892532a0266a6507eb93ca8c247c047ada4e3049f1ddfd410af0e521596d3341a6dcfc9

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.0"
   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 "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/base_style/all.css

@@ -117,6 +117,10 @@ a.FootnoteRef + a.FootnoteRef:before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef + a.TableFootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 

data/lib/isodoc/base_style/reset.css

@@ -117,6 +117,10 @@ a.FootnoteRef + a.FootnoteRef:before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef + a.TableFootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 

data/lib/isodoc/base_style/reset.scss

@@ -144,6 +144,12 @@ a.FootnoteRef + a.FootnoteRef:before {
     vertical-align: super;
   }
 
+a.TableFootnoteRef + a.TableFootnoteRef:before { 
+    content: ", ";
+    vertical-align: super; 
+  }
+
+
 .addition {
   color: blue;
 }

data/lib/isodoc/convert.rb

@@ -219,15 +219,23 @@ module IsoDoc
     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?

data/lib/isodoc/function/blocks.rb

@@ -10,8 +10,7 @@ module IsoDoc
       end
 
       def figure_name_parse(_node, div, name)
-        return if name.nil?
-
+        name.nil? and return
         div.p class: "FigureTitle", style: "text-align:center;" do |p|
           name.children.each { |n| parse(n, p) }
         end
@@ -110,16 +109,6 @@ module IsoDoc
         end
       end
 
-      def formula_where(dlist, out)
-        return unless dlist
-
-        out.p style: "page-break-after:avoid;" do |p|
-          p << @i18n.where
-        end
-        parse(dlist, out)
-        out.parent.at("./dl")["class"] = "formula_dl"
-      end
-
       def formula_parse1(node, out)
         out.div **attr_code(class: "formula") do |div|
           div.p do |_p|
@@ -139,9 +128,8 @@ module IsoDoc
       def formula_parse(node, out)
         out.div **formula_attrs(node) do |div|
           formula_parse1(node, div)
-          formula_where(node.at(ns("./dl")), div)
           node.children.each do |n|
-            next if %w(stem dl name).include? n.name
+            next if %w(stem name).include? n.name
 
             parse(n, div)
           end

data/lib/isodoc/function/cleanup.rb

@@ -88,7 +88,7 @@ module IsoDoc
       end
 
       FIGURE_WITH_FOOTNOTES =
-        "//div[@class = 'figure'][descendant::aside]"\
+        "//div[@class = 'figure'][descendant::aside]" \
         "[not(descendant::div[@class = 'figure'])]".freeze
 
       def figure_aside_process(elem, aside, key)
@@ -159,7 +159,7 @@ module IsoDoc
       end
 
       def table_footnote_cleanup_propagate(docxml)
-        docxml.xpath("//p[not(self::*[@class])]"\
+        docxml.xpath("//p[not(self::*[@class])]" \
                      "[ancestor::*[@class = 'TableFootnote']]").each do |p|
           p["class"] = "TableFootnote"
         end
@@ -194,7 +194,7 @@ module IsoDoc
       end
 
       def table_note_cleanup(docxml)
-        docxml.xpath("//table[div[@class = 'Note' or "\
+        docxml.xpath("//table[div[@class = 'Note' or " \
                      "@class = 'TableFootnote']]").each do |t|
           tfoot = table_get_or_make_tfoot(t)
           insert_here = new_fullcolspan_row(t, tfoot)

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) }
@@ -87,7 +87,7 @@ module IsoDoc
       end
 
       def dl_attrs(node)
-        attr_code(id: node["id"], style: keep_style(node))
+        attr_code(id: node["id"], style: keep_style(node), class: node["class"])
       end
 
       def dl_parse(node, out)

data/lib/isodoc/function/references.rb

@@ -153,7 +153,7 @@ module IsoDoc
           return num
         out.div do |div|
           num += 1
-          clause_name(num, f.at(ns("./title")), div, nil)
+          clause_name(f, f.at(ns("./title")), div, nil)
           if f.name == "clause"
             f.elements.each { |e| parse(e, div) unless e.name == "title" }
           else biblio_list(f, div, false)

data/lib/isodoc/function/section.rb

@@ -20,7 +20,7 @@ module IsoDoc
       def clause(isoxml, out)
         isoxml.xpath(ns(middle_clause(isoxml))).each do |c|
           out.div **attr_code(clause_attrs(c)) do |s|
-            clause_name(nil, c&.at(ns("./title")), s, nil)
+            clause_name(c, c&.at(ns("./title")), s, nil)
             c.elements.reject { |c1| c1.name == "title" }.each do |c1|
               parse(c1, s)
             end
@@ -50,7 +50,7 @@ module IsoDoc
         f = isoxml.at(ns("//clause[@type = 'scope']")) or return num
         out.div **attr_code(id: f["id"]) do |div|
           num = num + 1
-          clause_name(num, f&.at(ns("./title")), div, nil)
+          clause_name(f, f&.at(ns("./title")), div, nil)
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
@@ -65,7 +65,7 @@ module IsoDoc
         f = isoxml.at(ns(TERM_CLAUSE)) or return num
         out.div **attr_code(id: f["id"]) do |div|
           num = num + 1
-          clause_name(num, f&.at(ns("./title")), div, nil)
+          clause_name(f, f&.at(ns("./title")), div, nil)
           f.elements.each do |e|
             parse(e, div) unless %w{title source}.include? e.name
           end
@@ -82,7 +82,7 @@ module IsoDoc
         f = isoxml.at(ns("//sections/definitions")) or return num
         out.div **attr_code(id: f["id"], class: "Symbols") do |div|
           num = num + 1
-          clause_name(num, f.at(ns("./title")), div, nil)
+          clause_name(f, f.at(ns("./title")), div, nil)
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
@@ -101,7 +101,7 @@ module IsoDoc
         f = isoxml.at(ns("//introduction")) || return
         page_break(out)
         out.div class: "Section3", id: f["id"] do |div|
-          clause_name(nil, f.at(ns("./title")), div, { class: "IntroTitle" })
+          clause_name(f, f.at(ns("./title")), div, { class: "IntroTitle" })
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
@@ -112,7 +112,7 @@ module IsoDoc
         f = isoxml.at(ns("//foreword")) || return
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(nil, f.at(ns("./title")) || @i18n.foreword, s,
+          clause_name(f, f.at(ns("./title")) || @i18n.foreword, s,
                       { class: "ForewordTitle" })
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
@@ -123,7 +123,7 @@ module IsoDoc
         title_attr = { class: "IntroTitle" }
         page_break(out)
         out.div class: "Section3", id: f["id"] do |div|
-          clause_name(nil, f&.at(ns("./title")), div, title_attr)
+          clause_name(f, f&.at(ns("./title")), div, title_attr)
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
@@ -134,7 +134,7 @@ module IsoDoc
         f = isoxml.at(ns("//preface/abstract")) || return
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(nil, f.at(ns("./title")), s, { class: "AbstractTitle" })
+          clause_name(f, f.at(ns("./title")), s, { class: "AbstractTitle" })
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
@@ -144,7 +144,7 @@ module IsoDoc
                         "//preface/definitions | //preface/terms")).each do |f|
           page_break(out)
           out.div class: "Section3", id: f["id"] do |div|
-            clause_name(nil, f&.at(ns("./title")), div, { class: "IntroTitle" })
+            clause_name(f, f&.at(ns("./title")), div, { class: "IntroTitle" })
             f.elements.each do |e|
               parse(e, div) unless e.name == "title"
             end
@@ -157,7 +157,7 @@ module IsoDoc
         page_break(out)
         isoxml.xpath(ns("//colophon/clause")).each do |f|
           out.div class: "Section3", id: f["id"] do |div|
-            clause_name(nil, f&.at(ns("./title")), div, { class: "IntroTitle" })
+            clause_name(f, f&.at(ns("./title")), div, { class: "IntroTitle" })
             f.elements.each do |e|
               parse(e, div) unless e.name == "title"
             end

data/lib/isodoc/function/section_titles.rb

@@ -10,7 +10,7 @@ module IsoDoc
       end
 
       def inline_header_title(out, node, title)
-        out.span **{ class: "zzMoveToFollowing" } do |s|
+        out.span class: "zzMoveToFollowing" do |s|
           s.b do |b|
             title&.children&.each { |c2| parse(c2, b) }
             clausedelimspace(node, out) if /\S/.match?(title&.text)
@@ -38,15 +38,15 @@ module IsoDoc
       end
 
       def clause_title_depth(node, title)
-        depth = node.ancestors("clause, annex, terms, references, "\
-                               "definitions, acknowledgements, introduction, "\
+        depth = node.ancestors("clause, annex, terms, references, " \
+                               "definitions, acknowledgements, introduction, " \
                                "foreword").size + 1
         depth = title["depth"] if title && title["depth"]
         depth
       end
 
       def clause_parse_subtitle(title, heading)
-        if var = title&.at("./following-sibling::xmlns:variant-title"\
+        if var = title&.at("./following-sibling::xmlns:variant-title" \
                            "[@type = 'sub']")&.remove
           heading.br nil
           heading.br nil
@@ -55,8 +55,8 @@ module IsoDoc
       end
 
       # top level clause names
-      def clause_name(_num, title, div, header_class)
-        preceding_floating_titles(title, div)
+      def clause_name(node, title, div, header_class)
+        preceding_floating_titles(node, div)
         header_class = {} if header_class.nil?
         div.h1 **attr_code(header_class) do |h1|
           if title.is_a?(String) then h1 << title
@@ -72,7 +72,7 @@ module IsoDoc
         preceding_floating_titles(name, div)
         return if name.nil?
 
-        div.h1 **{ class: "Annex" } do |t|
+        div.h1 class: "Annex" do |t|
           name.children.each { |c2| parse(c2, t) }
           clause_parse_subtitle(name, t)
         end
@@ -85,10 +85,10 @@ module IsoDoc
         end
       end
 
-      def preceding_floating_titles(name, div)
-        return if name.nil? || name.is_a?(String)
+      def preceding_floating_titles(node, div)
+        return if node.nil?
 
-        out = name.parent.xpath("./preceding-sibling::*")
+        out = node.xpath("./preceding-sibling::*")
           .reverse.each_with_object([]) do |p, m|
           break m unless p.name == "p"
 

data/lib/isodoc/function/terms.rb

@@ -11,20 +11,20 @@ module IsoDoc
       end
 
       def deprecated_term_parse(node, out)
-        out.p **{ class: "DeprecatedTerms", style: "text-align:left;" } do |p|
+        out.p class: "DeprecatedTerms", style: "text-align:left;" do |p|
           p << l10n("#{@i18n.deprecated}: ")
           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 +63,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

@@ -112,16 +112,17 @@ module IsoDoc
         @meta.url isoxml, out
         @meta.keywords isoxml, out
         @meta.note isoxml, out
+        @meta.presentation isoxml, out
         @meta.get
       end
 
       def middle(isoxml, out)
         middle_title(isoxml, out)
         middle_admonitions(isoxml, out)
-        i = scope isoxml, out, 0
-        i = norm_ref isoxml, out, i
-        i = terms_defs isoxml, out, i
-        symbols_abbrevs isoxml, out, i
+        scope isoxml, out, 0
+        norm_ref isoxml, out, 0
+        terms_defs isoxml, out, 0
+        symbols_abbrevs isoxml, out, 0
         clause isoxml, out
         annex isoxml, out
         bibliography isoxml, out

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -100,12 +100,14 @@ module IsoDoc
       #{header_strip(content)}</a></li>)
       end
 
+      # array of arrays, one per level, containing XPath fragments for the elems
+      # matching that ToC level
       def toclevel_classes
-        (1..@htmlToClevels).reduce([]) { |m, i| m << "h#{i}" }
+        (1..@htmlToClevels).reduce([]) { |m, i| m << ["h#{i}"] }
       end
 
       def toclevel
-        ret = toclevel_classes.map do |l|
+        ret = toclevel_classes.flatten.map do |l|
           "#{l}:not(:empty):not(.TermNum):not(.noTOC)"
         end
         <<~HEAD.freeze
@@ -116,18 +118,25 @@ module IsoDoc
       # needs to be same output as toclevel
       def html_toc(docxml)
         idx = docxml.at("//div[@id = 'toc']") or return docxml
-        toc = "<ul>"
-        path = toclevel_classes.map do |l|
-          "//main//#{l}#{toc_exclude_class}"
+        path = toclevel_classes.map do |x|
+          x.map { |l| "//main//#{l}#{toc_exclude_class}" }
         end
-        docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
-          h["id"] ||= "toc#{tocidx}"
-          toc += html_toc_entry(h.name, h)
-        end
-        idx.children = "#{toc}</ul>"
+        toc = html_toc_entries(docxml, path)
+          .map { |k| k[:entry] }.join("\n")
+        idx.children = "<ul>#{toc}</ul>"
         docxml
       end
 
+      def html_toc_entries(docxml, path)
+        path.each_with_index.with_object([]) do |(p, i), m|
+          docxml.xpath(p.join(" | ")).each do |h|
+            h["id"] ||= "_#{UUIDTools::UUID.random_create}"
+            m << { entry: html_toc_entry("h#{i + 1}", h),
+                   line: h.line }
+          end
+        end.sort_by { |k| k[:line] }
+      end
+
       def toc_exclude_class
         "[not(@class = 'TermNum')][not(@class = 'noTOC')]" \
           "[string-length(normalize-space(.))>0]"

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/metadata.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative "./metadata_date"
 require_relative "./metadata_contributor"
 
@@ -39,7 +37,7 @@ module IsoDoc
       @metadata[key] = value
     end
 
-    NOLANG = "[not(@language) or @language = '']"
+    NOLANG = "[not(@language) or @language = '']".freeze
 
     def currlang
       "[@language = '#{@lang}']"
@@ -109,7 +107,8 @@ module IsoDoc
 
     def version(isoxml, _out)
       set(:edition, isoxml&.at(ns("//bibdata/edition#{NOLANG}"))&.text)
-      set(:edition_display, isoxml&.at(ns("//bibdata/edition#{currlang}"))&.text)
+      set(:edition_display,
+          isoxml&.at(ns("//bibdata/edition#{currlang}"))&.text)
       set(:docyear, isoxml&.at(ns("//bibdata/copyright/from"))&.text)
       set(:draft, isoxml&.at(ns("//bibdata/version/draft"))&.text)
       revdate = isoxml&.at(ns("//bibdata/version/revision-date"))&.text
@@ -173,5 +172,14 @@ module IsoDoc
       c = isoxml.at(ns("//metanorma-extension/source-highlighter-css")) or return
       set(:code_css, c.text)
     end
+
+    def presentation(xml, _out)
+      xml.xpath(ns("//metanorma-extension/presentation-metadata")).each do |p|
+        ((n = p.at(ns("./name"))) && (v = p.at(ns("./value")))) or next
+        lbl = "presentation_metadata_#{n.text}".to_sym
+        m = get[lbl] || []
+        set(lbl, m << v.text)
+      end
+    end
   end
 end

data/lib/isodoc/presentation_function/block.rb

@@ -31,10 +31,18 @@ module IsoDoc
     end
 
     def formula1(elem)
+      formula_where(elem.at(ns("./dl")))
       lbl = @xrefs.anchor(elem["id"], :label, false)
       prefix_name(elem, "", lbl, "name")
     end
 
+    def formula_where(dlist)
+      dlist or return
+      dlist["class"] = "formula_dl"
+      where = dlist.xpath(ns("./dt")).size > 1 ? @i18n.where : @i18n.where_one
+      dlist.previous = "<p keep-with-next='true'>#{where}</p>"
+    end
+
     def example(docxml)
       docxml.xpath(ns("//example")).each { |f| example1(f) }
     end

data/lib/isodoc/presentation_function/erefs.rb

@@ -17,10 +17,11 @@ module IsoDoc
 
     def eref_localities(refs, target, node)
       if can_conflate_eref_rendering?(refs)
-        l10n(", #{eref_localities_conflated(refs, target, node)}")
+        l10n(", #{eref_localities_conflated(refs, target, node)}"
+          .gsub(/\s+/, " "))
       else
         ret = resolve_eref_connectives(eref_locality_stacks(refs, target, node))
-        l10n(ret.join)
+        l10n(ret.join.gsub(/\s+/, " "))
       end
     end
 
@@ -68,7 +69,7 @@ module IsoDoc
     end
 
     def resolve_comma_connectives1(locs, locs1, add)
-      if [", ", " "].include?(locs[1])
+      if [", ", " ", ""].include?(locs[1])
         add += locs[0..2].join
         locs.shift(3)
       else

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)

data/lib/isodoc/presentation_function/xrefs.rb

@@ -1,7 +1,8 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def prefix_container(container, linkend, node, _target)
-      l10n("#{anchor_xref(node, container)}, #{linkend}")
+      l10n(@i18n.nested_xref.sub(/%1/, anchor_xref(node, container))
+        .sub(/%2/, linkend))
     end
 
     def anchor_value(id)
@@ -72,11 +73,22 @@ module IsoDoc
       capitalise_xref(node, linkend, anchor_value(node["target"]))
     end
 
+    # Note % to entry and Note % to entry: cannot conflate as Note % to entry 1 and 2
+    # So Notes 1 and 3, but Note 1 to entry and Note 3 to entry
     def combine_conflated_xref_locations(locs)
+      out = if locs.any? { |l| /%/.match?(l[:elem]) }
+              locs.each { |l| l[:label] = @xrefs.anchor(l[:target], :xref) }
+            else
+              conflate_xref_locations(locs)
+            end
+      combine_conflated_xref_locations_container(locs, l10n(combine_conn(out)))
+    end
+
+    def conflate_xref_locations(locs)
       out = locs.each { |l| l[:label] = anchor_value(l[:target]) }
       label = @i18n.inflect(locs.first[:elem], number: "pl")
-      out[0][:label] = l10n("#{label} #{out[0][:label]}")
-      combine_conflated_xref_locations_container(locs, l10n(combine_conn(out)))
+      out[0][:label] = l10n("#{label} #{out[0][:label]}").strip
+      out
     end
 
     def combine_conflated_xref_locations_container(locs, ret)
@@ -93,7 +105,7 @@ module IsoDoc
         type = @xrefs.anchor(l["target"], :type)
         m << { conn: l["connective"], target: l["target"],
                type: type, node: l, elem: @xrefs.anchor(l["target"], :elem),
-               container: @xrefs.anchor(node["target"], :container, false) ||
+               container: @xrefs.anchor(l["target"], :container, false) ||
                  %w(termnote).include?(type) }
       end
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.4.5".freeze
+  VERSION = "2.5.1".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -93,7 +93,7 @@ module IsoDoc
 
       def dl_parse_table(node, out)
         list_title_parse(node, out)
-        out.table class: "dl" do |v|
+        out.table class: (node["class"] || "dl") do |v|
           node.elements.select { |n| dt_dd?(n) }
             .each_slice(2) do |dt, dd|
             dl_parse_table1(v, dt, dd)
@@ -204,14 +204,6 @@ module IsoDoc
         )
       end
 
-      def formula_where(deflist, out)
-        return unless deflist
-
-        out.p { |p| p << @i18n.where }
-        parse(deflist, out)
-        t = out.parent.at("./table") and t["class"] = "formula_dl"
-      end
-
       def formula_parse1(node, out)
         out.div **attr_code(class: "formula") do |div|
           div.p do |_p|
@@ -244,11 +236,11 @@ module IsoDoc
 
       def info(isoxml, out)
         @tocfigurestitle =
-          isoxml&.at(ns("//metanorma-extension/toc[@type = 'figure']/title"))&.text
+          isoxml.at(ns("//metanorma-extension/toc[@type = 'figure']/title"))&.text
         @toctablestitle =
-          isoxml&.at(ns("//metanorma-extension/toc[@type = 'table']/title"))&.text
+          isoxml.at(ns("//metanorma-extension/toc[@type = 'table']/title"))&.text
         @tocrecommendationstitle = isoxml
-          &.at(ns("//metanorma-extension/toc[@type = 'recommendation']/title"))&.text
+          .at(ns("//metanorma-extension/toc[@type = 'recommendation']/title"))&.text
         super
       end
     end

data/lib/isodoc/xref/xref_gen.rb

@@ -62,8 +62,8 @@ module IsoDoc
             @anchors[n["id"]] =
               { label: termnote_label(c.print), type: "termnote",
                 value: c.print, elem: @labels["termnote"],
-                xref: l10n("#{anchor(t['id'], :xref)}, " \
-                           "#{@labels['note_xref']} #{c.print}") }
+                container: t["id"],
+                xref: l10n("#{@labels['note_xref']} #{c.print}") }
           end
         end
       end
@@ -75,8 +75,11 @@ module IsoDoc
           examples.noblank.each do |n|
             c.increment(n)
             idx = increment_label(examples, n, c, increment: false)
-            @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
-                                              "termexample", n["unnumbered"])
+            @anchors[n["id"]] =
+              { label: idx, type: "termexample",
+                value: idx, elem: @labels["example_xref"],
+                container: t["id"],
+                xref: l10n("#{@labels['example_xref']} #{idx}") }
           end
         end
       end

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -38,6 +38,7 @@ chain_and: "%1 و %2"
 chain_or: "%1 او %2"
 chain_from: "%1 %من 2"
 chain_to: "من %1 إلى %2"
+nested_xref: "%1, %2"
 ordinal_keys: [gender]
 SpelloutRules:
   f: spellout-ordinal-feminine
@@ -60,6 +61,7 @@ key: مفتاح
 example: مثال
 example_xref: مثال
 where: حيث
+where_one: حيث
 wholeoftext: كامل النص
 draft_label: مسودة
 inform_annex: إخباري

data/lib/isodoc-yaml/i18n-de.yaml

@@ -40,6 +40,7 @@ chain_and: "%1 und %2"
 chain_or: "%1 oder %2"
 chain_from: "%1 von %2"
 chain_to: "%1 bis %2"
+nested_xref: "%1, %2"
 ordinal_keys: [gender,number]
 SpelloutRules:
   m.sg: spellout-ordinal-r
@@ -66,6 +67,7 @@ key: Taste
 example: BEISPIEL
 example_xref: Beispiel
 where: wobei
+where_one: wobei
 wholeoftext: Ganzer Text
 draft_label: Entwurf
 inform_annex: informativ

data/lib/isodoc-yaml/i18n-en.yaml

@@ -46,6 +46,7 @@ chain_and: "%1 and %2"
 chain_or: "%1 or %2"
 chain_from: "%1 from %2"
 chain_to: "%1 to %2"
+nested_xref: "%1, %2"
 ordinal_keys: []
 SpelloutRules: spellout-ordinal
 note: NOTE
@@ -75,6 +76,7 @@ key: Key
 example: EXAMPLE
 example_xref: Example
 where: where
+where_one: where
 wholeoftext: Whole of text
 draft_label: draft
 inform_annex: informative

data/lib/isodoc-yaml/i18n-es.yaml

@@ -42,6 +42,7 @@ chain_and: "%1 y %2"
 chain_or: "%1 o %2"
 chain_from: "%1 del %2"
 chain_to: "%1 al %2"
+nested_xref: "%1, %2"
 ordinal_keys: [gender,number]
 SpelloutRules:
   m.sg: spellout-ordinal-masculine
@@ -66,6 +67,7 @@ key: Clave
 example: EJEMPLO
 example_xref: Ejemplo
 where: donde
+where_one: donde
 wholeoftext: Todo el texto
 draft_label: borrador
 inform_annex: informativo

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -39,6 +39,7 @@ chain_and: "%1 et %2"
 chain_or: "%1 ou %2"
 chain_from: "%1 de %2"
 chain_to: "%1 à %2"
+nested_xref: "%1, %2"
 ordinal_keys: [gender,number]
 SpelloutRules:
   m.sg: spellout-ordinal-masculine
@@ -63,6 +64,7 @@ key: Légende
 example: EXEMPLE
 example_xref: Exemple
 where: où
+where_one: où
 wholeoftext: Ensemble du texte
 draft_label: brouillon
 inform_annex: informative

data/lib/isodoc-yaml/i18n-ja.yaml

@@ -0,0 +1,215 @@
+term_def_boilerplate: 
+scope: 適用範囲
+symbolsabbrev: 記号及び略語
+abbrev: 略語
+symbols: 記号
+table_of_contents: 目次
+introduction: 序文
+foreword: まえがき
+abstract: Abstract
+acknowledgements: Acknowledgements
+termsdef: 用語及び定義
+termsdefsymbolsabbrev: 用語及び定義並びに記号及び略語
+termsdefsymbols: 用語及び定義並びに記号
+termsdefabbrev: 用語及び定義並びに略語
+normref: 引用規格
+bibliography: 参考文献
+preface: Preface
+clause: 箇条
+annex: 附属書
+appendix: Appendix
+no_terms_boilerplate: |
+          <p>この規格には，定義する用語はない。</p>
+internal_terms_boilerplate: |
+        <p>この規格で用いる主な用語及び定義は，次による。</p>
+norm_with_refs_pref: 
+      次に掲げる引用規格は，この規格に引用されることによって，その一部又は全部がこの規格の要 求事項を構成している。これらの引用規格のうち，西暦年を付記してあるものは，記載の年の版を適 用し，その後の改正版(追補を含む。)は適用しない。西暦年の付記がない引用規格は，その最新版(追 補を含む。)を適用する。
+norm_empty_pref: 
+          この規格には，引用規格はない。
+external_terms_boilerplate: |
+          <p>この規格で用いる主な用語及び定義は，% による。</p>
+internal_external_terms_boilerplate: |
+          <p>この規格で用いる主な用語及び定義は，次によるほか，% による。</p>
+term_defined_in: "[term defined in %]"
+binary_and: "%1 and %2"
+multiple_and: "%1, and %2"
+binary_or: "%1 or %2"
+multiple_or: "%1, or %2"
+chain_and: "%1 and %2"
+chain_or: "%1 or %2"
+chain_from: "%1 from %2"
+chain_to: "%1 to %2"
+nested_xref: "%1の%2"
+ordinal_keys: []
+SpelloutRules: spellout-ordinal
+note: 注記
+note_xref: 注記
+termnote: 注釈%
+list: List
+deflist: Definition List
+figure: 図
+diagram: Diagram
+formula: 式
+inequality: Formula
+table: 表
+requirement: 要求事項
+recommendation: 推奨事項
+permission: 許容事項
+box: Box
+index: 索引
+standard_no: 規格番号
+number: 番号
+# Modspec
+recommendationtest: Recommendation test
+requirementtest: Requirement test
+permissiontest: Permission test
+recommendationclass: Recommendations class
+requirementclass: Requirements class
+permissionclass: Permissions class
+abstracttest: Abstract test
+conformanceclass: Conformance class
+key: 記号説明
+example: 例
+example_xref: 例
+where: ここで，
+where_one: ここで，
+wholeoftext: Whole of text
+draft_label: draft
+inform_annex: 参考
+norm_annex: 規定
+modified: modified
+deprecated: 推奨しない用語
+source: 出典
+and: and
+all_parts: 規格群
+edition_ordinal: "%Spellout edition"
+edition: edition
+version: version
+toc_figures: List of figures
+toc_tables: List of tables
+toc_recommendations: List of recommendations
+month_january: January
+month_february: February
+month_march: March
+month_april: April
+month_may: May
+month_june: June
+month_july: July
+month_august: August
+month_september: September
+month_october: October
+month_november: November
+month_december: December
+obligation: Obligation
+admonition: {
+  danger: Danger,
+  warning: 警告,
+  caution: Caution,
+  important: Important,
+  safety precautions: Safety Precautions,
+  editorial: Editorial Note
+}
+locality: {
+                      section: Section,
+                      clause: 箇条,
+                      subclause: 細分箇条,
+                      part: 部,
+                      paragraph: 段落,
+                      chapter: Chapter,
+                      page: Page,
+                      table: 表,
+                      annex: 附属書,
+                      figure: 図,
+                      example: 例,
+                      note: 注記,
+                      formula: 式,
+                    }
+grammar_abbrevs:
+  masculine: m
+  feminine: f
+  neuter: n
+  common: common
+  singular: sg
+  dual: dual
+  pl: pl
+  isPreposition: prep
+  isParticiple: part
+  isAdjective: adj
+  isAdverb: adv
+  isNoun: noun
+  isVerb: verb
+relatedterms:
+  deprecates: deprecates
+  supersedes: supersedes
+  narrower: narrower
+  broader: broader
+  equivalent: equivalent
+  compare: compare
+  contrast: contrast
+  see: see
+  seealso: see also
+inflection:
+  Clause:
+    sg: Clause
+    pl: Clauses
+  Annex:
+    sg: Annex
+    pl: Annexes
+  Appendix:
+    sg: Appendix
+    pl: Appendixes
+  Note:
+    sg: Note
+    pl: Notes
+  "Note % to entry":
+    sg: Note % to entry
+    pl: Notes % to entry
+  List:
+    sg: List
+    pl: Lists
+  Figure:
+    sg: Figure
+    pl: Figures
+  Formula:
+    sg: Formula
+    pl: Formulas
+  Table:
+    sg: Table
+    pl: Tables
+  Requirement:
+    sg: Requirement
+    pl: Requirements
+  Recommendation:
+    sg: Recommendation
+    pl: Recommendations
+  Permission:
+    sg: Permission
+    pl: Permissions
+  Example:
+    sg: Example
+    pl: Examples
+  Part:
+    sg: Part
+    pl: Parts
+  Section:
+    sg: Section
+    pl: Sections
+  Paragraph:
+    sg: Paragraph
+    pl: Paragraphs
+  Chapter:
+    sg: Chapter
+    pl: Chapters
+  Page:
+    sg: Page
+    pl: Pages
+doctype_dict:
+  international-standard: 日本産業規格
+  technical-specification: 標準仕様書
+  technical-report: 標準報告書
+  publicly-available-specification: Publicly Available Specification
+  international-workshop-agreement: International Workshop Agreement
+  guide: Guide
+  amendment: 追補
+  technical-corrigendum: Technical Corrigendum
+  directive: Directive

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -45,6 +45,7 @@ chain_and: "%1 и %2"
 chain_or: "%1 или %2"
 chain_from: "%1 от %2"
 chain_to: "%1 до %2"
+nested_xref: "%1, %2"
 ordinal_keys: [gender,number]
 SpelloutRules:
   m.sg: spellout-ordinal-masculine
@@ -71,6 +72,7 @@ key: Условные обозначения
 example: ПРИМЕР
 example_xref: Пример
 where: где
+where_one: где
 wholeoftext: Текст полностью
 draft_label: проект
 inform_annex: информативное

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -41,6 +41,7 @@ chain_and: "%1和%2"
 chain_or: "%1或%2"
 chain_from: "%1从%2"
 chain_to: "%1到%2"
+nested_xref: "%1, %2"
 ordinal_keys: []
 SpelloutRules: spellout-ordinal
 note: 注
@@ -61,6 +62,7 @@ key: 说明
 example: 示例
 example_xref: 示例
 where: 式中
+where_one: 式中
 wholeoftext: 全部
 draft_label: 稿
 inform_annex: 资料性附录

data/lib/isodoc.rb

@@ -1,7 +1,6 @@
 require_relative "isodoc/version"
 
 require "nokogiri"
-require "asciimath"
 require "uuidtools"
 require "base64"
 require "mime/types"

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: asciimath
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: html2doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mathml2asciimath
+  name: plurimath
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: metanorma-utils
+  name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
@@ -384,6 +370,7 @@ files:
 - lib/isodoc-yaml/i18n-en.yaml
 - lib/isodoc-yaml/i18n-es.yaml
 - lib/isodoc-yaml/i18n-fr.yaml
+- lib/isodoc-yaml/i18n-ja.yaml
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc.rb