metanorma-csa 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 357398e41b0ef4578ddc860fb07f9362a08a0f328761e51c081145ae136876c8
-  data.tar.gz: 2fc5973e45e3de787fb5a4d0e0c8547ad59955538bc02769911e01b46b2be682
+  metadata.gz: e98c297fc717846192a2551b22d1e565b8e2b163dc2f261c27aabe7b423f91e2
+  data.tar.gz: c0f7495d9c084b83c09291e96a2b35fd7a3efba34d0bf723032c24ae6aaede9f
 SHA512:
-  metadata.gz: ec885ceec9ee2fd164859646646bc06d6200612ec77b4bd5d465ea7170dd0fa21f64a65e3d0b83a76337e0f6db6626a2590b7319061034ac17637bf0f69ee6cd
-  data.tar.gz: d13c3a960df5c9802ff586654c49c786b7cc0f4a17a7ca6c105814adf9f7a91eb51b22c8ea0af85000d3f3cd29451972743abcd2737709be5b6709b0feb3e850
+  metadata.gz: 9634d6ab81f7703fd35ab314fc5b147499013f82ee77b9a78eeaeb07543f22d3bee955025599fe37872bb5f6f29ec28e1dbaa4db8d05dcf37ace4f5d101ade9c
+  data.tar.gz: f91cb6b8d65cdef3a3835c6e57643dd61bef7fdd3595c4a24d5aa07ea879907cce9670f2e6064752c39594e9994676392876906bcce510c0c6c142316aca7322

data/lib/isodoc/csa/csa.standard.xsl

@@ -6354,6 +6354,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="contents_item">
 		<xsl:copy-of select="."/>
 	</xsl:template>
@@ -7798,21 +7810,29 @@
 	</xsl:variable>
 
 	<xsl:template match="@*|node()" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="index_add_id"/>
+			<xsl:apply-templates select="@*|node()" mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:variable name="id">
-			<xsl:call-template name="generateIndexXrefId"/>
+			<xsl:call-template name="generateIndexXrefId">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:call-template>
 		</xsl:variable>
 		<xsl:copy> <!-- add id to xref -->
 			<xsl:apply-templates select="@*" mode="index_add_id"/>
 			<xsl:attribute name="id">
 				<xsl:value-of select="$id"/>
 			</xsl:attribute>
-			<xsl:apply-templates mode="index_add_id"/>
+			<xsl:apply-templates mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 		<!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
 		<xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
@@ -7824,7 +7844,9 @@
 				<xsl:attribute name="id">
 					<xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
 				</xsl:attribute>
-				<xsl:apply-templates mode="index_add_id"/>
+				<xsl:apply-templates mode="index_add_id">
+					<xsl:with-param name="docid" select="$docid"/>
+				</xsl:apply-templates>
 			</xsl:copy>
 		</xsl:if>
 	</xsl:template>
@@ -7861,12 +7883,33 @@
 			</xsl:when>
 			<xsl:when test="self::* and local-name(.) = 'xref'">
 				<xsl:variable name="id" select="@id"/>
-				<xsl:variable name="page" select="$index//item[@id = $id]"/>
-				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
 
+				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
 				<xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
+
+				<xsl:variable name="pages_">
+					<xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
+						<xsl:choose>
+							<xsl:when test="@id = $id">
+								<page><xsl:value-of select="."/></page>
+							</xsl:when>
+							<xsl:when test="@id = $id_next">
+								<page_next><xsl:value-of select="."/></page_next>
+							</xsl:when>
+							<xsl:when test="@id = $id_prev">
+								<page_prev><xsl:value-of select="."/></page_prev>
+							</xsl:when>
+						</xsl:choose>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="pages" select="xalan:nodeset($pages_)"/>
+
+				<!-- <xsl:variable name="page" select="$index/index/item[@id = $id]"/> -->
+				<xsl:variable name="page" select="$pages/page"/>
+				<!-- <xsl:variable name="page_next" select="$index/index/item[@id = $id_next]"/> -->
+				<xsl:variable name="page_next" select="$pages/page_next"/>
+				<!-- <xsl:variable name="page_prev" select="$index/index/item[@id = $id_prev]"/> -->
+				<xsl:variable name="page_prev" select="$pages/page_prev"/>
 
 				<xsl:choose>
 					<!-- 2nd pass -->
@@ -7926,16 +7969,20 @@
 	</xsl:template>
 
 	<xsl:template name="generateIndexXrefId">
+		<xsl:param name="docid"/>
+
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 
-		<xsl:variable name="docid">
-			<xsl:call-template name="getDocumentId"/>
+		<xsl:variable name="docid_curr">
+			<xsl:value-of select="$docid"/>
+			<xsl:if test="normalize-space($docid) = ''"><xsl:call-template name="getDocumentId"/></xsl:if>
 		</xsl:variable>
+
 		<xsl:variable name="item_number">
 			<xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
 		</xsl:variable>
 		<xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
-		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
+		<xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">