metanorma-standoc 3.5.4 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 226aa50e55b47cc5c2b1951a1ab7846b9d66beed7feed9ff508d482b499252d9
-  data.tar.gz: fb3b3cd3fa7e5e2c33d424a965a2f79dbc6f107ae02b728437d886e4592e7c86
+  metadata.gz: 4c01913608379133f785a90f97b5243aa916581376cfb82f1e246506b7e1aad0
+  data.tar.gz: dfad852e2e0d35842e4da63195ea5c9d5bfcb1f0ab4a9757a49c29a1c0e71a3c
 SHA512:
-  metadata.gz: ae524cce75bd115159a547b56b134f21b1b2c46617a70b23a3dda2edd6dc0570ea1e59b5585540bef1835bafa727208707c311d71de8fd397e08ef167bd00825
-  data.tar.gz: 307205bf7fc9c09fd6eb662fc3d73215572ea9aa382d3f200593984ea14f49cd9f32c4fb4ae358e7af2c0ecd49cea45c995fd6b922dc5b09ed8b435e7c883191
+  metadata.gz: ddcac2bdad2e3f4496f3f80f9c7260fce0253087c9461bf733f0e6d901754b4933324e7931a3be329c500664fdbcd59d533db225572c077eacf4b62877d25e1d
+  data.tar.gz: c554a0010874b71a0c7fb48abd958dd919b4c789c12c362b001e4ee09668bb5eeee67681f3dad09386ccdbff4b2ff85b528569c76eb46794713f6d718fa1a355

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/standoc/version.rb

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

data/metanorma-standoc.gemspec

@@ -41,7 +41,9 @@ Gem::Specification.new do |spec|
   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.10"
-  spec.add_dependency "moxml", "~> 0.5.84"
+  # 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.4
+  version: 3.5.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-31 00:00:00.000000000 Z
+date: 2026-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -184,14 +184,14 @@ dependencies:
     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