isodoc 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1528432b5d869e42077b250498452e276bd3c774dbe55adbb375157c4c61f87
-  data.tar.gz: 16608e9fd9e1d2dd682667db8455bf63737d79e346f689c49c11628519f661e2
+  metadata.gz: 1838af1ef3cfa443fb12a42021110e6fbd62939a9de84b341063bde18dd6f095
+  data.tar.gz: aa8889a0f7b2519aee981d9f7e9e244b52dd9c6d8afb9c3232259e74899a64e9
 SHA512:
-  metadata.gz: 8c230460e11f2d68b5a844629947e8ee4fbdc4b23dd58d0ecbac85b2adaebeedf4fbde0b5eb434e51717449e3835cd202fefe5c7edfe217724cd5b41683e190b
-  data.tar.gz: 98fc8b60f2d0ebeddf9a2040fedba22b592e4af190cb055bb58c88fca0107daecfe9833c7552f76365a532591ea0e007ee6a228bbd41af21e25b9d5b5546871a
+  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/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/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/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/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/version.rb

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

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.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-21 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:
     - - ">="