isodoc 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3b8a9f7427b4df55cade247b1f292beb41b47d1ae684c9e1d3a7afe547c303f
-  data.tar.gz: e7bd73e5b3a1078f67c9b4f959e0a0255d524a600757d064353ddd941c8165c7
+  metadata.gz: 1838af1ef3cfa443fb12a42021110e6fbd62939a9de84b341063bde18dd6f095
+  data.tar.gz: aa8889a0f7b2519aee981d9f7e9e244b52dd9c6d8afb9c3232259e74899a64e9
 SHA512:
-  metadata.gz: 241e2e7855b90c61d4d17955125f3f2025a8b4bd986bc32192355e9eee1af51a931d039b07520bb1403ae0dac1b6b14d6969c62815be3d502935198efc9fb124
-  data.tar.gz: f8a77cad3f2a0b46679c0cc980180911574b6e4d7649979c58bb29c7024c26c0a8b2ea380d60b97de62a29f85a71e2441291f0e00907789f7c999d0f1f67dc46
+  metadata.gz: 485a2e94c34ee1f1d00a8ea50e04dbb2dd8d1aafee5091478e3dec43b61f0a9585905af7cf1f9ae28db44c9c0427e674a4b2e358bbac89e74a2fc117d6e98f72
+  data.tar.gz: be94db4afe2a26d5afee70e2b9afe48cf091372e3606643914f1705bfece932536d6699e0792a9d9a3df70d1753726d67261e628e8b066436e6371da9bda6c1f

data/README.adoc

@@ -2,7 +2,7 @@
 
 image:https://img.shields.io/gem/v/isodoc.svg["Gem Version", link="https://rubygems.org/gems/isodoc"]
 image:https://github.com/metanorma/isodoc/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/isodoc/actions?query=workflow%3Arake"]
-image:https://codeclimate.com/github/metanorma/isodoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/isodoc"]
+// image:https://codeclimate.com/github/metanorma/isodoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/isodoc"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/isodoc.svg["Pull Requests", link="https://github.com/metanorma/isodoc/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/isodoc/latest.svg["Commits since latest",link="https://github.com/metanorma/isodoc/releases"]
 

data/isodoc.gemspec

@@ -56,10 +56,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "xml-c14n"
-  # html2doc locks lutaml-model to ~ 0.7.0, but until testing of lutaml-model
-  # releases against dowmstream gems (notably Plurimath) is in place, locking at
-  # patch level
-  #spec.add_dependency "lutaml-model", "0.7.1"
+  spec.add_development_dependency "canon"
   # spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/isodoc/function/cleanup.rb

@@ -105,9 +105,9 @@ module IsoDoc
         table.at(".//tr").xpath("./td | ./th").each do |td|
           cols += (td["colspan"] ? td["colspan"].to_i : 1)
         end
-        style =
-          %{border-top:0pt;border-bottom:#{IsoDoc::Function::Table::SW} 1.5pt;}
-        tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
+        table["class"].nil? or # = plain table
+          s = "style='border-top:0pt;border-bottom:#{IsoDoc::Function::Table::SW} 1.5pt;'"
+        tfoot.add_child("<tr><td colspan='#{cols}' #{s}/></tr>")
         tfoot.xpath(".//td").last
       end
 

data/lib/isodoc/function/setup.rb

@@ -41,6 +41,7 @@ module IsoDoc
       end
 
       def info(isoxml, out)
+        @meta.localdir = @localdir
         @meta.code_css isoxml, out
         @meta.title isoxml, out
         @meta.subtitle isoxml, out

data/lib/isodoc/function/table.rb

@@ -40,16 +40,28 @@ module IsoDoc
         end
       end
 
+      def bordered_table_style(node, klass)
+        bordered = "border-width:1px;border-spacing:0;"
+        (node["plain"] != "true" && (%w(modspec).include?(klass) || !klass)) or
+          bordered = ""
+        bordered
+      end
+
       def table_attrs(node)
-        width = node["width"] ? "width:#{node['width']};" : nil
         c = node["class"]
-        bordered = "border-width:1px;border-spacing:0;"
-        (%w(modspec).include?(c) || !c) or bordered = ""
-        style = node["style"] ? "" : "#{bordered}#{width}"
+        style = table_attrs_style(node, c)
         attr_code(id: node["id"],
-                  class: c || "MsoISOTable",
-                  style: "#{style}#{keep_style(node)}",
-                  title: node["alt"])
+                  class: node["plain"] == "true" ? nil : (c || "MsoISOTable"),
+                  style: style, title: node["alt"])
+      end
+
+      def table_attrs_style(node, klass)
+        width = node["width"] ? "width:#{node['width']};" : nil
+        bordered = bordered_table_style(node, klass)
+        style = node["style"] ? "" : "#{bordered}#{width}"
+        style += keep_style(node) || ""
+        style.empty? and style = nil
+        style
       end
 
       def tcaption(node, table)
@@ -125,6 +137,7 @@ module IsoDoc
       end
 
       def table_bordered?(node)
+        node.parent.parent["plain"] == "true" and return false
         c = node.parent.parent["class"]
         %w(modspec).include?(c) || !c
       end

data/lib/isodoc/function/utils.rb

@@ -1,5 +1,4 @@
 require "metanorma-utils"
-require_relative "../../nokogiri/xml/node"
 
 module IsoDoc
   module Function

data/lib/isodoc/html_function/html.rb

@@ -96,7 +96,10 @@ module IsoDoc
 
       def table_attrs(node)
         ret = super
-        node.at(ns("./colgroup")) and ret[:style] += "table-layout:fixed;"
+        if node.at(ns("./colgroup"))
+          ret[:style] ||= ""
+          ret[:style] += "table-layout:fixed;"
+        end
         ret
       end
 

data/lib/isodoc/metadata.rb

@@ -3,7 +3,7 @@ require_relative "metadata_contributor"
 
 module IsoDoc
   class Metadata
-    attr_accessor :fonts_options, :labels
+    attr_accessor :fonts_options, :labels, :localdir
 
     def ns(xpath)
       Common::ns(xpath)
@@ -58,9 +58,8 @@ module IsoDoc
     end
 
     def docstatus(xml, _out)
-      set(:unpublished, true)
-      return unless s = xml.at(ns("//bibdata/status/stage#{NOLANG}"))
-
+      published_default(xml)
+      s = xml.at(ns("//bibdata/status/stage#{NOLANG}")) or return
       s1 = xml.at(ns("//bibdata/status/stage#{currlang}")) || s
       set(:stage, status_print(s.text))
       s1 and set(:stage_display, status_print(s1.text))
@@ -70,10 +69,18 @@ module IsoDoc
         set(:substage_display, i1)
       (i2 = xml.at(ns("//bibdata/status/iteration"))&.text) and
         set(:iteration, i2)
-      set(:unpublished, unpublished(s.text))
       unpublished(s.text) && set(:stageabbr, stage_abbr(s.text))
     end
 
+    def published_default(xml)
+      override = xml.at(ns("//semantic-metadata/stage-published"))&.text
+      default = override || "true"
+      ret = default == "false"
+      s = xml.at(ns("//bibdata/status/stage#{NOLANG}"))
+      override || !s or ret = unpublished(s.text)
+      set(:unpublished, ret)
+    end
+
     def stage_abbr(docstatus)
       status_print(docstatus).split(/ /).map { |s| s[0].upcase }.join
     end
@@ -131,8 +138,7 @@ module IsoDoc
 
     def title(isoxml, _out)
       main = isoxml.at(ns("//bibdata/title[@language='#{@lang}']"))
-        &.children&.to_xml
-      set(:doctitle, main)
+        &.children and set(:doctitle, to_xml(main))
     end
 
     def subtitle(_isoxml, _out)
@@ -193,5 +199,7 @@ module IsoDoc
         set(lbl, m << v.text)
       end
     end
+
+    include ::IsoDoc::ClassUtils
   end
 end

data/lib/isodoc/metadata_contributor.rb

@@ -97,11 +97,16 @@ module IsoDoc
       ret
     end
 
+    def to_datauri(src)
+      /^data:/.match?(src) and return src
+      Vectory::Utils::datauri(src, @localdir)
+    end
+
     def agency(xml)
       agency, publisher, logos = agency1(xml)
       set(:agency, agency)
       set(:publisher, connectives_strip(@i18n.boolean_conj(publisher, "and")))
-      set(:copublisher_logos, logos)
+      set(:copublisher_logos, logos.map { |l| to_datauri(l) })
       set(:copublisher_logo_attrs, copublisher_logo_attrs(xml))
       agency_addr(xml)
     end
@@ -135,7 +140,7 @@ module IsoDoc
         set(k, v)
       end
       n = a.at(ns("./address/formattedAddress")) and
-        set(:pub_address, n.children.to_xml)
+        set(:pub_address, to_xml(n.children))
     end
   end
 end

data/lib/isodoc/presentation_function/autonum.rb

@@ -30,7 +30,7 @@ module IsoDoc
     end
 
     def prefix_name_labels(node)
-      @new_ids ||= {}
+      #@new_ids ||= {}
       id = "_#{UUIDTools::UUID.random_create}"
       @new_ids[id] = nil
       { elem: node["id"], name: id }

data/lib/isodoc/presentation_function/bibdata.rb

@@ -50,12 +50,12 @@ module IsoDoc
     # translate dest_xpath in bibdata using lookup in hash
     # source text is dest_xpath by default, can be alt_source_xpath if given
     def hash_translate(bibdata, hash, dest_xpath, alt_source_xpath, lang)
-      x = bibdata.at(ns(dest_xpath)) or return
-      alt_source_xpath and doctype = bibdata.at(ns(alt_source_xpath))
-      doctype ||= x
       hash.is_a? Hash or return
-      hash[doctype.text] or return
-      tag_translate(x, lang, hash[doctype.text])
+      x = bibdata.xpath(ns(dest_xpath))
+      alt_source_xpath and alt_x = bibdata.at(ns(alt_source_xpath))&.text
+      x.each do |d|
+        v = hash[alt_x || d.text] and tag_translate(d, lang, v)
+      end
     end
 
     # does not allow %Spellout and %Ordinal in the ordinal expression

data/lib/isodoc/presentation_function/ids.rb

@@ -77,7 +77,6 @@ module IsoDoc
     end
 
     def provide_ids(docxml)
-      @new_ids = {} # guids assigned within Presentation XML
       anchor_sanitise(docxml)
       populate_id(docxml)
       add_missing_id(docxml)
@@ -120,10 +119,12 @@ module IsoDoc
     end
 
     def add_new_contenthash_id(docxml, ids)
+      suffix = "" # for disambiguation in Metanorma Collections
+      docxml["document_suffix"] and suffix = "_#{docxml['document_suffix']}"
       %w(original-id id).each do |k|
         docxml.xpath("//*[@#{k}]").each do |x|
           ids.has_key?(x[k]) or next
-          new_id = contenthash(x)
+          new_id = Metanorma::Utils::contenthash(x) + suffix
           ids[x[k]] = new_id
           x[k] = new_id
         end
@@ -134,17 +135,10 @@ module IsoDoc
       Metanorma::Utils::anchor_attributes(presxml: true).each do |e|
         docxml.xpath("//xmlns:#{e[0]}[@#{e[1]}]").each do |x|
           ids.has_key?(x[e[1]]) or next
-          #require "debug"; binding.b unless ids[x[e[1]]] 
           ids[x[e[1]]] or next
           x[e[1]] = ids[x[e[1]]]
         end
       end
     end
-
-    # TODO duplicate of standoc
-    def contenthash(elem)
-      Digest::MD5.hexdigest("#{elem.path}////#{elem.text}")
-        .sub(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/, "_\\1-\\2-\\3-\\4-\\5")
-    end
   end
 end

data/lib/isodoc/presentation_function/list.rb

@@ -62,6 +62,12 @@ module IsoDoc
       %w(—)
     end
 
+    def ul_label_list_from_metadata(docxml)
+      list = docxml.xpath(ns("//presentation-metadata/ul-label-list"))
+      list.empty? and return nil
+      list.map(&:text)
+    end
+
     def ul_label(elem)
       val = ul_label_value(elem)
       semx = "<semx element='autonum' source='#{elem['id']}'>#{val}</semx>"
@@ -71,7 +77,8 @@ module IsoDoc
 
     def ul_label_value(elem)
       depth = elem.ancestors("ul, ol").size
-      val = ul_label_list(elem)
+      val = ul_label_list_from_metadata(elem.document.root) ||
+        ul_label_list(elem)
       val[(depth - 1) % val.size]
     end
   end

data/lib/isodoc/presentation_xml_convert.rb

@@ -20,6 +20,7 @@ module IsoDoc
     def initialize(options)
       @format = :presentation
       @suffix = "presentation.xml"
+      @new_ids = {} # guids assigned within Presentation XML
       super
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.2.0".freeze
+  VERSION = "3.2.2".freeze
 end

data/lib/isodoc/word_function/table.rb

@@ -15,9 +15,10 @@ module IsoDoc
         table.at(".//tr").xpath("./td | ./th").each do |td|
           cols += (td["colspan"] ? td["colspan"].to_i : 1)
         end
-        style = "border-top:0pt;mso-border-top-alt:0pt;" \
-                "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;"
-        tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
+        table["plain"] == "true" or
+          s = "style='border-top:0pt;mso-border-top-alt:0pt;" \
+              "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;'"
+        tfoot.add_child("<tr><td colspan='#{cols}' #{s}/></tr>")
         tfoot.xpath(".//td").last
       end
 
@@ -72,7 +73,7 @@ module IsoDoc
 
       def table_attrs(node)
         c = node["class"]
-        style = node["style"] ? '' : "border-spacing:0;border-width:1px;"
+        style = node["style"] || node["plain"] == "true" ? "" : "border-spacing:0;border-width:1px;"
         (%w(modspec).include?(c) || !c) or style = nil
         ret =
           { summary: node["summary"], width: node["width"],

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -30,10 +30,9 @@ module IsoDoc
       end
 
       def sequential_figure_class_names(clause, container: false)
-        c = {}
         j = 0
         clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
-          .each do |t|
+          .each_with_object({}) do |t, c|
           c[t["class"]] ||= Counter.new
           # labelled_ancestor(t, %w(figure)) and next
           j = subfigure_increment(j, c[t["class"]], t)
@@ -50,7 +49,7 @@ module IsoDoc
 
       def figure_anchor(elem, sublabel, label, klass, container: false)
         if sublabel
-          /<semx/.match?(label) or label = semx(elem.parent, label)
+          label&.include?("<semx") or label = semx(elem.parent, label)
           subfigure_anchor(elem, sublabel, label, klass, container: false)
         else
           @anchors[elem["id"]] = anchor_struct(
@@ -185,9 +184,8 @@ container: false)
       end
 
       def hierarchical_figure_class_names(clauses, num)
-        c = {}
         j = 0
-        nodeSet(clauses).each do |clause|
+        nodeSet(clauses).each_with_object({}) do |clause, c|
           clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
             .noblank.each do |t|
             # labelled_ancestor(t, %w(figure)) and next
@@ -207,7 +205,8 @@ container: false)
             # labelled_ancestor(t) and next
             @anchors[t["id"]] =
               anchor_struct(hiersemx(clause, num, c.increment(t), t),
-                            t, @labels["table"], "table", { unnumb: t["unnumbered"], container: false })
+                            t, @labels["table"], "table",
+                            { unnumb: t["unnumbered"], container: false })
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -333,7 +333,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: xml-c14n
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -488,7 +488,6 @@ files:
 - lib/metanorma/output/base.rb
 - lib/metanorma/output/utils.rb
 - lib/metanorma/output/xslfo.rb
-- lib/nokogiri/xml/node.rb
 - lib/relaton/render-isodoc/config.yml
 - lib/relaton/render-isodoc/general.rb
 homepage: https://github.com/metanorma/isodoc

data/lib/nokogiri/xml/node.rb

@@ -1,14 +0,0 @@
-module Nokogiri
-  module XML
-    class Node
-      def add_first_child(content)
-        if children.empty?
-          add_child(content)
-        else
-          children.first.previous = content
-        end
-        self
-      end
-    end
-  end
-end