metanorma-cc 2.8.10 → 2.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fe64bc652ee4d4faee03d8d6a49c08ee041232a7b8165fb24d8a737ebf3638b
-  data.tar.gz: d9dac22b9636b91df75eb13b27add51e5812a64becad8b5dbca27afa630c7d0e
+  metadata.gz: 98ce3944ca66867d78ec838a11becca97a761833b289edbd163a2bdd49ce0ed8
+  data.tar.gz: d2f1a5e45c3cce9a1630991e4cc11409169ff5cf2571c828d4d0d188e0825927
 SHA512:
-  metadata.gz: 1f72c9331c18ab8c63508bc03047cf700f8038b9ee592b665d2569e145a4a5d07c57b7364c89e95c614c0e46f9f0424f5aa63b6d200af69b9f826ce94fe5001e
-  data.tar.gz: a15b116455d643d1963818d0f68616957ec9396c173f65e213b2632b16b8d9a44b4af9c9249ffe5a5d9641a0c8e07a308146c04438d2d440f16eaa0976fe65cb
+  metadata.gz: f61c7e1d1ac2bf99dab81accb1f183388d3464df020ff48f45da2e6bba55255a2a79f0a419219a805f68d02901c7ba99a7dbdde044d7c6f5053fe57b125fc5de
+  data.tar.gz: 7bffcdf95f9b4df56c77b336e00b3cc5f1b1900294f97879564f51f0901d9618b7e7e3f15186b5759bf160a3e10eda2fa8e65e12f30e4e62394e752af498f38a

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

@@ -991,6 +991,7 @@
 
 	<!-- Characters -->
 	<xsl:variable name="linebreak">&#8232;</xsl:variable>
+	<xsl:variable name="em_space"> </xsl:variable>
 	<xsl:variable name="tab_zh">　</xsl:variable>
 	<xsl:variable name="non_breaking_hyphen">‑</xsl:variable>
 	<xsl:variable name="thin_space"> </xsl:variable>
@@ -4352,7 +4353,15 @@
 	<!-- END requirement, recommendation, permission table -->
 	<!-- ========== -->
 
+	<xsl:attribute-set name="terms-style">
+		<xsl:attribute name="role">Sect</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_terms-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="term-style">
+		<xsl:attribute name="role">Sect</xsl:attribute>
 	</xsl:attribute-set> <!-- term-style -->
 
 	<xsl:template name="refine_term-style">
@@ -4448,7 +4457,10 @@
 	<xsl:template match="mn:terms">
 		<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block id="{@id}">
+		<fo:block id="{@id}" xsl:use-attribute-sets="terms-style">
+			<xsl:call-template name="refine_terms-style"/>
+			<xsl:call-template name="addTagElementT"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -4457,6 +4469,7 @@
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
 			<xsl:call-template name="refine_term-style"/>
+			<xsl:call-template name="addTagElementT"/>
 
 			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
 		</fo:block>
@@ -4692,7 +4705,9 @@
 
 	<xsl:template match="mn:definitions">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block id="{@id}">
+		<fo:block id="{@id}" role="Sect">
+			<xsl:call-template name="addTagElementT"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -4769,6 +4784,7 @@
 	<xsl:template match="mn:termexample/mn:p">
 		<xsl:variable name="element">inline
 
+			<xsl:value-of select="$example_display_in"/>
 		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="contains($element, 'block')">
@@ -5144,6 +5160,9 @@
 	</xsl:attribute-set><!-- table-note-style -->
 
 	<xsl:template name="refine_table-note-style">
+		<xsl:if test="self::mn:note">
+			<xsl:attribute name="role">Note</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_table-note-style -->
 
 	<xsl:attribute-set name="table-fn-style">
@@ -6445,7 +6464,7 @@
 	</xsl:template> <!-- table/note -->
 
 	<xsl:template match="mn:table/*[self::mn:note or self::mn:example]/mn:p |  mn:table/mn:tfoot//*[self::mn:note or self::mn:example]/mn:p" priority="2">
-		<xsl:apply-templates/>
+		<fo:inline role="P"><xsl:apply-templates/></fo:inline>
 	</xsl:template>
 
 	<!-- ============================ -->
@@ -7374,6 +7393,7 @@
 	<!-- ========================== -->
 
 	<xsl:attribute-set name="dl-block-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_dl-block-style">
@@ -7383,18 +7403,21 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="dt-row-style">
+		<xsl:attribute name="role">LI</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_dt-row-style">
 	</xsl:template>
 
 	<xsl:attribute-set name="dt-cell-style">
+		<xsl:attribute name="role">Lbl</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_dt-cell-style">
 	</xsl:template> <!-- refine_dt-cell-style -->
 
 	<xsl:attribute-set name="dt-block-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 		<xsl:attribute name="margin-top">0pt</xsl:attribute>
 		<xsl:attribute name="margin-left">7mm</xsl:attribute>
 	</xsl:attribute-set>
@@ -7412,6 +7435,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="dd-cell-style">
+		<xsl:attribute name="role">LBody</xsl:attribute>
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
 	</xsl:attribute-set>
 
@@ -7447,7 +7471,7 @@
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
-		<fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP">
+		<fo:block-container xsl:use-attribute-sets="dl-block-style">
 
 			<xsl:call-template name="refine_dl-block-style"/>
 
@@ -7567,7 +7591,7 @@
 								<fo:block id="{concat('table_if_start_',@id)}" keep-with-next="always" font-size="1pt">Start table '<xsl:value-of select="@id"/>'.</fo:block>
 							</xsl:if>
 
-							<fo:table width="95%" table-layout="fixed">
+							<fo:table width="95%" table-layout="fixed" role="L">
 
 								<xsl:if test="$isGenerateTableIF = 'true'">
 									<xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
@@ -7635,7 +7659,7 @@
 											<xsl:with-param name="table_or_dl">dl</xsl:with-param>
 										</xsl:apply-templates>
 
-									</xsl:when>
+									</xsl:when> <!-- $isGenerateTableIF = 'true' -->
 									<xsl:otherwise>
 
 										<xsl:variable name="simple-table">
@@ -7690,7 +7714,7 @@
 											<xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
 										</xsl:call-template>
 
-										<fo:table-body>
+										<fo:table-body role="SKIP">
 
 											<!-- DEBUG -->
 											<xsl:if test="$table_if_debug = 'true'">
@@ -7899,8 +7923,8 @@
 			<td number-columns-spanned="2">NOTE <xsl:apply-templates /> </td>
 		</tr> 
 		-->
-		<fo:table-row>
-			<fo:table-cell number-columns-spanned="2">
+		<fo:table-row role="SKIP">
+			<fo:table-cell number-columns-spanned="2" role="SKIP">
 				<fo:block role="SKIP">
 					<xsl:call-template name="note"/>
 				</fo:block>
@@ -7964,7 +7988,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">
+			<fo:block xsl:use-attribute-sets="dt-block-style">
 
 				<xsl:choose>
 					<xsl:when test="$isGenerateTableIF = 'true'">
@@ -8053,7 +8077,7 @@
 		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$is_inline_element_after_where = 'true'">
-				<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
+				<fo:inline role="SKIP"><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:apply-templates select="."/>
@@ -8341,6 +8365,7 @@
 	<!-- ====== -->
 
 	<xsl:attribute-set name="note-style">
+		<xsl:attribute name="role">Note</xsl:attribute>
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- note-style -->
@@ -8352,6 +8377,7 @@
 	<xsl:variable name="note-body-indent-table">5mm</xsl:variable>
 
 	<xsl:attribute-set name="note-name-style">
+		<xsl:attribute name="role">Lbl</xsl:attribute>
 		<xsl:attribute name="padding-right">6mm</xsl:attribute>
 	</xsl:attribute-set> <!-- note-name-style -->
 
@@ -8363,9 +8389,13 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_table-note-name-style">
+		<xsl:if test="self::mn:note">
+			<xsl:attribute name="role">Lbl</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_table-note-name-style -->
 
 	<xsl:attribute-set name="note-p-style">
+		<xsl:attribute name="role">P</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- note-p-style -->
 
@@ -8373,6 +8403,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="termnote-style">
+		<xsl:attribute name="role">Note</xsl:attribute>
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- termnote-style -->
@@ -8381,12 +8412,14 @@
 	</xsl:template> <!-- refine_termnote-style -->
 
 	<xsl:attribute-set name="termnote-name-style">
+		<xsl:attribute name="role">Lbl</xsl:attribute>
 	</xsl:attribute-set> <!-- termnote-name-style -->
 
 	<xsl:template name="refine_termnote-name-style">
 	</xsl:template>
 
 	<xsl:attribute-set name="termnote-p-style">
+		<xsl:attribute name="role">P</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_termnote-p-style">
@@ -8401,7 +8434,7 @@
 
 		<xsl:call-template name="setNamedDestination"/>
 
-		<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
+		<fo:block-container xsl:use-attribute-sets="note-style">
 			<xsl:if test="not(parent::mn:references)">
 				<xsl:copy-of select="@id"/>
 			</xsl:if>
@@ -8411,11 +8444,11 @@
 			<xsl:call-template name="refine_note-style"/>
 
 			<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
-						<fo:block>
+						<fo:block role="SKIP">
 
 							<xsl:call-template name="refine_note_block_style"/>
 
-							<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
+							<fo:inline xsl:use-attribute-sets="note-name-style">
 
 								<xsl:apply-templates select="mn:fmt-name/mn:tab" mode="tab"/>
 
@@ -8438,7 +8471,15 @@
 
 							</fo:inline>
 
-							<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
+							<xsl:choose>
+								<xsl:when test="parent::mn:formattedref and ancestor::mn:bibitem">
+									<fo:inline role="P"><xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/></fo:inline>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
+								</xsl:otherwise>
+							</xsl:choose>
+
 						</fo:block>
 			</fo:block-container>
 		</fo:block-container>
@@ -8451,13 +8492,13 @@
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
-				<fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
+				<fo:inline xsl:use-attribute-sets="note-p-style">
 					<xsl:call-template name="refine_note-p-style"/>
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
+				<fo:block xsl:use-attribute-sets="note-p-style">
 					<xsl:call-template name="refine_note-p-style"/>
 					<xsl:apply-templates/>
 				</fo:block>
@@ -9103,7 +9144,8 @@
 
 					<!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
 
-					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
+					<fo:external-graphic src="{$src}" vertical-align="middle">
+						<xsl:call-template name="addAltText"/>
 
 						<xsl:if test="parent::mn:logo"> <!-- publisher's logo -->
 							<xsl:attribute name="scaling">uniform</xsl:attribute>
@@ -9167,11 +9209,12 @@
 					<xsl:choose>
 						<xsl:when test="$isDeleted = 'true'">
 							<!-- enclose in svg -->
-							<fo:instream-foreign-object fox:alt-text="Image {@alt}">
+							<fo:instream-foreign-object>
 								<xsl:attribute name="width">100%</xsl:attribute>
 								<xsl:attribute name="content-height">100%</xsl:attribute>
 								<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
 								<xsl:attribute name="scaling">uniform</xsl:attribute>
+								<xsl:call-template name="addAltText"/>
 
 								<xsl:apply-templates select="." mode="cross_image"/>
 
@@ -9187,7 +9230,8 @@
 							<xsl:value-of select="concat('scale=', $scale,', indent=', $indent)"/>
 							</fo:block> -->
 
-							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}">
+							<fo:external-graphic src="{$src}">
+								<xsl:call-template name="addAltText"/>
 
 								<xsl:choose>
 									<!-- default -->
@@ -9247,6 +9291,25 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template name="addAltText">
+		<xsl:param name="name">Image</xsl:param>
+		<xsl:variable name="alt-text">
+			<xsl:choose>
+				<xsl:when test="self::mn:image and normalize-space(@alt) != ''">
+					<xsl:value-of select="@alt"/>
+				</xsl:when>
+				<xsl:when test="normalize-space(../@alt) != ''">
+					<xsl:value-of select="../@alt"/>
+				</xsl:when>
+				<xsl:when test="normalize-space(../mn:fmt-name) != ''">
+					<xsl:value-of select="../mn:fmt-name"/>
+				</xsl:when>
+				<xsl:otherwise><xsl:value-of select="$name"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:attribute name="fox:alt-text"><xsl:value-of select="$alt-text"/></xsl:attribute>
+	</xsl:template>
+
 	<xsl:template name="setImageWidth">
 		<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
 			<xsl:value-of select="@width"/>
@@ -9435,6 +9498,9 @@
 
 		<xsl:variable name="alt-text">
 			<xsl:choose>
+				<xsl:when test="normalize-space(../@alt) != ''">
+					<xsl:value-of select="../@alt"/>
+				</xsl:when>
 				<xsl:when test="normalize-space(../mn:fmt-name) != ''">
 					<xsl:value-of select="../mn:fmt-name"/>
 				</xsl:when>
@@ -11027,6 +11093,7 @@
 
 	<!-- admonition -->
 	<xsl:attribute-set name="admonition-style">
+		<xsl:attribute name="role">Note</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-style -->
@@ -11035,6 +11102,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="admonition-container-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-container-style -->
@@ -11043,6 +11111,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="admonition-name-style">
+		<xsl:attribute name="role">Lbl</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-name-style -->
 
@@ -11904,9 +11973,9 @@
 	<xsl:template name="fo_inline_bookmark">
 		<xsl:param name="bookmark_id"/>
 		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
-		<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and      following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
+		<fo:inline id="{@id}" font-size="1pt" role="SKIP"><xsl:if test="preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and      following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><fo:wrapper role="artifact"><xsl:value-of select="$hair_space"/></fo:wrapper></fo:inline>
 		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
-		<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
+		<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:inline></xsl:if>
 	</xsl:template>
 	<!-- =================== -->
 	<!-- End of Index processing -->
@@ -12074,6 +12143,13 @@
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
 
+	<xsl:attribute-set name="toc-container-style">
+		<xsl:attribute name="role">Sect</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-container-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-style">
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="line-height">115%</xsl:attribute>
@@ -13473,6 +13549,13 @@
 	<!-- ===================================== -->
 	<!-- ===================================== -->
 
+	<xsl:attribute-set name="annex-style">
+		<xsl:attribute name="role">Sect</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_annex-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="annex-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
@@ -13480,6 +13563,40 @@
 	<xsl:template name="refine_annex-title-style">
 	</xsl:template>
 
+	<xsl:template match="mn:annex[normalize-space() != '']">
+		<xsl:choose>
+			<xsl:when test="@continue = 'true'"> <!-- it's using for figure/table on top level for block span -->
+				<fo:block role="SKIP">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise>
+
+				<fo:block break-after="page"/>
+				<xsl:call-template name="setNamedDestination"/>
+
+				<fo:block xsl:use-attribute-sets="annex-style">
+
+					<xsl:call-template name="setId"/>
+
+					<!-- <xsl:if test="$namespace = 'iso'"> -->
+					<xsl:call-template name="addTagElementT"/>
+					<!-- </xsl:if> -->
+
+					<xsl:call-template name="setBlockSpanAll"/>
+
+					<xsl:call-template name="refine_annex-style"/>
+
+					<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
+
+					<fo:block role="SKIP">
+						<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
+					</fo:block>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:attribute-set name="p-zzSTDTitle1-style">
 	</xsl:attribute-set>
 
@@ -13936,22 +14053,14 @@
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="clause-style">
-
+		<xsl:attribute name="role">Sect</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_clause-style">
-		<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
-		<!-- <xsl:if test="$namespace = 'rsd'">
-			<xsl:variable name="level">
-				<xsl:call-template name="getLevel">
-					<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
-				</xsl:call-template>
-			</xsl:variable>
-			<xsl:if test="$level &gt;= 4">
-				<xsl:attribute name="margin-left">13mm</xsl:attribute>
-			</xsl:if>
-		</xsl:if> -->
-	</xsl:template>
+		<xsl:if test="parent::mn:copyright-statement">
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_clause-style -->
 
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
@@ -13961,6 +14070,10 @@
 
 			<xsl:call-template name="sections_element_style"/>
 
+			<!-- <xsl:if test="$namespace = 'rsd'"> -->
+			<xsl:call-template name="addTagElementT"/>
+			<!-- </xsl:if> -->
+
 			<xsl:call-template name="addReviewHelper"/>
 
 			<xsl:apply-templates/>
@@ -14027,16 +14140,15 @@
 
 	<xsl:template match="mn:clause[normalize-space() != '' or mn:figure or @id]" name="template_clause"> <!-- if clause isn't empty -->
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
-			<xsl:if test="parent::mn:copyright-statement">
-				<xsl:attribute name="role">SKIP</xsl:attribute>
-			</xsl:if>
+		<fo:block role="Sect">
 
 			<xsl:call-template name="setId"/>
 
+			<xsl:call-template name="addTagElementT"/>
+
 			<xsl:call-template name="setBlockSpanAll"/>
 
-			<xsl:call-template name="refine_clause_style"/>
+			<xsl:call-template name="refine_clause-style"/>
 
 			<xsl:call-template name="addReviewHelper"/>
 
@@ -14044,41 +14156,6 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template name="refine_clause_style">
-	</xsl:template> <!-- refine_clause_style -->
-
-	<xsl:template match="mn:annex[normalize-space() != '']">
-		<xsl:choose>
-			<xsl:when test="@continue = 'true'"> <!-- it's using for figure/table on top level for block span -->
-				<fo:block>
-					<xsl:apply-templates/>
-				</fo:block>
-			</xsl:when>
-			<xsl:otherwise>
-
-				<fo:block break-after="page"/>
-				<xsl:call-template name="setNamedDestination"/>
-
-				<fo:block id="{@id}">
-
-					<xsl:call-template name="setBlockSpanAll"/>
-
-					<xsl:call-template name="refine_annex_style"/>
-
-				</fo:block>
-
-				<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
-
-				<fo:block>
-					<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
-				</fo:block>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<xsl:template name="refine_annex_style">
-	</xsl:template>
-
 	<xsl:template match="mn:name/text() | mn:fmt-name/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
@@ -14194,6 +14271,13 @@
 	<xsl:template name="addTagElementT">
 		<xsl:variable name="title_">
 			<xsl:apply-templates select="mn:fmt-title"/>
+			<xsl:if test="not(mn:fmt-title) and self::mn:term">
+				<name>
+					<xsl:apply-templates select="mn:fmt-name"/>
+					<xsl:text> </xsl:text>
+					<xsl:apply-templates select="mn:fmt-preferred/node()[1]"/>
+				</name>
+			</xsl:if>
 		</xsl:variable>
 		<xsl:variable name="title__">
 			<xsl:for-each select="xalan:nodeset($title_)/*/node()">
@@ -14203,7 +14287,7 @@
 				</xsl:choose>
 			</xsl:for-each>
 		</xsl:variable>
-		<xsl:variable name="title" select="normalize-space($title__)"/>
+		<xsl:variable name="title" select="normalize-space(translate($title__, concat($em_space,' &#8232;'), '   '))"/>
 		<xsl:if test="$title != ''">
 			<xsl:attribute name="fox:title">
 				<xsl:if test="ancestor::mn:sections">

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

@@ -130,6 +130,10 @@ dl dd {
   grid-column-start: 2;
 }
 
+dl:has(dt .stem) {
+  grid-template-columns: fit-content(8em) auto;
+}
+
 b, strong {
   font-weight: bold;
 }

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

@@ -130,6 +130,10 @@ dl dd {
   grid-column-start: 2;
 }
 
+dl:has(dt .stem) {
+  grid-template-columns: fit-content(8em) auto;
+}
+
 b, strong {
   font-weight: bold;
 }

data/lib/metanorma/cc/basicdoc.rng

@@ -1527,12 +1527,16 @@ to indicate that the index range covers a range of locations between the current
       <ref name="index-primary">
         <a:documentation>Primary index term to be recorded at the current location</a:documentation>
       </ref>
-      <ref name="index-secondary">
-        <a:documentation>Secondary index term to be recorded at the current location</a:documentation>
-      </ref>
-      <ref name="index-tertiary">
-        <a:documentation>Tertiary index term to be recorded at the current </a:documentation>
-      </ref>
+      <optional>
+        <ref name="index-secondary">
+          <a:documentation>Secondary index term to be recorded at the current location</a:documentation>
+        </ref>
+      </optional>
+      <optional>
+        <ref name="index-tertiary">
+          <a:documentation>Tertiary index term to be recorded at the current </a:documentation>
+        </ref>
+      </optional>
     </element>
   </define>
   <define name="index-xref">
@@ -1547,12 +1551,16 @@ The text in the inline element is the primary index term to be be cross-referenc
       <ref name="index-primary">
         <a:documentation>The primary index term to be cross-referenced</a:documentation>
       </ref>
-      <ref name="index-secondary">
-        <a:documentation>The secondary index term to be cross-referenced</a:documentation>
-      </ref>
-      <ref name="index-tertiary">
-        <a:documentation>The tertiary index term to be cross-referenced</a:documentation>
-      </ref>
+      <optional>
+        <ref name="index-secondary">
+          <a:documentation>The secondary index term to be cross-referenced</a:documentation>
+        </ref>
+      </optional>
+      <optional>
+        <ref name="index-tertiary">
+          <a:documentation>The tertiary index term to be cross-referenced</a:documentation>
+        </ref>
+      </optional>
       <element name="target">
         <a:documentation>The index term to be cross-referenced to</a:documentation>
         <oneOrMore>
@@ -1933,7 +1941,8 @@ or as the string "auto"</a:documentation>
   <define name="mathml">
     <a:documentation>Encoding of MathML: the official W3C MathML 4 grammar (namespace
 http://www.w3.org/1998/Math/MathML), via the metanorma wrapper in
-grammars/mathml/. See grammars/mathml/README.adoc and basicdoc-models#35.</a:documentation>
+grammars/mathml/. See grammars/mathml/README.adoc, basicdoc-models#35,
+and the MathML 3 -&gt; 4 migration: basicdoc-models#39 / metanorma#585.</a:documentation>
     <externalRef href="metanorma-mathml.rng"/>
   </define>
   <define name="StemAttributes">

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.1.6 -->
+<!-- VERSION v2.2.0 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cc
-    VERSION = "2.8.10".freeze
+    VERSION = "2.8.11".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.8.10
+  version: 2.8.11
 platform: ruby
 authors:
 - Ribose Inc.