metanorma-generic 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 612b2975e8d6a1884052d9cac7af493ebd1fe1de013524f7baa511eb0ffa620a
-  data.tar.gz: 0ac333266ae8ed70ac3adbb3e01a46b817393dc44410c63dd726a7a74bd891c9
+  metadata.gz: 142ff668c810de695105351da5b83f38d1c50d5d97889389fd91c9aa85748443
+  data.tar.gz: 9fc97bedaaae979ed280274b9faa0d3cb777a7380a01c8ed00a7dad5483a081a
 SHA512:
-  metadata.gz: 992917cef52052efc53fbd3799f5c703d140c9c8d33fabef331116e4e68a726be58a53e81df4c9fefc1ca948a36a6b068de39c702709d87eae92caeb87569373
-  data.tar.gz: 6d75f39b8b7f89db43a5d03f413fd3f659e00876421d0f8c94df81969c3e8b739c1a7209604d27d79f1ac7b64a3772456cfbad55d5d1fada9c35af33a65d4fc8
+  metadata.gz: e014e23fd479eee366d9fa16954e482dd2d7a34e3e52a9fcfa62fa41e3ccf1f4bd0421b57b357db15828c241c1f53fa4b7fb30b7774ecdb4a8a8014e32910383
+  data.tar.gz: 50c472c1c2ad288c7845b9a38af6c9de9022fa9b2a641f5104066c0869e03f3f9c42bcc570a3f868b7e3e59e6b88277c0dbc95afac4067343db5d1491c5f2df3

data/lib/isodoc/generic/metadata.rb

@@ -31,18 +31,6 @@ end
 module IsoDoc
   module Generic
     class Metadata < IsoDoc::Metadata
-      def initialize(lang, script, locale, labels)
-        super
-        here = File.dirname(__FILE__)
-        default_logo_path =
-          File.expand_path(File.join(here, "html", "logo.jpg"))
-        set(:logo, baselocation(configuration.logo_path) || default_logo_path)
-        unless configuration.logo_paths.nil?
-          set(:logo_paths,
-              Array(configuration.logo_paths).map { |p| baselocation(p) })
-        end
-      end
-
       class << self
         attr_accessor :_file
       end
@@ -51,6 +39,16 @@ module IsoDoc
         klass._file = caller_locations(1..1).first.absolute_path
       end
 
+      def images(isoxml, out)
+        default_logo_path =
+          File.expand_path(File.join(File.dirname(__FILE__), "html", "logo.jpg"))
+        set(:logo, baselocation(configuration.logo_path) || default_logo_path)
+        unless configuration.logo_paths.nil?
+          set(:logo_paths,
+              Array(configuration.logo_paths).map { |p| baselocation(p) })
+        end
+      end
+
       def author(isoxml, _out)
         super
         tc = isoxml.at(ns("//bibdata/contributor[role/description = 'committee']/organization/subdivision[@type = 'Committee']/name"))

data/lib/metanorma/generic/biblio.rng

@@ -466,11 +466,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="orgname">
     <element name="name">
@@ -502,6 +502,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
   </define>
   <define name="logo">
     <element name="logo">
+      <optional>
+        <attribute name="type">
+          <a:documentation>The type of logo</a:documentation>
+        </attribute>
+      </optional>
       <ref name="image-no-id"/>
     </element>
   </define>
@@ -513,6 +518,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
           <a:documentation>Description of what is being depicted</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Description of what kind of depiction this</a:documentation>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="image-no-id">
           <a:documentation>A visual depiction of the bibliographic item</a:documentation>
@@ -1236,9 +1246,9 @@ Refer to `BibliographicItem` for definitions</a:documentation>
     <optional>
       <ref name="validity"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction"/>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="btitle">
     <a:documentation>A title of a bibliographic item, associated with a type of title</a:documentation>

data/lib/metanorma/generic/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.1.4 -->
+<!-- VERSION v2.1.5 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "3.2.1".freeze
+    VERSION = "3.2.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-17 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc