metanorma-iso 2.9.0 → 2.9.2

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

@@ -63,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>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "2.9.0".freeze
+    VERSION = "2.9.2".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.10.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.10.2"
   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.9.0
+  version: 2.9.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-12-10 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.10.0
+        version: 2.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.10.2
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement