isodoc 3.1.6 → 3.1.9

data/lib/isodoc/html_function/postprocess.rb

@@ -26,8 +26,7 @@ module IsoDoc
 
       def html_cleanup(html)
         html = term_header(html_footnote_filter(html_preface(htmlstyle(html))))
-        #html = footnote_format(footnote_backlinks(html))
-        html = (footnote_backlinks(html))
+        html = footnote_backlinks(html)
         html = mathml(html_list_clean(remove_placeholder_paras(html)))
         html_toc(heading_anchors(sourcecode_cleanup(html)))
       end

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -82,7 +82,6 @@ module IsoDoc
       def html_cover(docxml)
         doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
         d = docxml.at('//div[@class="title-section"]')
-        #d.children.first.add_previous_sibling(
         d.add_first_child(
           populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
         )
@@ -91,7 +90,6 @@ module IsoDoc
       def html_intro(docxml)
         doc = to_xhtml_fragment(File.read(@htmlintropage, encoding: "UTF-8"))
         d = docxml.at('//div[@class="prefatory-section"]')
-        #d.children.first.add_previous_sibling(
         d.add_first_child(
           populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
         )
@@ -180,9 +178,20 @@ module IsoDoc
       MATHJAX = <<~"MATHJAX".freeze
         <script type="text/x-mathjax-config">
           MathJax.Hub.Config({
-            "HTML-CSS": { preferredFont: "STIX" },
-            asciimath2jax: { delimiters: [['OPEN', 'CLOSE']] }
-         });
+            "HTML-CSS": {
+              preferredFont: "STIX",
+              linebreaks: {
+                automatic: true,
+                width: "container"  // or specify something like "90%"/"30em"
+              }
+            },
+            MathML: {
+              linebreaks: {
+                automatic: true
+              }
+            },
+            asciimath2jax: { delimiters: [['(#(', ')#)']] }
+          });
         </script>
         <script src="#{MATHJAX_ADDR}?config=MML_HTMLorMML-full" async="async"></script>
       MATHJAX

data/lib/isodoc/init.rb

@@ -143,9 +143,9 @@ module IsoDoc
       self.class::AGENCIES.include?(text)
     end
 
-    def docid_l10n(text)
+    def docid_l10n(text, citation: true)
       text.nil? and return text
-      @i18n.all_parts and text.gsub!(/All Parts/i, @i18n.all_parts.downcase)
+      docid_all_parts(text, citation)
       x = Nokogiri::XML::DocumentFragment.parse(text)
       (x.xpath(".//text()") - x.xpath(".//fn//text()")).each do |n|
         n.replace(n.text.gsub(/ /, " "))
@@ -153,10 +153,19 @@ module IsoDoc
       to_xml(x)
     end
 
+    def docid_all_parts(text, citation)
+      if citation
+        text.sub!(%r{\p{Zs}\(all\p{Zs}parts\)}, "")
+      else
+        @i18n.all_parts && !citation and
+          text.gsub!(/all\p{Zs}parts/, @i18n.all_parts.downcase)
+      end
+    end
+
     def docid_prefix(prefix, docid)
       docid = "#{prefix} #{docid}" if prefix && !omit_docid_prefix(prefix) &&
         !/^#{prefix}\b/.match(docid)
-      docid_l10n(docid)
+      docid_l10n(docid, citation: false)
     end
 
     def omit_docid_prefix(prefix)

data/lib/isodoc/presentation_function/autonum.rb

@@ -11,7 +11,7 @@ module IsoDoc
       prefix_name_postprocess(node, elem)
     end
 
-    def prefix_name_defaults(node, delims, label)
+    def prefix_name_defaults(_node, delims, label)
       label&.empty? and label = nil
       delims.nil? and delims = {}
       [label, delims]
@@ -80,7 +80,7 @@ module IsoDoc
     end
 
     def autonum(id, num)
-      /<semx/.match?(num) and return num # already contains markup
+      num.include?("<semx") and return num # already contains markup
       "<semx element='autonum' source='#{id}'>#{num}</semx>"
     end
 
@@ -135,7 +135,8 @@ module IsoDoc
     end
 
     def fmt_caption_label_wrap(label)
-      empty_xml?(label) || %r{<span class=['"]fmt-caption-label['"]}.match?(label) or
+      empty_xml?(label) ||
+        %r{<span class=['"]fmt-caption-label['"]}.match?(label) or
         label = "<span class='fmt-caption-label'>#{label}</span>"
       label
     end

data/lib/isodoc/presentation_function/block.rb

@@ -102,6 +102,7 @@ module IsoDoc
 
     def table1(elem)
       table_fn(elem)
+      table_css(elem)
       labelled_ancestor(elem) and return
       elem["unnumbered"] && !elem.at(ns("./name")) and return
       n = @xrefs.anchor(elem["id"], :label, false)
@@ -109,6 +110,16 @@ module IsoDoc
       prefix_name(elem, { caption: table_delim }, l10n(lbl), "name")
     end
 
+    def table_css(elem)
+      parser = IsoDoc::CssBorderParser::BorderParser.new
+      elem.xpath(ns(".//tr | .//th | .//td")).each do |n|
+        n["style"] or next
+        parsed_properties = parser.parse_declaration(n["style"])
+        new_style = parser.to_css_string(parsed_properties)
+        n["style"] = new_style
+      end
+    end
+
     def table_delim
       block_delim
     end
@@ -131,34 +142,63 @@ module IsoDoc
     def amend1(elem)
       ret = semx_fmt_dup(elem)
       ret.xpath(ns("./locality | ./localityStack | ./autonumber | " \
-                    "./classification | ./contributor")).each(&:remove)
+                   "./classification | ./contributor")).each(&:remove)
       ret.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
       ret.xpath(ns("./description")).each { |a| a.replace(a.children) }
       elem.xpath(ns(".//fmt-name | .//fmt-xref-label")).each(&:remove)
       elem.next = ret
     end
 
+    # TODO will go back to just one source/modification, preserving it
     def source(docxml)
-      docxml.xpath(ns("//source/modification")).each do |f|
+      fmt_source(docxml)
+      docxml.xpath(ns("//fmt-source/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) }
+      source_types(docxml)
+      docxml.xpath(ns("//fmt-source/source")).each do |f|
+        f.replace(semx_fmt_dup(f))
+      end
+    end
+
+    def source_types(docxml)
+      docxml.xpath(ns("//table/fmt-source")).each { |f| tablesource(f) }
+      docxml.xpath(ns("//figure/fmt-source")).each { |f| figuresource(f) }
+    end
+
+    def fmt_source(docxml)
+      n = docxml.xpath(ns("//source")) - docxml.xpath(ns("//term//source")) -
+        docxml.xpath(ns("//quote/source"))
+      n.each do |s|
+        dup = s.clone
+        modification_dup_align(s, dup)
+        s.next = "<fmt-source>#{to_xml(dup)}</fmt-source>"
+      end
     end
 
     def tablesource(elem)
-      source1(elem)
+      source1(elem, :table)
     end
 
     def figuresource(elem)
-      source1(elem)
+      source1(elem, :figure)
     end
 
-    def source1(elem)
-      while elem&.next_element&.name == "source"
-        elem << "; #{to_xml(elem.next_element.remove.children)}"
+    def source1(elem, ancestor)
+      n = elem
+      while n = n&.next_element
+        case n.name
+        when "source"
+        when "fmt-source"
+          elem << "; #{to_xml(n.remove.children)}"
+        else break
+        end
       end
-      elem.children = l10n("[#{@i18n.source}: #{to_xml(elem.children).strip}]")
+      source1_label(elem, to_xml(elem.children).strip, ancestor)
+    end
+
+    def source1_label(elem, sources, _ancestor)
+      elem.children = l10n("[#{@i18n.source}: #{sources}]")
     end
 
     def source_modification(mod)

data/lib/isodoc/presentation_function/concepts.rb

@@ -7,7 +7,7 @@ module IsoDoc
     end
 
     def concept1(node)
-      node.ancestors("definition, termsource, related").empty? or return
+      node.ancestors("definition, source, related").empty? or return
       xref = node&.at(ns("./semx/fmt-xref/@target"))&.text or
         return concept_render(node, ital: "true", ref: "true", bold: "false",
                                     linkref: "true", linkmention: "false")
@@ -30,8 +30,7 @@ module IsoDoc
     end
 
     def concept_dup(node, ret)
-      node.xpath(".//xmlns:semx[xmlns:fmt-xref | xmlns:fmt-eref | " \
-        "xmlns:fmt-origin | xmlns:fmt-link]").each(&:remove)
+      concept_dup_cleanup_orig(node)
       ret.xpath(ns(".//xref | .//eref | .//origin | .//link")).each(&:remove)
       ret.xpath(ns(".//semx")).each do |s|
         s.children.empty? and s.remove
@@ -41,6 +40,16 @@ module IsoDoc
       node.next = f
     end
 
+    def concept_dup_cleanup_orig(node)
+      node.xpath(".//xmlns:semx[xmlns:fmt-xref | xmlns:fmt-eref | " \
+         "xmlns:fmt-origin | xmlns:fmt-link]").each(&:remove)
+      node.xpath(ns(".//xref | .//eref | .//origin | .//link")).each do |x|
+        x["original-id"] or next
+        x["id"] = x["original-id"]
+        x.delete("original-id")
+      end
+    end
+
     def concept1_style(node, opts)
       r = node.at(ns(".//renderterm")) or return
       opts[:ital] == "true" and r.children = "<em>#{to_xml(r.children)}</em>"
@@ -103,13 +112,9 @@ module IsoDoc
     def related1(node)
       p, ref, orig = related1_prep(node)
       label = @i18n.relatedterms[orig["type"]].upcase
-      if p && ref
-        node.children = (l10n("<p><strong>#{label}:</strong> " \
-                          "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})</p>"))
-      else
-        node.children = (l10n("<p><strong>#{label}:</strong> " \
-                          "<strong>**RELATED TERM NOT FOUND**</strong></p>"))
-      end
+      ret = "<strong>**RELATED TERM NOT FOUND**</strong>"
+      p && ref and ret = "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})"
+      node.children = (l10n("<p><strong>#{label}:</strong> #{ret}</p>"))
     end
 
     def related1_prep(node)
@@ -152,8 +157,7 @@ module IsoDoc
         .with_object([]) do |(p, i), m|
         if (i.zero? && (pref = p)) || merge_preferred_eligible?(pref, p)
           m << p
-        else
-          p.wrap("<p></p>")
+        else p.wrap("<p></p>")
         end
       end
       pref&.replace(merge_second_preferred1(out, term))
@@ -188,7 +192,9 @@ module IsoDoc
       desgn.parent.name == "related" and return
       out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
       d1 = semx_fmt_dup(desgn)
-      s = d1.at(ns("./termsource"))
+      s = d1.at(ns("./source"))
+      s0 = desgn.at(ns("./source"))
+      modification_dup_align(s0, s)
       name = d1.at(ns("./expression/name | ./letter-symbol/name | " \
                          "./graphical-symbol")) or return
       designation_annotate(d1, name, desgn)

data/lib/isodoc/presentation_function/docid.rb

@@ -13,7 +13,8 @@ module IsoDoc
       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>"
+        id = docid_l10n(r, citation: false)
+        ins.next = "<docidentifier scope='biblio-tag'>#{id}</docidentifier>"
       end
       ret
     end

data/lib/isodoc/presentation_function/erefs.rb

@@ -15,7 +15,7 @@ module IsoDoc
     end
 
     def citeas_cleanup(ref)
-      if /</.match?(ref)
+      if ref.include?("<")
         xml = Nokogiri::XML("<root>#{ref}</root>")
         xml.xpath("//semx").each { |x| x.replace(x.children) }
         ref = to_xml(xml.at("//root").children)
@@ -33,7 +33,6 @@ module IsoDoc
         [e["connective"], to_xml(e.parent.remove)]
       end.flatten
       ret = resolve_eref_connectives(locs)
-      elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
       elem.next = "<semx element='erefstack' source='#{elem['id']}'>#{ret[1]}</semx>"
     end
 

data/lib/isodoc/presentation_function/footnotes.rb

@@ -3,11 +3,12 @@ module IsoDoc
     def footnote_collect(fnotes)
       seen = {}
       fnotes.each_with_object([]) do |x, m|
-        x["id"] ||= "_#{UUIDTools::UUID.random_create}"
         seen[x["reference"]] or m << fnbody(x, seen)
         x["target"] = seen[x["reference"]]
         ref = x["hiddenref"] == "true" ? "" : fn_ref_label(x)
-        x << "<fmt-fn-label>#{ref}</fmt-fn-label>"
+        x << <<~FNOTE.strip
+          <fmt-fn-label><span class='fmt-caption-label'>#{ref}</span</fmt-fn-label>
+        FNOTE
       end
     end
 
@@ -35,7 +36,7 @@ module IsoDoc
         body.at(ns("./semx")).children.first.before("<p> </p>").previous
       lbl = fn_body_label(fnote)
       ins.children.first.previous = <<~FNOTE.strip
-        <fmt-fn-label>#{lbl}<span class="fmt-caption-delim"><tab/></fmt-fn-label>
+        <fmt-fn-label><span class='fmt-caption-label'>#{lbl}</span><span class="fmt-caption-delim"><tab/></fmt-fn-label>
       FNOTE
     end
 
@@ -145,7 +146,6 @@ module IsoDoc
     end
 
     def comment_body(elem)
-      elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
       c1 = elem.after("<fmt-review-body/>").next
       elem.attributes.each_key { |k| c1[k] = elem[k] }
       c1["id"] = "_#{UUIDTools::UUID.random_create}"

data/lib/isodoc/presentation_function/ids.rb

@@ -0,0 +1,79 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def id_validate(docxml)
+      repeat_id_validate(docxml)
+      idref_validate(docxml)
+    end
+
+    def repeat_id_validate1(elem)
+      if @doc_ids[elem["id"]]
+        @log.add("Anchors", elem,
+                 "Anchor #{elem['id']} has already been " \
+                 "used at line #{@doc_ids[elem['id']]}", severity: 0)
+      end
+      @doc_ids[elem["id"]] = elem.line
+    end
+
+    def repeat_id_validate(doc)
+      @log or return
+      @doc_ids = {}
+      doc.xpath("//*[@id]").each do |x|
+        repeat_id_validate1(x)
+      end
+    end
+
+    def idref_validate(doc)
+      @log or return
+      doc.xpath("//*[@original-id]").each do |x|
+        @doc_ids[x["original-id"]] = x.line
+      end
+      Metanorma::Utils::anchor_attributes(presxml: true).each do |e|
+        doc.xpath("//xmlns:#{e[0]}[@#{e[1]}]").each do |x|
+          idref_validate1(x, e[1])
+        end
+      end
+    end
+
+    def idref_validate1(node, attr)
+      node[attr].strip.empty? and return
+      @doc_ids[node[attr]] and return
+      @log.add("Anchors", node,
+               "Anchor #{node[attr]} pointed to by #{node.name} " \
+               "is not defined in the document", severity: 1)
+    end
+
+    def provide_ids(docxml)
+      anchor_sanitise(docxml)
+      populate_id(docxml)
+      add_missing_id(docxml)
+    end
+
+    def anchor_sanitise(docxml)
+      Metanorma::Utils::anchor_attributes.each do |a|
+        docxml.xpath("//xmlns:#{a[0]}").each do |x|
+          x[a[1]] &&= to_ncname(x[a[1]])
+        end
+      end
+    end
+
+    def populate_id(docxml)
+      docxml.xpath("//*[@id]").each do |x|
+        x["semx-id"] = x["id"]
+        x["anchor"] and x["id"] = to_ncname(x["anchor"])
+      end
+    end
+
+    def add_missing_id(docxml)
+      docxml.xpath(ns("//source | //modification | //erefstack | //fn | " \
+        "//review | //floating-title")).each do |s|
+        s["id"] ||= "_#{UUIDTools::UUID.random_create}"
+      end
+    end
+
+    # do not sanitise "#"
+    def to_ncname(ident)
+      ret = ident.split("#", 2)
+      ret.map { |x| Metanorma::Utils::to_ncname(x) }.join("#")
+    end
+  end
+end

data/lib/isodoc/presentation_function/image.rb

@@ -24,11 +24,10 @@ module IsoDoc
     end
 
     def svgmap_extract(elem)
-      if elem.at(ns("./figure"))# then elem.replace(f)
+      if elem.at(ns("./figure"))
         n = semx_fmt_dup(elem)
         n.xpath(ns("./target")).each(&:remove)
         elem.next = n
-      #else elem.remove
       end
     end
 

data/lib/isodoc/presentation_function/inline.rb

@@ -71,13 +71,19 @@ module IsoDoc
     # do not change to Presentation XML rendering
     def sem_xml_descendant?(node)
       ancestor_names = node.ancestors.map(&:name)
-
-      return true if %w[preferred admitted deprecated related definition termsource].any? { |name| ancestor_names.include?(name) }
-      return true if %w[xref eref origin link name title].any? { |name| ancestor_names.include?(name) }
-      return true if ancestor_names.include?("bibitem") &&
-        !%w[formattedref biblio-tag].any? { |name| ancestor_names.include?(name) }
-      return true if (ancestor_names & %w[requirement recommendation permission]).any? &&
-        !ancestor_names.include?("fmt-provision")
+      %w[preferred admitted deprecated related definition source]
+        .any? do |name|
+        ancestor_names.include?(name)
+      end and return true
+      %w[xref eref origin link name title].any? do |name|
+        ancestor_names.include?(name)
+      end and return true
+      ancestor_names.include?("bibitem") &&
+        %w[formattedref biblio-tag].none? do |name|
+          ancestor_names.include?(name)
+        end and return true
+      (ancestor_names & %w[requirement recommendation permission]).any? &&
+        !ancestor_names.include?("fmt-provision") and return true
 
       false
     end

data/lib/isodoc/presentation_function/math.rb

@@ -50,41 +50,37 @@ module IsoDoc
                                   precision: num_precision(num.text))
     end
 
-    def numberformat_extract(options)
-      options.gsub!(/([a-z_]+)='/, %('\\1=))
-      
-      # Temporarily replace commas inside quotes with a placeholder
+    COMMA_PLACEHOLDER = "##COMMA##".freeze
+
+    # Temporarily replace commas inside quotes with a placeholder
+    def comma_placeholder(options)
       processed = ""
       in_quotes = false
-      placeholder = "##COMMA##"
-      
       options.each_char do |c|
-        if c == "'"
-          in_quotes = !in_quotes
-        end
-        
-        if c == ',' && in_quotes
-          processed << placeholder
-        else
-          processed << c
-        end
+        c == "'" and in_quotes = !in_quotes
+        processed << if c == "," && in_quotes
+                       COMMA_PLACEHOLDER
+                     else c end
       end
-      
-      result = CSV.parse_line(processed, quote_char: "'").each_with_object({}) do |x, acc|
-        # Restore commas from placeholders
-        x.gsub!(placeholder, ',')
+      processed
+    end
+
+    def numberformat_extract(options)
+      options.gsub!(/([a-z_]+)='/, %('\\1=))
+      processed = comma_placeholder(options)
+      CSV.parse_line(processed,
+                     quote_char: "'").each_with_object({}) do |x, acc|
+        x.gsub!(COMMA_PLACEHOLDER, ",")
         m = /^(.+?)=(.+)?$/.match(x) or next
         acc[m[1].to_sym] = m[2].sub(/^(["'])(.+)\1$/, "\\2")
       end
-      
-      result
     end
 
     def numberformat_type(ret)
       %i(precision significant digit_count group_digits fraction_group_digits)
         .each do |i|
-        ret[i] &&= ret[i].to_i
-      end
+          ret[i] &&= ret[i].to_i
+        end
       %i(notation exponent_sign number_sign locale).each do |i|
         ret[i] &&= ret[i].to_sym
       end

data/lib/isodoc/presentation_function/refs.rb

@@ -211,7 +211,7 @@ module IsoDoc
       date_note = bib.at(ns("./note[@type = 'Unpublished-Status']"))
       date_note.nil? and return ret
       id = "_#{UUIDTools::UUID.random_create}"
-      "#{ret}<fn reference='#{id}'><p>#{date_note.content}</p></fn>"
+      "#{ret}<fn id='#{id}' reference='#{id}'><p>#{date_note.content}</p></fn>"
     end
 
     def ident_fn(bib)

data/lib/isodoc/presentation_function/section.rb

@@ -6,8 +6,8 @@ module IsoDoc
     def clause(docxml)
       docxml.xpath(ns("//clause | //terms | //definitions | //references | " \
                       "//introduction | //foreword | //preface/abstract | " \
-                      "//acknowledgements | //colophon | //indexsect "))
-        .each do |f|
+                      "//acknowledgements | //colophon | //indexsect | " \
+                      "//executivesummary | //appendix")).each do |f|
         f.parent.name == "annex" &&
           @xrefs.klass.single_term_clause?(f.parent) and next
         clause1(f)
@@ -133,14 +133,15 @@ module IsoDoc
     end
 
     def preface_rearrange(doc)
-      preface_move(doc.xpath(ns("//preface/abstract")),
-                   %w(foreword introduction clause acknowledgements), doc)
-      preface_move(doc.xpath(ns("//preface/foreword")),
-                   %w(introduction clause acknowledgements), doc)
-      preface_move(doc.xpath(ns("//preface/introduction")),
-                   %w(clause acknowledgements), doc)
-      preface_move(doc.xpath(ns("//preface/acknowledgements")),
-                   %w(), doc)
+      [["//preface/abstract",
+        %w(foreword introduction clause acknowledgements executivesummary)],
+       ["//preface/foreword",
+        %w(introduction clause acknowledgements executivesummary)],
+       ["//preface/introduction", %w(clause acknowledgements executivesummary)],
+       ["//preface/acknowledgements", %w(executivesummary)],
+       ["//preface/executivesummary", %w()]].each do |x|
+        preface_move(doc.xpath(ns(x[0])), x[1], doc)
+      end
     end
 
     def preface_move(clauses, after, _doc)