metanorma-iso 2.8.9 → 2.9.1

data/lib/metanorma/iso/biblio.rng

@@ -1783,9 +1783,21 @@ that the `number` given for the series applies to the second iteration of number
 May be used to differentiate rendering of notes in bibliographies</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedMarkedUpString">
+      <ref name="LocalizedStringAttributes">
         <a:documentation>The content of the note</a:documentation>
       </ref>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlockNoId">
+            <a:documentation>Multiple blocks of content</a:documentation>
+          </ref>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement">
+            <a:documentation>Single block of content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="bibabstract">

data/lib/metanorma/iso/front.rb

@@ -21,6 +21,7 @@ module Metanorma
         @amd && a = node.attr("updates-document-type") and
           xml.updates_document_type a
         a = node.attr("fast-track") and xml.send "fast-track", a != "false"
+        a = node.attr("price-code") and xml.price_code a
       end
 
       STAGE_ERROR = [Pubid::Core::Errors::HarmonizedStageCodeInvalidError,

data/lib/metanorma/iso/front_contributor.rb

@@ -54,12 +54,10 @@ module Metanorma
       def contrib_committee_build(xml, agency, committee)
         name = org_abbrev.invert[agency] and agency = name
         xml.name agency
-        xml.subdivision do |s|
-          s.organization do |o|
+        xml.subdivision do |o|
             o.name committee[:name]
             committee[:abbr] and o.abbreviation committee[:abbr]
             committee[:ident] and o.identifier committee[:ident]
-          end
         end
       end
 

data/lib/metanorma/iso/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.4 -->
+<!-- VERSION v1.4.1 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -326,7 +326,7 @@ normative or informative references, some split references into sections organiz
       <a:documentation>Content of note</a:documentation>
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -412,7 +412,7 @@ normative or informative references, some split references into sections organiz
       <element name="note">
         <ref name="OptionalId"/>
         <oneOrMore>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
         </oneOrMore>
       </element>
     </define>
@@ -1977,7 +1977,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
@@ -2015,7 +2015,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -2037,7 +2037,7 @@ used in document amendments</a:documentation>
           <ref name="dl"/>
           <ref name="quote"/>
           <ref name="sourcecode"/>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="figure"/>
         </choice>
       </oneOrMore>

data/lib/metanorma/iso/relaton-iso.rng

@@ -30,6 +30,9 @@
       <optional>
         <ref name="fast_track"/>
       </optional>
+      <optional>
+        <ref name="price-code"/>
+      </optional>
     </define>
     <define name="bdate">
       <element name="date">
@@ -60,36 +63,19 @@
         </choice>
       </element>
     </define>
-    <define name="organization">
-      <element name="organization">
-        <oneOrMore>
-          <ref name="orgname"/>
-        </oneOrMore>
-        <optional>
-          <ref name="abbreviation"/>
-        </optional>
-        <optional>
-          <ref name="uri"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="org-identifier"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="contact"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="technical-committee"/>
-        </optional>
-        <optional>
-          <ref name="subcommittee"/>
-        </optional>
-        <optional>
-          <ref name="workgroup"/>
-        </optional>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
-      </element>
+    <define name="OrganizationType" combine="interleave">
+      <optional>
+        <ref name="technical-committee"/>
+      </optional>
+      <optional>
+        <ref name="subcommittee"/>
+      </optional>
+      <optional>
+        <ref name="workgroup"/>
+      </optional>
+      <optional>
+        <ref name="secretariat"/>
+      </optional>
     </define>
     <define name="DocumentType">
       <choice>
@@ -234,4 +220,9 @@
       <data type="boolean"/>
     </element>
   </define>
+  <define name="price-code">
+    <element name="price-code">
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "2.8.9".freeze
+    VERSION = "2.9.1".freeze
   end
 end

data/lib/metanorma/requirements/modspec.rb

@@ -1,24 +1,26 @@
 module Metanorma
   class Requirements
     class Modspec
-      # Don't want to inherit from Metanorma::Requirements::Modspec
       class Iso < ::Metanorma::Requirements::Modspec
+=begin
         def recommendation_label(elem, type, xrefs)
           lbl = super
           title = elem.at(ns("./title"))
           return lbl unless title &&
             elem.ancestors("requirement, recommendation, permission").empty?
 
-          lbl += ": " if lbl
-          lbl += title.children.to_xml
+          lbl += "<span class='fmt-caption-delim'>: </span>" if lbl
+          lbl += "<semx element='title' source='#{elem['id']}'>#{title.children.to_xml}</semx>"
+          require "debug"; binding.b
           l10n(lbl)
         end
 
         # ISO labels modspec reqt as table, with reqt label as title
         def recommendation_header(reqt, out)
-          n = reqt.at(ns("./name")) and out << n
+          n = reqt.at(ns("./fmt-name")) and out << n
           out
         end
+=end
 
         def requirement_table_nested_cleanup(node, table)
           table["type"] == "recommendclass" or return table
@@ -40,7 +42,7 @@ module Metanorma
         def nested_tables_names(table)
           table.xpath(ns("./tbody/tr/td/table"))
             .each_with_object([]) do |t, m|
-              m << t.at(ns("./name")).children.to_xml
+              m << t.at(ns(".//fmt-name")).children.to_xml
             end
         end
 
@@ -49,8 +51,10 @@ module Metanorma
           anchor[:modspec] = anchor[:xref_bare]
           if l = block.at(ns("./title"))
             anchor[:modspec] =
-              l10n("#{anchor[:modspec]}: #{l.children.to_xml.strip}")
+              l10n("#{anchor[:modspec]}<span class='fmt-caption-delim'>: </span><semx element='title' source='#{block['id']}'>#{l.children.to_xml.strip}</semx>")
           end
+          /<xref/.match?(anchor[:modspec]) or
+            anchor[:modspec] = "<xref target='#{block['id']}'>#{anchor[:modspec]}</xref>"
           anchor
         end
       end

data/metanorma-iso.gemspec

@@ -32,7 +32,7 @@ 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", "~> 2.9.3"
+  spec.add_dependency "metanorma-standoc", "~> 2.10.1"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid"
   spec.add_dependency "tokenizer", "~> 0.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.8.9
+  version: 2.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: 2.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: 2.10.1
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement