metanorma-generic 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22323f43a3dd010a733c4e125a219b0fa1e6c6ae9f566acdb6540c9aa04fc927
-  data.tar.gz: 1bc07cc00da944bd36c832427da46fa4a93107873256b172b453a4d1f940ee4c
+  metadata.gz: 142ff668c810de695105351da5b83f38d1c50d5d97889389fd91c9aa85748443
+  data.tar.gz: 9fc97bedaaae979ed280274b9faa0d3cb777a7380a01c8ed00a7dad5483a081a
 SHA512:
-  metadata.gz: 574d5c20ca45f7d74d1865548f5aa9fe09187efaeaeadf984f2768264e20184b750fd434885ec069dcf3ed03d6493c8fb75c59bc9f862a51eae418aead9db9a9
-  data.tar.gz: 6fda9039ba49b66fc273671af0daa1543aacdd74d8206088a555d67978a0ec6d86bd4488e1a6aa972820a9aaa1ba4da7ddfa4c14bb9746f5ca6ea74d96ce1e1e
+  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>
@@ -690,7 +700,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -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>
@@ -1296,17 +1306,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/generic/front.rb

@@ -27,10 +27,14 @@ module Metanorma
 
       def metadata_status(node, xml)
         xml.status do |s|
-          s.stage ( node.attr("status") || node.attr("docstage") ||
+          add_noko_elem(s, "stage", node.attr("status") || node.attr("docstage") ||
                    configuration.default_stage || "published")
-          x = node.attr("substage") and s.substage x
-          x = node.attr("iteration") and s.iteration x
+          # s.stage ( node.attr("status") || node.attr("docstage") ||
+          # configuration.default_stage || "published")
+          add_noko_elem(s, "substage", node.attr("substage"))
+          # x = node.attr("substage") and s.substage x
+          add_noko_elem(s, "iteration", node.attr("iteration"))
+          # x = node.attr("iteration") and s.iteration x
         end
       end
 
@@ -65,13 +69,14 @@ module Metanorma
             removed_count += 1
           end
           removed_count.zero? and break # Stop when no elems removed this pass
-
         end
       end
 
       def metadata_doctype(node, xml)
         d = doctype(node)
-        xml.doctype d, attr_code(abbreviation: configuration&.doctypes&.dig(d))
+        add_noko_elem(xml, "doctype", d,
+                      abbreviation: configuration&.doctypes&.dig(d))
+        # xml.doctype d, attr_code(abbreviation: configuration&.doctypes&.dig(d))
       end
 
       EXT_STRUCT = %w(_output _attribute _list).freeze

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.3 -->
+<!-- VERSION v2.1.5 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -905,15 +905,32 @@ titlecase, or lowercase</a:documentation>
     </element>
   </define>
   <define name="image" combine="choice">
-    <element name="svg">
-      <a:documentation>Add svg mark up to image</a:documentation>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
+    <choice>
+      <element name="image">
+        <ref name="RequiredId"/>
+        <ref name="ImageAttributes"/>
+        <optional>
+          <element name="svg">
+            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
+            <oneOrMore>
+              <choice>
+                <text/>
+                <ref name="AnyElement"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+      <element name="svg">
+        <a:documentation>Add svg mark up to image</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </choice>
   </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "3.2.0".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.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc