metanorma-iso 3.3.4 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11f636fab23bd563bc92f4402821fb2c88242885bfc55a875dd06724989d9470
-  data.tar.gz: 473e6d919660def188a066f584e007c424e3c2af71478140fc1ab7ddb0df64d5
+  metadata.gz: af8cccd4eb2c8c09f5e8e1714b3154106d37cbc60b470143dc1569885ddc5268
+  data.tar.gz: b9d3770934d56c2d25891663214631ab6fd72264ed9b17e1bb7729cf4302b89d
 SHA512:
-  metadata.gz: 67e8cbd787d333991eeda7d131852c3403a1a2f4e87a1cf26e1807f20f7ee463a0968cf821684fc039ade6357ab60c1b29ff95bf0bd4c2f7b4dc7690cb1c1f58
-  data.tar.gz: ec75982ff7c6548dfca34e6eba80928c7f028adbfe9fc7bb9b91e49ea5b4b17e89eb7f0b2ed904650efc3b22a29e41bf49b0e825d0eb7fa4ded3191f523e58e5
+  metadata.gz: de6922a6e5923045702366f758294685bf1ebde75aab4a7abf78f9e7ab48c72478e8e733d21611ce84dd45ed9aaac61b6857b2c158dda910f650e237c3cfbf7c
+  data.tar.gz: 6a218b206ab889b35501881571a695d7d2fd3e623e76f356aaf98717aa46298986ca1aacdcb108f6675945db181abff80cab3e79a5e007c28837cd74b6a0a9cb

data/lib/isodoc/iso/iso.amendment.xsl

@@ -1491,7 +1491,9 @@
 				</xsl:if>
 
 				<!-- Index -->
-				<xsl:call-template name="index-pages"/>
+				<xsl:call-template name="index-pages">
+					<xsl:with-param name="num" select="$num"/>
+				</xsl:call-template>
 
 				<xsl:call-template name="back-page">
 					<xsl:with-param name="num" select="$num"/>
@@ -6055,18 +6057,6 @@
 		<fo:block id="lastBlock{$num}" font-size="1pt" keep-with-previous="always" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
 	</xsl:template>
 
-	<xsl:template name="insert_firstpage_id">
-		<xsl:param name="num"/>
-		<fo:wrapper role="artifact">
-			<fo:block-container absolute-position="fixed" top="1mm">
-				<xsl:if test="$num = 1">
-					<xsl:attribute name="id">firstpage_id_0</xsl:attribute>
-				</xsl:if>
-				<fo:block id="firstpage_id_{$num}" role="SKIP"> </fo:block>
-			</fo:block-container>
-		</fo:wrapper>
-	</xsl:template>
-
 	<!-- https://www.metanorma.org/ns/standoc -->
 	<xsl:variable name="namespace_full" select="namespace-uri(//mn:metanorma[1])"/>
 
@@ -6921,7 +6911,7 @@
 	<xsl:variable name="named_dest_">
 		<xsl:choose>
 			<xsl:when test="count(ancestor::mn:figure) &gt; 1"/> <!-- prevent id 'a)' -->
-			<xsl:when test="ancestor::mn:note or ancestor::mn:example or        ancestor::mn:termnote or ancestor::mn:termexample"/>
+			<xsl:when test="ancestor::mn:note or ancestor::mn:example or        ancestor::mn:termnote or ancestor::mn:termexample or        ancestor::mn:admonition"/>
 			<xsl:when test="$caption_label = '' and parent::mn:foreword">
 				<xsl:variable name="foreword_number"><xsl:number count="mn:foreword" level="any"/></xsl:variable>
 				<xsl:if test="$foreword_number = 1">Foreword</xsl:if>
@@ -6932,7 +6922,13 @@
 			</xsl:when>
 			<xsl:when test="$caption_label = ''"/>
 			<xsl:when test="../@unnumbered = 'true'"/>
+			<xsl:when test="normalize-space(java:matches(java:java.lang.String.new($caption_label), '[\x21-\xFF]+')) = 'false'"/>
+			<!-- 1.1 in Appendix 1 -->
 			<xsl:otherwise>
+				<xsl:if test="ancestor::mn:annex and string(number(substring($caption_label, 1, 1))) != 'NaN'">
+					<xsl:variable name="annex_caption_label" select="translate(normalize-space(ancestor::mn:annex[1]/mn:fmt-title//mn:span[@class = 'fmt-caption-label']), ' ()', '')"/>
+					<xsl:value-of select="concat($annex_caption_label, '_')"/>
+				</xsl:if>
 				<xsl:if test="parent::mn:formula">Formula</xsl:if>
 				<xsl:value-of select="$caption_label"/>
 			</xsl:otherwise>
@@ -8044,9 +8040,11 @@
 	</xsl:template>
 
 	<xsl:template match="mn:feedback-statement//mn:p">
+		<xsl:param name="skip_id">false</xsl:param>
 		<xsl:param name="margin"/>
 		<!-- process in the template 'paragraph' -->
 		<xsl:call-template name="paragraph">
+			<xsl:with-param name="skip_id" select="$skip_id"/>
 			<xsl:with-param name="margin" select="$margin"/>
 		</xsl:call-template>
 	</xsl:template>
@@ -14736,7 +14734,12 @@
 	<xsl:template match="mn:figure[@class = 'pseudocode']">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}">
-			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
+			<fo:block role="SKIP">
+				<xsl:for-each select="mn:fmt-name"> <!-- set context -->
+					<xsl:call-template name="setIDforNamedDestination"/>
+				</xsl:for-each>
+				<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
+			</fo:block>
 		</fo:block>
 		<xsl:apply-templates select="mn:fmt-name"/>
 	</xsl:template>
@@ -17402,7 +17405,7 @@
 	</xsl:variable>
 
 	<xsl:template name="index-pages">
-		<xsl:variable name="num"><xsl:number level="any" count="mn:metanorma"/></xsl:variable>
+		<xsl:param name="num"/>
 
 		<xsl:variable name="docid">
 			<xsl:call-template name="getDocumentId"/>
@@ -19497,6 +19500,15 @@
 		</xsl:if>
 	</xsl:template>
 
+	<!-- debug templates -->
+	<xsl:template name="debug_contents">
+		<xsl:if test="$debug = 'true'">
+			<redirect:write file="contents_.xml"> <!-- {java:getTime(java:java.util.Date.new())} -->
+				<xsl:copy-of select="$contents"/>
+			</redirect:write>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="processPrefaceSectionsDefault">
 		<xsl:param name="num"/>
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
@@ -20739,14 +20751,18 @@
 	</xsl:template>
 
 	<xsl:template name="setIDforNamedDestination">
-		<xsl:if test="@named_dest">
-			<xsl:attribute name="id"><xsl:value-of select="@named_dest"/></xsl:attribute>
+		<xsl:if test="$isGenerateTableIF = 'false'">
+			<xsl:if test="@named_dest">
+				<xsl:attribute name="id"><xsl:value-of select="@named_dest"/></xsl:attribute>
+			</xsl:if>
 		</xsl:if>
 	</xsl:template>
 
 	<xsl:template name="setIDforNamedDestinationInline">
-		<xsl:if test="@named_dest">
-			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		<xsl:if test="$isGenerateTableIF = 'false'">
+			<xsl:if test="@named_dest">
+				<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+			</xsl:if>
 		</xsl:if>
 	</xsl:template>
 
@@ -20756,7 +20772,7 @@
 			<xsl:if test="@id and       normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}.*')) = 'false'">
 				<fox:destination internal-destination="{@id}"/>
 			</xsl:if>
-			<xsl:for-each select=". | mn:fmt-title | mn:fmt-name">
+			<xsl:for-each select=". | mn:fmt-title[1] | mn:fmt-name[1]">
 				<xsl:if test="@named_dest">
 					<fox:destination internal-destination="{@named_dest}"/>
 				</xsl:if>
@@ -20764,6 +20780,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="copyParagraphId">
+		<xsl:if test="normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}.*')) = 'false'">
+			<xsl:copy-of select="@id"/>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="add-letter-spacing">
 		<xsl:param name="text"/>
 		<xsl:param name="letter-spacing" select="'0.15'"/>
@@ -20986,7 +21008,7 @@
 	<xsl:template name="insertCoverPageFullImage">
 		<xsl:param name="name">coverpage-image</xsl:param>
 		<xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[local-name() = $name][1]/mn:image">
-			<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
+			<fo:page-sequence master-reference="cover-page" force-page-count="no-force" initial-page-number="1">
 				<fo:flow flow-name="xsl-region-body">
 					<xsl:call-template name="insertBackgroundPageImage">
 						<xsl:with-param name="number" select="position()"/>
@@ -21450,6 +21472,18 @@
 		</xsl:attribute>
 	</xsl:template>
 
+	<xsl:template name="insert_firstpage_id">
+		<xsl:param name="num"/>
+		<fo:wrapper role="artifact">
+			<fo:block-container absolute-position="fixed" top="1mm">
+				<xsl:if test="$num = 1">
+					<xsl:attribute name="id">firstpage_id_0</xsl:attribute>
+				</xsl:if>
+				<fo:block id="firstpage_id_{$num}" role="SKIP"> </fo:block>
+			</fo:block-container>
+		</fo:wrapper>
+	</xsl:template>
+
 	<xsl:template name="getCharByCodePoint">
 		<xsl:param name="codepoint"/>
 		<xsl:param name="radix">16</xsl:param>

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -1491,7 +1491,9 @@
 				</xsl:if>
 
 				<!-- Index -->
-				<xsl:call-template name="index-pages"/>
+				<xsl:call-template name="index-pages">
+					<xsl:with-param name="num" select="$num"/>
+				</xsl:call-template>
 
 				<xsl:call-template name="back-page">
 					<xsl:with-param name="num" select="$num"/>
@@ -6055,18 +6057,6 @@
 		<fo:block id="lastBlock{$num}" font-size="1pt" keep-with-previous="always" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
 	</xsl:template>
 
-	<xsl:template name="insert_firstpage_id">
-		<xsl:param name="num"/>
-		<fo:wrapper role="artifact">
-			<fo:block-container absolute-position="fixed" top="1mm">
-				<xsl:if test="$num = 1">
-					<xsl:attribute name="id">firstpage_id_0</xsl:attribute>
-				</xsl:if>
-				<fo:block id="firstpage_id_{$num}" role="SKIP"> </fo:block>
-			</fo:block-container>
-		</fo:wrapper>
-	</xsl:template>
-
 	<!-- https://www.metanorma.org/ns/standoc -->
 	<xsl:variable name="namespace_full" select="namespace-uri(//mn:metanorma[1])"/>
 
@@ -6921,7 +6911,7 @@
 	<xsl:variable name="named_dest_">
 		<xsl:choose>
 			<xsl:when test="count(ancestor::mn:figure) &gt; 1"/> <!-- prevent id 'a)' -->
-			<xsl:when test="ancestor::mn:note or ancestor::mn:example or        ancestor::mn:termnote or ancestor::mn:termexample"/>
+			<xsl:when test="ancestor::mn:note or ancestor::mn:example or        ancestor::mn:termnote or ancestor::mn:termexample or        ancestor::mn:admonition"/>
 			<xsl:when test="$caption_label = '' and parent::mn:foreword">
 				<xsl:variable name="foreword_number"><xsl:number count="mn:foreword" level="any"/></xsl:variable>
 				<xsl:if test="$foreword_number = 1">Foreword</xsl:if>
@@ -6932,7 +6922,13 @@
 			</xsl:when>
 			<xsl:when test="$caption_label = ''"/>
 			<xsl:when test="../@unnumbered = 'true'"/>
+			<xsl:when test="normalize-space(java:matches(java:java.lang.String.new($caption_label), '[\x21-\xFF]+')) = 'false'"/>
+			<!-- 1.1 in Appendix 1 -->
 			<xsl:otherwise>
+				<xsl:if test="ancestor::mn:annex and string(number(substring($caption_label, 1, 1))) != 'NaN'">
+					<xsl:variable name="annex_caption_label" select="translate(normalize-space(ancestor::mn:annex[1]/mn:fmt-title//mn:span[@class = 'fmt-caption-label']), ' ()', '')"/>
+					<xsl:value-of select="concat($annex_caption_label, '_')"/>
+				</xsl:if>
 				<xsl:if test="parent::mn:formula">Formula</xsl:if>
 				<xsl:value-of select="$caption_label"/>
 			</xsl:otherwise>
@@ -8044,9 +8040,11 @@
 	</xsl:template>
 
 	<xsl:template match="mn:feedback-statement//mn:p">
+		<xsl:param name="skip_id">false</xsl:param>
 		<xsl:param name="margin"/>
 		<!-- process in the template 'paragraph' -->
 		<xsl:call-template name="paragraph">
+			<xsl:with-param name="skip_id" select="$skip_id"/>
 			<xsl:with-param name="margin" select="$margin"/>
 		</xsl:call-template>
 	</xsl:template>
@@ -14736,7 +14734,12 @@
 	<xsl:template match="mn:figure[@class = 'pseudocode']">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}">
-			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
+			<fo:block role="SKIP">
+				<xsl:for-each select="mn:fmt-name"> <!-- set context -->
+					<xsl:call-template name="setIDforNamedDestination"/>
+				</xsl:for-each>
+				<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
+			</fo:block>
 		</fo:block>
 		<xsl:apply-templates select="mn:fmt-name"/>
 	</xsl:template>
@@ -17402,7 +17405,7 @@
 	</xsl:variable>
 
 	<xsl:template name="index-pages">
-		<xsl:variable name="num"><xsl:number level="any" count="mn:metanorma"/></xsl:variable>
+		<xsl:param name="num"/>
 
 		<xsl:variable name="docid">
 			<xsl:call-template name="getDocumentId"/>
@@ -19497,6 +19500,15 @@
 		</xsl:if>
 	</xsl:template>
 
+	<!-- debug templates -->
+	<xsl:template name="debug_contents">
+		<xsl:if test="$debug = 'true'">
+			<redirect:write file="contents_.xml"> <!-- {java:getTime(java:java.util.Date.new())} -->
+				<xsl:copy-of select="$contents"/>
+			</redirect:write>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="processPrefaceSectionsDefault">
 		<xsl:param name="num"/>
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
@@ -20739,14 +20751,18 @@
 	</xsl:template>
 
 	<xsl:template name="setIDforNamedDestination">
-		<xsl:if test="@named_dest">
-			<xsl:attribute name="id"><xsl:value-of select="@named_dest"/></xsl:attribute>
+		<xsl:if test="$isGenerateTableIF = 'false'">
+			<xsl:if test="@named_dest">
+				<xsl:attribute name="id"><xsl:value-of select="@named_dest"/></xsl:attribute>
+			</xsl:if>
 		</xsl:if>
 	</xsl:template>
 
 	<xsl:template name="setIDforNamedDestinationInline">
-		<xsl:if test="@named_dest">
-			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		<xsl:if test="$isGenerateTableIF = 'false'">
+			<xsl:if test="@named_dest">
+				<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+			</xsl:if>
 		</xsl:if>
 	</xsl:template>
 
@@ -20756,7 +20772,7 @@
 			<xsl:if test="@id and       normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}.*')) = 'false'">
 				<fox:destination internal-destination="{@id}"/>
 			</xsl:if>
-			<xsl:for-each select=". | mn:fmt-title | mn:fmt-name">
+			<xsl:for-each select=". | mn:fmt-title[1] | mn:fmt-name[1]">
 				<xsl:if test="@named_dest">
 					<fox:destination internal-destination="{@named_dest}"/>
 				</xsl:if>
@@ -20764,6 +20780,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="copyParagraphId">
+		<xsl:if test="normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}.*')) = 'false'">
+			<xsl:copy-of select="@id"/>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="add-letter-spacing">
 		<xsl:param name="text"/>
 		<xsl:param name="letter-spacing" select="'0.15'"/>
@@ -20986,7 +21008,7 @@
 	<xsl:template name="insertCoverPageFullImage">
 		<xsl:param name="name">coverpage-image</xsl:param>
 		<xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[local-name() = $name][1]/mn:image">
-			<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
+			<fo:page-sequence master-reference="cover-page" force-page-count="no-force" initial-page-number="1">
 				<fo:flow flow-name="xsl-region-body">
 					<xsl:call-template name="insertBackgroundPageImage">
 						<xsl:with-param name="number" select="position()"/>
@@ -21450,6 +21472,18 @@
 		</xsl:attribute>
 	</xsl:template>
 
+	<xsl:template name="insert_firstpage_id">
+		<xsl:param name="num"/>
+		<fo:wrapper role="artifact">
+			<fo:block-container absolute-position="fixed" top="1mm">
+				<xsl:if test="$num = 1">
+					<xsl:attribute name="id">firstpage_id_0</xsl:attribute>
+				</xsl:if>
+				<fo:block id="firstpage_id_{$num}" role="SKIP"> </fo:block>
+			</fo:block-container>
+		</fo:wrapper>
+	</xsl:template>
+
 	<xsl:template name="getCharByCodePoint">
 		<xsl:param name="codepoint"/>
 		<xsl:param name="radix">16</xsl:param>

data/lib/metanorma/iso/validate_style.rb

@@ -9,16 +9,17 @@ module Metanorma
         node.nil? and return ""
         node1 = Nokogiri::XML.fragment(node.to_s)
         node1.xpath(".//link | .//locality | .//localityStack | " \
-          ".//stem | .//sourcecode").each(&:remove)
+                    ".//stem | .//sourcecode").each(&:remove)
         ret = ""
         node1.traverse { |x| ret += x.text if x.text? }
         HTMLEntities.new.decode(ret)
       end
 
       # ISO/IEC DIR 2, 12.2
-      def foreword_style(node)
+      # Annulled, ISO's own foreword text fails this test
+      def foreword_style(_node)
         @novalid and return
-        style_no_guidance(node, extract_text(node), "Foreword")
+        # style_no_guidance(node, extract_text(node), "Foreword")
       end
 
       # ISO/IEC DIR 2, 14.2

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.3.4".freeze
+    VERSION = "3.4.0".freeze
   end
 end

data/lib/relaton/render/selective_capitalize.rb

@@ -4,13 +4,13 @@ module Relaton
       module SelectiveCapitalize
         def selective_capitalize(input, exceptions)
           return nil if input.nil?
-          
+
           # Convert exceptions to an array if it's not already
           exceptions_array = exceptions.is_a?(Array) ? exceptions : [exceptions]
-          
+
           # Split the input into words
           words = input.split(/\s+/)
-          
+
           # Capitalize each word unless it's in the exceptions list
           words.map do |word|
             if exceptions_array.include?(word.downcase)
@@ -18,24 +18,25 @@ module Relaton
             else
               word.capitalize
             end
-          end.join(' ')
+          end.join(" ")
         end
       end
     end
   end
 end
 
-# Extend the customise_liquid method to register our filter
+# Extend the create_liquid_environment method to register our filter
 module Relaton
   module Render
     module Template
       class General
-        alias_method :original_customise_liquid, :customise_liquid
-        
-        def customise_liquid
-          original_customise_liquid
-          # Register our filter
-          ::Liquid::Template.register_filter(::Relaton::Render::Template::SelectiveCapitalize)
+        alias_method :original_create_liquid_environment,
+                     :create_liquid_environment
+
+        def create_liquid_environment
+          env = original_create_liquid_environment
+          env.register_filter(::Relaton::Render::Template::SelectiveCapitalize)
+          env
         end
       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", "~> 3.3.1"
+  spec.add_dependency "metanorma-standoc", "~> 3.4.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid"
   #spec.add_dependency "pubid-cen"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-30 00:00:00.000000000 Z
+date: 2026-04-13 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.3.1
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement