metanorma-iso 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a2abb0538e4a003829a682164cccf063c9a9b069249e9edb4722f99d8c443fc
-  data.tar.gz: 57a31c0c8b3553918f9575c277840ee254c7d6e8731420bc7a03449643003e6f
+  metadata.gz: fd0358f94bbae1d6d9701a3fc7e65a4e13023aa367d7b790816361544c44f4a4
+  data.tar.gz: f79b87d35cdebb5111e9d97b8ca8af7e4d7334c1aaaa3b13813f2b3813c373c3
 SHA512:
-  metadata.gz: 3b8a911f86177ae812a0331e5a78b1b1e846a4c50c542642fd27517a43e92adcfeb9a3dcd28d5c42e76f14c73131cabbcf1c25eee9332d7a798b0d4ea30c05c0
-  data.tar.gz: 22bb15fe291f927d8f8013268f997b7cf888febd3a6d1f3db89d0812bbb0dadbd14dc5553cea4f34c7529163e507ba3a22dc562590de2174fe83b65670e09b66
+  metadata.gz: b8c623bbbf2c8238d3cf712a21d8f7941968464cfa979947db054331d54b9185db422154f318efb3b339e7cabdc37824de0e2b1014a3b97267663b791fd2559c
+  data.tar.gz: d98155a8922bafdac24a604144b3f6436dc426aea949a4142425fc1df2e699aae57a58f29228af36a2699f72fb003e5640c2732508a352a103b42418119354a2

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

@@ -4167,9 +4167,7 @@
 						</xsl:choose>
 					</xsl:if>
 
-					<xsl:if test="@named_dest">
-						<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
-					</xsl:if>
+					<xsl:call-template name="setIDforNamedDestinationInline"/>
 
 					<xsl:choose>
 						<xsl:when test="$layoutVersion = '1951' and ((ancestor::iso:preface and $level  = 1) or (parent::iso:introduction and $revision_date_num &lt; 19680101))">
@@ -4251,15 +4249,16 @@
 					</xsl:choose>
 					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 
-					<!-- becaise @id applied above -->
-					<xsl:if test="$layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989' or        @type = 'floating-title' or @type = 'section-title'">
+					<!-- because @id from preceding clause applied, see above -->
+					<!-- <xsl:if test="$layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989' or
+							@type = 'floating-title' or @type = 'section-title'">
 						<xsl:if test="@named_dest">
 							<fo:inline>
 								<xsl:call-template name="setIDforNamedDestination"/>
 								<xsl:value-of select="$zero_width_space"/>
 							</fo:inline>
 						</xsl:if>
-					</xsl:if>
+					</xsl:if> -->
 				</xsl:element>
 
 				<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::iso:p)">
@@ -18235,8 +18234,14 @@
 			<xsl:choose>
 				<xsl:when test="count(ancestor::*[local-name() = 'figure']) &gt; 1"/> <!-- prevent id 'a)' -->
 				<xsl:when test="ancestor::*[local-name() = 'note'] or ancestor::*[local-name() = 'example'] or        ancestor::*[local-name() = 'termnote'] or ancestor::*[local-name() = 'termexample']"/>
-				<xsl:when test="$caption_label = '' and parent::*[local-name() = 'foreword']">Foreword</xsl:when>
-				<xsl:when test="$caption_label = '' and parent::*[local-name() = 'introduction']">Introduction</xsl:when>
+				<xsl:when test="$caption_label = '' and parent::*[local-name() = 'foreword']">
+					<xsl:variable name="foreword_number"><xsl:number count="*[local-name() = 'foreword']" level="any"/></xsl:variable>
+					<xsl:if test="$foreword_number = 1">Foreword</xsl:if>
+				</xsl:when>
+				<xsl:when test="$caption_label = '' and parent::*[local-name() = 'introduction']">
+					<xsl:variable name="introduction_number"><xsl:number count="*[local-name() = 'introduction']" level="any"/></xsl:variable>
+					<xsl:if test="$introduction_number = 1">Introduction</xsl:if>
+				</xsl:when>
 				<xsl:when test="$caption_label = ''"/>
 				<xsl:when test="../@unnumbered = 'true'"/>
 				<xsl:otherwise>
@@ -19882,6 +19887,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setIDforNamedDestinationInline">
+		<xsl:if test="@named_dest">
+			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="setNamedDestination">
 		<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
 		<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'">

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

@@ -4167,9 +4167,7 @@
 						</xsl:choose>
 					</xsl:if>
 
-					<xsl:if test="@named_dest">
-						<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
-					</xsl:if>
+					<xsl:call-template name="setIDforNamedDestinationInline"/>
 
 					<xsl:choose>
 						<xsl:when test="$layoutVersion = '1951' and ((ancestor::iso:preface and $level  = 1) or (parent::iso:introduction and $revision_date_num &lt; 19680101))">
@@ -4251,15 +4249,16 @@
 					</xsl:choose>
 					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 
-					<!-- becaise @id applied above -->
-					<xsl:if test="$layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989' or        @type = 'floating-title' or @type = 'section-title'">
+					<!-- because @id from preceding clause applied, see above -->
+					<!-- <xsl:if test="$layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989' or
+							@type = 'floating-title' or @type = 'section-title'">
 						<xsl:if test="@named_dest">
 							<fo:inline>
 								<xsl:call-template name="setIDforNamedDestination"/>
 								<xsl:value-of select="$zero_width_space"/>
 							</fo:inline>
 						</xsl:if>
-					</xsl:if>
+					</xsl:if> -->
 				</xsl:element>
 
 				<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::iso:p)">
@@ -18235,8 +18234,14 @@
 			<xsl:choose>
 				<xsl:when test="count(ancestor::*[local-name() = 'figure']) &gt; 1"/> <!-- prevent id 'a)' -->
 				<xsl:when test="ancestor::*[local-name() = 'note'] or ancestor::*[local-name() = 'example'] or        ancestor::*[local-name() = 'termnote'] or ancestor::*[local-name() = 'termexample']"/>
-				<xsl:when test="$caption_label = '' and parent::*[local-name() = 'foreword']">Foreword</xsl:when>
-				<xsl:when test="$caption_label = '' and parent::*[local-name() = 'introduction']">Introduction</xsl:when>
+				<xsl:when test="$caption_label = '' and parent::*[local-name() = 'foreword']">
+					<xsl:variable name="foreword_number"><xsl:number count="*[local-name() = 'foreword']" level="any"/></xsl:variable>
+					<xsl:if test="$foreword_number = 1">Foreword</xsl:if>
+				</xsl:when>
+				<xsl:when test="$caption_label = '' and parent::*[local-name() = 'introduction']">
+					<xsl:variable name="introduction_number"><xsl:number count="*[local-name() = 'introduction']" level="any"/></xsl:variable>
+					<xsl:if test="$introduction_number = 1">Introduction</xsl:if>
+				</xsl:when>
 				<xsl:when test="$caption_label = ''"/>
 				<xsl:when test="../@unnumbered = 'true'"/>
 				<xsl:otherwise>
@@ -19882,6 +19887,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setIDforNamedDestinationInline">
+		<xsl:if test="@named_dest">
+			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="setNamedDestination">
 		<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
 		<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'">

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.0.5".freeze
+    VERSION = "3.0.6".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Ribose Inc.