metanorma-bipm 2.8.11 → 2.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8cace5f622ac07370af170dffc8f8805ba518f96656928c189f1f664e0696df
-  data.tar.gz: 8ec8533476e550db921c7980b6824e261ede18831b929b81d9a5572837958ef7
+  metadata.gz: ac11763bf2b9640057d0fa72fdf2be51fe8da9e19b280d651977602fda86850b
+  data.tar.gz: 7eecd3131b02dae5c762c25d186ef320be0d29e769400c7ca589614453fdf01b
 SHA512:
-  metadata.gz: e1f225138b83840c80db446bb0508e6e0363e8b4f2278ffc541b2d06c83026e28e5fe2f92dff5729bf72c7e439e488b4fa36f0f45ad7d49c097aea0c39a07844
-  data.tar.gz: 5da4df7467f48769b214f7284e36c1fb3322cfa93577bbfde6e0e94d52fffc58bb196dc37744264d5284985f0427157a828225809aa287ad13d927aee53e914b
+  metadata.gz: b8c387f804bfa77e21221ed581ea607fd58d654401a702f72d9fccbd63e8114964ac5471406ac2e57c9c7fe9733c0a6956d42ded29e7bf6da79b6b9f6361aa27
+  data.tar.gz: 88675ffeb679f623b4afeb2a068fee507fabb4618fe3da5ed8f139a2f35e70678c9af837de9bffff1d428c9e908f700542f90a786048c49a0a4d2393c11f99ff

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

@@ -4015,6 +4015,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>
@@ -7370,7 +7371,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">
@@ -7464,7 +7473,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>
@@ -7473,6 +7485,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>
@@ -7703,7 +7716,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>
@@ -7775,6 +7790,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')">
@@ -8191,6 +8207,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:if test="ancestor::mn:preface">
 			<xsl:attribute name="margin-top">18pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -9509,7 +9528,7 @@
 
 			</fo:inline>
 				<xsl:if test="ancestor::mn:preface">
-					<fo:block> </fo:block>
+					<fo:block role="SKIP"> </fo:block>
 				</xsl:if>
 
 			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
@@ -9517,7 +9536,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>
 
 	<!-- ============================ -->
@@ -10450,6 +10469,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">
@@ -10459,18 +10479,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-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set>
@@ -10488,6 +10511,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>
 
@@ -10523,7 +10547,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"/>
 
@@ -10645,7 +10669,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>
@@ -10713,7 +10737,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">
@@ -10768,7 +10792,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'">
@@ -10977,8 +11001,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>
@@ -11042,7 +11066,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'">
@@ -11131,7 +11155,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="."/>
@@ -11400,6 +11424,7 @@
 	<!-- ====== -->
 
 	<xsl:attribute-set name="note-style">
+		<xsl:attribute name="role">Note</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="text-align">justify</xsl:attribute>
 	</xsl:attribute-set> <!-- note-style -->
@@ -11415,6 +11440,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-set> <!-- note-name-style -->
 
 	<xsl:template name="refine_note-name-style">
@@ -11426,12 +11452,16 @@
 	</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:if test="ancestor::mn:preface">
 			<xsl:attribute name="text-decoration">underline</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="text-align">justify</xsl:attribute>
 	</xsl:attribute-set> <!-- note-p-style -->
 
@@ -11439,6 +11469,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="termnote-style">
+		<xsl:attribute name="role">Note</xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		<xsl:attribute name="text-align">justify</xsl:attribute>
 	</xsl:attribute-set> <!-- termnote-style -->
@@ -11447,6 +11478,7 @@
 	</xsl:template> <!-- refine_termnote-style -->
 
 	<xsl:attribute-set name="termnote-name-style">
+		<xsl:attribute name="role">Lbl</xsl:attribute>
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 	</xsl:attribute-set> <!-- termnote-name-style -->
 
@@ -11454,6 +11486,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="termnote-p-style">
+		<xsl:attribute name="role">P</xsl:attribute>
 		<xsl:attribute name="text-align">justify</xsl:attribute>
 	</xsl:attribute-set>
 
@@ -11469,7 +11502,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>
@@ -11479,11 +11512,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"/>
 
@@ -11506,7 +11539,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>
@@ -11525,13 +11566,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>
@@ -12190,7 +12231,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>
@@ -12254,11 +12296,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"/>
 
@@ -12274,7 +12317,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 -->
@@ -12334,6 +12378,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"/>
@@ -12522,6 +12585,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>
@@ -14151,6 +14217,7 @@
 
 	<!-- admonition -->
 	<xsl:attribute-set name="admonition-style">
+		<xsl:attribute name="role">Note</xsl:attribute>
 		<xsl:attribute name="border">0.25pt solid black</xsl:attribute>
 		<xsl:attribute name="margin-left">16mm</xsl:attribute>
 		<xsl:attribute name="margin-right">16mm</xsl:attribute>
@@ -14161,6 +14228,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 name="padding">2mm</xsl:attribute>
@@ -14171,6 +14239,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 name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -14201,7 +14270,7 @@
 			<xsl:call-template name="refine_admonition-style"/>
 
 			<xsl:call-template name="setBlockSpanAll"/>
-					<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
+					<fo:block-container xsl:use-attribute-sets="admonition-container-style">
 
 						<xsl:call-template name="refine_admonition-container-style"/>
 								<fo:block xsl:use-attribute-sets="admonition-name-style">
@@ -15018,9 +15087,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 -->
@@ -15188,6 +15257,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="line-height">135%</xsl:attribute>
 	</xsl:attribute-set>
@@ -16625,6 +16701,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 -->
@@ -16632,6 +16715,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>
 
@@ -17147,22 +17264,15 @@
 	</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:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:template> <!-- refine_clause-style -->
 
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
@@ -17172,6 +17282,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/>
@@ -17234,16 +17348,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"/>
 
@@ -17251,42 +17364,6 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template name="refine_clause_style">
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>
-	</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(.),' ',' ')"/>
@@ -17402,6 +17479,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()">
@@ -17411,7 +17495,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">