metanorma-iso 3.4.1 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 280ddeefbca35755cc0324649f4f554fca30120dcb8d901740d0dbd7baa0e0f8
-  data.tar.gz: 81b5b54c4105074d822bced3f25d9a005c3f58c7ddeb47449184594605e57d47
+  metadata.gz: 370c95ed634b5f69d7fe7133ceae5d05de4d68d8561c85e86844528dc6311833
+  data.tar.gz: 81d6900cc3ef2ce858d06e6c50415cd837d39787fcef055277e0db9314c355ff
 SHA512:
-  metadata.gz: 1fda52f6d5031ee446362525af0de04ec2551375007a1a76b0e9226b41ad4b41fa216d113f80a9ed317c140fcc5a5a44323c23801a8608fe6847213f24df7829
-  data.tar.gz: 15efc546555858005e2a4128244dce03bed7f93dc6aac9631e143e84269757f40ddc687be8c9b3c7322ebf112a5b96fee127252024a107a4aa096a351930dc31
+  metadata.gz: 2ec200175fa3d89c8304c9f267d8070cb068f4e58cf9ff8d56acfc48f4c561124f84695c95062da979cd16deb5abf0b0cd2612a208788dcdbcca5e881c31a38f
+  data.tar.gz: 837d81ef10cd6535c3bc209e5d6809cd362d40c5c5b4c4dd77d26ce50b76aa4407fd61a29961f43c2e07b23e23fb5aef15955440dc2c32aa07239d8d989c2df4

data/lib/isodoc/iso/base_convert.rb

@@ -99,20 +99,8 @@ module IsoDoc
         end
       end
 
-      def table_parse(node, out)
-        @in_table = true
-        out.table(**table_attrs(node)) do |t|
-          table_title_parse(node, t)
-          table_parse_core(node, t)
-          table_parse_tail(node, t)
-        end
-        @in_table = false
-      end
-
       def table_title_parse(node, out)
-        name = node.at(ns("./fmt-name"))
-        summ = node["summary"]
-        meas = node.at(ns("./note[@type = 'units']"))
+        name, summ, meas = table_title_parse_prep(node)
         name || summ || meas or return
         out.caption do |p|
           children_parse(name, p)
@@ -123,14 +111,16 @@ module IsoDoc
         end
       end
 
-      def table_parse_tail(node, out)
-        (key = node.at(ns("./key"))) && parse(key, out)
-        node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
-        node.xpath(ns("./note[not(@type = 'units')]")).each do |n|
-          parse(n, out)
-        end
-        node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))
-          .each { |n| parse(n, out) }
+      def table_title_parse_prep(node)
+        name = node.at(ns("./fmt-name"))
+        summ = node["summary"]
+        meas = node.at(ns("./note[@type = 'units']"))
+        [name, summ, meas]
+      end
+
+      def table_parse_tail_elems
+        ["./key", "./fmt-source", "./note[not(@type = 'units')]",
+         "./fmt-footnote-container/fmt-fn-body"]
       end
 
       def figure_parse1(node, out)

data/lib/isodoc/iso/html/style-human.css

@@ -827,7 +827,9 @@ nav {
     background-color: black;
     color: white !important;
     cursor: pointer;
-    z-index: 100;
+    left: 0;
+    top: 0;
+    z-index: 103;
   }
   #toggle span {
     text-align: center;

data/lib/isodoc/iso/html/style-iso.css

@@ -776,7 +776,9 @@ nav {
     background-color: #f7f7f7;
     color: black !important;
     cursor: pointer;
-    z-index: 100;
+    left: 0;
+    top: 0;
+    z-index: 103;
   }
   #toggle span {
     text-align: center;

data/lib/isodoc/iso/init.rb

@@ -50,38 +50,6 @@ module IsoDoc
       def requirements_processor
         ::Metanorma::Requirements::Iso
       end
-
-      def std_docid_semantic(id)
-        id.nil? and return nil
-        ret = Nokogiri::XML.fragment(id)
-        ret.traverse do |x|
-          x.text? or next
-          x.replace(std_docid_semantic1(x.text))
-        end
-        to_xml(ret)
-      end
-
-      def std_docid_semantic1(id)
-        id1 = id.sub(%r{\p{Zs}\(all\p{Zs}parts\)}, "###ALLPARTS###")
-        ids = id1.split(/(\p{Zs})/)
-        agency?(ids[0].sub(%r{^([^/]+)/.*$}, "\\1")) or return id
-        ids.map! do |i|
-          if %w(GUIDE TR TS DIR).include?(i)
-            "<span class='stddocNumber'>#{i}</span>"
-          elsif /\p{Zs}/.match?(i) then i
-          else std_docid_semantic_full(i)
-          end
-        end.join.gsub(%r{</span>(\p{Zs}+)<}, "\\1</span><")
-          .sub("###ALLPARTS###", " (all parts)")
-      end
-
-      def std_docid_semantic_full(ident)
-        ident
-          .sub(/^([^0-9]+)(\p{Zs}|$)/, "<span class='stdpublisher'>\\1</span>\\2")
-          .sub(/([0-9]+)/, "<span class='stddocNumber'>\\1</span>")
-          .sub(/-([0-9]+)/, "-<span class='stddocPartNumber'>\\1</span>")
-          .sub(/:([0-9]{4})(?!\d)/, ":<span class='stdyear'>\\1</span>")
-      end
     end
   end
 end

data/lib/isodoc/iso/metadata.rb

@@ -5,7 +5,7 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, locale, i18n)
         super
-        DATETYPES.each { |w| @metadata["#{w.gsub(/-/, '_')}date".to_sym] = nil }
+        DATETYPES.each { |w| @metadata[:"#{w.gsub('-', '_')}date"] = nil }
         set(:obsoletes, nil)
         set(:obsoletes_part, nil)
       end
@@ -24,11 +24,12 @@ module IsoDoc
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))
         published = published_default(isoxml)
-        revdate = isoxml.at(ns("//bibdata/version/revision-date"))
+        revdate = isoxml.at(ns("//bibdata/date[@type='updated']"))
         set(:revdate, revdate&.text)
         docstatus and docstatus1(isoxml, docstatus, published)
         docscheme = get[:"presentation_metadata_document-scheme"]
-        docscheme && !docscheme.empty? and set(:document_scheme, docscheme.first)
+        docscheme && !docscheme.empty? and set(:document_scheme,
+                                               docscheme.first)
       end
 
       def docstatus1(isoxml, docstatus, published)
@@ -39,7 +40,7 @@ module IsoDoc
             status_abbrev(docstatus["abbreviation"] || "??",
                           isoxml.at(ns("//bibdata/status/substage"))&.text,
                           isoxml.at(ns("//bibdata/status/iteration"))&.text,
-                          isoxml.at(ns("//bibdata/version/draft"))&.text,
+                          isoxml.at(ns("//bibdata/version"))&.text,
                           isoxml.at(ns("//bibdata/ext/doctype"))&.text))
         !published and set(:stageabbr, docstatus["abbreviation"])
       end
@@ -67,8 +68,8 @@ module IsoDoc
       end
 
       def title_part_prefix(xml, part, lang)
-        t = xml.at(ns("//bibdata/title[@language='#{lang}']"\
-          "[@type='title-#{part}-prefix']")) or return
+        t = xml.at(ns("//bibdata/title[@language='#{lang}']" \
+                      "[@type='title-#{part}-prefix']")) or return
         to_xml(t.children)
       end
 
@@ -97,7 +98,7 @@ module IsoDoc
       def title_parts(isoxml, lang)
         %w(intro main complementary part amd add).each_with_object({}) do |w, m|
           m[w.to_sym] = isoxml.at(ns("//bibdata/title[@type='title-#{w}' and " \
-                              "@language='#{lang}']"))
+                                     "@language='#{lang}']"))
         end
       end
 
@@ -164,7 +165,7 @@ module IsoDoc
       end
 
       COMMITTEE = "//bibdata/contributor[role/@type = 'author'] " \
-        "[role/description = 'committee']/organization".freeze
+                  "[role/description = 'committee']/organization".freeze
 
       def tc_base(xml, _grouptype)
         s = xml.at(ns("#{COMMITTEE}/subdivision[@type = 'Technical committee']"))
@@ -208,8 +209,8 @@ module IsoDoc
 
       def secretariat(xml)
         sec = xml.at(ns("//bibdata/contributor[role/@type = 'author']" \
-          "[role/description = 'secretariat']/organization/subdivision" \
-          "[@type = 'Secretariat']/name"))
+                        "[role/description = 'secretariat']/organization/subdivision" \
+                        "[@type = 'Secretariat']/name"))
         set(:secretariat, sec.text) if sec
       end
 

data/lib/isodoc/iso/presentation_section.rb

@@ -20,8 +20,7 @@ module IsoDoc
         docxml.at(ns("//bibdata//contributor/role[description = 'committee']")) or
           ret += "<p>Editorial groups are missing.</p>"
         docxml.at(ns("//bibdata/date[@type = 'published' or @type = 'issued' " \
-                     "or @type = 'created']")) ||
-          docxml.at(ns("//bibdata/version/revision-date")) or
+                     "or @type = 'created' or @type = 'updated']")) or
           ret += "<p>Document date is missing.</p>"
         ret
       end

data/lib/isodoc/iso/presentation_xref.rb

@@ -1,3 +1,5 @@
+require "pubid"
+
 module IsoDoc
   module Iso
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
@@ -151,9 +153,15 @@ module IsoDoc
                            @xrefs.anchor(node["target"], :type))
       end
 
-      def anchor_xref(node, target, container: false)
-        # require "debug"; binding.b
-        super
+      def annotate_docid?(_id)
+        true
+      end
+
+      def std_docid_span_classes(id)
+        id.gsub('class="publisher"', 'class="stdpublisher"')
+          .gsub('class="docnumber"', 'class="stddocNumber"')
+          .gsub('class="part"', 'class="stddocPartNumber"')
+          .gsub('class="year"', 'class="stdyear"')
       end
     end
   end

data/lib/isodoc/iso/word_convert.rb

@@ -234,15 +234,6 @@ module IsoDoc
         @in_table = false
       end
 
-      def table_parse_tail(node, out)
-        (key = node.at(ns("./key"))) && parse(key, out)
-        node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
-        node.xpath(ns("./note[not(@type = 'units')]"))
-          .each { |n| parse(n, out) }
-        node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))
-          .each { |n| parse(n, out) }
-      end
-
       def admonition_class(node)
         if node["type"] == "editorial" then "zzHelp"
         else super

data/lib/metanorma/iso/basicdoc.rng

@@ -187,6 +187,15 @@ Applicable to modify and delete</a:documentation>
         <a:documentation>Optional caption of this block</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="position">
+        <a:documentation>For an "add" change, whether the change is added before or after the location</a:documentation>
+        <choice>
+          <value>before</value>
+          <value>after</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <element name="location">
         <a:documentation>The location(s) in the original document which have undergone the change described in this block</a:documentation>

data/lib/metanorma/iso/biblio.rng

@@ -1142,11 +1142,11 @@ NOTE: This should preferably be encoded as  a URI or short identifier, rather th
         <a:documentation>Information about how long the current description of the bibliographic item is valid for</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction">
         <a:documentation>Depiction of the bibliographic item, typically an image</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="ReducedBibliographicItem">
     <a:documentation>Reduced description of a bibliographic resource, without mandatory title and docidentifier, used for document relations
@@ -2015,15 +2015,11 @@ provided that it is not the entire bibliographic item that is so related</a:docu
     <a:documentation>A version of the bibliographic item (within an edition). Can be used for drafts</a:documentation>
     <element name="version">
       <optional>
-        <ref name="revision-date">
-          <a:documentation>The date at which the current version of the bibliographic item was produced</a:documentation>
-        </ref>
-      </optional>
-      <optional>
-        <ref name="draft">
-          <a:documentation>The identifier for the current draft of the bibliographic item</a:documentation>
-        </ref>
+        <attribute name="type">
+          <a:documentation>Versioning scheme, in case of multiple versioning schemes</a:documentation>
+        </attribute>
       </optional>
+      <text/>
     </element>
   </define>
   <define name="vedition">
@@ -2063,13 +2059,13 @@ provided that it is not the entire bibliographic item that is so related</a:docu
           <ref name="LocalizedString"/>
         </element>
       </optional>
-      <oneOrMore>
+      <zeroOrMore>
         <element name="taxon">
           <a:documentation>The keywords as a hierarchical taxonomy. For example, the sequence of `taxon` elements
 `pump`, `centrifugal pump`, `line shaft pump` represents a taxonomic classification</a:documentation>
           <ref name="LocalizedString"/>
         </element>
-      </oneOrMore>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="vocabid">
           <a:documentation>Identifiers for the keyword as a controlled vocabulary</a:documentation>

data/lib/metanorma/iso/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.5 -->
+<!-- VERSION v2.1.6 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -164,6 +164,9 @@ Sources are currently only rendered in metanorma-plateau</a:documentation>
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <ref name="DisplayDirective"/>
+      </optional>
     </define>
     <define name="DlAttributes">
       <ref name="BlockAttributes"/>
@@ -814,6 +817,9 @@ titlecase, or lowercase</a:documentation>
   </define>
   <define name="UlAttributes" combine="interleave">
     <ref name="BlockAttributes"/>
+    <optional>
+      <ref name="DisplayDirective"/>
+    </optional>
   </define>
   <define name="TableAttributes" combine="interleave">
     <optional>
@@ -1968,7 +1974,7 @@ used in document amendments</a:documentation>
           <a:documentation>Zero or more examples of how the term is to be used</a:documentation>
         </ref>
       </zeroOrMore>
-      <ref name="TermSource">
+      <ref name="TermSources">
         <a:documentation>Bibliographic references for the managed term</a:documentation>
       </ref>
     </element>
@@ -2077,7 +2083,7 @@ used in document amendments</a:documentation>
         <a:documentation>Information about how the designation is to be used</a:documentation>
       </ref>
     </optional>
-    <ref name="TermSource">
+    <ref name="TermSources">
       <a:documentation>Bibliographic references for this designation of the managed term</a:documentation>
     </ref>
   </define>
@@ -2348,7 +2354,7 @@ used in document amendments</a:documentation>
           <ref name="formula"/>
         </choice>
       </oneOrMore>
-      <ref name="TermSource">
+      <ref name="TermSources">
         <a:documentation>Bibliographic references for this designation of the managed term</a:documentation>
       </ref>
     </element>
@@ -2365,7 +2371,7 @@ used in document amendments</a:documentation>
           <ref name="formula"/>
         </choice>
       </oneOrMore>
-      <ref name="TermSource">
+      <ref name="TermSources">
         <a:documentation>Bibliographic references for this designation of the managed term</a:documentation>
       </ref>
     </element>
@@ -2788,6 +2794,26 @@ to span across both columns</a:documentation>
       </attribute>
     </optional>
   </define>
+  <define name="DisplayDirective">
+    <a:documentation>Directive on how to render a block in Presentation XML </a:documentation>
+    <optional>
+      <attribute name="display">
+        <a:documentation>Display style for block.
+If the block is `ol` or `ul` and dispay is `table`, 
+the list is to be rendered as a table, with a column for each nested level, and a row for each terminal sublist</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="display-directives">
+        <a:documentation>display-directives is a key-value set of attributes, guiding how the rendering of the block should happen. 
+The key-value set is comma-delimited, and encoded as `key1='value1',key2='value'`, 
+as with stem//mn/@data-metanorma-numberformat
+*  If the block is `ol` or `ul` and dispay is `table`,  display-directives can have the value `colgroup='col1,col2,...coln'`, 
+where each col value is a percentage width of the column in the output table (with no % suffix). 
+e.g. `colgroup='50,33.3,16.7'`  </a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <define name="ReferencesAttributes">
     <optional>
       <attribute name="obligation">
@@ -2800,7 +2826,7 @@ Normative References contents contain normative references, but as a clause in t
       <data type="boolean"/>
     </attribute>
   </define>
-  <define name="TermSource">
+  <define name="TermSources">
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>

data/lib/metanorma/iso/reqt.rng

@@ -47,7 +47,15 @@ the tag name of the top level containers</a:documentation>
     </optional>
     <optional>
       <attribute name="model">
-        <a:documentation>Model of requirements realised by this requirement, e.g. "ogc" for Modspec</a:documentation>
+        <a:documentation>Model of requirements realised by this requirement, e.g. "ogc" for Modspec.
+Current legal values: ogc, default</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="render">
+        <a:documentation>Rendering of requirements realised by this requirement. Current legal values:
+default:: default, inline
+ogc:: default</a:documentation>
       </attribute>
     </optional>
     <optional>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.4.1".freeze
+    VERSION = "3.4.3".freeze
   end
 end

data/lib/metanorma/requirements/requirements.rb

@@ -7,8 +7,10 @@ module Metanorma
       def create(type)
         case type
         when :modspec, :ogc
-          ::Metanorma::Requirements::Modspec::Iso.new(parent: self)
-        else ::Metanorma::Requirements::Default.new(parent: self)
+          ::Metanorma::Requirements::Modspec::Iso.new(parent: self,
+                                                      isodoc: @isodoc)
+        else ::Metanorma::Requirements::Default.new(parent: self,
+                                                    isodoc: @isodoc)
         end
       end
     end

data/metanorma-iso.gemspec

@@ -32,13 +32,13 @@ Gem::Specification.new do |spec|
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 3.4.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.4.2"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid"
   spec.add_dependency "tokenizer", "~> 0.3.0"
 
   spec.add_development_dependency "benchmark"
-  spec.add_development_dependency "canon", "= 0.2.3"
+  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 "guard", "~> 2.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-05-25 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.4.0
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement