metanorma-standoc 2.3.9 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb752d30fc48409836f4b8b63f7f57864ffe6626f624ca2520875b918ff5df3
-  data.tar.gz: 5da9f771b4caa899c275a131c4484f0c0ae14a05041012994edd57de3588ff63
+  metadata.gz: 29a338b7e2acb906be1a2f9fb958fec1281991d934cae8f33279605d4c7296e7
+  data.tar.gz: 104dfd478b186a14b6a7acd276c28785ada074ce3f747839ee30a4620269b74e
 SHA512:
-  metadata.gz: 5c85f82ea6c5121977b3f511d5e70b74420bc8ed9f3256117ecf16a2547e454a9b738188d5ace110127533395b4d230787fbfef1dcb37384bc07f1a8403ffc0a
-  data.tar.gz: 8bcb04197dd817d9a853692935e07c76c70f2293821e4b1e2fb560a6e52c2eccc5b9dfc993ef5b562d09af75381e067af9dac5f2063d92c5995b447d0219c0a5
+  metadata.gz: 94ef91339b3743becae21df403eeb7b9af5910257ba97756c72111ddababda0523d9e6b961aa6eab9737af6c460f4c3c89aecf0af3ecbacbb391aa9e10493af3
+  data.tar.gz: 0ef86c13ca5bea907b55aa9e9ce98b1447e9c887e388db737855f9d8f55f3db39d20cf34aa526e2c2f0ccf140792cfd6f396b4ba117a1d50f67f28a0dd027442

data/lib/isodoc/html/htmlstyle.css

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

data/lib/metanorma/standoc/base.rb

@@ -59,6 +59,7 @@ module Metanorma
         @index_terms = node.attr("index-terms")
         @boilerplateauthority = node.attr("boilerplate-authority")
         @embed_hdr = node.attr("embed_hdr")
+        @embed_id = node.attr("embed_id")
         @document_scheme = node.attr("document-scheme")
         @xrefstyle = node.attr("xrefstyle")
         @source_linenums = node.attr("source-linenums-option") == "true"

data/lib/metanorma/standoc/blocks.rb

@@ -1,4 +1,3 @@
-require "htmlentities"
 require "uri" if /^2\./.match?(RUBY_VERSION)
 require_relative "./blocks_notes"
 
@@ -8,6 +7,7 @@ module Metanorma
       def id_attr(node = nil)
         { id: Metanorma::Utils::anchor_or_uuid(node),
           tag: node&.attr("tag"),
+          columns: node&.attr("columns"),
           "multilingual-rendering": node&.attr("multilingual-rendering") }
       end
 
@@ -43,11 +43,15 @@ module Metanorma
         result
       end
 
+      def form_attrs(node)
+        attr_code(id_attr(node)
+          .merge(class: node.attr("class"),
+                 name: node.attr("name"), action: node.attr("action")))
+      end
+
       def form(node)
         noko do |xml|
-          xml.form **attr_code(id_attr(node)
-            .merge(class: node.attr("class"),
-                   name: node.attr("name"), action: node.attr("action"))) do |f|
+          xml.form **form_attrs(node) do |f|
             f << node.content
           end
         end
@@ -108,8 +112,7 @@ module Metanorma
       end
 
       def example_to_requirement(node, role)
-        return unless @reqt_models.requirement_roles.key?(role&.to_sym)
-
+        @reqt_models.requirement_roles.key?(role&.to_sym) or return
         # need to call here for proper recursion ordering
         select_requirement_model(node)
         requirement(node,
@@ -169,8 +172,7 @@ module Metanorma
       end
 
       def figure_title(node, out)
-        return if node.title.nil?
-
+        node.title.nil? and return
         out.name { |name| name << node.title }
       end
 
@@ -196,8 +198,7 @@ module Metanorma
       end
 
       def paragraph(node)
-        return termsource(node) if node.role == "source"
-
+        node.role == "source" and return termsource(node)
         noko do |xml|
           xml.p **para_attrs(node) do |xml_t|
             xml_t << node.content

data/lib/metanorma/standoc/cleanup.rb

@@ -26,7 +26,8 @@ module Metanorma
       def cleanup(xmldoc)
         element_name_cleanup(xmldoc)
         passthrough_cleanup(xmldoc)
-        sections_cleanup(xmldoc) # feeds: obligations_cleanup, toc_cleanup
+        sections_cleanup(xmldoc) # feeds: obligations_cleanup, toc_cleanup,
+        # floatingtitle_cleanup
         obligations_cleanup(xmldoc)
         para_index_cleanup(xmldoc)
         block_index_cleanup(xmldoc)

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -22,10 +22,8 @@ module Metanorma
             @log.add("Crossreferences", nil,
                      "term source #{s['bibitemid']} not referenced")
         end
-        a = if source.empty? && term.nil?
-              @i18n.no_terms_boilerplate
-            else
-              term_defs_boilerplate_cont(source, term, isodoc)
+        a = if source.empty? && term.nil? then @i18n.no_terms_boilerplate
+            else term_defs_boilerplate_cont(source, term, isodoc)
             end
         a and div.next = a
       end
@@ -81,7 +79,7 @@ module Metanorma
         xmldoc.xpath(xpath).each do |f|
           f.xpath(".//clause[@type = 'boilerplate'] | " \
                   ".//note[@type = 'boilerplate']").each do |c|
-            c&.at("./title")&.remove
+            c.at("./title")&.remove
             c.replace(c.children)
           end
         end
@@ -89,13 +87,12 @@ module Metanorma
 
       def termdef_boilerplate_insert(xmldoc, isodoc, once = false)
         xmldoc.xpath(self.class::TERM_CLAUSE).each do |f|
-          next if f.at("./clause[@type = 'boilerplate'] | " \
-                       "./note[@type = 'boilerplate']")
-
+          f.at("./clause[@type = 'boilerplate'] | " \
+               "./note[@type = 'boilerplate']") and next
           term_defs_boilerplate(f.at("./title"),
                                 xmldoc.xpath(".//termdocsource"),
                                 f.at(".//term"), f.at(".//p"), isodoc)
-          break if once
+          once and break
         end
       end
 
@@ -109,8 +106,7 @@ module Metanorma
       end
 
       def initial_boilerplate(xml, isodoc)
-        return if xml.at("//boilerplate")
-
+        xml.at("//boilerplate") and return
         preface = xml.at("//preface") || xml.at("//sections") ||
           xml.at("//annex") || xml.at("//references") or return
         b = boilerplate(xml, isodoc) or return
@@ -123,10 +119,8 @@ module Metanorma
 
       def boilerplate(xml, conv)
         file = boilerplate_file(xml)
-        if @boilerplateauthority
-          file = File.join(@localdir,
-                           @boilerplateauthority)
-        end
+        @boilerplateauthority and
+          file = File.join(@localdir, @boilerplateauthority)
         (!file.nil? and File.exist?(file)) or return
         conv.populate_template(File.read(file, encoding: "UTF-8"), nil)
       end
@@ -134,7 +128,8 @@ module Metanorma
       def bibdata_cleanup(xmldoc)
         bibdata_anchor_cleanup(xmldoc)
         bibdata_docidentifier_cleanup(xmldoc)
-        bibdata_embed_hdr_cleanup(xmldoc)
+        bibdata_embed_hdr_cleanup(xmldoc) # feeds bibdata_embed_id_cleanup
+        bibdata_embed_id_cleanup(xmldoc)
         biblio_indirect_erefs(xmldoc, @internal_eref_namespaces&.uniq)
       end
 
@@ -147,8 +142,7 @@ module Metanorma
       def bibdata_docidentifier_cleanup(xmldoc)
         ins = xmldoc.at("//bibdata/docidentifier")
         xmldoc.xpath("//bibdata/docidentifier").each_with_index do |b, i|
-          next if i.zero?
-
+          i.zero? and next
           ins.next = b.remove
           ins = ins.next
         end
@@ -212,8 +206,7 @@ module Metanorma
       end
 
       def bibdata_embed_hdr_cleanup(xmldoc)
-        return if @embed_hdr.nil? || @embed_hdr.empty?
-
+        (@embed_hdr.nil? || @embed_hdr.empty?) and return
         xmldoc.at("//bibdata") << "<relation type='derivedFrom'>" \
                                   "#{hdr2bibitem(@embed_hdr.first)}</relation>"
       end
@@ -241,6 +234,19 @@ module Metanorma
           bibitem << "<relation type='derivedFrom'>#{x}</relation>"
         end
       end
+
+      def bibdata_embed_id_cleanup(xmldoc)
+        @embed_id.nil? and return
+        bibdata = xmldoc.at("//bibdata")
+        #require "debug"; binding.b
+        @embed_id.each do |d|
+          bibdata = bibdata.at("./relation[@type = 'derivedFrom']/bibitem")
+          ident = bibdata.at("./docidentifier[@primary = 'true']") ||
+            bibdata.at("./docidentifier")
+          xmldoc.xpath("//xref[@target = '#{d}'][normalize-space(text()) = '']")
+            .each { |x| x << ident.text }
+        end
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -13,20 +13,31 @@ module Metanorma
       end
 
       def strip_initial_space(elem)
-        return unless elem.children[0].text?
-
+        elem.children[0].text? or return
         if /\S/.match?(elem.children[0].text)
-          elem.children[0].content = elem.children[0].text.gsub(/^ /, "")
+          elem.children[0].content = elem.children[0].text.lstrip
         else
           elem.children[0].remove
         end
       end
 
       def bookmark_cleanup(xmldoc)
+        redundant_bookmark_cleanup(xmldoc)
         li_bookmark_cleanup(xmldoc)
         dt_bookmark_cleanup(xmldoc)
       end
 
+      def redundant_bookmark_cleanup(xmldoc)
+        xmldoc.xpath("//bookmark").each do |b|
+          p = b
+          while !p.xml? && p = p.parent
+            p["id"] == b["id"] or next
+            b.remove
+            break
+          end
+        end
+      end
+
       def bookmark_to_id(elem, bookmark)
         parent = bookmark.parent
         elem["id"] = bookmark.remove["id"]
@@ -103,8 +114,8 @@ module Metanorma
       end
 
       def concept_eref_cleanup(elem)
-        t = elem&.at("./xrefrender")&.remove&.children&.to_xml
-        l = elem&.at("./locality")&.remove&.children&.to_xml
+        t = elem.at("./xrefrender")&.remove&.children&.to_xml
+        l = elem.at("./locality")&.remove&.children&.to_xml
         elem.add_child "<eref bibitemid='#{elem['key']}'>#{l}</eref>"
         extract_localities(elem.elements[-1])
         elem.elements[-1].add_child(t) if t

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -11,10 +11,23 @@ module Metanorma
           .asciimath_to_mathml(text, ["<amathstem>", "</amathstem>"],
                                retain_asciimath: true)
         asciimath2mathml_wrap(text)
+      rescue StandardError => e
+        asciimath2mathml_err(text, e)
+        text
+      end
+
+      def asciimath2mathml_err(text, expr)
+        err = "Malformed MathML: #{expr}\n#{text}"
+        @log.add("Maths", nil, err)
+        @fatalerror << err
+        warn err
       end
 
       def asciimath2mathml_wrap(text)
         x = Nokogiri::XML(text)
+        x.xpath("//*[local-name() = 'math'][@display]").each do |y|
+          y.delete("display")
+        end
         x.xpath("//*[local-name() = 'math'][not(parent::stem)]").each do |y|
           y.wrap("<stem type='MathML'></stem>")
         end
@@ -43,7 +56,9 @@ module Metanorma
       end
 
       def mathml_namespace(stem)
-        stem.xpath("./math").each { |x| x.default_namespace = MATHML_NS }
+        stem.xpath("./*[local-name() = 'math']").each do |x|
+          x.default_namespace = MATHML_NS
+        end
       end
 
       def mathml_mi_italics

data/lib/metanorma/standoc/cleanup_section.rb

@@ -1,7 +1,6 @@
 require "date"
 require "htmlentities"
 require "json"
-require "mathml2asciimath"
 require_relative "cleanup_section_names"
 
 module Metanorma
@@ -86,6 +85,7 @@ module Metanorma
 
       def sections_order_cleanup(xml)
         s = xml.at("//sections")
+        pop_floating_title(xml)
         make_preface(xml, s)
         make_annexes(xml)
         make_indexsect(xml, s)
@@ -214,7 +214,6 @@ module Metanorma
       end
 
       def floatingtitle_cleanup(xmldoc)
-        pop_floating_title(xmldoc)
         floating_title_preface2sections(xmldoc)
       end
 

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -17,7 +17,7 @@ module Metanorma
         doc.xpath(xpath).each_with_index do |node, i|
           first && !i.zero? and next
           title = get_or_make_title(node)
-          fn = title.xpath("./fn")
+          fn = title.xpath("./fn | ./bookmark")
           fn.each(&:remove)
           title.children = text
           fn.each { |n| title << n }

data/lib/metanorma/standoc/cleanup_symbols.rb

@@ -4,11 +4,14 @@ module Metanorma
       # Indices sort after letter but before any following
       # letter (x, x_m, x_1, xa); we use colon to force that sort order.
       # Numbers sort *after* letters; we use thorn to force that sort order.
+      # Capitals sort before their corresponding lowercase.
       def symbol_key(sym)
-        @c.decode(asciimath_key(sym).text.downcase)
+        @c.decode(asciimath_key(sym).text)
           .gsub(/[\[\]{}<>()]/, "").gsub(/\s/m, "")
           .gsub(/[[:punct:]]|[_^]/, ":\\0").gsub(/`/, "")
           .gsub(/[0-9]+/, "þ\\0")
+          .tr("AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz",
+              "ABCFEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")
       end
 
       def asciimath_key(sym)

data/lib/metanorma/standoc/cleanup_terms.rb

@@ -74,7 +74,7 @@ module Metanorma
       end
 
       def term_children_cleanup(xmldoc)
-        xmldoc.xpath("//terms[terms]").each { |t| t.name = "clause" }
+        xmldoc.xpath("//terms[terms][not(term)]").each { |t| t.name = "clause" }
         xmldoc.xpath("//term").each do |t|
           %w(termnote termexample termsource term).each do |w|
             t.xpath("./#{w}").each { |n| t << n.remove }

data/lib/metanorma/standoc/front_contributor.rb

@@ -114,7 +114,7 @@ module Metanorma
         aff = node.attr("affiliation#{suffix}")
         pos = node.attr("contributor-position#{suffix}")
         (aff || pos) and person.affiliation do |a|
-          pos and a.name pos
+          pos and a.name { |n| n << pos }
           aff and a.organization do |o|
             person_organization(node, suffix, o)
           end

data/lib/metanorma/standoc/inline.rb

@@ -1,10 +1,9 @@
 require "asciidoctor/extensions"
-require "htmlentities"
 require "unicode2latex"
 require "mime/types"
 require "base64"
 require "English"
-require "latexmath"
+require "plurimath"
 
 module Metanorma
   module Standoc
@@ -139,27 +138,24 @@ module Metanorma
         noko { |xml| xml.hr }.join
       end
 
-      def xml_encode(text)
-        @c.encode(text, :basic, :hexadecimal)
-          .gsub(/&amp;gt;/, ">").gsub(/&amp;lt;/, "<").gsub(/&amp;amp;/, "&")
-          .gsub(/&gt;/, ">").gsub(/&lt;/, "<").gsub(/&amp;/, "&")
-          .gsub(/&quot;/, '"').gsub(/&#xa;/, "\n").gsub(/&amp;#/, "&#")
-      end
-
       def latex_parse1(text)
         lxm_input = Unicode2LaTeX.unicode2latex(@c.decode(text))
-        results = Latexmath.parse(lxm_input).to_mathml
-        results.nil? and
+        results = Plurimath::Math.parse(lxm_input, "latex").to_mathml
+        if results.nil?
           @log.add("Math", nil,
                    "latexmlmath failed to process equation:\n#{lxm_input}")
-        results&.sub(%r{<math ([^>]+ )?display="block"}, "<math \\1")
+          return
+        end
+        results.sub(%r{<math ([^>]+ )?display="block"}, "<math \\1")
       end
 
       def stem_parse(text, xml, style)
         if /&lt;([^:>&]+:)?math(\s+[^>&]+)?&gt; |
           <([^:>&]+:)?math(\s+[^>&]+)?>/x.match? text
           math = xml_encode(text)
-          xml.stem math, type: "MathML"
+          xml.stem type: "MathML" do |s|
+            s << math
+          end
         elsif style == :latexmath then latex_parse(text, xml)
         else
           xml.stem text&.gsub(/&amp;#/, "&#"), type: "AsciiMath"