metanorma-cc 2.6.4 → 2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c63fc41e6751e3067d668e9b3bbd2a3fba140ac7dfc419011a57497de2c241c4
-  data.tar.gz: 76ee7f5bb6098975736b76c00e78fa7d1a1715d196647ad74d0a2cc9109bb9be
+  metadata.gz: ccd59d280a54179866ee784241bfb8b5e5c81cd79559511f06df43a2b1e875d9
+  data.tar.gz: 38da06098f7f5ae15b123e76504444d20951a0c8b57ab6433004b34f01b086cf
 SHA512:
-  metadata.gz: d40f01895625c4723b48e80059ed7fcf290df29f68b9dbc414845dbeda1ec2850c16f915562670cfeaa9dd88692ad94818affc0f66400cfaaa2709d5fdcb3ee9
-  data.tar.gz: c714d0766e783387085fbb7c9f2485af68f10993f31db1610b65d9f24687a1b21f02cc508264715c1a9013bf3d1ce10a115852e62ee6dc9d54c493afeab657b0
+  metadata.gz: aab4e6c0a74a29581baf734887aa4be6c9ce3a6726f234f8cc08383f768a6e239e87c68f1a3005a6e335734fe9e87642d89a6f137cf6bc94ab2d39a823ead9f2
+  data.tar.gz: 4cc6db292421d2f70775fce27c593bf61ecc08bea4c5cd089651b8596bb83ee6526947c8b2354202dcae4d7e9a8b95a5f639e851729904bcdfc79659dff4fb7d

data/lib/isodoc/cc/cc.standard.xsl

@@ -2940,8 +2940,14 @@
 				</xsl:choose>
 			</xsl:variable>
 
+			<xsl:call-template name="setNamedDestination"/>
+
 			<fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
 
+				<xsl:for-each select="*[local-name() = 'name']">
+					<xsl:call-template name="setIDforNamedDestination"/>
+				</xsl:for-each>
+
 				<xsl:call-template name="refine_table-container-style">
 					<xsl:with-param name="margin-side" select="$margin-side"/>
 				</xsl:call-template>
@@ -3146,6 +3152,7 @@
 	<!-- table/name-->
 	<xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
 		<xsl:param name="continued"/>
+		<xsl:param name="cols-count"/>
 		<xsl:if test="normalize-space() != ''">
 
 					<fo:block xsl:use-attribute-sets="table-name-style">
@@ -3167,9 +3174,30 @@
 
 					<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
 					<xsl:if test="$continued = 'true'">
-						<fo:block text-align="right">
-							<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
-						</fo:block>
+
+						<!-- to prevent the error 'THead element may contain only TR elements' -->
+
+						<xsl:choose>
+							<xsl:when test="string(number($cols-count)) != 'NaN'">
+								<fo:table width="100%" table-layout="fixed" role="SKIP">
+									<fo:table-body role="SKIP">
+										<fo:table-row>
+											<fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
+												<fo:block text-align="right" role="SKIP">
+													<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
+												</fo:block>
+											</fo:table-cell>
+										</fo:table-row>
+									</fo:table-body>
+								</fo:table>
+							</xsl:when>
+							<xsl:otherwise>
+								<fo:block text-align="right">
+									<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
+								</fo:block>
+							</xsl:otherwise>
+						</xsl:choose>
+
 					</xsl:if>
 					<!-- </xsl:if> -->
 
@@ -3562,6 +3590,7 @@
 
 						<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
 							<xsl:with-param name="continued">true</xsl:with-param>
+							<xsl:with-param name="cols-count" select="$cols-count"/>
 						</xsl:apply-templates>
 
 						<xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
@@ -3943,8 +3972,8 @@
 			<xsl:for-each select="xalan:nodeset($styles__)/item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
 				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
-				<xsl:if test="$key = 'color' or $key = 'background-color'">
-					<style name="{$key}"><xsl:value-of select="$value"/></style>
+				<xsl:if test="$key = 'color' or       $key = 'background-color' or      $key = 'border' or      $key = 'border-top' or      $key = 'border-right' or      $key = 'border-left' or      $key = 'border-bottom' or      $key = 'border-style' or      $key = 'border-width' or      $key = 'border-color' or      $key = 'border-top-style' or      $key = 'border-top-width' or      $key = 'border-top-color' or      $key = 'border-right-style' or      $key = 'border-right-width' or      $key = 'border-right-color' or      $key = 'border-left-style' or      $key = 'border-left-width' or      $key = 'border-left-color' or      $key = 'border-bottom-style' or      $key = 'border-bottom-width' or      $key = 'border-bottom-color'">
+					<style name="{$key}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($value), 'currentColor', 'inherit')"/></style>
 				</xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
@@ -4008,6 +4037,7 @@
 	<!-- table/note, table/example, table/tfoot//note, table/tfoot//example -->
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example'] |       *[local-name()='table']/*[local-name()='tfoot']//*[local-name()='note' or local-name() = 'example']" priority="2">
 
+				<xsl:call-template name="setNamedDestination"/>
 				<fo:block xsl:use-attribute-sets="table-note-style">
 					<xsl:copy-of select="@id"/>
 
@@ -4533,7 +4563,7 @@
 		<xsl:variable name="target" select="@target"/>
 		<xsl:choose>
 			<!-- case for footnotes in Requirement tables (https://github.com/metanorma/metanorma-ogc/issues/791) -->
-			<xsl:when test="not(ancestor::*[local-name() = 'table'][1]/*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body'][@id = $target]) and        $footnotes/*[local-name() = 'fmt-fn-body'][@id = $target]">
+			<xsl:when test="not(ancestor::*[local-name() = 'table'][1]//*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body'][@id = $target]) and        $footnotes/*[local-name() = 'fmt-fn-body'][@id = $target]">
 				<xsl:call-template name="fn">
 					<xsl:with-param name="footnote_body_from_table">true</xsl:with-param>
 				</xsl:call-template>
@@ -4629,6 +4659,10 @@
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
 		<fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP">
 
+			<xsl:if test="@key = 'true' and ancestor::*[local-name() = 'figure']">
+				<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+			</xsl:if>
+
 			<xsl:call-template name="setBlockSpanAll"/>
 
 					<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
@@ -4922,7 +4956,7 @@
 
 	<!-- caption for figure key and another caption, https://github.com/metanorma/isodoc/issues/607 -->
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'p'][@keep-with-next = 'true' and *[local-name() = 'strong']]" priority="3">
-		<fo:block text-align="left" margin-bottom="12pt" keep-with-next="always">
+		<fo:block text-align="left" margin-bottom="12pt" keep-with-next="always" keep-with-previous="always">
 			<xsl:call-template name="refine_figure_key_style"/>
 			<xsl:apply-templates/>
 		</fo:block>
@@ -5173,6 +5207,7 @@
 
 			<xsl:call-template name="refine_dt-cell-style"/>
 
+			<xsl:call-template name="setNamedDestination"/>
 			<fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
 
 				<xsl:choose>
@@ -5610,7 +5645,7 @@
 	<!-- ================= -->
 
 	<!-- highlight text -->
-	<xsl:template match="*[local-name()='hi']">
+	<xsl:template match="*[local-name()='hi'] | *[local-name() = 'span'][@class = 'fmt-hi']" priority="3">
 		<fo:inline background-color="yellow">
 			<xsl:apply-templates/>
 		</fo:inline>
@@ -7205,6 +7240,7 @@
 	<!-- Appendix processing -->
 	<!-- ======================== -->
 	<xsl:template match="*[local-name()='appendix']">
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
 			<xsl:apply-templates select="*[local-name()='title']"/>
 		</fo:block>
@@ -7215,13 +7251,14 @@
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
 		</xsl:variable>
-		<fo:inline role="H{$level}"><xsl:apply-templates/></fo:inline>
+		<fo:inline role="H{$level}"><xsl:call-template name="setIDforNamedDestination"/><xsl:apply-templates/></fo:inline>
 	</xsl:template>
 	<!-- ======================== -->
 	<!-- END Appendix processing -->
 	<!-- ======================== -->
 
 	<xsl:template match="*[local-name()='appendix']//*[local-name()='example']" priority="2">
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
 			<xsl:apply-templates select="*[local-name()='name']"/>
 		</fo:block>
@@ -7251,6 +7288,7 @@
 	<xsl:template match="*[local-name() = 'annotation']/*[local-name() = 'p']">
 		<xsl:param name="callout"/>
 		<fo:inline id="{@id}">
+			<xsl:call-template name="setNamedDestination"/>
 			<!-- for first p in annotation, put <x> -->
 			<xsl:if test="not(preceding-sibling::*[local-name() = 'p'])"><xsl:value-of select="$callout"/></xsl:if>
 			<xsl:apply-templates/>
@@ -7297,6 +7335,7 @@
 
 			</xsl:if>
 			<fo:block-container margin-left="0mm" role="SKIP">
+				<xsl:call-template name="setNamedDestination"/>
 				<fo:block id="{@id}">
 					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
 				</fo:block>
@@ -7342,8 +7381,13 @@
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell display-align="center">
+
 							<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
 
+								<xsl:for-each select="../*[local-name() = 'name']">
+									<xsl:call-template name="setIDforNamedDestination"/>
+								</xsl:for-each>
+
 								<xsl:call-template name="refine_formula-stem-number-style"/>
 
 								<xsl:apply-templates select="../*[local-name() = 'name']"/>
@@ -7378,6 +7422,8 @@
 
 	<xsl:template match="*[local-name() = 'note']" name="note">
 
+				<xsl:call-template name="setNamedDestination"/>
+
 				<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
 
 					<xsl:call-template name="setBlockSpanAll"/>
@@ -7442,6 +7488,7 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'termnote']">
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
 
 			<xsl:call-template name="setBlockSpanAll"/>
@@ -7548,12 +7595,14 @@
 
 	<xsl:template match="*[local-name() = 'terms']">
 		<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'term']">
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
 
 			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
@@ -7585,6 +7634,7 @@
 	<xsl:template match="*[local-name() = 'figure']" name="figure">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="figure-block-style">
 			<xsl:call-template name="refine_figure-block-style"/>
 
@@ -7601,6 +7651,11 @@
 			</xsl:variable>
 
 			<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
+
+				<xsl:for-each select="*[local-name() = 'name']"> <!-- set context -->
+					<xsl:call-template name="setIDforNamedDestination"/>
+				</xsl:for-each>
+
 				<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
 			</fo:block>
 
@@ -7633,6 +7688,7 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']">
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}">
 			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 		</fo:block>
@@ -7646,6 +7702,7 @@
 	</xsl:template>
 
 	<!-- SOURCE: ... -->
+	<!-- figure/source -->
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
 
 				<xsl:call-template name="termsource"/>
@@ -8878,6 +8935,7 @@
 	<xsl:template match="title" mode="bookmark"/>
 	<xsl:template match="text()" mode="bookmark"/>
 
+	<!-- figure/name -->
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |         *[local-name() = 'image']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="figure-name-style">
@@ -8890,11 +8948,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -9595,6 +9653,7 @@
 	<!-- permission -->
 	<!-- ========== -->
 	<xsl:template match="*[local-name() = 'permission']">
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
 			<xsl:apply-templates select="*[local-name()='name']"/>
 			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
@@ -9603,10 +9662,12 @@
 
 	<xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
-			<fo:block xsl:use-attribute-sets="permission-name-style">
-				<xsl:apply-templates/>
 
-			</fo:block>
+					<fo:block xsl:use-attribute-sets="permission-name-style">
+						<xsl:apply-templates/>
+
+					</fo:block>
+
 		</xsl:if>
 	</xsl:template>
 
@@ -9622,6 +9683,7 @@
 	<!-- requirement -->
 <!-- ========== -->
 	<xsl:template match="*[local-name() = 'requirement']">
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
 			<xsl:apply-templates select="*[local-name()='name']"/>
 			<xsl:apply-templates select="*[local-name()='label']"/>
@@ -9633,11 +9695,13 @@
 
 	<xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
-			<fo:block xsl:use-attribute-sets="requirement-name-style">
 
-				<xsl:apply-templates/>
+					<fo:block xsl:use-attribute-sets="requirement-name-style">
+
+						<xsl:apply-templates/>
+
+					</fo:block>
 
-			</fo:block>
 		</xsl:if>
 	</xsl:template>
 
@@ -9666,6 +9730,7 @@
 	<!-- recommendation -->
 	<!-- ========== -->
 	<xsl:template match="*[local-name() = 'recommendation']">
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
 			<xsl:apply-templates select="*[local-name()='name']"/>
 			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
@@ -9674,10 +9739,12 @@
 
 	<xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
-			<fo:block xsl:use-attribute-sets="recommendation-name-style">
-				<xsl:apply-templates/>
 
-			</fo:block>
+					<fo:block xsl:use-attribute-sets="recommendation-name-style">
+						<xsl:apply-templates/>
+
+					</fo:block>
+
 		</xsl:if>
 	</xsl:template>
 
@@ -9756,6 +9823,7 @@
 			<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
 				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 			</xsl:if>
+			<xsl:call-template name="setNamedDestination"/>
 			<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 				<fo:table id="{@id}" table-layout="fixed" width="100%"> <!-- border="1pt solid black" -->
 					<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
@@ -9865,6 +9933,7 @@
 	<!-- termexample -->
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'termexample']">
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
 			<xsl:call-template name="refine_termexample-style"/>
 			<xsl:call-template name="setBlockSpanAll"/>
@@ -9919,6 +9988,7 @@
 	-->
 	<xsl:template match="*[local-name() = 'example']" name="example">
 
+				<xsl:call-template name="setNamedDestination"/>
 				<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
 
 					<xsl:call-template name="setBlockSpanAll"/>
@@ -10444,8 +10514,13 @@
 		<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
 
 			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
+
 				<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
 
+					<xsl:for-each select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"><!-- change context -->
+						<xsl:call-template name="setIDforNamedDestination"/>
+					</xsl:for-each>
+
 					<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
 				</fo:block>
 			</xsl:if>
@@ -10565,6 +10640,7 @@
 	<!-- main sections -->
 	<xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
 
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block>
 			<xsl:call-template name="setId"/>
 
@@ -10610,6 +10686,7 @@
 
 				<fo:block break-after="page"/>
 
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block>
 			<xsl:call-template name="setId"/>
 			<xsl:call-template name="addReviewHelper"/>
@@ -10638,6 +10715,7 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'clause'][normalize-space() != '' or *[local-name() = 'figure'] or @id]" name="template_clause"> <!-- if clause isn't empty -->
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block>
 			<xsl:if test="parent::*[local-name() = 'copyright-statement']">
 				<xsl:attribute name="role">SKIP</xsl:attribute>
@@ -10660,6 +10738,7 @@
 	</xsl:template> <!-- refine_clause_style -->
 
 	<xsl:template match="*[local-name() = 'definitions']">
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
@@ -10675,6 +10754,8 @@
 			<xsl:otherwise>
 
 				<fo:block break-after="page"/>
+				<xsl:call-template name="setNamedDestination"/>
+
 				<fo:block id="{@id}">
 
 					<xsl:call-template name="setBlockSpanAll"/>
@@ -10746,6 +10827,7 @@
 		<!-- following-sibling::node()[1][local-name() = 'bookmark'][@id = $source] and
 				following-sibling::node()[2][local-name() = 'fmt-review-end'][@source = $source] -->
 			<!-- <fo:block id="{$source}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$source}" fox:alt-text="Annot___{$source}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block> -->
+			<xsl:call-template name="setNamedDestination"/>
 			<fo:block id="{@id}" font-size="1pt" role="SKIP" keep-with-next="always" line-height="0.1"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
 		<!-- </xsl:if> -->
 		</xsl:if>
@@ -11461,6 +11543,7 @@
 	<!-- Normative references -->
 	<xsl:template match="*[local-name() = 'references'][@normative='true']" priority="2">
 
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 
@@ -11481,6 +11564,7 @@
 			</xsl:if>
 		</xsl:if> -->
 
+		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}"/>
 
 		<xsl:apply-templates select="*[local-name() = 'title'][@columns = 1]"/>
@@ -11500,6 +11584,7 @@
 	<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
 		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
 
+				<xsl:call-template name="setNamedDestination"/>
 				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
 
 					<xsl:call-template name="processBibitem"/>
@@ -11513,6 +11598,7 @@
 		 <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
 				<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
+				<xsl:call-template name="setNamedDestination"/>
 				<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
 
 					<fo:list-item>
@@ -11542,6 +11628,7 @@
 		<xsl:choose>
 			<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
 			<xsl:otherwise>
+				<xsl:call-template name="setNamedDestination"/>
 				<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
 
 					<fo:list-item-label end-indent="label-end()">
@@ -12196,7 +12283,7 @@
 	</xsl:template>
 
 	<!-- Example with 'class': <span class="stdpublisher">ISO</span> <span class="stddocNumber">10303</span>-<span class="stddocPartNumber">1</span>:<span class="stdyear">1994</span> -->
-	<xsl:template match="*[local-name() = 'span'][@style or @class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear' or @class = 'horizontal' or @class = 'norotate' or @class = 'halffontsize']" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'span'][@style or @class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear' or @class = 'fmt-hi' or @class = 'horizontal' or @class = 'norotate' or @class = 'halffontsize']" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>
@@ -12228,28 +12315,56 @@
 	<xsl:template match="*[local-name() = 'stem']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'stem']" mode="update_xml_pres"/>
 
-	<xsl:template match="*[local-name() = 'fmt-stem'][not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])]" mode="update_xml_step1">
+	<xsl:template match="*[local-name() = 'fmt-stem']" mode="update_xml_step1">
 		<xsl:element name="stem" namespace="{$namespace_full}">
 			<xsl:copy-of select="@*"/>
 			<xsl:choose>
 				<xsl:when test="*[local-name() = 'semx'] and count(node()) = 1">
-					<xsl:copy-of select="*[local-name() = 'semx']/node()"/>
+					<xsl:choose>
+						<xsl:when test="not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])">
+							<xsl:copy-of select="*[local-name() = 'semx']/node()"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="*[local-name() = 'semx']/node()" mode="update_xml_step1"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:copy-of select="node()"/>
+					<xsl:choose>
+						<xsl:when test="not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])">
+							<xsl:copy-of select="node()"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="node()" mode="update_xml_step1"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:element>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'fmt-stem'][not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])]" mode="update_xml_pres">
+	<xsl:template match="*[local-name() = 'fmt-stem']" mode="update_xml_pres">
 		<xsl:element name="stem" namespace="{$namespace_full}">
 			<xsl:copy-of select="@*"/>
 			<xsl:choose>
 				<xsl:when test="*[local-name() = 'semx'] and count(node()) = 1">
-					<xsl:copy-of select="*[local-name() = 'semx']/node()"/>
+					<xsl:choose>
+						<xsl:when test="not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])">
+							<xsl:copy-of select="*[local-name() = 'semx']/node()"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="*[local-name() = 'semx']/node()" mode="update_xml_pres"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:copy-of select="node()"/>
+					<xsl:choose>
+						<xsl:when test="not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])">
+							<xsl:copy-of select="node()"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="node()" mode="update_xml_pres"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:element>
@@ -12344,6 +12459,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -12478,16 +12596,24 @@
 	<xsl:template match="*[local-name() = 'fmt-title']" mode="update_xml_step1">
 		<xsl:element name="title" namespace="{$namespace_full}">
 			<xsl:copy-of select="@*"/>
+			<xsl:call-template name="addNamedDestinationAttribute"/>
+
 			<xsl:apply-templates mode="update_xml_step1"/>
 		</xsl:element>
 	</xsl:template>
 	<xsl:template match="*[local-name() = 'fmt-title']" mode="update_xml_pres">
 		<xsl:element name="title" namespace="{$namespace_full}">
 			<xsl:copy-of select="@*"/>
+			<xsl:call-template name="addNamedDestinationAttribute"/>
+
 			<xsl:apply-templates mode="update_xml_pres"/>
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template name="addNamedDestinationAttribute">
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'fmt-name']"/>
 	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
 		<xsl:choose>
@@ -12497,6 +12623,8 @@
 			<xsl:otherwise>
 				<xsl:element name="name" namespace="{$namespace_full}">
 					<xsl:copy-of select="@*"/>
+					<xsl:call-template name="addNamedDestinationAttribute"/>
+
 					<xsl:apply-templates mode="update_xml_step1"/>
 				</xsl:element>
 			</xsl:otherwise>
@@ -12510,6 +12638,8 @@
 			<xsl:otherwise>
 				<xsl:element name="name" namespace="{$namespace_full}">
 					<xsl:copy-of select="@*"/>
+					<xsl:call-template name="addNamedDestinationAttribute"/>
+
 					<xsl:apply-templates mode="update_xml_pres"/>
 				</xsl:element>
 			</xsl:otherwise>
@@ -12614,6 +12744,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -13967,6 +14111,30 @@
 		</xsl:attribute>
 	</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>
+	</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'">
+			<fox:destination internal-destination="{@id}"/>
+		</xsl:if>
+		<xsl:for-each select=". | *[local-name() = 'title'] | *[local-name() = 'name']">
+			<xsl:if test="@named_dest">
+				<fox:destination internal-destination="{@named_dest}"/>
+			</xsl:if>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:template name="add-letter-spacing">
 		<xsl:param name="text"/>
 		<xsl:param name="letter-spacing" select="'0.15'"/>

data/lib/metanorma/cc/basicdoc.rng

@@ -267,6 +267,10 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <value>justified</value>
     </choice>
   </define>
+  <define name="IdRefType">
+    <a:documentation>Type of cross-references to elements. In BasicDoc, these always point to id { xsd:ID } </a:documentation>
+    <data type="IDREF"/>
+  </define>
   <define name="RequiredId">
     <a:documentation>Mandatory anchor of element, to be used for cross-references within the document</a:documentation>
     <attribute name="id">
@@ -409,13 +413,13 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <attribute name="from">
         <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
 If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
     <optional>
       <attribute name="to">
         <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
   </define>
@@ -1504,7 +1508,7 @@ Restricted recursively to contain only other such inline elements with no identi
         <attribute name="to">
           <a:documentation>A reference to an anchor element (typically a bookmark), 
 to indicate that the index range covers a range of locations between the current index element and the `to` anchor</a:documentation>
-          <data type="IDREF"/>
+          <ref name="IdRefType"/>
         </attribute>
       </optional>
       <ref name="index-primary">
@@ -1662,7 +1666,7 @@ which can be bookmarks as well as block or section references</a:documentation>
   <define name="XrefAttributes">
     <attribute name="target">
       <a:documentation>The identifier of a section, block or inlined element being referenced</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <optional>
       <attribute name="type">
@@ -1723,7 +1727,7 @@ The target of a footnote is the location it is embedded in within the text</a:do
       <attribute name="target">
         <a:documentation>The target of the callout is understood to be the location of the callout within the source code; 
 the extent of the target is not expressed overtly</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
       <text>
         <a:documentation>The label of the callout, used to identify its target within the source code</a:documentation>

data/lib/metanorma/cc/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.0.3 -->
+<!-- VERSION v2.0.5 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -36,6 +36,12 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="IdRefType">
+      <a:documentation>Cross-references are not normalised to xsd:IDREF in Semantic XML: that is deferred to Presentation XML.
+All IdRefType instances point not to `@id` in Semantic XML, which is the Content GUID for an element,
+but to `@anchor`, the user-supplied cross-reference</a:documentation>
+      <text/>
+    </define>
     <define name="index-primary">
       <element name="primary">
         <oneOrMore>
@@ -238,7 +244,7 @@
           <a:documentation>Notes specific to this block</a:documentation>
         </ref>
       </zeroOrMore>
-      <ref name="TermSource">
+      <ref name="BlockSource">
         <a:documentation>A source for the table</a:documentation>
       </ref>
     </define>
@@ -262,10 +268,112 @@ and is intended to be referenced by a callout within the source code</a:document
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
-      <ref name="TermSource">
+      <ref name="BlockSource">
+        <a:documentation>A source for the block</a:documentation>
+      </ref>
+    </define>
+    <define name="FigureBody">
+      <optional>
+        <ref name="tname">
+          <a:documentation>The caption of the block</a:documentation>
+        </ref>
+      </optional>
+      <choice>
+        <a:documentation>Content of the figure</a:documentation>
+        <ref name="image"/>
+        <ref name="video"/>
+        <ref name="audio"/>
+        <ref name="pre"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="figure"/>
+        </zeroOrMore>
+      </choice>
+      <zeroOrMore>
+        <ref name="fn">
+          <a:documentation>Footnotes specific to the figure</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <optional>
+        <ref name="dl">
+          <a:documentation>An optional definitions list defining any symbols used in the figure</a:documentation>
+        </ref>
+      </optional>
+      <zeroOrMore>
+        <ref name="note">
+          <a:documentation>Notes whose scope is the current block</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <ref name="BlockSource">
         <a:documentation>A source for the block</a:documentation>
       </ref>
     </define>
+    <define name="FigureNoIdBody">
+      <optional>
+        <ref name="source">
+          <a:documentation>A URI or other reference intended to link to an externally hosted image (or equivalent)</a:documentation>
+        </ref>
+      </optional>
+      <optional>
+        <ref name="tname">
+          <a:documentation>The caption of the block</a:documentation>
+        </ref>
+      </optional>
+      <choice>
+        <a:documentation>Content of the figure</a:documentation>
+        <ref name="image-no-id"/>
+        <ref name="video-no-id"/>
+        <ref name="audio-no-id"/>
+        <ref name="pre-no-id"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote-no-id"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="figure-no-id"/>
+        </zeroOrMore>
+      </choice>
+      <zeroOrMore>
+        <ref name="fn">
+          <a:documentation>Footnotes specific to the figure</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <optional>
+        <ref name="dl-no-id">
+          <a:documentation>An optional definitions list defining any symbols used in the figure</a:documentation>
+        </ref>
+      </optional>
+      <zeroOrMore>
+        <ref name="note-no-id">
+          <a:documentation>Notes whose scope is the current block</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>A source for the block</a:documentation>
+      </ref>
+    </define>
+    <define name="source">
+      <element name="source">
+        <attribute name="status">
+          <a:documentation>The status of the term as it is used in this document, relative to its definition in the original document</a:documentation>
+          <ref name="SourceStatusType"/>
+        </attribute>
+        <attribute name="type">
+          <a:documentation>The type of the managed term in the present context</a:documentation>
+          <ref name="SourceTypeType"/>
+        </attribute>
+        <ref name="origin">
+          <a:documentation>The original document and location where the term definition has been obtained from</a:documentation>
+        </ref>
+        <optional>
+          <ref name="modification">
+            <a:documentation>Any changes that the definition of the term has undergone relative to the original document,
+in order to be applicable in this standardisation document</a:documentation>
+          </ref>
+        </optional>
+      </element>
+    </define>
     <define name="sourcecodebody">
       <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
 (The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
@@ -687,6 +795,20 @@ titlecase, or lowercase</a:documentation>
       </attribute>
     </optional>
   </define>
+  <define name="RequiredId" combine="interleave">
+    <optional>
+      <attribute name="anchor">
+        <a:documentation>User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
+      </attribute>
+    </optional>
+  </define>
+  <define name="OptionalId" combine="interleave">
+    <optional>
+      <attribute name="anchor">
+        <a:documentation> User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <define name="ObligationType">
     <a:documentation>The force of a clause in a standard document: whether it has normative or informative effect</a:documentation>
     <choice>
@@ -1081,7 +1203,7 @@ That concept may be defined as a term within the current document, or it may be
     <element name="label">
       <!-- Identifier of form input element that this element is a label of -->
       <attribute name="for">
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
       <zeroOrMore>
         <ref name="PureTextElement"/>
@@ -1328,6 +1450,7 @@ numbers</a:documentation>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
+          <ref name="executivesummary"/>
         </choice>
       </oneOrMore>
     </element>
@@ -1351,6 +1474,11 @@ numbers</a:documentation>
       <ref name="Content-Section"/>
     </element>
   </define>
+  <define name="executivesummary">
+    <element name="executivesummary">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="indexsect">
     <element name="indexsect">
       <ref name="Content-Section"/>
@@ -1576,6 +1704,15 @@ used in document amendments</a:documentation>
   <define name="annex">
     <element name="annex">
       <ref name="Annex-Section"/>
+      <zeroOrMore>
+        <ref name="annex-appendix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="annex-appendix">
+    <a:documentation>Appendix, distinct subclause type for annexes (annex to annex, rather than subclause to annex)</a:documentation>
+    <element name="appendix">
+      <ref name="Clause-Section"/>
     </element>
   </define>
   <define name="terms">
@@ -2106,7 +2243,7 @@ used in document amendments</a:documentation>
   </define>
   <define name="termsource">
     <a:documentation>The bibliographic source where a term is defined in the sense applicable in this standardisation document</a:documentation>
-    <element name="termsource">
+    <element name="source">
       <attribute name="status">
         <a:documentation>The status of the term as it is used in this document, relative to its definition in the original document</a:documentation>
         <ref name="SourceStatusType"/>
@@ -2488,6 +2625,11 @@ Normative References contents contain normative references, but as a clause in t
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="BlockSource">
+    <zeroOrMore>
+      <ref name="source"/>
+    </zeroOrMore>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/cc/processor.rb

@@ -8,7 +8,7 @@ module Metanorma
       end
 
       def initialize
-        @short = [:csd, :cc]
+        @short = %i[csd cc]
         @input_format = :asciidoc
         @asciidoctor_backend = :cc
       end
@@ -17,7 +17,7 @@ module Metanorma
         super.merge(
           html: "html",
           pdf: "pdf",
-          doc: "doc"
+          doc: "doc",
         )
       end
 
@@ -25,17 +25,21 @@ module Metanorma
         "Metanorma::Cc #{Metanorma::Cc::VERSION}"
       end
 
-      def output(isodoc_node, inname, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options = {})
         options_preprocess(options)
         case format
         when :html
-          IsoDoc::Cc::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Cc::HtmlConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::Cc::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Cc::WordConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::Cc::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Cc::PdfConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :presentation
-          IsoDoc::Cc::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Cc::PresentationXMLConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cc
-    VERSION = "2.6.4".freeze
+    VERSION = "2.6.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic