metanorma-generic 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 142ff668c810de695105351da5b83f38d1c50d5d97889389fd91c9aa85748443
-  data.tar.gz: 9fc97bedaaae979ed280274b9faa0d3cb777a7380a01c8ed00a7dad5483a081a
+  metadata.gz: 7c11f49226ea10d4136e27236caf28a459cbdb5bcbbf6657a64b68d742158fe9
+  data.tar.gz: 1ae50495c623e5ab73df0d2042f755dcf239594aea965fe7dbacad190804f787
 SHA512:
-  metadata.gz: e014e23fd479eee366d9fa16954e482dd2d7a34e3e52a9fcfa62fa41e3ccf1f4bd0421b57b357db15828c241c1f53fa4b7fb30b7774ecdb4a8a8014e32910383
-  data.tar.gz: 50c472c1c2ad288c7845b9a38af6c9de9022fa9b2a641f5104066c0869e03f3f9c42bcc570a3f868b7e3e59e6b88277c0dbc95afac4067343db5d1491c5f2df3
+  metadata.gz: fcf1aa613e434f4eab913908d97b9c077b930514946e86bccd2ecfb78419ee28e7695aaca6cdc32b33321aa453fd11ea7894e7ed6207da9c67b7fcd3588395f0
+  data.tar.gz: f2631b3642211fb2857565afb2f20e781e8d9228e148051303cc86c2cf7377659af8eecb1769c998021f1aa6124dc31f44a085c2b56c367cecb6bb9add39f7e1

data/lib/isodoc/generic/base_convert.rb

@@ -21,7 +21,7 @@ module IsoDoc
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72",
                       "xml:lang": "EN-US", class: "container" }
-        xml.body **body_attr do |body|
+        xml.body(**body_attr) do |body|
           make_body1(body, docxml)
           make_body2(body, docxml)
           make_body3(body, docxml)

data/lib/isodoc/generic/html/generic.scss

@@ -668,6 +668,10 @@ table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
+table.MsoNormalTable th, table.MsoNormalTable td {
+  border: none;
+  mso-border-alt: none;
+} 
 table.MsoISOTable p, table.MsoISOTableBig p
 {font-size:10.0pt; }
 table.MsoTableGrid

data/lib/isodoc/generic/html/htmlstyle.scss

@@ -323,7 +323,7 @@ ol ul > li:first-child {
     3.5 Bibliograhy
 */
 
-p.Biblio, p.NormRef {
+p.Biblio, p.NormRef, div.Biblio, div.NormRef {
     margin-top: 1em;
     margin-left: 2em;
 }

data/lib/isodoc/generic/metadata.rb

@@ -1,6 +1,5 @@
 require "isodoc"
 require "nokogiri"
-require_relative "init"
 require_relative "utils"
 
 class Nokogiri::XML::Node
@@ -41,7 +40,8 @@ module IsoDoc
 
       def images(isoxml, out)
         default_logo_path =
-          File.expand_path(File.join(File.dirname(__FILE__), "html", "logo.jpg"))
+          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,

data/lib/metanorma/generic/converter.rb

@@ -16,20 +16,6 @@ module Metanorma
         loc
       end
 
-      def docidentifier_cleanup(xmldoc)
-        docid = xmldoc.at("//bibdata/docidentifier") or return
-        docid.text.empty? or return
-        id = docidentifier_from_template(xmldoc) or return
-        (id.empty? and docid.remove) or docid.children = id
-      end
-
-      def docidentifier_from_template(xmldoc)
-        b = boilerplate_isodoc(xmldoc) or return
-        template = configuration.docid_template ||
-          "{{ agency }} {{ docnumeric }}"
-        b.populate_template(template, nil)
-      end
-
       def doctype(node)
         d = super
         node.attr("doctype") == "article" and d = "article"

data/lib/metanorma/generic/front.rb

@@ -27,25 +27,31 @@ module Metanorma
 
       def metadata_status(node, xml)
         xml.status do |s|
-          add_noko_elem(s, "stage", node.attr("status") || node.attr("docstage") ||
-                   configuration.default_stage || "published")
-          # s.stage ( node.attr("status") || node.attr("docstage") ||
-          # configuration.default_stage || "published")
+          add_noko_elem(s, "stage", node.attr("status") ||
+                        node.attr("docstage") ||
+                   configuration.default_stage || "published",
+                        abbreviation: node.attr("docstage-abbrev"))
           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
 
       def metadata_id(node, xml)
-        id_type = node.attr("publisher_abbr") || node.attr("publisher") ||
-          configuration.organization_name_short
-        xml.docidentifier primary: "true", type: id_type do |i|
-          i << (node.attr("docidentifier") || "")
+        if id = node.attr("docidentifier") || configuration.docid_template ||
+            "{{ agency }} {{ docnumeric }}"
+          add_noko_elem(xml, "docidentifier",
+                        id, primary: "true", boilerplate: true,
+                            type: metadata_id_primary_type(node))
+        else
+          metadata_id_primary(node, xml)
         end
       end
 
+      def metadata_id_primary_type(node)
+        node.attr("publisher_abbr") || node.attr("publisher") ||
+          configuration.organization_name_short
+      end
+
       def metadata_ext(node, ext)
         super
         if configuration.metadata_extensions.is_a? Hash
@@ -75,8 +81,8 @@ module Metanorma
       def metadata_doctype(node, xml)
         d = doctype(node)
         add_noko_elem(xml, "doctype", d,
-                      abbreviation: configuration&.doctypes&.dig(d))
-        # xml.doctype d, attr_code(abbreviation: configuration&.doctypes&.dig(d))
+                      abbreviation: node.attr("doctype-abbrev") ||
+                      configuration&.doctypes&.dig(d))
       end
 
       EXT_STRUCT = %w(_output _attribute _list).freeze

data/lib/metanorma/generic/isodoc.rng

@@ -167,12 +167,6 @@ Sources are currently only rendered in metanorma-plateau</a:documentation>
     </define>
     <define name="DlAttributes">
       <ref name="BlockAttributes"/>
-      <optional>
-        <attribute name="key">
-          <a:documentation>This definition list is the key of a figure or formula</a:documentation>
-          <data type="boolean"/>
-        </attribute>
-      </optional>
     </define>
     <define name="DlBody">
       <optional>
@@ -311,7 +305,7 @@ 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>
+        <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>
@@ -340,8 +334,8 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </zeroOrMore>
       <optional>
-        <ref name="dl">
-          <a:documentation>An optional definitions list defining any symbols used in the figure</a:documentation>
+        <ref name="key">
+          <a:documentation>An key defining any symbols used in the figure</a:documentation>
         </ref>
       </optional>
       <zeroOrMore>
@@ -365,7 +359,7 @@ 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>
+        <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>
@@ -429,7 +423,7 @@ in order to be applicable in this standardisation document</a:documentation>
       </element>
     </define>
     <define name="sourcecodebody">
-      <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
+      <a:documentation>The computer code or other such text presented in the block, as a single unformatted string.
 (The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
       <element name="body">
         <oneOrMore>
@@ -549,7 +543,7 @@ normative or informative references, some split references into sections organiz
           <choice>
             <a:documentation>Table cell contains a block</a:documentation>
             <ref name="paragraph-with-footnote"/>
-            <ref name="dl"/>
+            <ref name="key"/>
             <ref name="ul"/>
             <ref name="ol"/>
             <ref name="figure"/>
@@ -632,8 +626,40 @@ This is done if the footnote reference is already presented in some other form,
         <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
     </define>
+    <define name="FormulaBody">
+      <ref name="stem">
+        <a:documentation>The content of the formula, as a mathematical expression</a:documentation>
+      </ref>
+      <optional>
+        <ref name="key">
+          <a:documentation>A key defining any symbols used in the formula</a:documentation>
+        </ref>
+      </optional>
+      <zeroOrMore>
+        <ref name="note">
+          <a:documentation>Notes whose scope is the current block</a:documentation>
+        </ref>
+      </zeroOrMore>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="key">
+    <a:documentation>Key to a table, figure, or formula</a:documentation>
+    <element name="key">
+      <optional>
+        <ref name="tname">
+          <a:documentation>optional title of key</a:documentation>
+        </ref>
+      </optional>
+      <oneOrMore>
+        <choice>
+          <a:documentation>Definition list and/or paragraph content</a:documentation>
+          <ref name="dl"/>
+          <ref name="paragraph"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -1042,7 +1068,7 @@ parargaph sources are currently only rendered in metanorma-plateau</a:documentat
       </optional>
       <optional>
         <attribute name="custom-charset">
-          <a:documentation>Character set that the contained text belongs to; 
+          <a:documentation>Character set that the contained text belongs to;
 is used in particular to capture mutually agreed definitions of codepoints in Unicode Private Use Area</a:documentation>
         </attribute>
       </optional>
@@ -1623,7 +1649,7 @@ numbers</a:documentation>
   <define name="definitions">
     <a:documentation>One or more definition lists, used to define symbols and abbreviations used in the remainder of the document.
 These can also be used as glossaries, with simple definitions, in contrast to the more elaborate definitions given in
-terms sections </a:documentation>
+terms sections</a:documentation>
     <element name="definitions">
       <ref name="OptionalId"/>
       <ref name="LocalizedStringAttributes"/>
@@ -1864,7 +1890,7 @@ used in document amendments</a:documentation>
       </zeroOrMore>
       <zeroOrMore>
         <ref name="related">
-          <a:documentation>Zero or more names which are related to the term being defined. </a:documentation>
+          <a:documentation>Zero or more names which are related to the term being defined.</a:documentation>
         </ref>
       </zeroOrMore>
       <optional>
@@ -2025,7 +2051,7 @@ used in document amendments</a:documentation>
     <element name="letter-symbol">
       <optional>
         <attribute name="isInternational">
-          <a:documentation>Whether the designation is the same across languages, or language-specific   </a:documentation>
+          <a:documentation>Whether the designation is the same across languages, or language-specific</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
@@ -2632,6 +2658,11 @@ links within an SVG file, so that the SVG file can hyperlink to anchors within t
         <a:documentation>Connective linking this location to its predecessor. _from/to_ are presumed to nest more closely than _and_ or _or_</a:documentation>
         <ref name="XrefConnectiveType"/>
       </attribute>
+      <optional>
+        <attribute name="custom-connective">
+          <a:documentation>Custom wording for connnective linking this location to its predecessor, custom wording. If provided, is treated as equivalent semantically to connective value</a:documentation>
+        </attribute>
+      </optional>
     </element>
   </define>
   <define name="XrefStyleType">
@@ -2658,6 +2689,11 @@ links within an SVG file, so that the SVG file can hyperlink to anchors within t
         <ref name="XrefConnectiveType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="custom-connective">
+        <a:documentation>Custom wording for connnective linking this location to its predecessor, custom wording. If provided, is treated as equivalent semantically to connective value</a:documentation>
+      </attribute>
+    </optional>
     <ref name="erefType"/>
   </define>
   <define name="erefstack">

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "3.2.2".freeze
+    VERSION = "3.2.3".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.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.3.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-01 00:00:00.000000000 Z
+date: 2026-02-16 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.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement