metanorma-ogc 2.2.2 → 2.2.3

data/lib/isodoc/ogc/ogc.release-notes.xsl

@@ -7392,6 +7392,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>
@@ -8874,21 +8886,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"> -->
@@ -8900,7 +8920,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>
@@ -8937,12 +8959,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 -->
@@ -9002,16 +9045,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/ogc/ogc.standard.xsl

@@ -7392,6 +7392,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>
@@ -8874,21 +8886,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"> -->
@@ -8900,7 +8920,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>
@@ -8937,12 +8959,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 -->
@@ -9002,16 +9045,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/ogc/ogc.test-suite.xsl

@@ -7392,6 +7392,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>
@@ -8874,21 +8886,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"> -->
@@ -8900,7 +8920,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>
@@ -8937,12 +8959,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 -->
@@ -9002,16 +9045,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/ogc/ogc.user-guide.xsl

@@ -7392,6 +7392,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>
@@ -8874,21 +8886,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"> -->
@@ -8900,7 +8920,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>
@@ -8937,12 +8959,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 -->
@@ -9002,16 +9045,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/ogc/ogc.white-paper.xsl

@@ -6563,6 +6563,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>
@@ -8037,21 +8049,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"> -->
@@ -8063,7 +8083,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>
@@ -8100,12 +8122,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 -->
@@ -8165,16 +8208,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/ogc/word_convert.rb

@@ -170,6 +170,11 @@ module IsoDoc
         @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
       end
 
+      def table_attrs(node)
+        node["class"] == "modspec" and node["width"] = "100%"
+        super
+      end
+
       include BaseConvert
       include Init
     end

data/lib/isodoc/ogc/xref.rb

@@ -18,11 +18,6 @@ module IsoDoc
         n = section_names(doc.at(ns("//sections/definitions")), n, 1)
         clause_names(doc, n)
         end
-        if @parse_settings.empty?
-        middle_section_asset_names(doc)
-        termnote_anchor_names(doc)
-        termexample_anchor_names(doc)
-        end
       end
 
       def preface_anchor_names(doc)