metanorma-ogc 2.9.11 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33728dc4126d8356b1bf0c002821f3a55bb9898d9285c67666895a524c9e8409
-  data.tar.gz: 700e119692d754bebed198ce44cfa168369cefbf31ae2f31c419609cb9ed26e9
+  metadata.gz: 8d20eed6d34c5097a728d8bc2cb6626647a2acda2e634dc71db1689d6f0a0c7b
+  data.tar.gz: ed547a419ccb6f861506067f1eb37077448618359a923113bdf9c461e320d622
 SHA512:
-  metadata.gz: c5799dd3358c104db6602d5a35669edd242504074eec37c92767f12a5f852898fbd0160f2b98c0337890430ca28eeadd83875677cab4143a753097036771d271
-  data.tar.gz: '038704ee24505a7832eaa2d6707dc0c0d3018324ee438a8aebdab3282962522fa2c3e4d6e94eb2f37f55c393fc63ab23b1534be77d65a7e297eda37c578371af'
+  metadata.gz: eebdc442874c0d44b738d6184aa501824ffe081b1975abfdd73c10baa54ad793ce5d214f73c3270ebe2cadb2f00b7274de70930dfa39b8c90156787a0b5333a7
+  data.tar.gz: 0ed5ec31ae3d4157a1f890545aa8bb4ab6cf17e894ee0307200526eb4f001aaeea5aa623de71de339374c268139db076f774f4bf37582430f1af071615c1b52e

data/lib/isodoc/ogc/ogc.standard.xsl

@@ -471,7 +471,7 @@
 								<!-- crossing lines -->
 								<fo:block-container absolute-position="fixed" width="{$pageWidth}mm" height="{$pageHeight}mm" font-size="0">
 									<fo:block>
-										<fo:instream-foreign-object content-height="{$pageHeight}mm" content-width="{$pageWidth}mm" fox:alt-text="Crossing lines">
+										<fo:instream-foreign-object content-height="{$pageHeight}mm" content-width="{$pageWidth}mm" fox:alt-text="Crossing lines" fox:placement="Block">
 											<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2159 2794" width="{$pageWidth}mm" height="{$pageHeight}mm">
 												<line x1="230" y1="0" x2="2159" y2="490" stroke="{$color_design_light}"/>
 												<line x1="0" y1="395" x2="820" y2="0" stroke="{$color_design_light}"/>
@@ -528,7 +528,7 @@
 											<!-- crossing lines -->
 											<fo:block-container absolute-position="fixed" width="{$pageWidth}mm" height="{$pageHeight}mm" font-size="0">
 												<fo:block>
-													<fo:instream-foreign-object content-height="{$pageHeight}mm" content-width="{$pageWidth}mm" fox:alt-text="Crossing lines">
+													<fo:instream-foreign-object content-height="{$pageHeight}mm" content-width="{$pageWidth}mm" fox:alt-text="Crossing lines" fox:placement="Block">
 														<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2159 2794" width="{$pageWidth}mm" height="{$pageHeight}mm">
 															<line x1="0" y1="545" x2="2084" y2="0" stroke="{$color_design_light}"/>
 															<line x1="0" y1="1374" x2="355" y2="0" stroke="{$color_design_light}"/>
@@ -658,7 +658,7 @@
 						<!-- background image -->
 						<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0">
 							<fo:block>
-								<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Cover-Background))}" width="{$pageWidth}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
+								<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Cover-Background))}" width="{$pageWidth}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front" fox:placement="Block"/>
 							</fo:block>
 						</fo:block-container>
 
@@ -1861,7 +1861,7 @@
 		<xsl:for-each select="$logo/mn:image"><!-- set context -->
 			<xsl:choose>
 				<xsl:when test="@mimetype = 'image/svg+xml'">
-					<fo:instream-foreign-object content-width="39mm" fox:alt-text="Image Logo">
+					<fo:instream-foreign-object content-width="39mm" fox:alt-text="Image Logo" fox:placement="Block">
 						<xsl:call-template name="getSVG"/>
 					</fo:instream-foreign-object>
 				</xsl:when>
@@ -1871,7 +1871,7 @@
 							<xsl:with-param name="src" select="@src"/>
 						</xsl:call-template>
 					</xsl:variable>
-					<fo:external-graphic src="{$logo_url}" width="39mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo"/>
+					<fo:external-graphic src="{$logo_url}" width="39mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo" fox:placement="Block"/>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:for-each>
@@ -1886,7 +1886,7 @@
 			<xsl:choose>
 				<xsl:when test="@mimetype = 'image/svg+xml'">
 					<fo:block text-align="right" margin-right="-1mm" margin-top="-1mm" margin-bottom="6mm">
-						<fo:instream-foreign-object content-width="29mm" fox:alt-text="Image Logo">
+						<fo:instream-foreign-object content-width="29mm" fox:alt-text="Image Logo" fox:placement="Block">
 							<xsl:call-template name="getSVG"/>
 						</fo:instream-foreign-object>
 					</fo:block>
@@ -1898,7 +1898,7 @@
 						</xsl:call-template>
 					</xsl:variable>
 					<fo:block text-align="right" margin-right="-1mm" margin-top="-1mm" margin-bottom="1mm">
-						<fo:external-graphic src="{$logo_url}" width="29mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo"/>
+						<fo:external-graphic src="{$logo_url}" width="29mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo" fox:placement="Block"/>
 					</fo:block>
 				</xsl:otherwise>
 			</xsl:choose>
@@ -1947,7 +1947,7 @@
 
 		<!-- orange circle 14mm -->
 		<fo:block>
-			<fo:instream-foreign-object content-height="14mm" content-width="14mm" fox:alt-text="Circle">
+			<fo:instream-foreign-object content-height="14mm" content-width="14mm" fox:alt-text="Circle" fox:placement="Block">
 				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" viewBox="0 0 500 500">
 					<g id="UrTavla">
 						<circle style="fill:{$color_design};" cx="250" cy="250" r="250">
@@ -1968,7 +1968,7 @@
 				<xsl:variable name="color_background_page">
 					<xsl:call-template name="getVariable"><xsl:with-param name="variable">color_background_page</xsl:with-param></xsl:call-template>
 				</xsl:variable>
-				<fo:instream-foreign-object content-height="{$pageHeight}mm" fox:alt-text="Background color">
+				<fo:instream-foreign-object content-height="{$pageHeight}mm" fox:alt-text="Background color" fox:placement="Block">
 					<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="{$pageWidth}mm" height="{$pageHeight}mm">
 						<rect width="{$pageWidth}mm" height="{$pageHeight}mm" style="fill:{$color_background_page};stroke-width:0;fill-opacity:{$opacity}"/>
 					</svg>
@@ -1983,7 +1983,7 @@
 		</xsl:variable>
 		<fo:block-container absolute-position="fixed" width="{$pageWidth}mm" height="{$pageHeight}mm" font-size="0">
 			<fo:block>
-				<fo:instream-foreign-object content-height="{$pageHeight}mm" content-width="{$pageWidth}mm" fox:alt-text="Crossing lines">
+				<fo:instream-foreign-object content-height="{$pageHeight}mm" content-width="{$pageWidth}mm" fox:alt-text="Crossing lines" fox:placement="Block">
 					<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2159 2794" width="{$pageWidth}mm" height="{$pageHeight}mm">
 						<line x1="0" y1="300" x2="2159" y2="675" stroke="{$color_design}"/>
 						<line x1="1215" y1="0" x2="2159" y2="1380" stroke="{$color_design}"/>
@@ -3155,7 +3155,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>
 
@@ -4238,6 +4238,9 @@
 		<xsl:if test="parent::mn:example">
 			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 		</xsl:if>
+		<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">
@@ -4574,30 +4577,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">
@@ -4605,7 +4608,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>
@@ -4617,8 +4620,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>
@@ -5195,7 +5198,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>
@@ -5424,11 +5427,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>
@@ -7058,19 +7062,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'"> -->
@@ -7554,7 +7561,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>
@@ -7592,14 +7599,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"/>
 
@@ -9933,6 +9940,13 @@
 		</xsl:if>
 	</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>
 
@@ -10009,9 +10023,9 @@
 			<xsl:call-template name="refine_note-style"/>
 
 			<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
-						<fo:block role="SKIP">
+						<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">
 
@@ -10050,9 +10064,6 @@
 		</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>
@@ -10173,9 +10184,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 name="margin-left">13mm</xsl:attribute>
 	</xsl:attribute-set>
@@ -10199,6 +10210,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 name="margin-right">13mm</xsl:attribute>
@@ -10232,7 +10244,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>
@@ -10241,11 +10253,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>
@@ -10718,7 +10734,7 @@
 
 					<!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
 
-					<fo:external-graphic src="{$src}" 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 -->
@@ -10783,7 +10799,7 @@
 					<xsl:choose>
 						<xsl:when test="$isDeleted = 'true'">
 							<!-- enclose in svg -->
-							<fo:instream-foreign-object>
+							<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>
@@ -10804,7 +10820,7 @@
 							<xsl:value-of select="concat('scale=', $scale,', indent=', $indent)"/>
 							</fo:block> -->
 
-							<fo:external-graphic src="{$src}">
+							<fo:external-graphic src="{$src}" fox:placement="Block">
 								<xsl:call-template name="addAltText"/>
 
 								<xsl:choose>
@@ -11143,7 +11159,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>
@@ -11192,7 +11208,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'">
@@ -11257,6 +11273,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>
@@ -11532,10 +11552,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>
@@ -11557,6 +11579,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 -->
@@ -11565,6 +11588,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-set> <!-- formula-stem-block-style -->
@@ -11573,6 +11597,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 -->
@@ -11581,12 +11606,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  -->
 	<!-- ====== -->
@@ -11602,7 +11640,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>
@@ -11635,22 +11673,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"/>
@@ -11798,9 +11836,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 -->
@@ -11824,9 +11862,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>
@@ -12999,8 +13034,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>
@@ -13678,7 +13715,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>
@@ -13705,7 +13742,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>
@@ -13983,7 +14020,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"/>
@@ -15711,7 +15750,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/>
@@ -15800,7 +15840,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>
@@ -16756,13 +16796,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)"/>
@@ -16772,7 +16812,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>