metanorma-iso 2.8.6 → 2.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddb53f2b57b43d15c8642f188c78935c617cb9d6171f29d52ee81b8cfb14b988
-  data.tar.gz: d170b0caf5967ebfa44259a9c76353d2ea9ebeef591e6c48fa82e4144c14b192
+  metadata.gz: 1a1decc1f961cb0dcf05ae91afaaf5af40ad2d9d1efc0d5a2ba735a4b99588fc
+  data.tar.gz: ea50bf0571dc8897676140515cb3525823f8000c49abe40b800c9735768136e1
 SHA512:
-  metadata.gz: 585acab1303c34a7ac8b3b081262f425f6d5dceec79378172be4b77f07db26dd7a78680fda017dc4fdac72792d222daa55c87ebd7ba2c9a560838b66350422d2
-  data.tar.gz: e1d4ba3749ae6de29bd312a2022594736f65afcf43364a48fe96810f09b019a3392eab054d6c19c862723434e07964470b66f3b3b37f739d8590a0bb780b6547
+  metadata.gz: 49415b45e7fc9272e220effbaaca8b115225a96602f8feaa377617072f698e3b2c55e45acdf5d898372601f3c35c3c4efe41b29728a42aa1255da2b854f3b633
+  data.tar.gz: 68b815821be72ede1dad90453dbf1943394b73aaef47df340ad08dc56b422801b45d2095930b50d9f81a69deeea47edcc9c471a034f34c38daca28d6486eb220

data/lib/isodoc/iso/html/style-human.css

@@ -82,6 +82,9 @@ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
 p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
   font-size: {{monospacefontsize}}; }
 
+sub, sup {
+  font-size: 0.75em; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }

data/lib/isodoc/iso/html/style-iso.css

@@ -82,6 +82,9 @@ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
 p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
   font-size: {{monospacefontsize}}; }
 
+sub, sup {
+  font-size: 0.75em; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }

data/lib/isodoc/iso/iso.amendment.xsl

@@ -1438,6 +1438,7 @@
 
 	<xsl:template name="insertCoverPage">
 		<xsl:if test="$isGenerateTableIF = 'false'"> <!-- no need cover page for auto-layout algorithm -->
+			<xsl:variable name="fo_cover_page">
 			<!-- cover page -->
 			<xsl:choose>
 				<xsl:when test="$layoutVersion = '1951'">
@@ -1752,7 +1753,7 @@
 										<!-- International 
 										Standard -->
 										<fo:table-cell number-columns-spanned="2" padding-left="6mm">
-											<fo:block-container height="46mm">
+											<fo:block-container height="46mm" role="SKIP">
 												<fo:block font-size="20pt" font-weight="bold" line-height="1.25" margin-top="3mm">
 
 													<xsl:variable name="updates-document-type" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:updates-document-type"/>
@@ -1816,8 +1817,7 @@
 
 									<fo:table-row height="46mm">
 										<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}">
-											<fo:block>
-												</fo:block>
+											<fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
 										</fo:table-cell>
 										<fo:table-cell number-columns-spanned="2" display-align="after" padding-left="6mm">
 											<fo:block font-size="19pt" font-weight="bold" line-height="1">
@@ -1830,12 +1830,12 @@
 									</fo:table-row>
 
 									<fo:table-row height="1.4mm" font-size="0pt">
-										<fo:table-cell border-bottom="{$cover_page_border}"><fo:block> </fo:block></fo:table-cell>
-										<fo:table-cell number-columns-spanned="2"><fo:block> </fo:block></fo:table-cell>
-										<fo:table-cell border-bottom="{$cover_page_border}"><fo:block> </fo:block></fo:table-cell>
+										<fo:table-cell border-bottom="{$cover_page_border}"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
+										<fo:table-cell number-columns-spanned="2"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
+										<fo:table-cell border-bottom="{$cover_page_border}"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
 									</fo:table-row>
 									<fo:table-row height="1.4mm" font-size="0pt">
-										<fo:table-cell number-columns-spanned="4"><fo:block> </fo:block></fo:table-cell>
+										<fo:table-cell number-columns-spanned="4"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
 									</fo:table-row>
 
 									<fo:table-row>
@@ -1870,7 +1870,7 @@
 											</fo:block-container>
 										</fo:table-cell>
 										<fo:table-cell number-columns-spanned="2" padding-left="6mm">
-											<fo:block margin-top="2.5mm" line-height="1.1">
+											<fo:block margin-top="2.5mm" line-height="1.1" role="SKIP">
 
 												<xsl:if test="not($stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM')">
 													<xsl:variable name="edition_and_date">
@@ -2509,7 +2509,7 @@
 										</fo:block>
 									</fo:block-container>
 								</fo:flow>
-						</xsl:otherwise>
+							</xsl:otherwise>
 						</xsl:choose>
 
 					</fo:page-sequence>
@@ -2709,7 +2709,11 @@
 					</fo:page-sequence>
 				</xsl:otherwise>
 			</xsl:choose>
-		</xsl:if> <!-- $isGenerateTableIF = ' false' -->
+			</xsl:variable>
+
+			<xsl:apply-templates select="xalan:nodeset($fo_cover_page)" mode="set_table_role_skip"/>
+
+		</xsl:if> <!-- $isGenerateTableIF = 'false' -->
 	</xsl:template> <!-- END insertCoverPage -->
 
 	<xsl:template match="iso:preface/iso:introduction" mode="update_xml_step1" priority="3">
@@ -4833,6 +4837,7 @@
 	<xsl:template name="insertLastPage_2024">
 		<fo:page-sequence master-reference="last-page_2024" force-page-count="no-force">
 			<fo:flow flow-name="xsl-region-body">
+				<xsl:variable name="fo_last_page">
 				<fo:table table-layout="fixed" width="100%" margin-bottom="-1mm">
 					<xsl:call-template name="insertInterFont"/>
 					<fo:table-column column-width="proportional-column-width(73)"/>
@@ -4846,15 +4851,15 @@
 									<xsl:call-template name="insertLogoImages2024"/>
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell number-columns-spanned="2"><fo:block> </fo:block></fo:table-cell>
+							<fo:table-cell number-columns-spanned="2"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
 						</fo:table-row>
 						<fo:table-row height="1.4mm" font-size="0pt">
-							<fo:table-cell border-bottom="{$cover_page_border}"><fo:block> </fo:block></fo:table-cell>
-							<fo:table-cell number-columns-spanned="2"><fo:block> </fo:block></fo:table-cell>
-							<fo:table-cell border-bottom="{$cover_page_border}"><fo:block> </fo:block></fo:table-cell>
+							<fo:table-cell border-bottom="{$cover_page_border}"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
+							<fo:table-cell number-columns-spanned="2"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
+							<fo:table-cell border-bottom="{$cover_page_border}"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
 						</fo:table-row>
 						<fo:table-row height="2mm" font-size="0pt">
-							<fo:table-cell number-columns-spanned="4"><fo:block> </fo:block></fo:table-cell>
+							<fo:table-cell number-columns-spanned="4"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
 						</fo:table-row>
 						<fo:table-row height="182mm"> <!-- 174 -->
 							<fo:table-cell number-columns-spanned="2" display-align="after" border-right="{$cover_page_border}">
@@ -4890,6 +4895,8 @@
 						</fo:table-row>
 					</fo:table-body>
 				</fo:table>
+				</xsl:variable>
+				<xsl:apply-templates select="xalan:nodeset($fo_last_page)" mode="set_table_role_skip"/>
 			</fo:flow>
 		</fo:page-sequence>
 	</xsl:template> <!-- END: insertLastPage_2024 -->
@@ -5080,7 +5087,7 @@
 	</xsl:template>
 
 	<xsl:template name="insertLastBlock">
-		<fo:block id="lastBlock" font-size="1pt" keep-with-previous="always" role="SKIP"> </fo:block>
+		<fo:block id="lastBlock" font-size="1pt" keep-with-previous="always" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
 	</xsl:template>
 
 			<xsl:strip-space elements="iso:xref"/>
@@ -8596,6 +8603,7 @@
 
 			<fo:block role="SKIP">
 				<xsl:apply-templates/>
+				<xsl:if test="$isGenerateTableIF = 'false' and count(node()) = 0"> </xsl:if>
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template> <!-- cell in table header row - 'th' -->
@@ -8659,6 +8667,8 @@
 
 				<xsl:if test="$isGenerateTableIF = 'true'"> <fo:inline id="{@id}_end">end</fo:inline></xsl:if> <!-- to determine width of text --> <!-- <xsl:value-of select="$hair_space"/> -->
 
+				<xsl:if test="$isGenerateTableIF = 'false' and count(node()) = 0"> </xsl:if>
+
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template> <!-- td -->
@@ -11557,14 +11567,16 @@
 	<xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target_normalized" select="translate(@target, '\', '/')"/>
 		<xsl:variable name="target_attachment_name" select="substring-after($target_normalized, '_attachments/')"/>
+		<xsl:variable name="isLinkToEmbeddedFile" select="normalize-space(@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target])"/>
 		<xsl:variable name="target">
 			<xsl:choose>
 				<xsl:when test="@updatetype = 'true'">
 					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
 				</xsl:when>
 				<!-- link to the PDF attachment -->
-				<xsl:when test="@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target]">
-					<xsl:value-of select="concat('url(embedded-file:', @target, ')')"/>
+				<xsl:when test="$isLinkToEmbeddedFile = 'true'">
+					<xsl:variable name="target_file" select="java:org.metanorma.fop.Util.getFilenameFromPath(@target)"/>
+					<xsl:value-of select="concat('url(embedded-file:', $target_file, ')')"/>
 				</xsl:when>
 				<!-- <xsl:when test="starts-with($target_normalized, '_') and contains($target_normalized, '_attachments/') and $pdfAttachmentsList//attachment[@filename = $target_attachment_name]">
 					<xsl:value-of select="concat('url(embedded-file:', $target_attachment_name, ')')"/>
@@ -11595,6 +11607,11 @@
 				<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 			</xsl:if>
 
+			<xsl:if test="$isLinkToEmbeddedFile = 'true'">
+				<xsl:attribute name="color">inherit</xsl:attribute>
+				<xsl:attribute name="text-decoration">none</xsl:attribute>
+			</xsl:if>
+
 			<xsl:call-template name="refine_link-style"/>
 
 			<xsl:choose>
@@ -11605,6 +11622,9 @@
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
 							<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
+								<xsl:if test="$isLinkToEmbeddedFile = 'true'">
+									<xsl:attribute name="role">Annot</xsl:attribute>
+								</xsl:if>
 								<xsl:choose>
 									<xsl:when test="normalize-space(.) = ''">
 										<xsl:call-template name="add-zero-spaces-link-java">
@@ -11617,6 +11637,10 @@
 									</xsl:otherwise>
 								</xsl:choose>
 							</fo:basic-link>
+							<xsl:if test="$isLinkToEmbeddedFile = 'true'">
+								<!-- reserve space at right for PaperClip icon -->
+								<fo:inline keep-with-previous.within-line="always">        </fo:inline>
+							</xsl:if>
 						</xsl:with-param>
 					</xsl:call-template>
 				</xsl:otherwise>
@@ -17293,9 +17317,14 @@
 		</x:xmpmeta>
 		<!-- add attachments -->
 		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
-			<xsl:variable name="description" select="normalize-space(//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment'] = current()/@name]/*[local-name() = 'formattedref'])"/>
-
-			<pdf:embedded-file filename="{@name}">
+			<xsl:variable name="bibitem_attachment_" select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment'] = current()/@name]"/>
+			<xsl:variable name="bibitem_attachment" select="xalan:nodeset($bibitem_attachment_)"/>
+			<xsl:variable name="description" select="normalize-space($bibitem_attachment/*[local-name() = 'formattedref'])"/>
+			<xsl:variable name="filename" select="java:org.metanorma.fop.Util.getFilenameFromPath(@name)"/>
+			<!-- Todo: need update -->
+			<xsl:variable name="afrelationship" select="normalize-space($bibitem_attachment//*[local-name() = 'span'][@class = 'pdf-AFRelationship'])"/>
+
+			<pdf:embedded-file filename="{$filename}" link-as-file-annotation="true">
 				<xsl:attribute name="src">
 					<xsl:choose>
 						<xsl:when test="normalize-space() != ''">
@@ -17311,18 +17340,27 @@
 				<xsl:if test="$description != ''">
 					<xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
 				</xsl:if>
+				<xsl:if test="$afrelationship != ''">
+					<xsl:attribute name="afrelationship"><xsl:value-of select="$afrelationship"/></xsl:attribute>
+				</xsl:if>
 			</pdf:embedded-file>
 		</xsl:for-each>
 		<!-- references to external attachments (no binary-encoded within the Metanorma XML file) -->
 		<xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
 			<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
 				<xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
+				<xsl:variable name="attachment_name" select="java:org.metanorma.fop.Util.getFilenameFromPath($attachment_path)"/>
 				<xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
 				<xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
-				<pdf:embedded-file src="{$url}" filename="{$attachment_path}">
+				<!-- Todo: need update -->
+			<xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'span'][@class = 'pdf-AFRelationship'])"/>
+				<pdf:embedded-file src="{$url}" filename="{$attachment_name}" link-as-file-annotation="true">
 					<xsl:if test="$description != ''">
 						<xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
 					</xsl:if>
+					<xsl:if test="$afrelationship != ''">
+					<xsl:attribute name="afrelationship"><xsl:value-of select="$afrelationship"/></xsl:attribute>
+				</xsl:if>
 				</pdf:embedded-file>
 			</xsl:for-each>
 		</xsl:if>
@@ -17342,6 +17380,12 @@
 	<!-- Get or calculate depth of the element -->
 	<xsl:template name="getLevel">
 		<xsl:param name="depth"/>
+		<!-- <xsl:message>
+			<xsl:choose>
+				<xsl:when test="local-name() = 'title'">title=<xsl:value-of select="."/></xsl:when>
+				<xsl:when test="local-name() = 'clause'">clause/title=<xsl:value-of select="*[local-name() = 'title']"/></xsl:when>
+			</xsl:choose>
+		</xsl:message> -->
 		<xsl:choose>
 			<xsl:when test="normalize-space(@depth) != ''">
 				<xsl:value-of select="@depth"/>
@@ -17362,8 +17406,27 @@
 						<xsl:when test="ancestor::*[local-name() = 'preface']">
 							<xsl:value-of select="$level_total - 2"/>
 						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'sections'] and self::*[local-name() = 'title']">
+							<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause'][2]/*[local-name() = 'title']/@depth)"/>
+							<xsl:choose>
+								<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
+									<xsl:value-of select="number($upper_clause_depth + 1)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$level_total - 2"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'sections']">
-							<xsl:value-of select="$level_total - 1"/>
+							<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause'][1]/*[local-name() = 'title']/@depth)"/>
+							<xsl:choose>
+								<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
+									<xsl:value-of select="number($upper_clause_depth + 1)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$level_total - 1"/>
+								</xsl:otherwise>
+							</xsl:choose>
 						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'bibliography']">
 							<xsl:value-of select="$level_total - 1"/>
@@ -17371,6 +17434,17 @@
 						<xsl:when test="parent::*[local-name() = 'annex']">
 							<xsl:value-of select="$level_total - 1"/>
 						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'annex'] and self::*[local-name() = 'title']">
+							<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause'][2]/*[local-name() = 'title']/@depth)"/>
+							<xsl:choose>
+								<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
+									<xsl:value-of select="number($upper_clause_depth + 1)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$level_total - 1"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'annex']">
 							<xsl:value-of select="$level_total"/>
 						</xsl:when>
@@ -17729,6 +17803,20 @@
 
 	<!-- END: insert cover page image -->
 
+	<xsl:template name="insertVerticalChar">
+		<xsl:param name="str"/>
+		<xsl:if test="string-length($str) &gt; 0">
+			<fo:inline-container writing-mode="lr-tb" text-align="center" alignment-baseline="central" reference-orientation="90" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
+				<fo:block-container width="1em">
+						<fo:block line-height="1em"><xsl:value-of select="substring($str,1,1)"/></fo:block>
+				</fo:block-container>
+			</fo:inline-container>
+			<xsl:call-template name="insertVerticalChar">
+				<xsl:with-param name="str" select="substring($str, 2)"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>
@@ -18016,4 +18104,18 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="@*|node()" mode="set_table_role_skip">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="set_table_role_skip"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[starts-with(local-name(), 'table')]" mode="set_table_role_skip">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="set_table_role_skip"/>
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+			<xsl:apply-templates select="node()" mode="set_table_role_skip"/>
+		</xsl:copy>
+	</xsl:template>
+
 </xsl:stylesheet>

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -1438,6 +1438,7 @@
 
 	<xsl:template name="insertCoverPage">
 		<xsl:if test="$isGenerateTableIF = 'false'"> <!-- no need cover page for auto-layout algorithm -->
+			<xsl:variable name="fo_cover_page">
 			<!-- cover page -->
 			<xsl:choose>
 				<xsl:when test="$layoutVersion = '1951'">
@@ -1752,7 +1753,7 @@
 										<!-- International 
 										Standard -->
 										<fo:table-cell number-columns-spanned="2" padding-left="6mm">
-											<fo:block-container height="46mm">
+											<fo:block-container height="46mm" role="SKIP">
 												<fo:block font-size="20pt" font-weight="bold" line-height="1.25" margin-top="3mm">
 
 													<xsl:variable name="updates-document-type" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:updates-document-type"/>
@@ -1816,8 +1817,7 @@
 
 									<fo:table-row height="46mm">
 										<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}">
-											<fo:block>
-												</fo:block>
+											<fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
 										</fo:table-cell>
 										<fo:table-cell number-columns-spanned="2" display-align="after" padding-left="6mm">
 											<fo:block font-size="19pt" font-weight="bold" line-height="1">
@@ -1830,12 +1830,12 @@
 									</fo:table-row>
 
 									<fo:table-row height="1.4mm" font-size="0pt">
-										<fo:table-cell border-bottom="{$cover_page_border}"><fo:block> </fo:block></fo:table-cell>
-										<fo:table-cell number-columns-spanned="2"><fo:block> </fo:block></fo:table-cell>
-										<fo:table-cell border-bottom="{$cover_page_border}"><fo:block> </fo:block></fo:table-cell>
+										<fo:table-cell border-bottom="{$cover_page_border}"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
+										<fo:table-cell number-columns-spanned="2"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
+										<fo:table-cell border-bottom="{$cover_page_border}"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
 									</fo:table-row>
 									<fo:table-row height="1.4mm" font-size="0pt">
-										<fo:table-cell number-columns-spanned="4"><fo:block> </fo:block></fo:table-cell>
+										<fo:table-cell number-columns-spanned="4"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
 									</fo:table-row>
 
 									<fo:table-row>
@@ -1870,7 +1870,7 @@
 											</fo:block-container>
 										</fo:table-cell>
 										<fo:table-cell number-columns-spanned="2" padding-left="6mm">
-											<fo:block margin-top="2.5mm" line-height="1.1">
+											<fo:block margin-top="2.5mm" line-height="1.1" role="SKIP">
 
 												<xsl:if test="not($stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM')">
 													<xsl:variable name="edition_and_date">
@@ -2509,7 +2509,7 @@
 										</fo:block>
 									</fo:block-container>
 								</fo:flow>
-						</xsl:otherwise>
+							</xsl:otherwise>
 						</xsl:choose>
 
 					</fo:page-sequence>
@@ -2709,7 +2709,11 @@
 					</fo:page-sequence>
 				</xsl:otherwise>
 			</xsl:choose>
-		</xsl:if> <!-- $isGenerateTableIF = ' false' -->
+			</xsl:variable>
+
+			<xsl:apply-templates select="xalan:nodeset($fo_cover_page)" mode="set_table_role_skip"/>
+
+		</xsl:if> <!-- $isGenerateTableIF = 'false' -->
 	</xsl:template> <!-- END insertCoverPage -->
 
 	<xsl:template match="iso:preface/iso:introduction" mode="update_xml_step1" priority="3">
@@ -4833,6 +4837,7 @@
 	<xsl:template name="insertLastPage_2024">
 		<fo:page-sequence master-reference="last-page_2024" force-page-count="no-force">
 			<fo:flow flow-name="xsl-region-body">
+				<xsl:variable name="fo_last_page">
 				<fo:table table-layout="fixed" width="100%" margin-bottom="-1mm">
 					<xsl:call-template name="insertInterFont"/>
 					<fo:table-column column-width="proportional-column-width(73)"/>
@@ -4846,15 +4851,15 @@
 									<xsl:call-template name="insertLogoImages2024"/>
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell number-columns-spanned="2"><fo:block> </fo:block></fo:table-cell>
+							<fo:table-cell number-columns-spanned="2"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
 						</fo:table-row>
 						<fo:table-row height="1.4mm" font-size="0pt">
-							<fo:table-cell border-bottom="{$cover_page_border}"><fo:block> </fo:block></fo:table-cell>
-							<fo:table-cell number-columns-spanned="2"><fo:block> </fo:block></fo:table-cell>
-							<fo:table-cell border-bottom="{$cover_page_border}"><fo:block> </fo:block></fo:table-cell>
+							<fo:table-cell border-bottom="{$cover_page_border}"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
+							<fo:table-cell number-columns-spanned="2"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
+							<fo:table-cell border-bottom="{$cover_page_border}"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
 						</fo:table-row>
 						<fo:table-row height="2mm" font-size="0pt">
-							<fo:table-cell number-columns-spanned="4"><fo:block> </fo:block></fo:table-cell>
+							<fo:table-cell number-columns-spanned="4"><fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block></fo:table-cell>
 						</fo:table-row>
 						<fo:table-row height="182mm"> <!-- 174 -->
 							<fo:table-cell number-columns-spanned="2" display-align="after" border-right="{$cover_page_border}">
@@ -4890,6 +4895,8 @@
 						</fo:table-row>
 					</fo:table-body>
 				</fo:table>
+				</xsl:variable>
+				<xsl:apply-templates select="xalan:nodeset($fo_last_page)" mode="set_table_role_skip"/>
 			</fo:flow>
 		</fo:page-sequence>
 	</xsl:template> <!-- END: insertLastPage_2024 -->
@@ -5080,7 +5087,7 @@
 	</xsl:template>
 
 	<xsl:template name="insertLastBlock">
-		<fo:block id="lastBlock" font-size="1pt" keep-with-previous="always" role="SKIP"> </fo:block>
+		<fo:block id="lastBlock" font-size="1pt" keep-with-previous="always" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
 	</xsl:template>
 
 			<xsl:strip-space elements="iso:xref"/>
@@ -8596,6 +8603,7 @@
 
 			<fo:block role="SKIP">
 				<xsl:apply-templates/>
+				<xsl:if test="$isGenerateTableIF = 'false' and count(node()) = 0"> </xsl:if>
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template> <!-- cell in table header row - 'th' -->
@@ -8659,6 +8667,8 @@
 
 				<xsl:if test="$isGenerateTableIF = 'true'"> <fo:inline id="{@id}_end">end</fo:inline></xsl:if> <!-- to determine width of text --> <!-- <xsl:value-of select="$hair_space"/> -->
 
+				<xsl:if test="$isGenerateTableIF = 'false' and count(node()) = 0"> </xsl:if>
+
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template> <!-- td -->
@@ -11557,14 +11567,16 @@
 	<xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target_normalized" select="translate(@target, '\', '/')"/>
 		<xsl:variable name="target_attachment_name" select="substring-after($target_normalized, '_attachments/')"/>
+		<xsl:variable name="isLinkToEmbeddedFile" select="normalize-space(@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target])"/>
 		<xsl:variable name="target">
 			<xsl:choose>
 				<xsl:when test="@updatetype = 'true'">
 					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
 				</xsl:when>
 				<!-- link to the PDF attachment -->
-				<xsl:when test="@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target]">
-					<xsl:value-of select="concat('url(embedded-file:', @target, ')')"/>
+				<xsl:when test="$isLinkToEmbeddedFile = 'true'">
+					<xsl:variable name="target_file" select="java:org.metanorma.fop.Util.getFilenameFromPath(@target)"/>
+					<xsl:value-of select="concat('url(embedded-file:', $target_file, ')')"/>
 				</xsl:when>
 				<!-- <xsl:when test="starts-with($target_normalized, '_') and contains($target_normalized, '_attachments/') and $pdfAttachmentsList//attachment[@filename = $target_attachment_name]">
 					<xsl:value-of select="concat('url(embedded-file:', $target_attachment_name, ')')"/>
@@ -11595,6 +11607,11 @@
 				<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 			</xsl:if>
 
+			<xsl:if test="$isLinkToEmbeddedFile = 'true'">
+				<xsl:attribute name="color">inherit</xsl:attribute>
+				<xsl:attribute name="text-decoration">none</xsl:attribute>
+			</xsl:if>
+
 			<xsl:call-template name="refine_link-style"/>
 
 			<xsl:choose>
@@ -11605,6 +11622,9 @@
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
 							<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
+								<xsl:if test="$isLinkToEmbeddedFile = 'true'">
+									<xsl:attribute name="role">Annot</xsl:attribute>
+								</xsl:if>
 								<xsl:choose>
 									<xsl:when test="normalize-space(.) = ''">
 										<xsl:call-template name="add-zero-spaces-link-java">
@@ -11617,6 +11637,10 @@
 									</xsl:otherwise>
 								</xsl:choose>
 							</fo:basic-link>
+							<xsl:if test="$isLinkToEmbeddedFile = 'true'">
+								<!-- reserve space at right for PaperClip icon -->
+								<fo:inline keep-with-previous.within-line="always">        </fo:inline>
+							</xsl:if>
 						</xsl:with-param>
 					</xsl:call-template>
 				</xsl:otherwise>
@@ -17293,9 +17317,14 @@
 		</x:xmpmeta>
 		<!-- add attachments -->
 		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
-			<xsl:variable name="description" select="normalize-space(//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment'] = current()/@name]/*[local-name() = 'formattedref'])"/>
-
-			<pdf:embedded-file filename="{@name}">
+			<xsl:variable name="bibitem_attachment_" select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment'] = current()/@name]"/>
+			<xsl:variable name="bibitem_attachment" select="xalan:nodeset($bibitem_attachment_)"/>
+			<xsl:variable name="description" select="normalize-space($bibitem_attachment/*[local-name() = 'formattedref'])"/>
+			<xsl:variable name="filename" select="java:org.metanorma.fop.Util.getFilenameFromPath(@name)"/>
+			<!-- Todo: need update -->
+			<xsl:variable name="afrelationship" select="normalize-space($bibitem_attachment//*[local-name() = 'span'][@class = 'pdf-AFRelationship'])"/>
+
+			<pdf:embedded-file filename="{$filename}" link-as-file-annotation="true">
 				<xsl:attribute name="src">
 					<xsl:choose>
 						<xsl:when test="normalize-space() != ''">
@@ -17311,18 +17340,27 @@
 				<xsl:if test="$description != ''">
 					<xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
 				</xsl:if>
+				<xsl:if test="$afrelationship != ''">
+					<xsl:attribute name="afrelationship"><xsl:value-of select="$afrelationship"/></xsl:attribute>
+				</xsl:if>
 			</pdf:embedded-file>
 		</xsl:for-each>
 		<!-- references to external attachments (no binary-encoded within the Metanorma XML file) -->
 		<xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
 			<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
 				<xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
+				<xsl:variable name="attachment_name" select="java:org.metanorma.fop.Util.getFilenameFromPath($attachment_path)"/>
 				<xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
 				<xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
-				<pdf:embedded-file src="{$url}" filename="{$attachment_path}">
+				<!-- Todo: need update -->
+			<xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'span'][@class = 'pdf-AFRelationship'])"/>
+				<pdf:embedded-file src="{$url}" filename="{$attachment_name}" link-as-file-annotation="true">
 					<xsl:if test="$description != ''">
 						<xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
 					</xsl:if>
+					<xsl:if test="$afrelationship != ''">
+					<xsl:attribute name="afrelationship"><xsl:value-of select="$afrelationship"/></xsl:attribute>
+				</xsl:if>
 				</pdf:embedded-file>
 			</xsl:for-each>
 		</xsl:if>
@@ -17342,6 +17380,12 @@
 	<!-- Get or calculate depth of the element -->
 	<xsl:template name="getLevel">
 		<xsl:param name="depth"/>
+		<!-- <xsl:message>
+			<xsl:choose>
+				<xsl:when test="local-name() = 'title'">title=<xsl:value-of select="."/></xsl:when>
+				<xsl:when test="local-name() = 'clause'">clause/title=<xsl:value-of select="*[local-name() = 'title']"/></xsl:when>
+			</xsl:choose>
+		</xsl:message> -->
 		<xsl:choose>
 			<xsl:when test="normalize-space(@depth) != ''">
 				<xsl:value-of select="@depth"/>
@@ -17362,8 +17406,27 @@
 						<xsl:when test="ancestor::*[local-name() = 'preface']">
 							<xsl:value-of select="$level_total - 2"/>
 						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'sections'] and self::*[local-name() = 'title']">
+							<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause'][2]/*[local-name() = 'title']/@depth)"/>
+							<xsl:choose>
+								<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
+									<xsl:value-of select="number($upper_clause_depth + 1)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$level_total - 2"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'sections']">
-							<xsl:value-of select="$level_total - 1"/>
+							<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause'][1]/*[local-name() = 'title']/@depth)"/>
+							<xsl:choose>
+								<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
+									<xsl:value-of select="number($upper_clause_depth + 1)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$level_total - 1"/>
+								</xsl:otherwise>
+							</xsl:choose>
 						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'bibliography']">
 							<xsl:value-of select="$level_total - 1"/>
@@ -17371,6 +17434,17 @@
 						<xsl:when test="parent::*[local-name() = 'annex']">
 							<xsl:value-of select="$level_total - 1"/>
 						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'annex'] and self::*[local-name() = 'title']">
+							<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause'][2]/*[local-name() = 'title']/@depth)"/>
+							<xsl:choose>
+								<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
+									<xsl:value-of select="number($upper_clause_depth + 1)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$level_total - 1"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'annex']">
 							<xsl:value-of select="$level_total"/>
 						</xsl:when>
@@ -17729,6 +17803,20 @@
 
 	<!-- END: insert cover page image -->
 
+	<xsl:template name="insertVerticalChar">
+		<xsl:param name="str"/>
+		<xsl:if test="string-length($str) &gt; 0">
+			<fo:inline-container writing-mode="lr-tb" text-align="center" alignment-baseline="central" reference-orientation="90" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
+				<fo:block-container width="1em">
+						<fo:block line-height="1em"><xsl:value-of select="substring($str,1,1)"/></fo:block>
+				</fo:block-container>
+			</fo:inline-container>
+			<xsl:call-template name="insertVerticalChar">
+				<xsl:with-param name="str" select="substring($str, 2)"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>
@@ -18016,4 +18104,18 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="@*|node()" mode="set_table_role_skip">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="set_table_role_skip"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[starts-with(local-name(), 'table')]" mode="set_table_role_skip">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="set_table_role_skip"/>
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+			<xsl:apply-templates select="node()" mode="set_table_role_skip"/>
+		</xsl:copy>
+	</xsl:template>
+
 </xsl:stylesheet>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.8.6".freeze
+    VERSION = "2.8.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.8.6
+  version: 2.8.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc