metanorma-cc 2.8.10 → 2.9.0

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>
@@ -1771,7 +1772,7 @@
 		</xsl:element>
 	</xsl:template> -->
 
-	<xsl:template match="mn: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:template match="mn:span[                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim' or                @class = 'fmt-clause-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
 
@@ -2803,6 +2804,9 @@
 
 	<xsl:template name="refine_sourcecode-style">
 		<xsl:call-template name="setKeepAttributes"/>
+		<xsl:if test="ancestor::mn:sourcecode and parent::mn:td">
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_sourcecode-style -->
 
 	<xsl:attribute-set name="sourcecode-number-style">
@@ -3129,30 +3133,30 @@
 	</xsl:template>
 
 	<!-- outer table with line numbers for sourcecode -->
-	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] |  -->
-		<fo:block>
-			<fo:table width="100%" table-layout="fixed">
+	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] |  -->
+		<fo:block role="SKIP">
+			<fo:table width="100%" table-layout="fixed" role="SKIP">
 				<xsl:copy-of select="@id"/>
 					<fo:table-column column-width="8%"/>
 					<fo:table-column column-width="92%"/>
-					<fo:table-body>
+					<fo:table-body role="SKIP">
 						<xsl:apply-templates/>
 					</fo:table-body>
 			</fo:table>
 		</fo:block>
 	</xsl:template>
-	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table/mn:tbody" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody'] |  -->
+	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table/mn:tbody" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody'] |  -->
 		<xsl:apply-templates/>
 	</xsl:template>
-	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr'] |  -->
-		<fo:table-row>
+	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr'] |  -->
+		<fo:table-row role="SKIP">
 			<xsl:apply-templates/>
 		</fo:table-row>
 	</xsl:template>
 	<!-- first td with line numbers -->
-	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][not(preceding-sibling::*)]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
-		<fo:table-cell>
-			<fo:block>
+	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][not(preceding-sibling::*)]" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
+		<fo:table-cell role="SKIP">
+			<fo:block role="SKIP">
 
 				<!-- set attibutes for line numbers - same as sourcecode -->
 				<xsl:variable name="sourcecode_attributes">
@@ -3160,7 +3164,7 @@
 						<xsl:call-template name="get_sourcecode_attributes"/>
 					</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:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*[not(starts-with(local-name(), 'margin-') or starts-with(local-name(), 'space-') or starts-with(local-name(), 'role'))]">
 					<xsl:attribute name="{name()}">
 						<xsl:value-of select="."/>
 					</xsl:attribute>
@@ -3172,8 +3176,8 @@
 	</xsl:template>
 
 	<!-- second td with sourcecode -->
-	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
-		<fo:table-cell>
+	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][preceding-sibling::*]" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
+		<fo:table-cell role="SKIP">
 			<fo:block role="SKIP">
 				<xsl:apply-templates/>
 			</fo:block>
@@ -3742,7 +3746,7 @@
 		<xsl:param name="value"/>
 		<xsl:variable name="add_width" select="string-length($value) * 20"/>
 		<xsl:variable name="maxwidth" select="60 + $add_width"/>
-			<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-10%"><!-- alignment-baseline="middle" -->
+			<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-10%" fox:placement="Inline"><!-- alignment-baseline="middle" -->
 				<xsl:attribute name="height">3.5mm</xsl:attribute> <!-- 5mm -->
 				<xsl:attribute name="content-width">100%</xsl:attribute>
 				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -3971,11 +3975,12 @@
 			<xsl:choose>
 
 				<xsl:when test="ancestor::mn:sourcecode[@linenums = 'true'] and ancestor::*[local-name() = 'td'][1][not(preceding-sibling::*)]"> <!-- pre in the first td in the table with @linenums = 'true' -->
+					<xsl:attribute name="role">SKIP</xsl:attribute>
 					<xsl:if test="ancestor::mn:tr[1]/following-sibling::mn:tr"> <!-- is current tr isn't last -->
 						<xsl:attribute name="margin-top">0pt</xsl:attribute>
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 					</xsl:if>
-					<fo:instream-foreign-object fox:alt-text="{.}" content-width="95%">
+					<fo:instream-foreign-object fox:alt-text="{.}" content-width="95%" fox:placement="Inline" role="artifact">
 						<math xmlns="http://www.w3.org/1998/Math/MathML">
 							<mtext><xsl:value-of select="."/></mtext>
 						</math>
@@ -4352,7 +4357,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 +4461,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 +4473,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 +4709,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 +4788,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 +5164,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">
@@ -5496,19 +5519,22 @@
 		<xsl:if test="normalize-space() != ''">
 
 			<fo:block xsl:use-attribute-sets="table-name-style">
-
 				<xsl:call-template name="refine_table-name-style">
 					<xsl:with-param name="continued" select="$continued"/>
 				</xsl:call-template>
 
-				<xsl:choose>
-					<xsl:when test="$continued = 'true'">
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:apply-templates/>
-					</xsl:otherwise>
-				</xsl:choose>
+				<!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
+				<fo:block role="P">
+
+					<xsl:choose>
+						<xsl:when test="$continued = 'true'">
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates/>
+						</xsl:otherwise>
+					</xsl:choose>
 
+				</fo:block>
 			</fo:block>
 
 			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
@@ -5992,7 +6018,7 @@
 
 			<xsl:variable name="tableWithNotesAndFootnotes">
 
-				<fo:table keep-with-previous="always" role="SKIP">
+				<fo:table keep-with-previous="always" role="TFoot">
 					<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
 						<xsl:variable name="name" select="local-name()"/>
 						<xsl:choose>
@@ -6030,14 +6056,14 @@
 					</xsl:choose>
 
 					<fo:table-body role="SKIP">
-						<fo:table-row role="SKIP">
+						<fo:table-row>
 							<xsl:for-each select="ancestor::mn:table[1]">
 								<xsl:call-template name="setTableStyles">
 									<xsl:with-param name="scope">ancestor_table</xsl:with-param>
 								</xsl:call-template>
 							</xsl:for-each>
 
-							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}" role="SKIP">
+							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
 
 								<xsl:call-template name="refine_table-footer-cell-style"/>
 
@@ -6445,7 +6471,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 +7400,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 +7410,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 +7442,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 +7478,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 +7598,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 +7666,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 +7721,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 +7930,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 +7995,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 +8084,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 +8372,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 -->
@@ -8348,10 +8380,18 @@
 	<xsl:template name="refine_note-style">
 	</xsl:template> <!-- refine_note-style -->
 
+	<xsl:attribute-set name="note-block-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+	</xsl:attribute-set> <!-- note-block-style -->
+
+	<xsl:template name="refine_note-block-style">
+	</xsl:template> <!-- refine_note-block-style -->
+
 	<xsl:variable name="note-body-indent">10mm</xsl:variable>
 	<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 +8403,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 +8417,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 +8426,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 +8448,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 +8458,11 @@
 			<xsl:call-template name="refine_note-style"/>
 
 			<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
-						<fo:block>
+						<fo:block xsl:use-attribute-sets="note-block-style">
 
-							<xsl:call-template name="refine_note_block_style"/>
+							<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,26 +8485,31 @@
 
 							</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>
 	</xsl:template>
 
-	<xsl:template name="refine_note_block_style">
-	</xsl:template> <!-- refine_note_block_style -->
-
 	<xsl:template match="mn:note/mn:p">
 		<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>
@@ -8567,9 +8619,9 @@
 	<!-- ====== -->
 
 	<xsl:attribute-set name="quote-container-style">
+		<xsl:attribute name="role">BlockQuote</xsl:attribute>
 		<xsl:attribute name="margin-left">12mm</xsl:attribute>
 		<xsl:attribute name="margin-right">12mm</xsl:attribute>
-		<xsl:attribute name="role">SKIP</xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set>
 
@@ -8592,6 +8644,7 @@
 	</xsl:template> <!-- refine_quote-style -->
 
 	<xsl:attribute-set name="quote-source-style">
+		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="text-align">right</xsl:attribute>
 		<xsl:attribute name="margin-right">-12mm</xsl:attribute>
 	</xsl:attribute-set> <!-- quote-source-style -->
@@ -8624,7 +8677,7 @@
 					<xsl:call-template name="refine_quote-style"/>
 
 					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
-						<fo:block role="BlockQuote">
+						<fo:block role="SKIP"> <!-- BlockQuote -->
 							<xsl:apply-templates select="./node()[not(self::mn:author) and         not(self::mn:fmt-source) and         not(self::mn:attribution)]"/> <!-- process all nested nodes, except author and source -->
 						</fo:block>
 					</fo:block-container>
@@ -8633,11 +8686,15 @@
 					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 						<fo:block xsl:use-attribute-sets="quote-source-style">
 							<xsl:call-template name="refine_quote-source-style"/>
-							<!-- — ISO, ISO 7301:2011, Clause 1 -->
-							<xsl:apply-templates select="mn:author"/>
-							<xsl:apply-templates select="mn:fmt-source"/>
-							<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
-							<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
+
+							<!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
+							<fo:block role="P">
+								<!-- — ISO, ISO 7301:2011, Clause 1 -->
+								<xsl:apply-templates select="mn:author"/>
+								<xsl:apply-templates select="mn:fmt-source"/>
+								<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
+								<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
+							</fo:block>
 						</fo:block>
 					</fo:block-container>
 				</xsl:if>
@@ -9103,7 +9160,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" fox:placement="Inline">
+						<xsl:call-template name="addAltText"/>
 
 						<xsl:if test="parent::mn:logo"> <!-- publisher's logo -->
 							<xsl:attribute name="scaling">uniform</xsl:attribute>
@@ -9167,11 +9225,12 @@
 					<xsl:choose>
 						<xsl:when test="$isDeleted = 'true'">
 							<!-- enclose in svg -->
-							<fo:instream-foreign-object fox:alt-text="Image {@alt}">
+							<fo:instream-foreign-object fox:placement="Block">
 								<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 +9246,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}" fox:placement="Block">
+								<xsl:call-template name="addAltText"/>
 
 								<xsl:choose>
 									<!-- default -->
@@ -9247,6 +9307,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 +9514,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>
@@ -9503,7 +9585,7 @@
 											</xsl:if>
 											<fo:block text-depth="0" line-height="0" font-size="0">
 
-												<fo:instream-foreign-object fox:alt-text="{$alt-text}">
+												<fo:instream-foreign-object fox:alt-text="{$alt-text}" fox:placement="Block">
 													<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>
@@ -9552,7 +9634,7 @@
 					<xsl:copy>
 						<xsl:copy-of select="@*"/>
 					<!-- <fo:block xsl:use-attribute-sets="image-style"> -->
-						<fo:instream-foreign-object fox:alt-text="{$alt-text}">
+						<fo:instream-foreign-object fox:alt-text="{$alt-text}" fox:placement="Block">
 
 							<xsl:choose>
 								<xsl:when test="$image_class = 'corrigenda-tag'">
@@ -9617,6 +9699,10 @@
 								<xsl:attribute name="content-height"><xsl:value-of select="round($scale_x * $scale_y * 100)"/>%</xsl:attribute>
 							</xsl:if>
 
+							<xsl:if test="self::fo:inline">
+								<xsl:attribute name="fox:placement">Inline</xsl:attribute>
+							</xsl:if>
+
 							<xsl:copy-of select="$svg_content"/>
 
 							<!-- <debug>
@@ -9892,10 +9978,12 @@
 	<xsl:template match="mn:figure/mn:fmt-name |         mn:image/mn:fmt-name">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="figure-name-style">
-
 				<xsl:call-template name="refine_figure-name-style"/>
 
-				<xsl:apply-templates/>
+				<!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
+				<fo:block role="P">
+					<xsl:apply-templates/>
+				</fo:block>
 			</fo:block>
 		</xsl:if>
 	</xsl:template>
@@ -9917,6 +10005,7 @@
 
 	<!-- Formula's styles -->
 	<xsl:attribute-set name="formula-style">
+		<xsl:attribute name="role">P</xsl:attribute>
 		<xsl:attribute name="margin-top">6pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- formula-style -->
@@ -9925,6 +10014,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="formula-stem-block-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
 		<xsl:attribute name="text-align">left</xsl:attribute>
 		<xsl:attribute name="margin-left">5mm</xsl:attribute>
@@ -9934,6 +10024,7 @@
 	</xsl:template> <!-- refine_formula-stem-block-style -->
 
 	<xsl:attribute-set name="formula-stem-number-style">
+		<xsl:attribute name="role">Span</xsl:attribute>
 		<xsl:attribute name="text-align">right</xsl:attribute>
 	</xsl:attribute-set> <!-- formula-stem-number-style -->
 	<!-- End Formula's styles -->
@@ -9942,12 +10033,25 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="mathml-style">
+		<xsl:attribute name="role">Formula</xsl:attribute>
 		<xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_mathml-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="mathml-instream-foreign-object-style">
+		<xsl:attribute name="fox:alt-text">Math</xsl:attribute>
+		<xsl:attribute name="fox:actual-text">Math</xsl:attribute>
+		<xsl:attribute name="fox:placement">Inline</xsl:attribute>
+	</xsl:attribute-set> <!-- mathml-instream-foreign-object-style -->
+
+	<xsl:template name="refine_mathml-instream-foreign-object-style">
+		<xsl:if test="ancestor::mn:formula">
+			<xsl:attribute name="fox:placement">Block</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_mathml-instream-foreign-object-style -->
+
 	<!-- ====== -->
 	<!-- formula  -->
 	<!-- ====== -->
@@ -9963,7 +10067,7 @@
 			</xsl:if>
 			<fo:block-container margin-left="0mm" role="SKIP">
 				<xsl:call-template name="setNamedDestination"/>
-				<fo:block id="{@id}">
+				<fo:block id="{@id}" role="SKIP">
 					<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/> <!-- formula's number will be process in 'stem' template -->
 				</fo:block>
 			</fo:block-container>
@@ -9996,22 +10100,22 @@
 
 			<xsl:call-template name="refine_formula-style"/>
 
-			<fo:table table-layout="fixed" width="100%">
+			<fo:table table-layout="fixed" width="100%" role="SKIP">
 				<fo:table-column column-width="95%"/>
 				<fo:table-column column-width="5%"/>
-				<fo:table-body>
-					<fo:table-row>
-						<fo:table-cell display-align="center">
-							<fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
+				<fo:table-body role="SKIP">
+					<fo:table-row role="SKIP">
+						<fo:table-cell display-align="center" role="SKIP">
+							<fo:block xsl:use-attribute-sets="formula-stem-block-style">
 
 								<xsl:call-template name="refine_formula-stem-block-style"/>
 
 								<xsl:apply-templates/>
 							</fo:block>
 						</fo:table-cell>
-						<fo:table-cell display-align="center">
+						<fo:table-cell display-align="center" role="SKIP">
 
-							<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
+							<fo:block xsl:use-attribute-sets="formula-stem-number-style">
 
 								<xsl:for-each select="../mn:fmt-name">
 									<xsl:call-template name="setIDforNamedDestination"/>
@@ -10159,9 +10263,9 @@
 			<xsl:apply-templates select="." mode="mathml"/>
 		</xsl:variable>
 
-		<fo:instream-foreign-object fox:alt-text="Math" fox:actual-text="Math">
+		<fo:instream-foreign-object xsl:use-attribute-sets="mathml-instream-foreign-object-style">
 
-			<xsl:call-template name="refine_mathml_insteam_object_style"/>
+			<xsl:call-template name="refine_mathml-instream-foreign-object-style"/>
 
 			<xsl:if test="$isGenerateTableIF = 'false'">
 				<!-- put MathML in Actual Text -->
@@ -10185,9 +10289,6 @@
 		</fo:instream-foreign-object>
 	</xsl:template>
 
-	<xsl:template name="refine_mathml_insteam_object_style">
-	</xsl:template> <!-- refine_mathml_insteam_object_style -->
-
 	<xsl:template match="mathml:*" mode="mathml_actual_text">
 		<!-- <xsl:text>a+b</xsl:text> -->
 		<xsl:text>&lt;</xsl:text>
@@ -11027,6 +11128,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 +11137,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 +11146,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 -->
 
@@ -11300,8 +11404,10 @@
 
 	</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
 
+	<!-- commented 2026-08-06: from https://github.com/metanorma/metanorma-standoc/issues/1140:
+			Presentation XML will no longer contain notes following bibitem, those notes will have been moved in Presentation XML to inside bibitem, and then duplicated to inside formattedref. -->
 	<!-- bibitem's notes will be processing in 'processBibitemFollowingNotes' -->
-	<xsl:template match="mn:references/mn:note" priority="2"/> <!-- [not(@normative='true')] -->
+	<!-- <xsl:template match="mn:references/mn:note" priority="2"/>--> <!-- [not(@normative='true')] -->
 
 	<xsl:template name="insertListItem_Bibitem">
 		<xsl:choose>
@@ -11904,9 +12010,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 -->
@@ -12000,7 +12106,7 @@
 			<xsl:call-template name="set_id_metanorma_form_item">
 				<xsl:with-param name="form_item_type" select="$form_item_type"/>
 			</xsl:call-template>
-			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
+			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%" fox:placement="Inline">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
 				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -12027,7 +12133,7 @@
 			<xsl:call-template name="set_id_metanorma_form_item">
 				<xsl:with-param name="form_item_type" select="$form_item_type"/>
 			</xsl:call-template>
-			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
+			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%" fox:placement="Inline">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
 				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -12074,6 +12180,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>
@@ -12296,7 +12409,9 @@
 				</xsl:variable>
 				<mnx:example id="{@id}" alt-text="{normalize-space($example_name)}">
 					<xsl:element name="fmt-name" namespace="{$namespace_full}">
-						<xsl:value-of select="mn:fmt-xref-label[@container]"/>
+						<xsl:call-template name="capitalize"><!-- https://github.com/metanorma/metanorma-pdfa/issues/72 -->
+							<xsl:with-param name="str" select="mn:fmt-xref-label[@container]"/>
+						</xsl:call-template>
 						<xsl:if test="normalize-space($example_name) != ''">
 							<xsl:value-of select="mn:fmt-name/mn:span[@class = 'fmt-caption-delim']"/>
 							<xsl:copy-of select="$example_name"/>
@@ -13473,6 +13588,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 +13602,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 +14092,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 +14109,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/>
@@ -13998,7 +14150,8 @@
 	<xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
 		<fo:block break-after="page"/>
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
+			<xsl:call-template name="addTagElementT"/>
 			<xsl:call-template name="setId"/>
 			<xsl:call-template name="addReviewHelper"/>
 			<xsl:apply-templates/>
@@ -14027,16 +14180,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 +14196,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(.),' ',' ')"/>
@@ -14123,7 +14240,7 @@
 
 	<xsl:template match="mn:blacksquare" name="blacksquare">
 		<fo:inline padding-right="2.5mm" baseline-shift="5%">
-			<fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad">
+			<fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad" fox:placement="Inline">
 					<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" fill="black"/>
 					</svg>
@@ -14194,6 +14311,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 +14327,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">
@@ -15072,13 +15196,13 @@
 		<xsl:param name="bitmap_width" select="$pageWidth"/>
 		<xsl:choose>
 			<xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
-				<fo:instream-foreign-object fox:alt-text="Image Front">
+				<fo:instream-foreign-object fox:alt-text="Image Front" fox:placement="Block">
 					<xsl:attribute name="content-height"><xsl:value-of select="$svg_content_height"/>mm</xsl:attribute>
 					<xsl:call-template name="getSVG"/>
 				</fo:instream-foreign-object>
 			</xsl:when>
 			<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
-				<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
+				<fo:external-graphic src="{@src}" fox:alt-text="Image Front" fox:placement="Block"/>
 			</xsl:when>
 			<xsl:otherwise> <!-- bitmap image -->
 				<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
@@ -15088,7 +15212,7 @@
 							<xsl:with-param name="src" select="$coverimage_src"/>
 						</xsl:call-template>
 					</xsl:variable>
-					<fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
+					<fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front" fox:placement="Block"/>
 				</xsl:if>
 			</xsl:otherwise>
 		</xsl:choose>