metanorma-generic 3.1.5 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 318f94629076866149fc5d16da650508942e6bfa093d42e66a26198d408c707f
-  data.tar.gz: 5f3c48fc5ad1edd4515317c49682c7f69b02a5c431baba2c9fd2748f9a8d61a6
+  metadata.gz: 22323f43a3dd010a733c4e125a219b0fa1e6c6ae9f566acdb6540c9aa04fc927
+  data.tar.gz: 1bc07cc00da944bd36c832427da46fa4a93107873256b172b453a4d1f940ee4c
 SHA512:
-  metadata.gz: b340bf90d5f82273008d558d81317ffcc95bbd86361953f7932eec08ab36bff3ae54c38a372faf7c1036a3f371a1348b75d13946939938a64a7d3f41b959f17a
-  data.tar.gz: be8ad207e0e535cb65ba3980e1baab650969be80d620cdcc4068ed0aa96ca907b56b0e19ea85f0cdff578c0f34689635958310bf0d254809158d1e79e3e307fc
+  metadata.gz: 574d5c20ca45f7d74d1865548f5aa9fe09187efaeaeadf984f2768264e20184b750fd434885ec069dcf3ed03d6493c8fb75c59bc9f862a51eae418aead9db9a9
+  data.tar.gz: 6fda9039ba49b66fc273671af0daa1543aacdd74d8206088a555d67978a0ec6d86bd4488e1a6aa972820a9aaa1ba4da7ddfa4c14bb9746f5ca6ea74d96ce1e1e

data/lib/metanorma/generic/biblio.rng

@@ -869,7 +869,7 @@ depending on whether the items exist as independent documents, or are parts of a
       </zeroOrMore>
     </element>
   </define>
-  <define name="BibItemType" combine="choice">
+  <define name="BibItemType">
     <a:documentation>Type of bibliographic item.
 The value list complies with the types provided in ISO 690:2021.
 NOTE: These values represent a strict superset to BibTeX

data/lib/metanorma/generic/converter.rb

@@ -39,8 +39,7 @@ module Metanorma
         type = @default_doctype || configuration.doctypes.keys[0]
         if !configuration.doctypes.key?(d)
           node.attr("doctype") && node.attr("doctype") != "article" and # factory default
-            @log.add("Document Attributes", nil,
-                     "#{d} is not a legal document type: reverting to '#{type}'")
+            @log.add("GENERIC_1", nil, params: [d, type])
           d = type
         end
         d
@@ -114,8 +113,7 @@ module Metanorma
         stages.empty? and return
         stage = xmldoc.at("//bibdata/status/stage")&.text
         stages.include? stage or
-          @log.add("Document Attributes", nil,
-                   "#{stage} is not a recognised status")
+          @log.add("GENERIC_2", nil, params: [stage])
       end
 
       def committee_validate(xmldoc)
@@ -124,8 +122,7 @@ module Metanorma
         xmldoc.xpath("//bibdata/contributor[role/description = 'committee']/" \
             "organization/subdivision/name").each do |c|
           committees.include? c.text or
-            @log.add("Document Attributes", nil,
-                     "#{c.text} is not a recognised committee")
+            @log.add("GENERIC_3", nil, params: [c.text])
         end
       end
 
@@ -166,7 +163,7 @@ module Metanorma
         Metanorma::Generic::Configuration::CONFIG_ATTRS.each do |a|
           conv.meta.set(a, configuration.send(a))
         end
-        #conv.meta.set(:bibdata, bibdata_hash(xmldoc))
+        # conv.meta.set(:bibdata, bibdata_hash(xmldoc))
         @isodoc = conv
         @isodoc
       end
@@ -192,3 +189,5 @@ module Metanorma
     end
   end
 end
+
+require "metanorma/generic/log"

data/lib/metanorma/generic/isodoc.rng

@@ -311,17 +311,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video"/>
         <ref name="audio"/>
-        <ref name="pre"/>
+        <ref name="pre">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
+          <ref name="paragraph-with-footnote">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure"/>
+          <ref name="figure">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -354,17 +365,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image-no-id"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image-no-id">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video-no-id"/>
         <ref name="audio-no-id"/>
-        <ref name="pre-no-id"/>
+        <ref name="pre-no-id">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote-no-id"/>
+          <ref name="paragraph-with-footnote-no-id">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure-no-id"/>
+          <ref name="figure-no-id">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table-no-id">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -876,6 +898,9 @@ titlecase, or lowercase</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
+      <ref name="LocalizedStringAttributes">
+        <a:documentation>Specify language of bibitem, can be used to render it with language-specific bibliographic style</a:documentation>
+      </ref>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>

data/lib/metanorma/generic/log.rb

@@ -0,0 +1,23 @@
+module Metanorma
+  module Generic
+    class Converter
+      GENERIC_LOG_MESSAGES = {
+        # rubocop:disable Naming/VariableNumber
+        "GENERIC_1": { category: "Document Attributes",
+                       error: "%s is not a legal document type: reverting to '%s'",
+                       severity: 2 },
+        "GENERIC_2": { category: "Document Attributes",
+                       error: "%s is not a recognised status",
+                       severity: 2 },
+        "GENERIC_3": { category: "Document Attributes",
+                       error: "%s is not a recognised committee",
+                       severity: 2 },
+      }.freeze
+      # rubocop:enable Naming/VariableNumber
+
+      def log_messages
+        super.merge(GENERIC_LOG_MESSAGES)
+      end
+    end
+  end
+end

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "3.1.5".freeze
+    VERSION = "3.2.0".freeze
   end
 end

data/metanorma-generic.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 3.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.2.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -40,5 +40,5 @@ spec.add_development_dependency "rubocop-performance"
   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 "canon"
+  spec.add_development_dependency "canon", "= 0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -182,16 +182,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 description: |
   Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
 
@@ -245,6 +245,7 @@ files:
 - lib/metanorma/generic/front.rb
 - lib/metanorma/generic/generic.rng
 - lib/metanorma/generic/isodoc.rng
+- lib/metanorma/generic/log.rb
 - lib/metanorma/generic/processor.rb
 - lib/metanorma/generic/reqt.rng
 - lib/metanorma/generic/rsd.rng