metanorma-iho 1.4.1.pre.alpha.3 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3adc6385dd1bab4ff66dc1bc17d20f8363ea9dda8ff91fcc3417b77a16941620
-  data.tar.gz: 5c326855f8766ca7836e1b2947a3ca3d75acb709fdd3f561f02108eca2d54a31
+  metadata.gz: 824725320798b47f87cd40d24f23c15cd4ab90be26fc64f57bad206e64582b37
+  data.tar.gz: c44ebe0729cc65fae4f5fdc44cf7fc96e7803f0f2d86d2ba882dfc3428a3240a
 SHA512:
-  metadata.gz: fed8ea5843917db0b3880da2932783664ada731a67509ce2f05910697e41676d0aaa0d0c12055c0ba4376a5b5aaa310522192657afe191bc1ba6418135b216a7
-  data.tar.gz: acbb16e9583700af8dc14336e5c484b870996cc036544c9e8dd6790dd79924016fc6444163fe4b2cb272c0a8d71cde595dd8f64cc64a3d65a9e7475fdf301cf9
+  metadata.gz: 6f2bbdc06b70a035b7934587c0e5d970803a20da9e975561cbe435b93a3a2525183276ae2daf39c59c5eb6817bc4896a4092b64ed4025da049b08844490ee96e
+  data.tar.gz: 24be541a07bbad79baee00bdc2bbabe6db706473e119693508bbc4f9f125c0c6f16ef4aa0790f8a8468c2143fcfcb1793cf2fb2a74a4976e93a671e300577a4f

data/Gemfile

@@ -3,17 +3,15 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
-# canonical α line: pubid 2 monogem main (subsumes the 1.x trio); single
-# pins for the engine mains — released standoc/isodoc still cap the
-# old relaton line
-gem "pubid", "~> 2.0.0.pre.alpha"
-gem "relaton-cli", "~> 3.0.0.pre.alpha"
-gem "isodoc", github: "metanorma/isodoc", branch: "main"
+# canonical line: relaton 3 finals over the α engine line
+gem "pubid", "~> 2.0"
+gem "relaton-cli", "~> 3.0"
+gem "isodoc", "~> 3.7.9"
 gem "isodoc-i18n", github: "metanorma/isodoc-i18n", branch: "main"
-gem "metanorma-standoc", github: "metanorma/metanorma-standoc", branch: "main"
-gem "metanorma-document", github: "metanorma/metanorma-document", branch: "main"
+gem "metanorma-standoc", "~> 3.5.7"
+gem "metanorma-document", "~> 0.5.3"
 gem "metanorma-core", github: "metanorma/metanorma-core", branch: "main"
 gem "metanorma-iso", github: "metanorma/metanorma-iso", branch: "main"
 gem "metanorma-generic", github: "metanorma/metanorma-generic", branch: "main"
-gem "metanorma-utils", github: "metanorma/metanorma-utils", branch: "main"
+gem "metanorma-utils", "~> 2.0"
 gem "metanorma-plugin-lutaml", github: "metanorma/metanorma-plugin-lutaml", branch: "main"

data/lib/isodoc/iho/iho.specification.xsl

@@ -43,18 +43,6 @@
 	</xsl:variable>
 	<xsl:variable name="variables" select="xalan:nodeset($variables_)"/>
 
-	<xsl:template name="getVariable">
-		<xsl:param name="variable"/>
-		<xsl:variable name="num" select="number(java:org.metanorma.fop.global.Variables.getVariable('num'))"/>
-		<xsl:value-of select="$variables/mnx:doc[@num = $num]/*[local-name() = $variable]"/>
-	</xsl:template>
-
-	<xsl:template name="getVariableCopyOf">
-		<xsl:param name="variable"/>
-		<xsl:variable name="num" select="number(java:org.metanorma.fop.global.Variables.getVariable('num'))"/>
-		<xsl:copy-of select="$variables/mnx:doc[@num = $num]/*[local-name() = $variable]/node()"/>
-	</xsl:template>
-
 	<!-- Example:
 		<item level="1" id="Foreword" display="true">Foreword</item>
 		<item id="term-script" display="false">3.2</item>
@@ -16542,6 +16530,23 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template name="getVariable">
+		<xsl:param name="variable"/>
+		<!-- Note: need insert <xsl:variable name="setVariable" select="java:org.metanorma.fop.global.Variables.setVariable('num', $num)"/> before
+			in the iteration <xsl:for-each select="xalan:nodeset($updated_xml)//mn:metanorma"> -->
+		<xsl:variable name="num" select="number(java:org.metanorma.fop.global.Variables.getVariable('num'))"/>
+		<xsl:value-of select="$variables/mnx:doc[@num = $num]/*[local-name() = $variable]"/>
+	</xsl:template>
+
+	<!-- get variable value with the internal elements(nodes), e.g. formatting -->
+	<xsl:template name="getVariableCopyOf">
+		<xsl:param name="variable"/>
+		<!-- Note: need insert <xsl:variable name="setVariable" select="java:org.metanorma.fop.global.Variables.setVariable('num', $num)"/> before
+			in the iteration <xsl:for-each select="xalan:nodeset($updated_xml)//mn:metanorma"> -->
+		<xsl:variable name="num" select="number(java:org.metanorma.fop.global.Variables.getVariable('num'))"/>
+		<xsl:copy-of select="$variables/mnx:doc[@num = $num]/*[local-name() = $variable]/node()"/>
+	</xsl:template>
+
 	<!-- ============================================= -->
 	<!--  mode="print_as_xml", for debug purposes -->
 	<!-- ============================================= -->

data/lib/isodoc/iho/iho.standard.xsl

@@ -43,18 +43,6 @@
 	</xsl:variable>
 	<xsl:variable name="variables" select="xalan:nodeset($variables_)"/>
 
-	<xsl:template name="getVariable">
-		<xsl:param name="variable"/>
-		<xsl:variable name="num" select="number(java:org.metanorma.fop.global.Variables.getVariable('num'))"/>
-		<xsl:value-of select="$variables/mnx:doc[@num = $num]/*[local-name() = $variable]"/>
-	</xsl:template>
-
-	<xsl:template name="getVariableCopyOf">
-		<xsl:param name="variable"/>
-		<xsl:variable name="num" select="number(java:org.metanorma.fop.global.Variables.getVariable('num'))"/>
-		<xsl:copy-of select="$variables/mnx:doc[@num = $num]/*[local-name() = $variable]/node()"/>
-	</xsl:template>
-
 	<!-- Example:
 		<item level="1" id="Foreword" display="true">Foreword</item>
 		<item id="term-script" display="false">3.2</item>
@@ -16542,6 +16530,23 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template name="getVariable">
+		<xsl:param name="variable"/>
+		<!-- Note: need insert <xsl:variable name="setVariable" select="java:org.metanorma.fop.global.Variables.setVariable('num', $num)"/> before
+			in the iteration <xsl:for-each select="xalan:nodeset($updated_xml)//mn:metanorma"> -->
+		<xsl:variable name="num" select="number(java:org.metanorma.fop.global.Variables.getVariable('num'))"/>
+		<xsl:value-of select="$variables/mnx:doc[@num = $num]/*[local-name() = $variable]"/>
+	</xsl:template>
+
+	<!-- get variable value with the internal elements(nodes), e.g. formatting -->
+	<xsl:template name="getVariableCopyOf">
+		<xsl:param name="variable"/>
+		<!-- Note: need insert <xsl:variable name="setVariable" select="java:org.metanorma.fop.global.Variables.setVariable('num', $num)"/> before
+			in the iteration <xsl:for-each select="xalan:nodeset($updated_xml)//mn:metanorma"> -->
+		<xsl:variable name="num" select="number(java:org.metanorma.fop.global.Variables.getVariable('num'))"/>
+		<xsl:copy-of select="$variables/mnx:doc[@num = $num]/*[local-name() = $variable]/node()"/>
+	</xsl:template>
+
 	<!-- ============================================= -->
 	<!--  mode="print_as_xml", for debug purposes -->
 	<!-- ============================================= -->

data/lib/metanorma/iho/citation_style.rb

@@ -1,4 +1,4 @@
-require "relaton-render"
+require "relaton/render"
 
 module Metanorma
   module Iho

data/lib/metanorma/iho/converter.rb

@@ -15,6 +15,24 @@ module Metanorma
         Metanorma::Iho.configuration
       end
 
+      # IHO M-3 (2026) development-stage vocabulary (metanorma-iho#553):
+      # a `:status:` value may be the stage slug or its M-3 abbreviation;
+      # both normalize to the slug with the abbreviation carried on the
+      # stage element. Values outside the M-3 vocabulary pass through
+      # unchanged (in-force, draft, ...).
+      def metadata_status(node, xml)
+        return super unless node.attr("status")
+
+        stage, abbr = M3Stages.normalize(node.attr("status"))
+        abbr ||= node.attr("docstage-abbrev")
+        xml.status do |s|
+          add_noko_elem(s, "stage", stage, abbreviation: abbr)
+          add_noko_elem(s, "substage", node.attr("docsubstage") ||
+                        node.attr("substage"))
+          add_noko_elem(s, "iteration", node.attr("iteration"))
+        end
+      end
+
       def presentation_xml_converter(node)
         IsoDoc::Iho::PresentationXMLConvert
           .new(html_extract_attributes(node)

data/lib/metanorma/iho/front.rb

@@ -24,9 +24,34 @@ module Metanorma
           @log.add("IHO_1", nil)
         end
         super
+        metadata_committee(node, ext)
         metadata_commentperiod(node, ext)
       end
 
+      # IHO S-4 documents carry their editorial group as plain attributes:
+      # :committee:/:workgroup: (with _2, _3… suffixes for additional
+      # groups). Emitted into bibdata <ext><editorialgroup>, the shape
+      # relaton's IHO hash parser normalizes
+      # (relaton/iho/hash_parser_v1#editorialgroup_hash_to_bib). The
+      # emission was dropped in d1af149 as an IEC-motivated ride-along
+      # (metanorma-iec#191); IHO genuinely uses it.
+      def metadata_committee(node, xml)
+        node.attr("workgroup") or return
+        i = 1
+        while node.attr("workgroup#{i == 1 ? "" : "_#{i}"}")
+          sfx = i == 1 ? "" : "_#{i}"
+          xml.editorialgroup do |a|
+            a.committee do |n|
+              n.abbreviation node.attr("committee#{sfx}").to_s.upcase
+            end
+            a.workgroup do |n|
+              n.abbreviation node.attr("workgroup#{sfx}").upcase
+            end
+          end
+          i += 1
+        end
+      end
+
       def metadata_commentperiod(node, xml)
         from = node.attr("comment-from") or return
         xml.commentperiod do |c|

data/lib/metanorma/iho/html/renderer.rb

@@ -78,7 +78,10 @@ module Metanorma
           text = Array(element.value).join.strip
           return nil if text.empty?
 
-          text.split("-").map(&:capitalize).join(" ")
+          label = text.split("-").map(&:capitalize).join(" ")
+          abbr = element.respond_to?(:abbreviation) ? element.abbreviation : nil
+          abbr = Array(abbr).filter_map { |a| a.respond_to?(:value) ? Array(a.value).join.strip : nil }.first
+          abbr && !abbr.empty? ? "#{label} (#{abbr})" : label
         end
 
         def iho_copyright_line(bibdata)

data/lib/metanorma/iho/m3_stages.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Iho
+    # IHO M-3 (2026 edition), "Principles and procedures for making changes
+    # to IHO technical standards and specifications", document development
+    # stages (p. 68). A `:status:` value may be given as the stage slug or
+    # as its M-3 abbreviation; both normalize to the slug plus the
+    # abbreviation, which is carried on the bibdata stage element so the
+    # development stage is identifiable in the rendered document.
+    module M3Stages
+      STAGES = {
+        "concept-proposal" => "CP",
+        "proposal-development" => "PD",
+        "working-draft" => "WD",
+        "endorsement-draft" => "ED",
+        "approval-draft" => "AD",
+      }.freeze
+
+      # Returns [stage, abbreviation]. Values outside the M-3 2026
+      # vocabulary pass through unchanged with no abbreviation, preserving
+      # the pre-M-3 2026 statuses (in-force, draft, ...).
+      def self.normalize(value)
+        raw = value.to_s.strip
+        return [nil, nil] if raw.empty?
+
+        slug = raw.downcase.tr(" ", "-").tr("_", "-")
+        return [slug, STAGES[slug]] if STAGES.key?(slug)
+
+        hit = STAGES.find { |_s, abbr| abbr.casecmp(raw).zero? }
+        return [hit[0], hit[1]] if hit
+
+        [raw, nil]
+      end
+    end
+  end
+end

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iho
-    VERSION = "1.4.1.pre.alpha.3".freeze
+    VERSION = "1.4.2".freeze
   end
 end

data/lib/metanorma/iho.rb

@@ -6,6 +6,7 @@ require "metanorma/iho/processor"
 module Metanorma
   module Iho
     autoload :CitationStyle, "metanorma/iho/citation_style"
+    autoload :M3Stages, "metanorma/iho/m3_stages"
 
     class Configuration < Metanorma::Generic::Configuration
       def initialize(*args)

data/metanorma-iho.gemspec

@@ -27,10 +27,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
-  spec.add_dependency "metanorma-generic", ">= 3.5.1.pre.alpha.1"
+  spec.add_dependency "metanorma-generic", "~> 3.5.1"
 
   spec.add_development_dependency "debug"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 13.0"

data/metanorma.yml

@@ -12,6 +12,8 @@ committees:
     full_name: Inter-Regional Coordination Committee
   - code: ihb
     full_name: International Hydrographic Bureau
+  - code: ncwg
+    full_name: Nautical Cartography Working Group
 htmlcoverpage: lib/isodoc/iho/html/html_iho_titlepage.html
 htmlintropage: lib/isodoc/iho/html/html_iho_intro.html
 htmlstylesheet: lib/isodoc/iho/html/htmlstyle.scss

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 1.4.1.pre.alpha.3
+  version: 1.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-27 00:00:00.000000000 Z
+date: 2026-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1.pre.alpha.1
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1.pre.alpha.1
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -260,6 +246,7 @@ files:
 - lib/metanorma/iho/iho-style.yml
 - lib/metanorma/iho/iho.rng
 - lib/metanorma/iho/log.rb
+- lib/metanorma/iho/m3_stages.rb
 - lib/metanorma/iho/mathml4-content.rng
 - lib/metanorma/iho/mathml4-core.rng
 - lib/metanorma/iho/mathml4-presentation.rng