metanorma-bipm 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f52ce111308c1af654fb2fb4b8d4f8471df9f9074d79899a84d8d0b4d4ad29ef
-  data.tar.gz: fc05ab77853f03bc9329fcd5696dbef3287e02bbfaf79adff6ddca72993a3d77
+  metadata.gz: cfbdffcf73976366237efc63ba10a8d4f1abce69283275245e5cb6c0e1a227af
+  data.tar.gz: 19cf95cc971bee861e7027dbca0fe4708d81ab03bc34e603d0ef4d2af2cb5db1
 SHA512:
-  metadata.gz: 4075ca8a876e97b4d2a1f6579c34123613d5da30ee189b7d436c5b06790bb2b390f8b3677131de7bf5570b7f49b5c42fd8819435cfdf1db2483337d5ad6053db
-  data.tar.gz: 59f01bf9e376d33e7348fb7307f4f16f4918d03868d6bc1300374ff40795510b135a4ebb58a603a6639ed8c689fbdf00e35dfb8df6af6d0a44c0943cb71c0070
+  metadata.gz: b35bb3852d18fed6f2977b2b020ff4c6032d7ae1b7785ce85443f43a7720143e7d9d820749cd0cd70ec93d0051c0b0e17f19cfef1bfbe1215fe2cae655a4cd12
+  data.tar.gz: aa02636559c9a13fcf1be5dab81e699cca967ec2e72104f8af72eed28a944c88c52a79737f8f029a19c3f80c0a0bb009d9f5b61fa8ba9f90c24d1837e829b7df

data/lib/isodoc/bipm/bipm.brochure.xsl

@@ -1065,16 +1065,18 @@
 											<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and not(@type = 'annex') and not(@type = 'index') and not(@parent = 'annex')]">
 												<xsl:call-template name="insertContentItem"/>
 											</xsl:for-each>
-											<xsl:if test="$doctype ='brochure'">
-												<!-- insert page break between main sections and appendixes in ToC -->
+											<!-- insert page break between main sections and appendixes in ToC -->
+											<!-- <xsl:if test="$doctype ='brochure'">
 												<fo:table-row>
 													<fo:table-cell number-columns-spanned="2">
 														<fo:block break-after="page"/>
 													</fo:table-cell>
 												</fo:table-row>
-											</xsl:if>
+											</xsl:if> -->
 											<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and (@type = 'annex')]"> <!--  or (@level = 2 and @parent = 'annex') -->
-												<xsl:call-template name="insertContentItem"/>
+												<xsl:call-template name="insertContentItem">
+													<xsl:with-param name="keep-with-next">true</xsl:with-param>
+												</xsl:call-template>
 											</xsl:for-each>
 											<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and (@type = 'index')]">
 												<xsl:call-template name="insertContentItem"/>
@@ -1733,7 +1735,11 @@
 	</xsl:template>
 
 	<xsl:template name="insertContentItem">
+		<xsl:param name="keep-with-next"/>
 		<fo:table-row>
+			<xsl:if test="$keep-with-next = 'true'">
+				<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			</xsl:if>
 			<xsl:variable name="space-before">
 				<xsl:if test="@level = 1">
 					<xsl:if test="@type = 'annex'">14pt</xsl:if>
@@ -2224,6 +2230,14 @@
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="header">
+		<xsl:apply-templates select="."/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="header">
+		<xsl:apply-templates select="."/>
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -2747,6 +2761,10 @@
 				<xsl:attribute name="role">BlockQuote</xsl:attribute>
 			</xsl:if>
 
+			<xsl:if test="ancestor::bipm:preface">
+				<xsl:attribute name="space-after">6pt</xsl:attribute>
+			</xsl:if>
+
 			<!-- last item -->
 			<xsl:if test="not(following-sibling::*[1][local-name() = 'li'])">
 				<xsl:attribute name="space-after">6pt</xsl:attribute>
@@ -2913,8 +2931,8 @@
 				<xsl:choose>
 					<xsl:when test="$curr_lang = 'fr'">
 						<xsl:choose>
-							<xsl:when test="ancestor::bipm:li">Remarque: </xsl:when>
-							<xsl:otherwise>Note: </xsl:otherwise>
+							<xsl:when test="ancestor::bipm:li">Remarque : </xsl:when>
+							<xsl:otherwise>Note : </xsl:otherwise>
 						</xsl:choose>
 					</xsl:when>
 					<xsl:otherwise>Note: </xsl:otherwise>
@@ -2928,11 +2946,26 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']" priority="3">
-		<fo:inline xsl:use-attribute-sets="note-p-style">
-			<xsl:apply-templates/>
-		</fo:inline>
-		<fo:inline><xsl:value-of select="$linebreak"/></fo:inline>
-
+		<xsl:variable name="num"><xsl:number/></xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
+				<fo:inline xsl:use-attribute-sets="note-p-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:when test="ancestor::*[local-name() = 'preface']">
+				<fo:block xsl:use-attribute-sets="note-p-style">
+					<xsl:attribute name="space-before">6pt</xsl:attribute>
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline xsl:use-attribute-sets="note-p-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+				<fo:inline><xsl:value-of select="$linebreak"/></fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'sup_fn']">
@@ -4462,6 +4495,7 @@
 	<xsl:attribute-set name="note-style">
 
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<xsl:attribute name="text-align">justify</xsl:attribute>
 
 	</xsl:attribute-set>
 
@@ -8680,7 +8714,11 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:text>:</xsl:text>
+						<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+						<xsl:choose>
+							<xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
+							<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
+						</xsl:choose>
 
 				</xsl:otherwise>
 			</xsl:choose>
@@ -8700,7 +8738,11 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:text>:</xsl:text>
+						<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+						<xsl:choose>
+							<xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
+							<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
+						</xsl:choose>
 
 				</xsl:otherwise>
 			</xsl:choose>
@@ -9709,6 +9751,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>
@@ -11157,21 +11211,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"> -->
@@ -11183,7 +11245,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>
@@ -11220,12 +11284,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 -->
@@ -11285,16 +11370,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">

data/lib/isodoc/bipm/bipm.guide.xsl

@@ -1065,16 +1065,18 @@
 											<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and not(@type = 'annex') and not(@type = 'index') and not(@parent = 'annex')]">
 												<xsl:call-template name="insertContentItem"/>
 											</xsl:for-each>
-											<xsl:if test="$doctype ='brochure'">
-												<!-- insert page break between main sections and appendixes in ToC -->
+											<!-- insert page break between main sections and appendixes in ToC -->
+											<!-- <xsl:if test="$doctype ='brochure'">
 												<fo:table-row>
 													<fo:table-cell number-columns-spanned="2">
 														<fo:block break-after="page"/>
 													</fo:table-cell>
 												</fo:table-row>
-											</xsl:if>
+											</xsl:if> -->
 											<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and (@type = 'annex')]"> <!--  or (@level = 2 and @parent = 'annex') -->
-												<xsl:call-template name="insertContentItem"/>
+												<xsl:call-template name="insertContentItem">
+													<xsl:with-param name="keep-with-next">true</xsl:with-param>
+												</xsl:call-template>
 											</xsl:for-each>
 											<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and (@type = 'index')]">
 												<xsl:call-template name="insertContentItem"/>
@@ -1733,7 +1735,11 @@
 	</xsl:template>
 
 	<xsl:template name="insertContentItem">
+		<xsl:param name="keep-with-next"/>
 		<fo:table-row>
+			<xsl:if test="$keep-with-next = 'true'">
+				<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			</xsl:if>
 			<xsl:variable name="space-before">
 				<xsl:if test="@level = 1">
 					<xsl:if test="@type = 'annex'">14pt</xsl:if>
@@ -2224,6 +2230,14 @@
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="header">
+		<xsl:apply-templates select="."/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="header">
+		<xsl:apply-templates select="."/>
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -2747,6 +2761,10 @@
 				<xsl:attribute name="role">BlockQuote</xsl:attribute>
 			</xsl:if>
 
+			<xsl:if test="ancestor::bipm:preface">
+				<xsl:attribute name="space-after">6pt</xsl:attribute>
+			</xsl:if>
+
 			<!-- last item -->
 			<xsl:if test="not(following-sibling::*[1][local-name() = 'li'])">
 				<xsl:attribute name="space-after">6pt</xsl:attribute>
@@ -2913,8 +2931,8 @@
 				<xsl:choose>
 					<xsl:when test="$curr_lang = 'fr'">
 						<xsl:choose>
-							<xsl:when test="ancestor::bipm:li">Remarque: </xsl:when>
-							<xsl:otherwise>Note: </xsl:otherwise>
+							<xsl:when test="ancestor::bipm:li">Remarque : </xsl:when>
+							<xsl:otherwise>Note : </xsl:otherwise>
 						</xsl:choose>
 					</xsl:when>
 					<xsl:otherwise>Note: </xsl:otherwise>
@@ -2928,11 +2946,26 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']" priority="3">
-		<fo:inline xsl:use-attribute-sets="note-p-style">
-			<xsl:apply-templates/>
-		</fo:inline>
-		<fo:inline><xsl:value-of select="$linebreak"/></fo:inline>
-
+		<xsl:variable name="num"><xsl:number/></xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
+				<fo:inline xsl:use-attribute-sets="note-p-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:when test="ancestor::*[local-name() = 'preface']">
+				<fo:block xsl:use-attribute-sets="note-p-style">
+					<xsl:attribute name="space-before">6pt</xsl:attribute>
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline xsl:use-attribute-sets="note-p-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+				<fo:inline><xsl:value-of select="$linebreak"/></fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'sup_fn']">
@@ -4462,6 +4495,7 @@
 	<xsl:attribute-set name="note-style">
 
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<xsl:attribute name="text-align">justify</xsl:attribute>
 
 	</xsl:attribute-set>
 
@@ -8680,7 +8714,11 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:text>:</xsl:text>
+						<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+						<xsl:choose>
+							<xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
+							<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
+						</xsl:choose>
 
 				</xsl:otherwise>
 			</xsl:choose>
@@ -8700,7 +8738,11 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:text>:</xsl:text>
+						<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+						<xsl:choose>
+							<xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
+							<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
+						</xsl:choose>
 
 				</xsl:otherwise>
 			</xsl:choose>
@@ -9709,6 +9751,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>
@@ -11157,21 +11211,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"> -->
@@ -11183,7 +11245,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>
@@ -11220,12 +11284,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 -->
@@ -11285,16 +11370,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">