metanorma-standoc 3.5.3 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8808acd759aa7b130b2afb79e10a7299f28ac19ee9049f4f85ccf564a6658f39
-  data.tar.gz: 916fee107a523cf51a52145ba024471d6556d8eb4e721165ce5965295414199f
+  metadata.gz: 4c01913608379133f785a90f97b5243aa916581376cfb82f1e246506b7e1aad0
+  data.tar.gz: dfad852e2e0d35842e4da63195ea5c9d5bfcb1f0ab4a9757a49c29a1c0e71a3c
 SHA512:
-  metadata.gz: 55f619f67cd98e47a859a0b82a1215639a517288a25f89d09369ac8bef187b86ad13bebbe98443f9d79b646cad0fece4568a286ee35d4df5399c4a259ea6a264
-  data.tar.gz: 2dacb944bce0af6d09f0fdea02c23664e859e6ddf8afa49295fe88f2b3ca72babf53aedea99218e678191f79d8ef32c471ac685e1e3f4e7f9cf2746b55558356
+  metadata.gz: ddcac2bdad2e3f4496f3f80f9c7260fce0253087c9461bf733f0e6d901754b4933324e7931a3be329c500664fdbcd59d533db225572c077eacf4b62877d25e1d
+  data.tar.gz: c554a0010874b71a0c7fb48abd958dd919b4c789c12c362b001e4ee09668bb5eeee67681f3dad09386ccdbff4b2ff85b528569c76eb46794713f6d718fa1a355

data/lib/metanorma/cleanup/attachment.rb

@@ -26,7 +26,7 @@ module Metanorma
         init_attachments
         f = File.basename(path)
         File.exist?(File.join(@attachmentsdir, f)) and
-          f += "_#{UUIDTools::UUID.random_create}"
+          f += "_#{Metanorma::Utils.random_uuid}"
         out_fld = File.join(@attachmentsdir, f)
         FileUtils.cp(path, out_fld)
         datauri_attachment(out_fld, bib.document)

data/lib/metanorma/converter/base.rb

@@ -46,6 +46,7 @@ module Metanorma
       def document1(node)
         init(node)
         ret = to_xml(makexml(node))
+        release_lutaml_caches
         outputs(node, ret) unless node.attr("nodoc") || !node.attr("docfile")
         ret
       end
@@ -66,6 +67,15 @@ module Metanorma
       OPEN_TITLE_NAME = %r{(<(title|name))}.freeze
       SOURCECODE_NAME = %r{(<sourcecode[^<>]*+>)\s++(<name[^<>]*+>(?>.*?</name>))\s++}m.freeze
 
+      # The lutaml plugin's macro caches hold fully parsed multi-GB XMI
+      # trees that serve only macro rendering during conversion; release
+      # them before the output phases stack their own document DOMs.
+      def release_lutaml_caches
+        return unless defined?(Metanorma::Plugin::Lutaml::CacheRegistry)
+
+        Metanorma::Plugin::Lutaml::CacheRegistry.clear_all
+      end
+
       def insert_xml_cr(doc)
         doc.gsub!(CLOSE_TAG, "\\1\n")
         doc.gsub!(OPEN_TITLE_NAME, "\n\\1")

data/lib/metanorma/converter/blocks.rb

@@ -8,7 +8,7 @@ module Metanorma
     module Blocks
       def id_attr(node = nil)
         anchor = node&.id
-        { id: "_#{UUIDTools::UUID.random_create}",
+        { id: "_#{Metanorma::Utils.random_uuid}",
           anchor: anchor && !anchor.empty? ? anchor : nil,
           tag: node&.attr("tag"), columns: node&.attr("columns"),
           "multilingual-rendering": node&.attr("multilingual-rendering") }

data/lib/metanorma/converter/front_organisation.rb

@@ -135,10 +135,44 @@ module Metanorma
         else
           organization(xml, org[:name], node, !node.attr("publisher"), org)
           org_address(org, xml)
-          org_logo(xml, org[:logo])
+          org_logo(xml, org[:logo] || authoritative_org_logo(node, org))
         end
       end
 
+      # Authoritative sourcing of copublisher logos
+      # (https://github.com/metanorma/metanorma/issues/346 ,
+      # https://github.com/metanorma/metanorma/issues/582 ): when the document
+      # attributes provide no logo for an organization, take it from the
+      # Relaton SDO logo store, embedded as a data URI. This is enabled by the
+      # `:sdo-logos:` document attribute, applies to copublishers only (the
+      # document's own default publisher is branded by the flavor, not the
+      # SDO store), and is best effort: an organization the store does not
+      # know, a store entry without logos, or an unreachable store leaves the
+      # logo out, and never fails the compile.
+      def authoritative_org_logo(node, org)
+        node.attr("sdo-logos") or return
+        abbr = org_name_and_abbrev(org, org[:name])[1].to_s.strip
+        abbr.empty? and return
+        own_publisher?(org, abbr) and return
+        logo = sdo_org_logo(abbr)
+        logo.nil? and return
+        logo.data_uri
+      rescue StandardError => e
+        @log.add("STANDOC_66", nil, params: [abbr, e.message])
+        nil
+      end
+
+      def own_publisher?(org, abbr)
+        d = default_publisher
+        !d.nil? && (org[:name] == d || abbr == d)
+      end
+
+      def sdo_org_logo(abbr)
+        store_org = Relaton.organization(abbr) or return
+        store_org.logo_query(format: "png").first ||
+          store_org.logo_query.first
+      end
+
       def org_attrs_parse_core(node, opts)
         source = opts[:source]&.detect { |s| node.attr(s) }
         org_attrs_simple_parse(node, opts, source) ||

data/lib/metanorma/converter/log.rb

@@ -201,6 +201,10 @@ module Metanorma
         STANDOC_65: { category: "AsciiDoc Input",
                       error: "Unbalanced sourcecode markup: unclosed %s",
                       severity: 0 },
+        STANDOC_66: { category: "Images",
+                      error: "Could not fetch the authoritative logo for " \
+                             "organization %s: %s",
+                      severity: 2 },
         RELATON_1: { category: "Relaton",
                      error: "(Error from Relaton) %s",
                      severity: 0 },

data/lib/metanorma/converter/macros_form.rb

@@ -12,7 +12,7 @@ module Metanorma
         m = %w(id name value disabled readonly checked maxlength minlength)
           .map { |a| attr[a] ? " #{map_attr_name(a)}='#{attr[a]}'" : nil }
           .compact
-        m << " id='_#{UUIDTools::UUID.random_create}'"
+        m << " id='_#{Metanorma::Utils.random_uuid}'"
         %{<input type='#{target}' #{m.join}/>}
       end
     end
@@ -41,7 +41,7 @@ module Metanorma
         m = %w(id name rows cols value)
           .map { |a| attr[a] ? " #{map_attr_name(a)}='#{attr[a]}'" : nil }
           .compact
-        m << " id='_#{UUIDTools::UUID.random_create}'"
+        m << " id='_#{Metanorma::Utils.random_uuid}'"
         %{<textarea #{m.join}/>}
       end
     end
@@ -59,7 +59,7 @@ module Metanorma
         m = %w(id name size disabled multiple value)
           .map { |a| attr[a] ? " #{map_attr_name(a)}='#{attr[a]}'" : nil }
           .compact
-        m << " id='_#{UUIDTools::UUID.random_create}'"
+        m << " id='_#{Metanorma::Utils.random_uuid}'"
         out = Asciidoctor::Inline.new(parent, :quoted, attr["text"]).convert
         %{<select #{m.join}>#{out}</select>}
       end

data/lib/metanorma/converter/macros_inline.rb

@@ -65,7 +65,7 @@ module Metanorma
 
       def process(parent, target, attrs)
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        id = "_#{UUIDTools::UUID.random_create}"
+        id = "_#{Metanorma::Utils.random_uuid}"
         %{<span id='#{id}' anchor='#{target}'>#{out}</span>}
       end
     end
@@ -77,7 +77,7 @@ module Metanorma
 
       def process(parent, target, attrs)
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        id = "_#{UUIDTools::UUID.random_create}"
+        id = "_#{Metanorma::Utils.random_uuid}"
         %{<span id='#{id}' source='#{target}'>#{out}</span>}
       end
     end

data/lib/metanorma/converter/ref.rb

@@ -145,7 +145,7 @@ module Metanorma
       def refitem_render_attrs(match, code)
         attr_code(anchor: match[:anchor], suppress_identifier: code[:dropid],
                   amend: code[:amend], hidden: code[:hidden],
-                  id: "_#{UUIDTools::UUID.random_create}")
+                  id: "_#{Metanorma::Utils.random_uuid}")
       end
 
       def refitem_render_formattedref(bibitem, title)

data/lib/metanorma/converter/ref_utility.rb

@@ -198,7 +198,7 @@ module Metanorma
 
       def ref_attributes(match)
         code = analyse_ref_code(match[:code])
-        { anchor: match[:anchor], id: "_#{UUIDTools::UUID.random_create}",
+        { anchor: match[:anchor], id: "_#{Metanorma::Utils.random_uuid}",
           type: "standard",
           suppress_identifier: code[:dropid] || nil }
       end

data/lib/metanorma/converter/utils.rb

@@ -41,11 +41,11 @@ module Metanorma
       end
 
       def add_id(node)
-        node["id"] = "_#{UUIDTools::UUID.random_create}"
+        node["id"] = "_#{Metanorma::Utils.random_uuid}"
       end
 
       def add_id_text
-        %(id = "_#{UUIDTools::UUID.random_create}")
+        %(id = "_#{Metanorma::Utils.random_uuid}")
       end
 
       def csv_split(text, delim = ";", encode: true)
@@ -162,7 +162,7 @@ module Metanorma
       # from that of current doc
       def separate_numbering_footnotes(docxml)
         docxml.xpath("//xmlns:fn").each do |f|
-          f["reference"] = "_#{UUIDTools::UUID.random_create}_#{f['reference']}"
+          f["reference"] = "_#{Metanorma::Utils.random_uuid}_#{f['reference']}"
         end
         docxml
       end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.5.3".freeze
+    VERSION = "3.5.5".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -40,8 +40,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.5"
   spec.add_dependency "metanorma-plugin-lutaml", "~> 0.7.55" # LutamlDataPreprocessor shipped in 0.7.55
   spec.add_dependency "metanorma-plugin-plantuml", "~> 1.0.0"
-  spec.add_dependency "metanorma-utils", "~> 2.0.1"
-  spec.add_dependency "moxml", "~> 0.5.84"
+  spec.add_dependency "metanorma-utils", "~> 2.0.10"
+  # moxml 0.6.0 removed the Opal surface (lutaml/moxml#516); owner
+  # call to update all to the latest moxml line.
+  spec.add_dependency "moxml", "~> 0.6.0"
   spec.add_dependency "leptris", "~> 1.9"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "png_conform", "~> 0.1.0"
@@ -55,9 +57,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "relaton-iev", "~> 2.0"
   spec.add_dependency "svg_conform", "~> 0.2"
 
-  spec.add_development_dependency "canon" # , "= 0.2.3"
   spec.add_development_dependency "debug"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
+  spec.add_development_dependency "canon", "~> 0.3"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "openssl"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.5.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-30 00:00:00.000000000 Z
+date: 2026-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: moxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.84
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.84
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: leptris
   requirement: !ruby/object:Gem::Requirement
@@ -296,20 +296,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: canon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -325,19 +311,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement