metanorma-cc 2.7.9 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df1b28d9833b4e7eb481375744567ea2c6be3a35f565d7845c6b476058168c6b
-  data.tar.gz: 8b2c58175c4c986baeb8064d0f855a138d614bd3c183779550b46034dfded8c8
+  metadata.gz: 7c80db3e135f995e13f7459b98f7085de83e185636f0986326bb5fe4fca86692
+  data.tar.gz: 62ed996afcb67f966a34632724c388ba0bed95177643a76cc01c49442faffb0b
 SHA512:
-  metadata.gz: 07d568a091e112978f4dabf0f8e902ebb25c826c2cd2cfa9941941195cc4a8a03db648af11c26b64bb5834d7d022b79a34750d4e97ab186ef7e4716fdb64cb35
-  data.tar.gz: f797e63800468c093afd5310de758da9772757c47a407164d3965cdc4ad63b296adedcfe34980f07bbb9767bce617c72942842a6887aec51958b307f2dc3d768
+  metadata.gz: 66312c95c05747bdc27817346a75529cfed5b90b70cde5552fbd569630ed0f18347aa8aad4fac406fb51c33cb43d58d7bd5f7c20cd70aeaf0b27e9e9abaf5f89
+  data.tar.gz: 7007fd2f5181ea82e72a2114050ecb884053b7c9fc8729b062ef645f401fc7a8afe06a919ff2d9c6c59f357be2538cff6cbc0f0fb771f7be649a17f50275ec33

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

@@ -271,7 +271,7 @@
 	<xsl:template name="cover-page">
 		<!-- Cover Page -->
 		<xsl:choose>
-			<xsl:when test="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'coverpage-image']/mn:value/mn:image and         normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:full-coverpage-replacement) = 'true'">
+			<xsl:when test="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:coverpage-image/mn:image and         normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:full-coverpage-replacement) = 'true'">
 				<xsl:call-template name="insertCoverPageFullImage"/>
 			</xsl:when>
 			<xsl:otherwise>
@@ -693,12 +693,13 @@
 	<xsl:variable name="root_element">metanorma</xsl:variable>
 
 	<!---examples: 2013, 2024 -->
-	<xsl:variable name="document_scheme" select="normalize-space(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'document-scheme']/mn:value)"/>
+	<xsl:variable name="document_scheme" select="normalize-space(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:document-scheme)"/>
 
 	<!-- external parameters -->
 	<xsl:param name="svg_images"/> <!-- svg images array -->
 	<xsl:variable name="images" select="document($svg_images)"/>
 	<xsl:param name="basepath"/> <!-- base path for images -->
+	<xsl:param name="mn2pdfpath"/> <!-- mn2pdf working directory -->
 	<xsl:param name="inputxml_basepath"/> <!-- input xml file path -->
 	<xsl:param name="inputxml_filename"/> <!-- input xml file name -->
 	<xsl:param name="output_path"/> <!-- output PDF file name -->
@@ -821,8 +822,6 @@
 		</title-part>
 		<title-part lang="fr">
 		</title-part>
-		<title-part lang="ru">
-		</title-part>
 		<title-part lang="zh">第 # 部分:</title-part>
 	</xsl:variable>
 	<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
@@ -864,31 +863,6 @@
 		<xsl:copy-of select="//mn:metanorma/mn:localized-strings"/>
 	</xsl:variable>
 
-	<xsl:template name="getTitle">
-		<xsl:param name="name"/>
-		<xsl:param name="lang"/>
-		<xsl:variable name="lang_">
-			<xsl:choose>
-				<xsl:when test="$lang != ''">
-					<xsl:value-of select="$lang"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:call-template name="getLang"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<xsl:variable name="language" select="normalize-space($lang_)"/>
-		<xsl:variable name="title_" select="$titles/*[local-name() = $name][@lang = $language]"/>
-		<xsl:choose>
-			<xsl:when test="normalize-space($title_) != ''">
-				<xsl:value-of select="$title_"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
 	<!-- Characters -->
 	<xsl:variable name="linebreak">&#8232;</xsl:variable>
 	<xsl:variable name="tab_zh">　</xsl:variable>
@@ -981,6 +955,22 @@
 		</xsl:choose>
 	</xsl:variable>
 
+	<xsl:attribute-set name="page-sequence-preface">
+		<xsl:attribute name="format">i</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_page-sequence-preface">
+		<xsl:param name="layoutVersion"/>
+	</xsl:template>
+
+	<xsl:attribute-set name="page-sequence-main">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_page-sequence-main">
+		<xsl:param name="layoutVersion"/>
+	</xsl:template>
+
 	<xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable>
 	<xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable>
 	<xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable>
@@ -994,8 +984,22 @@
 		<xsl:param name="root-style"/>
 		<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
 
+		<xsl:variable name="additional_fonts___">
+			<xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:fonts |      //mn:metanorma[1]/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'fonts']/mn:value |       //mn:metanorma[1]/mn:presentation-metadata[mn:name = 'fonts']/mn:value">
+				<font><xsl:value-of select="."/></font>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="additional_fonts__">
+			<!-- unique fonts -->
+			<xsl:for-each select="xalan:nodeset($additional_fonts___)//font">
+				<xsl:choose>
+					<xsl:when test="preceding-sibling::font[text() = current()/text()]"><!-- skip --></xsl:when>
+					<xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:for-each>
+		</xsl:variable>
 		<xsl:variable name="additional_fonts_">
-			<xsl:for-each select="//mn:metanorma[1]/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'fonts']/mn:value |       //mn:metanorma[1]/mn:presentation-metadata[mn:name = 'fonts']/mn:value">
+			<xsl:for-each select="xalan:nodeset($additional_fonts__)//font">
 				<xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
@@ -2614,9 +2618,129 @@
 	<xsl:variable name="sourcecode_css" select="xalan:nodeset($sourcecode_css_)"/>
 
 	<xsl:template match="*[local-name() = 'property']" mode="css">
-		<xsl:attribute name="{@name}">
-			<xsl:value-of select="@value"/>
-		</xsl:attribute>
+		<!-- don't delete leading and trailing spaces -->
+		<!-- the list from https://www.data2type.de/en/xml-xslt-xslfo/xsl-fo/xsl-fo-introduction/blocks -->
+		<xsl:variable name="allowed_attributes_">
+			<xsl:text>
+				background-attachment
+				background-color
+				background-image
+				background-position-horizontal
+				background-position-vertical
+				background-repeat
+				border
+				border-after-color
+				border-after-style
+				border-after-width
+				border-before-color
+				border-before-style
+				border-before-width
+				border-bottom-color
+				border-bottom-style
+				border-bottom-width
+				border-color
+				border-end-color
+				border-end-style
+				border-end-width
+				border-left-color
+				border-left-style
+				border-left-width
+				border-right-color
+				border-right-style
+				border-right-width
+				border-start-color
+				border-start-style
+				border-start-width
+				border-style
+				border-top-color
+				border-top-style
+				border-top-width
+				border-width
+				break-after
+				break-before
+				color
+				country
+				end-indent
+				font-family
+				font-model
+				font-selection-strategy
+				font-size
+				font-size-adjust
+				font-stretch
+				font-style
+				font-variant
+				font-weight
+				hyphenate
+				hyphenation-character
+				hyphenation-keep
+				hyphenation-ladder-count
+				hyphenation-push-character-count
+				hyphenation-remain-character-count
+				id
+				intrusion-displace
+				keep-together
+				keep-with-next
+				keep-with-previous
+				language
+				last-line-end-indent
+				line-height
+				line-height-shift-adjustment
+				line-stacking-strategy
+				linefeed-treatment
+				margin
+				margin-bottom
+				margin-left
+				margin-right
+				margin-top
+				orphans
+				padding
+				padding-after
+				padding-before
+				padding-bottom
+				padding-end
+				padding-left
+				padding-right
+				pause-after
+				padding-start
+				padding-top
+				reference-orientation
+				relative-position
+				richness
+				role
+				script
+				source-document
+				space-after
+				space-before
+				span
+				start-indent
+				text-align
+				text-align-last
+				text-altitude
+				text-depth
+				text-indent
+				visibility
+				white-space-collapse
+				white-space-treatment
+				widows
+				wrap-option
+			</xsl:text>
+		</xsl:variable>
+		<xsl:variable name="allowed_attributes" select="concat(' ', normalize-space($allowed_attributes_), ' ')"/>
+		<xsl:choose>
+			<xsl:when test="contains($allowed_attributes, concat(' ', @name, ' '))">
+				<xsl:attribute name="{@name}">
+					<xsl:value-of select="@value"/>
+				</xsl:attribute>
+			</xsl:when>
+			<xsl:when test="@name = 'border-radius'">
+				<xsl:attribute name="fox:border-radius">
+					<xsl:value-of select="@value"/>
+				</xsl:attribute>
+			</xsl:when>
+			<xsl:otherwise>
+				<!-- skip -->
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template name="get_sourcecode_attributes">
@@ -2653,11 +2777,12 @@
 
 		<xsl:choose>
 			<xsl:when test="$isGenerateTableIF = 'true' and (ancestor::*[local-name() = 'td'] or ancestor::*[local-name() = 'th'])">
-				<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">
-					<xsl:attribute name="{local-name()}">
+				<!-- <xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">					
+					<xsl:attribute name="{name()}">
 						<xsl:value-of select="."/>
 					</xsl:attribute>
-				</xsl:for-each>
+				</xsl:for-each> -->
+				<xsl:copy-of select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*"/>
 				<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
 			</xsl:when>
 
@@ -2675,11 +2800,12 @@
 
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
 
-							<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">
-								<xsl:attribute name="{local-name()}">
+							<!-- <xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">					
+								<xsl:attribute name="{name()}">
 									<xsl:value-of select="."/>
 								</xsl:attribute>
-							</xsl:for-each>
+							</xsl:for-each> -->
+							<xsl:copy-of select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*"/>
 
 							<xsl:call-template name="refine_sourcecode-style"/>
 
@@ -2689,10 +2815,10 @@
 								<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 							</xsl:if>
 
-							<xsl:apply-templates select="node()[not(self::mn:fmt-name or self::mn:dl)]"/>
+							<xsl:apply-templates select="node()[not(self::mn:fmt-name or self::mn:dl or self::mn:key)]"/>
 						</fo:block>
 
-						<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
+						<xsl:apply-templates select="mn:dl | mn:key"/> <!-- Key table -->
 
 						<!-- <xsl:choose>
 							<xsl:when test="$namespace = 'rsd'"></xsl:when>
@@ -2790,7 +2916,7 @@
 					</xsl:for-each>
 				</xsl:variable>
 				<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*[not(starts-with(local-name(), 'margin-') or starts-with(local-name(), 'space-'))]">
-					<xsl:attribute name="{local-name()}">
+					<xsl:attribute name="{name()}">
 						<xsl:value-of select="."/>
 					</xsl:attribute>
 				</xsl:for-each>
@@ -3958,6 +4084,12 @@
 	<xsl:template name="refine_term-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="term-kind-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_term-kind-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="term-number-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -4935,7 +5067,7 @@
 									<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
 								</xsl:when>
 								<xsl:otherwise>
-									<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:note) and not(self::mn:example) and not(self::mn:dl) and not(self::mn:fmt-source) and not(self::mn:p)          and not(self::mn:thead) and not(self::mn:tfoot) and not(self::mn:fmt-footnote-container)]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
+									<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:note) and not(self::mn:example) and not(self::mn:dl) and not(self::mn:key) and not(self::mn:fmt-source) and not(self::mn:p)          and not(self::mn:thead) and not(self::mn:tfoot) and not(self::mn:fmt-footnote-container)]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
 								</xsl:otherwise>
 							</xsl:choose>
 
@@ -5508,7 +5640,7 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ..//mn:fn[not(parent::mn:fmt-name)] or ../mn:fmt-source or ../mn:p"/>
+		<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ../mn:key or ..//mn:fn[not(parent::mn:fmt-name)] or ../mn:fmt-source or ../mn:p"/>
 
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 		</xsl:variable>
@@ -5591,7 +5723,7 @@
 
 								<!-- fn will be processed inside 'note' processing -->
 								<xsl:apply-templates select="../mn:p"/>
-								<xsl:apply-templates select="../mn:dl"/>
+								<xsl:apply-templates select="../mn:dl | ../mn:key"/>
 								<xsl:apply-templates select="../mn:note[not(@type = 'units')]"/>
 								<xsl:apply-templates select="../mn:example"/>
 								<xsl:apply-templates select="../mn:fmt-source"/>
@@ -6906,7 +7038,7 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_dl-block-style">
-		<xsl:if test="@key = 'true' and ancestor::mn:figure">
+		<xsl:if test="(@key = 'true' or ancestor::mn:key) and ancestor::mn:figure">
 			<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
 		</xsl:if>
 	</xsl:template>
@@ -7014,15 +7146,15 @@
 			<fo:block-container margin-left="0mm" role="SKIP">
 				<xsl:attribute name="margin-right">0mm</xsl:attribute>
 
-				<xsl:variable name="parent" select="local-name(..)"/>
+				<xsl:variable name="parent" select="local-name(../..)"/>
 
 				<xsl:variable name="key_iso"> <!-- and  (not(../@class) or ../@class !='pseudocode') -->
 				</xsl:variable>
 
-				<xsl:variable name="onlyOneComponent" select="normalize-space($parent = 'formula' and count(mn:dt) = 1)"/>
+				<xsl:variable name="onlyOneFormulaKeyItem" select="normalize-space($parent = 'formula' and count(mn:dt) = 1)"/>
 
 				<xsl:choose>
-					<xsl:when test="$onlyOneComponent = 'true'"> <!-- only one component -->
+					<xsl:when test="$onlyOneFormulaKeyItem = 'true'"> <!-- only one component -->
 						<fo:block margin-bottom="12pt" text-align="left">
 							<!-- <xsl:variable name="title-where">
 										<xsl:call-template name="getLocalizedString">
@@ -7030,7 +7162,7 @@
 										</xsl:call-template>
 									</xsl:variable>
 									<xsl:value-of select="$title-where"/> -->
-							<xsl:apply-templates select="preceding-sibling::*[1][self::mn:p and @keep-with-next = 'true']/node()"/>
+							<xsl:apply-templates select="ancestor::mn:key/preceding-sibling::*[1][self::mn:p and @keep-with-next = 'true']/node()"/>
 							<xsl:text> </xsl:text>
 							<xsl:apply-templates select="mn:dt/*"/>
 							<xsl:if test="mn:dd/node()[normalize-space() != ''][1][self::text()]">
@@ -7051,15 +7183,16 @@
 							</xsl:variable>
 							<xsl:value-of select="$title-where"/><xsl:if test="$namespace = 'bsi' or $namespace = 'itu'">:</xsl:if> -->
 							<!-- preceding 'p' with word 'where' -->
-							<xsl:apply-templates select="preceding-sibling::*[1][self::mn:p and @keep-with-next = 'true']/node()"/>
+							<!-- <xsl:apply-templates select="preceding-sibling::*[1][self::mn:p and @keep-with-next = 'true']/node()"/> -->
+							<xsl:apply-templates select="ancestor::mn:key/preceding-sibling::*[1][self::mn:p and @keep-with-next = 'true']/node()"/>
 						</fo:block>
 					</xsl:when>  <!-- END: a few components -->
 					<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
 						<!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
-						<xsl:if test="not(preceding-sibling::*[1][self::mn:p and @keep-with-next])"> <!-- for old Presentation XML -->
+						<xsl:if test="not(preceding-sibling::*[1][self::mn:p and @keep-with-next]) and 1 = 2"> <!-- for old Presentation XML -->
 							<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
 
-								<xsl:call-template name="refine_figure_key_style"/>
+								<xsl:call-template name="refine_figure-key-name-style"/>
 
 								<xsl:variable name="title-key">
 									<xsl:call-template name="getLocalizedString">
@@ -7073,7 +7206,7 @@
 				</xsl:choose>
 
 				<!-- a few components -->
-				<xsl:if test="$onlyOneComponent = 'false'">
+				<xsl:if test="$onlyOneFormulaKeyItem = 'false'">
 					<fo:block role="SKIP">
 
 						<xsl:call-template name="refine_multicomponent_style"/>
@@ -7086,7 +7219,7 @@
 
 							<xsl:call-template name="refine_multicomponent_block_style"/>
 
-							<xsl:apply-templates select="mn:fmt-name">
+							<xsl:apply-templates select="mn:fmt-name | parent::mn:key[parent::mn:table]/mn:name">
 								<xsl:with-param name="process">true</xsl:with-param>
 							</xsl:apply-templates>
 
@@ -7261,11 +7394,11 @@
 	</xsl:template> <!-- refine_dl_formula_where_style -->
 
 	<xsl:template name="refine_multicomponent_style">
-		<xsl:variable name="parent" select="local-name(..)"/>
+		<xsl:variable name="parent" select="local-name(../..)"/>
 	</xsl:template> <!-- refine_multicomponent_style -->
 
 	<xsl:template name="refine_multicomponent_block_style">
-		<xsl:variable name="parent" select="local-name(..)"/>
+		<xsl:variable name="parent" select="local-name(../..)"/>
 	</xsl:template> <!-- refine_multicomponent_block_style -->
 
 	<!-- dl/name -->
@@ -8273,6 +8406,18 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:attribute-set name="figure-key-name-style">
+		<xsl:attribute name="text-align">left</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
+	</xsl:attribute-set> <!-- figure-key-name-style -->
+
+	<xsl:template name="refine_figure-key-name-style">
+
+	</xsl:template> <!-- refine_figure-key-name-style -->
+
 	<!-- ============================ -->
 	<!-- figure's footnotes rendering -->
 	<!-- ============================ -->
@@ -8435,7 +8580,7 @@
 	<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
 	<!-- figure's footnote label -->
 	<!-- figure/dl[@key = 'true']/dt/p/sup -->
-	<xsl:template match="mn:figure/mn:dl[@key = 'true']/mn:dt/     mn:p[count(node()[normalize-space() != '']) = 1]/mn:sup" priority="3">
+	<xsl:template match="mn:figure/mn:dl[@key = 'true']/mn:dt/     mn:p[count(node()[normalize-space() != '']) = 1]/mn:sup |     mn:figure/mn:key/mn:dl/mn:dt/     mn:p[count(node()[normalize-space() != '']) = 1]/mn:sup" priority="3">
 		<xsl:variable name="key_iso">
 		</xsl:variable>
 		<xsl:if test="normalize-space($key_iso) = 'true'">
@@ -8453,16 +8598,13 @@
 	<!-- ============================ -->
 
 	<!-- caption for figure key and another caption, https://github.com/metanorma/isodoc/issues/607 -->
-	<xsl:template match="mn:figure/mn:p[@keep-with-next = 'true' and mn:strong]" priority="3">
-		<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:template match="mn:figure/mn:p[@keep-with-next = 'true' and mn:strong] | mn:figure/mn:key/mn:name" priority="3">
+		<fo:block xsl:use-attribute-sets="figure-key-name-style">
+			<xsl:call-template name="refine_figure-key-name-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template name="refine_figure_key_style">
-	</xsl:template> <!-- refine_figure_key_style -->
-
 	<!-- ====== -->
 	<!-- figure    -->
 	<!-- image    -->
@@ -8775,9 +8917,15 @@
 			<xsl:otherwise>
 				<xsl:variable name="src_with_basepath" select="concat($basepath, @src)"/>
 				<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($src_with_basepath)))"/>
+				<xsl:variable name="src_with_mn2pdfpath" select="concat($mn2pdfpath, @src)"/>
+				<xsl:variable name="file_exists_in_mn2pdf_path" select="normalize-space(java:exists(java:java.io.File.new($src_with_mn2pdfpath)))"/>
 				<xsl:choose>
 					<xsl:when test="$file_exists = 'true'">
-						<xsl:value-of select="$src_with_basepath"/>
+						<xsl:value-of select="java:org.metanorma.fop.Util.getURIFromPath($src_with_basepath)"/>
+					</xsl:when>
+					<xsl:when test="$file_exists_in_mn2pdf_path = 'true'">
+						<!-- <xsl:value-of select="$src_with_mn2pdfpath"/> -->
+						<xsl:value-of select="java:org.metanorma.fop.Util.getURIFromPath($src_with_mn2pdfpath)"/>
 					</xsl:when>
 					<xsl:otherwise>
 						<xsl:value-of select="@src"/>
@@ -8891,7 +9039,9 @@
 	<!-- =================== -->
 	<!-- SVG images processing -->
 	<!-- =================== -->
-	<xsl:variable name="figure_name_height">14</xsl:variable>
+	<xsl:variable name="figure_name_height_">14
+	</xsl:variable>
+	<xsl:variable name="figure_name_height" select="number(normalize-space($figure_name_height_))"/>
 	<xsl:variable name="width_effective" select="$pageWidth - $marginLeftRight1 - $marginLeftRight2"/><!-- paper width minus margins -->
 	<xsl:variable name="height_effective" select="$pageHeight - $marginTop - $marginBottom - $figure_name_height"/><!-- paper height minus margins and title height -->
 	<xsl:variable name="image_dpi" select="96"/>
@@ -9091,6 +9241,17 @@
 							</xsl:if>
 
 							<xsl:copy-of select="$svg_content"/>
+
+							<!-- <debug>
+								<svg_width><xsl:value-of select="$svg_width"/></svg_width>
+								<width_effective_px><xsl:value-of select="$width_effective_px"/></width_effective_px>
+								<scale_x><xsl:value-of select="$scale_x"/></scale_x>
+								<svg_height><xsl:value-of select="$svg_height"/></svg_height>
+								<height_effective_px><xsl:value-of select="$height_effective_px"/></height_effective_px>
+								<isPrecedingTitle><xsl:value-of select="$isPrecedingTitle"/></isPrecedingTitle>
+								<scale_y><xsl:value-of select="$scale_y"/></scale_y>
+							</debug> -->
+
 						</fo:instream-foreign-object>
 					<!-- </fo:block> -->
 					</xsl:copy>
@@ -9224,10 +9385,12 @@
 		</xsl:for-each>
 	</xsl:template>
 
-	<xsl:template match="mn:figure/mn:image[@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
-		<xsl:variable name="svg_content" select="document(@src)"/>
+	<!-- <p id="."><image id="" src="..." mimetype="image/svg+xml" height="auto" width="auto"/></p> -->
+	<xsl:template match="mn:figure/mn:image[@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]] |    *[not(self::mn:figure)]/mn:image[@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))] and count(node()) = 0]" priority="2">
+		<xsl:variable name="src"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
+		<xsl:variable name="svg_content" select="document($src)"/>
 		<xsl:variable name="name" select="ancestor::mn:figure/mn:fmt-name"/>
-		<xsl:for-each select="xalan:nodeset($svg_content)/node()">
+		<xsl:for-each select="xalan:nodeset($svg_content)/*"> <!-- node() -->
 			<xsl:call-template name="image_svg">
 				<xsl:with-param name="name" select="$name"/>
 			</xsl:call-template>
@@ -9501,7 +9664,7 @@
 	<!-- ====== -->
 
 	<!-- ignore 'p' with 'where' in formula, before 'dl' -->
-	<xsl:template match="mn:formula/*[self::mn:p and @keep-with-next = 'true' and following-sibling::*[1][self::mn:dl]]"/>
+	<xsl:template match="mn:formula/*[self::mn:p and @keep-with-next = 'true' and following-sibling::*[1][self::mn:dl or self::mn:key]]"/>
 
 	<!-- ======================================= -->
 	<!-- math -->
@@ -10239,6 +10402,12 @@
 	<!-- END Lists processing -->
 	<!-- ===================================== -->
 
+	<xsl:attribute-set name="footnote-separator-block-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_footnote-separator-block-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="footnote-separator-leader-style">
 	</xsl:attribute-set>
 
@@ -10777,7 +10946,7 @@
 								<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
 							</xsl:call-template>
 						</fo:block>
-						<xsl:call-template name="processBibitemFollowingNotes"/>
+						<xsl:call-template name="processFormattedrefNotes"/>
 					</fo:list-item-body>
 				</fo:list-item>
 			</xsl:otherwise>
@@ -10798,10 +10967,19 @@
 			<xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
 		</xsl:apply-templates>
 		<xsl:apply-templates select="mn:formattedref"/>
-				<xsl:call-template name="processBibitemFollowingNotes"/>
+				<xsl:call-template name="processFormattedrefNotes"/>
 		<!-- end bibitem processing -->
 	</xsl:template> <!-- processBibitem (bibitem) -->
 
+	<!-- note at the end of formattedref, will be processed in processFormattedrefNotes -->
+	<xsl:template match="mn:formattedref/mn:note[not(following-sibling::node()[normalize-space() != '' and not(self::mn:note)])]"/>
+
+	<xsl:template name="processFormattedrefNotes">
+		<xsl:for-each select="mn:formattedref/mn:note[not(following-sibling::node()[normalize-space() != '' and not(self::mn:note)])]">
+			<xsl:call-template name="note"/>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:template name="processBibitemFollowingNotes">
 		<!-- current context is bibitem element -->
 		<xsl:variable name="bibitem_id" select="@id"/>
@@ -12173,8 +12351,8 @@
 
 	<xsl:variable name="toc_level">
 		<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
-		<xsl:variable name="pdftoclevels" select="normalize-space(//mn:metanorma-extension/mn:presentation-metadata[mn:name/text() = 'PDF TOC Heading Levels']/mn:value)"/> <!-- :toclevels-pdf  Number of table of contents levels to render in PDF output; used to override :toclevels:-->
-		<xsl:variable name="toclevels" select="normalize-space(//mn:metanorma-extension/mn:presentation-metadata[mn:name/text() = 'TOC Heading Levels']/mn:value)"/> <!-- Number of table of contents levels to render -->
+		<xsl:variable name="pdftoclevels" select="normalize-space(//mn:metanorma-extension/mn:presentation-metadata/mn:pdf-toc-heading-levels)"/> <!-- :toclevels-pdf  Number of table of contents levels to render in PDF output; used to override :toclevels:-->
+		<xsl:variable name="toclevels" select="normalize-space(//mn:metanorma-extension/mn:presentation-metadata/mn:toc-heading-levels)"/> <!-- Number of table of contents levels to render -->
 		<xsl:choose>
 			<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
 			<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when>  <!-- if there is value in xml -->
@@ -12730,6 +12908,35 @@
 		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 	</xsl:template> <!-- refine_title-style -->
 
+	<xsl:attribute-set name="key-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_key-style">
+
+	</xsl:template>
+
+	<xsl:attribute-set name="key-name-style" use-attribute-sets="dl-name-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_key-name-style">
+	</xsl:template>
+
+	<xsl:template match="mn:key">
+		<xsl:apply-templates/>
+	</xsl:template>
+
+	<xsl:template match="mn:key/mn:name">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:block xsl:use-attribute-sets="key-name-style">
+				<xsl:call-template name="refine_key-name-style"/>
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="processPrefaceSectionsDefault">
 		<xsl:param name="num"/>
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
@@ -13904,6 +14111,23 @@
 		<xsl:call-template name="getLang_fromCurrentNode"/><xsl:value-of select=".//mn:p[1]/@id"/>
 	</xsl:template>
 
+	<xsl:template name="getDoctype">
+		<xsl:variable name="doctype_alias" select="normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:doctype-alias)"/>
+		<xsl:value-of select="$doctype_alias"/>
+		<xsl:if test="$doctype_alias = ''"><xsl:value-of select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/></xsl:if>
+	</xsl:template>
+
+	<xsl:template name="getDoctypeTitle">
+		<xsl:variable name="doctype_i18n" select="normalize-space(/mn:metanorma/mn:bibdata/mn:ext/mn:doctype[@language = $lang])"/>
+		<xsl:value-of select="$doctype_i18n"/>
+		<xsl:if test="$doctype_i18n = ''">
+			<xsl:variable name="doctype"><xsl:call-template name="getDoctype"/></xsl:variable>
+			<xsl:call-template name="capitalizeWords">
+				<xsl:with-param name="str" select="$doctype"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="setId">
 		<xsl:param name="prefix"/>
 		<xsl:attribute name="id">
@@ -13933,7 +14157,7 @@
 	<xsl:template name="setNamedDestination">
 		<xsl:if test="$isGenerateTableIF = 'false'">
 			<!-- 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'">
+			<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=". | mn:fmt-title | mn:fmt-name">
@@ -14153,7 +14377,7 @@
 		<!-- background image -->
 		<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
 			<fo:block>
-				<xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image[$num]">
+				<xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[local-name() = $name][1]/mn:image[$num]">
 
 					<xsl:call-template name="insertPageImage"/>
 
@@ -14165,7 +14389,7 @@
 	<!-- for https://github.com/metanorma/mn-native-pdf/issues/845 -->
 	<xsl:template name="insertCoverPageFullImage">
 		<xsl:param name="name">coverpage-image</xsl:param>
-		<xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image">
+		<xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[local-name() = $name][1]/mn:image">
 			<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
 				<fo:flow flow-name="xsl-region-body">
 					<xsl:call-template name="insertBackgroundPageImage">
@@ -14718,4 +14942,11 @@
 	<!-- END: mode="set_table_role_skip" -->
 	<!-- ============================================= -->
 
+	<xsl:variable name="svg_empty">
+		<!-- empty -->
+		<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 2 2">
+			<rect x="0" y="0" width="2" height="2" style="fill:#fff;fill-opacity:0;stroke:none"/>
+		</svg>
+	</xsl:variable>
+
 </xsl:stylesheet>

data/lib/isodoc/cc/html/cc.css

@@ -745,6 +745,11 @@ table.MsoISOTable td, table.MsoISOTableBig td {
   padding: 0cm 2.85pt 0cm 2.85pt;
 }
 
+table.MsoNormalTable th, table.MsoNormalTable td {
+  border: none;
+  mso-border-alt: none;
+}
+
 table.MsoISOTable p, table.MsoISOTableBig p {
   font-size: {{smallerfontsize}};
 }

data/lib/isodoc/cc/html/cc.scss

@@ -667,6 +667,10 @@ table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
+table.MsoNormalTable th, table.MsoNormalTable td {
+  border: none;
+  mso-border-alt: none;
+}
 table.MsoISOTable p, table.MsoISOTableBig p
 {font-size:$smallerfontsize; }
 table.MsoTableGrid

data/lib/isodoc/cc/html/htmlstyle.css

@@ -911,7 +911,7 @@ main li {
 }
 
 /* Bibliograhy */
-p.Biblio, p.NormRef {
+p.Biblio, p.NormRef, div.Biblio, div.NormRef {
   margin-top: 1em;
 }
 
@@ -1100,6 +1100,10 @@ table th, table td {
 table td.header {
   font-weight: 400;
 }
+table table.plain, table table.plain th, table table.plain td {
+  border: none !important;
+  font-size: 0.95em;
+}
 
 p.TableTitle {
   text-align: center;

data/lib/isodoc/cc/html/htmlstyle.scss

@@ -198,7 +198,7 @@ main li {
 
 /* Bibliograhy */
 
-p.Biblio, p.NormRef {
+p.Biblio, p.NormRef, div.Biblio, div.NormRef {
   margin-top: 1em;
 }
 

data/lib/metanorma/cc/isodoc.rng

@@ -167,12 +167,6 @@ Sources are currently only rendered in metanorma-plateau</a:documentation>
     </define>
     <define name="DlAttributes">
       <ref name="BlockAttributes"/>
-      <optional>
-        <attribute name="key">
-          <a:documentation>This definition list is the key of a figure or formula</a:documentation>
-          <data type="boolean"/>
-        </attribute>
-      </optional>
     </define>
     <define name="DlBody">
       <optional>
@@ -311,7 +305,7 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure     </a:documentation>
+        <a:documentation>Content of the figure</a:documentation>
         <ref name="image">
           <a:documentation>by default the content of a figure is a media file</a:documentation>
         </ref>
@@ -340,8 +334,8 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </zeroOrMore>
       <optional>
-        <ref name="dl">
-          <a:documentation>An optional definitions list defining any symbols used in the figure</a:documentation>
+        <ref name="key">
+          <a:documentation>An key defining any symbols used in the figure</a:documentation>
         </ref>
       </optional>
       <zeroOrMore>
@@ -365,7 +359,7 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure     </a:documentation>
+        <a:documentation>Content of the figure</a:documentation>
         <ref name="image-no-id">
           <a:documentation>by default the content of a figure is a media file</a:documentation>
         </ref>
@@ -429,7 +423,7 @@ in order to be applicable in this standardisation document</a:documentation>
       </element>
     </define>
     <define name="sourcecodebody">
-      <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
+      <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>
       <element name="body">
         <oneOrMore>
@@ -549,7 +543,7 @@ normative or informative references, some split references into sections organiz
           <choice>
             <a:documentation>Table cell contains a block</a:documentation>
             <ref name="paragraph-with-footnote"/>
-            <ref name="dl"/>
+            <ref name="key"/>
             <ref name="ul"/>
             <ref name="ol"/>
             <ref name="figure"/>
@@ -632,8 +626,40 @@ This is done if the footnote reference is already presented in some other form,
         <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
     </define>
+    <define name="FormulaBody">
+      <ref name="stem">
+        <a:documentation>The content of the formula, as a mathematical expression</a:documentation>
+      </ref>
+      <optional>
+        <ref name="key">
+          <a:documentation>A key defining any symbols used in the formula</a:documentation>
+        </ref>
+      </optional>
+      <zeroOrMore>
+        <ref name="note">
+          <a:documentation>Notes whose scope is the current block</a:documentation>
+        </ref>
+      </zeroOrMore>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="key">
+    <a:documentation>Key to a table, figure, or formula</a:documentation>
+    <element name="key">
+      <optional>
+        <ref name="tname">
+          <a:documentation>optional title of key</a:documentation>
+        </ref>
+      </optional>
+      <oneOrMore>
+        <choice>
+          <a:documentation>Definition list and/or paragraph content</a:documentation>
+          <ref name="dl"/>
+          <ref name="paragraph"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -1042,7 +1068,7 @@ parargaph sources are currently only rendered in metanorma-plateau</a:documentat
       </optional>
       <optional>
         <attribute name="custom-charset">
-          <a:documentation>Character set that the contained text belongs to; 
+          <a:documentation>Character set that the contained text belongs to;
 is used in particular to capture mutually agreed definitions of codepoints in Unicode Private Use Area</a:documentation>
         </attribute>
       </optional>
@@ -1623,7 +1649,7 @@ numbers</a:documentation>
   <define name="definitions">
     <a:documentation>One or more definition lists, used to define symbols and abbreviations used in the remainder of the document.
 These can also be used as glossaries, with simple definitions, in contrast to the more elaborate definitions given in
-terms sections </a:documentation>
+terms sections</a:documentation>
     <element name="definitions">
       <ref name="OptionalId"/>
       <ref name="LocalizedStringAttributes"/>
@@ -1864,7 +1890,7 @@ used in document amendments</a:documentation>
       </zeroOrMore>
       <zeroOrMore>
         <ref name="related">
-          <a:documentation>Zero or more names which are related to the term being defined. </a:documentation>
+          <a:documentation>Zero or more names which are related to the term being defined.</a:documentation>
         </ref>
       </zeroOrMore>
       <optional>
@@ -2025,7 +2051,7 @@ used in document amendments</a:documentation>
     <element name="letter-symbol">
       <optional>
         <attribute name="isInternational">
-          <a:documentation>Whether the designation is the same across languages, or language-specific   </a:documentation>
+          <a:documentation>Whether the designation is the same across languages, or language-specific</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
@@ -2632,6 +2658,11 @@ links within an SVG file, so that the SVG file can hyperlink to anchors within t
         <a:documentation>Connective linking this location to its predecessor. _from/to_ are presumed to nest more closely than _and_ or _or_</a:documentation>
         <ref name="XrefConnectiveType"/>
       </attribute>
+      <optional>
+        <attribute name="custom-connective">
+          <a:documentation>Custom wording for connnective linking this location to its predecessor, custom wording. If provided, is treated as equivalent semantically to connective value</a:documentation>
+        </attribute>
+      </optional>
     </element>
   </define>
   <define name="XrefStyleType">
@@ -2658,6 +2689,11 @@ links within an SVG file, so that the SVG file can hyperlink to anchors within t
         <ref name="XrefConnectiveType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="custom-connective">
+        <a:documentation>Custom wording for connnective linking this location to its predecessor, custom wording. If provided, is treated as equivalent semantically to connective value</a:documentation>
+      </attribute>
+    </optional>
     <ref name="erefType"/>
   </define>
   <define name="erefstack">

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cc
-    VERSION = "2.7.9".freeze
+    VERSION = "2.8.0".freeze
   end
 end

data/metanorma-cc.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-generic", "~> 3.2.0"
+  spec.add_dependency "metanorma-generic", "~> 3.2.3"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.7.9
+  version: 2.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-01 00:00:00.000000000 Z
+date: 2026-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement