metanorma-ogc 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35680f6a9dbf6cebb472698a3d3665ec78f9d81735ec9068c0068cf26326b82e
-  data.tar.gz: 4cc255a9dbf73b58c30492a0bfa107cbfa6379f418c8cd18bc4aeeb1ec9f7c85
+  metadata.gz: e3fc76cd9d97dc46e32d4eb7ede5a5df4aa9088814efb2fb7306f85babe2c66d
+  data.tar.gz: c1ecd3aa0d5018f229f1f91e84d2fccd3360d7aebabd0371dde2a93c6c3231c2
 SHA512:
-  metadata.gz: 906b73d6e8fe1ce05aa7bd62b7df4923fd0b64ab711a286e96553f16a8d25da0bd8be4badadf585d92234f7a265a3b9f6c201a20113f071dac576dc6c1afbd70
-  data.tar.gz: 1a4f85e5ba023bd4531b903579749f618f61c47a5ab0a847e4c3c06e8d23b334d47bc8b6f822d17d0723fb3c1d4339f1d43773d916ee593da7da1ca23ea98286
+  metadata.gz: fa24e603f131367c5d0ed1a17da95e83be2c798c9fccdf8376aaf92b6f6c1912092443315abc02bb824daf14d648c9a73dda0dc7ec76580e51249f90370575ca
+  data.tar.gz: 852573bbac927f234f2df921d60f915c17c3a95413988fc277a3c644a259e3d078063f1cfb3e4c14eac3b7c9e4070e9d7629cbc72cc369476c5a8e9580655812

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

@@ -75,6 +75,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/ogc/ogc.abstract-specification-topic.xsl

@@ -5246,6 +5246,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' -->
@@ -5309,6 +5310,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 -->
@@ -8115,14 +8118,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, ')')"/>
@@ -8153,6 +8158,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>
@@ -8163,6 +8173,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">
@@ -8175,6 +8188,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>
@@ -13745,9 +13762,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() != ''">
@@ -13763,18 +13785,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>
@@ -13794,6 +13825,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"/>
@@ -13814,8 +13851,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"/>
@@ -13823,6 +13879,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>
@@ -14181,6 +14248,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"/>
@@ -14468,4 +14549,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/ogc/ogc.best-practice.xsl

@@ -5246,6 +5246,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' -->
@@ -5309,6 +5310,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 -->
@@ -8115,14 +8118,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, ')')"/>
@@ -8153,6 +8158,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>
@@ -8163,6 +8173,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">
@@ -8175,6 +8188,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>
@@ -13745,9 +13762,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() != ''">
@@ -13763,18 +13785,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>
@@ -13794,6 +13825,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"/>
@@ -13814,8 +13851,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"/>
@@ -13823,6 +13879,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>
@@ -14181,6 +14248,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"/>
@@ -14468,4 +14549,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>