metanorma-ieee 1.7.1.pre.alpha.2 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e30d6f56faebc7392e2ca7d50266967e648063e663dae3bf002f94607bd2578
-  data.tar.gz: 5c204ca32f700274f9e0bf644eefef4edbb0343d2fa26dafb4d4f1952e7c44fe
+  metadata.gz: d58e0bedc3b61221224ec9eb38a220d5ba3266c196b28314488d83a6699ddb41
+  data.tar.gz: 8e90070593ab7add6299ef6f2a8abddacfe6cec23863978b911bd238d111e8ce
 SHA512:
-  metadata.gz: 20f745193c3494845fd55736ba6e0c41d090dad80d51888fbf97d33539ede637404372761b5f48165db9a0be093e391f267b48222fe6a2819aef75f1357f0500
-  data.tar.gz: ea6ff96790320afefb6e7e6e4d0c7cc18588d5cfc3501c8833316fa56b001b600469b6a153733f6c22cc57efcd0304c15d664ff0940415344f743451b77c0834
+  metadata.gz: 9c7be18476b196110805846ecceb41dcfbeddefb3c2dbb8c481ac8f016adfd5d47481b24a5f7f4feab4fd44254d6fae34846ac02b93cd4aee8ef8c6159513e7a
+  data.tar.gz: f56a089eb2635e0a2e86940e8f8ebbe58d4c1930eb3ef431fd27ccbfd88971a9a2d32016f8a1185cce451d6602bce7e0c17321ca5b32fc35e6b2fe2beb45ea14

data/Gemfile

@@ -1,8 +1,9 @@
 source "https://rubygems.org"
-gem "relaton-render", "= 3.0.0.pre.alpha.43" # canonical ieee-sa pack; delta merge, edition precedence, named ieee_* rules
-# the lockfile is not tracked; without an exact pin CI floats the monogem
-# to newer alphas whose rendering differs, flipping fixture baselines
-gem "relaton", "~> 3.0.0.pre.alpha" # prerelease line: alpha.17 carries the singular_tolerance declarations
+gem "relaton-render", "~> 3.0" # canonical ieee-sa pack; delta merge, edition precedence, named ieee_* rules
+gem "relaton", "~> 3.0" # 3.0.0 final carries the singular_tolerance declarations
+# parsanol 1.3.123 is the current pubid-compatible line (pubid pins ~> 1.3.12x);
+# 1.3.123 restores the 1.3.121 binding behaviour (parsanol#421).
+gem "parsanol", "~> 1.3.123" # pubid ~> 2.0.3 requires the 1.3.12x line; 1.3.123 carries the JIS binding fix (parsanol#421)
 # leptris 1.9.359 drops Leptris::XML::Declaration#to_xml (blocks_spec);
 # 1.9.356 is the last rendering-green line until leptris restores it
 
@@ -11,24 +12,18 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 gemspec
 gem "metanorma-mirror", "~> 1.0"
 
-# TEMPORARY: cross-PR branch pins so CI can resolve the in-flight
-# metanorma-standoc namespace rename (Metanorma::Standoc::Document)
-# and the pubid-2 / relaton-bib 2.2 / metanorma-document 0.5 chain.
-# Revert each pin once the corresponding PR merges:
-#   - https://github.com/metanorma/metanorma-standoc/pull/1232
-#   - https://github.com/metanorma/metanorma-document/pull/45
-gem "metanorma-standoc", github: "metanorma/metanorma-standoc", branch: "main"
+gem "metanorma-standoc", "~> 3.5.1.pre.alpha" # Standoc::Document rename
 # released plugin-lutaml 0.7.50 dropped the preprocessor names standoc
 # registers (LutamlDataPreprocessor); main carries them (generic#133)
 gem "metanorma-plugin-lutaml", github: "metanorma/metanorma-plugin-lutaml", branch: "main"
-gem "metanorma-document", github: "metanorma/metanorma-document", branch: "main" # TEMPORARY audit chain
-gem "isodoc", github: "metanorma/isodoc", branch: "main" # merged as #825
+gem "metanorma-document", "~> 0.5.2.pre.alpha"
+gem "isodoc", "~> 3.7.4.pre.alpha"
 gem "relaton-bib", "2.2.0.pre.alpha.1"
-gem "pubid", github: "pubid/pubid", branch: "main"
+gem "pubid", "~> 2.0"
 
 eval_gemfile("Gemfile.devel") rescue nil
 gem "metanorma-iso", github: "metanorma/metanorma-iso", branch: "main"
-gem "metanorma-core", github: "metanorma/metanorma-core", branch: "feat/flavor-table" # TEMPORARY audit chain
+gem "metanorma-core", "~> 0.2.5.pre.alpha" # published flavor/taste table (metanorma-core#18)
 # moxml 0.5.138's leptris adapter references Leptris::XML::Declaration,
 # which only exists in leptris 1.9.359 (the to_xml regression pair,
 # leptris#1733); pin the coherent 1.9.356-era moxml line

data/lib/isodoc/ieee/ieee.amendment.xsl

@@ -12,6 +12,23 @@
 	<!-- mandatory variable -->
 	<xsl:variable name="debug">false</xsl:variable>
 
+	<xsl:variable name="variables_">
+		<xsl:for-each select="//mn:metanorma">
+			<xsl:variable name="num"><xsl:number level="any" count="mn:metanorma"/></xsl:variable>
+
+			<xsl:variable name="current_document">
+				<xsl:copy-of select="."/>
+			</xsl:variable>
+
+			<xsl:for-each select="xalan:nodeset($current_document)">
+				<mnx:doc num="{$num}">
+
+				</mnx:doc>
+			</xsl:for-each>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable name="variables" select="xalan:nodeset($variables_)"/>
+
 	<!-- mandatory variable -->
 	<xsl:variable name="contents_">
 		<xsl:variable name="bundle" select="count(//mn:metanorma) &gt; 1"/>
@@ -19303,6 +19320,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/ieee/ieee.standard.xsl

@@ -12,6 +12,23 @@
 	<!-- mandatory variable -->
 	<xsl:variable name="debug">false</xsl:variable>
 
+	<xsl:variable name="variables_">
+		<xsl:for-each select="//mn:metanorma">
+			<xsl:variable name="num"><xsl:number level="any" count="mn:metanorma"/></xsl:variable>
+
+			<xsl:variable name="current_document">
+				<xsl:copy-of select="."/>
+			</xsl:variable>
+
+			<xsl:for-each select="xalan:nodeset($current_document)">
+				<mnx:doc num="{$num}">
+
+				</mnx:doc>
+			</xsl:for-each>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable name="variables" select="xalan:nodeset($variables_)"/>
+
 	<!-- mandatory variable -->
 	<xsl:variable name="contents_">
 		<xsl:variable name="bundle" select="count(//mn:metanorma) &gt; 1"/>
@@ -19303,6 +19320,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/ieee/validate.rb

@@ -69,14 +69,30 @@ module Metanorma
         normative_dated_refs(root)
       end
 
-      # Style manual 12.3.1
+      # Style manual 12.3.1. A reference that names a stage ("ISO/IEC/IEEE
+      # FDIS 42010") is sufficient identification on its own: staged documents
+      # have no publication date, and the stage is how the in-progress
+      # citation identifies itself (relaton-iso#120).
       def normative_dated_refs(root)
         root.xpath("//references[@normative = 'true']/bibitem").each do |b|
+          next if staged_reference?(b)
+
           b.at(".//date") or
             @log.add("IEEE_10", b, params: [b.at("./@anchor")&.text])
         end
       end
 
+      ISO_STAGE_ABBREVIATIONS =
+        %w(PWI NP NWIP DP WD AWI preCD PreCD CD CDV DIS FDIS Fpr PRF DAM).freeze
+
+      def staged_reference?(bibitem)
+        bibitem.xpath(".//docidentifier").any? do |d|
+          ISO_STAGE_ABBREVIATIONS.any? do |st|
+            d.text.match?(/(?<=[\s\/])#{st}(?=[\s\/.:-]|$)/)
+          end
+        end
+      end
+
       def list_validate(doc)
         listcount_validate(doc)
         listdepth_validate(doc)

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ieee
-    VERSION = "1.7.1.pre.alpha.2".freeze
+    VERSION = "1.7.2".freeze
   end
 end

data/metanorma-ieee.gemspec

@@ -27,10 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "metanorma-standoc", ">= 3.4.2" # audit chain
   spec.add_dependency "mnconvert", "~> 1.20"
-  spec.add_dependency "pubid", "~> 2.0"
+  spec.add_dependency "pubid", "~> 2.0.3"
 
   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 "openssl"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.7.1.pre.alpha.2
+  version: 1.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-27 00:00:00.000000000 Z
+date: 2026-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,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