metanorma-itu 2.5.6 → 2.5.9

data/lib/isodoc/itu/itu.resolution.xsl

@@ -1477,11 +1477,11 @@
 										<xsl:apply-templates select="/itu:itu-standard/itu:boilerplate/itu:copyright-statement"/>
 									</fo:block>
 
-									<!-- <xsl:if test="$debug = 'true'">
-										<redirect:write file="contents_{java:getTime(java:java.util.Date.new())}.xml">
+									<xsl:if test="$debug = 'true'">
+										<redirect:write file="contents_.xml"> <!-- {java:getTime(java:java.util.Date.new())} -->
 											<xsl:copy-of select="$contents"/>
 										</redirect:write>
-									</xsl:if> -->
+									</xsl:if>
 
 									<xsl:apply-templates select="/*/*[local-name()='preface']//*[local-name() = 'clause'][@type = 'toc']">
 										<xsl:with-param name="process">true</xsl:with-param>
@@ -1850,18 +1850,18 @@
 	<!-- ============================= -->
 
 	<!-- element with title -->
-	<xsl:template match="*[itu:title]" mode="contents">
+	<xsl:template match="*[itu:title or itu:fmt-title]" mode="contents">
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel">
-				<xsl:with-param name="depth" select="itu:title/@depth"/>
+				<xsl:with-param name="depth" select="itu:fmt-title/@depth | itu:title/@depth"/>
 			</xsl:call-template>
 		</xsl:variable>
 
 		<xsl:variable name="section">
-			<!-- <xsl:call-template name="getSection"/> -->
-			<xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
+			<xsl:call-template name="getSection"/>
+			<!-- <xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
 				<xsl:value-of select="."/>
-			</xsl:for-each>
+			</xsl:for-each> -->
 		</xsl:variable>
 
 		<xsl:variable name="type">
@@ -1881,7 +1881,7 @@
 				<xsl:when test="@type = 'toc'">true</xsl:when>
 				<xsl:when test="ancestor-or-self::itu:bibitem">true</xsl:when>
 				<xsl:when test="ancestor-or-self::itu:term">true</xsl:when>
-				<xsl:when test="@inline-header = 'true' and not(*[local-name() = 'title']/*[local-name() = 'tab'])">true</xsl:when>
+				<xsl:when test="@inline-header = 'true' and not(*[local-name() = 'fmt-title']/*[local-name() = 'tab']) and not(*[local-name() = 'title']/*[local-name() = 'tab'])">true</xsl:when>
 				<xsl:otherwise>false</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -1938,6 +1938,7 @@
 		</xsl:choose>
 		<fo:block>
 			<xsl:call-template name="setId"/>
+			<xsl:call-template name="addReviewHelper"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -2073,19 +2074,25 @@
 			</fo:block>
 			<xsl:if test="$doctype != 'resolution'">
 				<fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
-					<xsl:choose>
+					<!-- <xsl:choose>
 						<xsl:when test="parent::*[@obligation = 'informative']">
 							<xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
 						</xsl:when>
 						<xsl:otherwise>
 							<xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
 						</xsl:otherwise>
-					</xsl:choose>
+					</xsl:choose> -->
+					<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
+					<xsl:apply-templates select="following-sibling::itu:p[not(preceding-sibling::itu:clause)][starts-with(normalize-space(), '(')]/node()"/>
 				</fo:block>
 			</xsl:if>
 		</fo:block>
 	</xsl:template>
 
+	<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
+	<!-- renders in the annex/title template -->
+	<xsl:template match="itu:annex/itu:p[preceding-sibling::*[1][self::itu:title or self::itu:variant-title]][starts-with(normalize-space(), '(')]" priority="3"/>
+
 	<!-- Bibliography -->
 	<xsl:template match="itu:references[not(@normative='true')]/itu:title">
 		<fo:block font-size="14pt" font-weight="bold" text-align="center" margin-bottom="18pt" role="H1">
@@ -2225,32 +2232,50 @@
 				<xsl:call-template name="setStyle_preferred"/>
 				<xsl:apply-templates/>
 			</fo:inline>
-			<xsl:if test="../itu:termsource/itu:origin">
-				<xsl:text>: </xsl:text>
+			<xsl:if test="../itu:termsource">
+				<!-- https://github.com/metanorma/isodoc/issues/614 -->
+				<!-- <xsl:text>: </xsl:text> -->
+				<xsl:text> </xsl:text>
 				<xsl:variable name="citeas" select="../itu:termsource/itu:origin/@citeas"/>
 				<xsl:variable name="bibitemid" select="../itu:termsource/itu:origin/@bibitemid"/>
 				<xsl:variable name="origin_text" select="normalize-space(../itu:termsource/itu:origin/text())"/>
 
-				<xsl:call-template name="insert_basic_link">
-					<xsl:with-param name="element">
-						<fo:basic-link internal-destination="{$bibitemid}" fox:alt-text="{$citeas}">
-							<xsl:choose>
-								<xsl:when test="$origin_text != ''">
-									<xsl:text> </xsl:text><xsl:apply-templates select="../itu:termsource/itu:origin/node()"/>
-								</xsl:when>
-								<xsl:when test="contains($citeas, '[')">
-									<xsl:text> </xsl:text><xsl:value-of select="$citeas"/> <!--  disable-output-escaping="yes" -->
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:text> [</xsl:text><xsl:value-of select="$citeas"/><xsl:text>]</xsl:text>
-								</xsl:otherwise>
-							</xsl:choose>
-						</fo:basic-link>
-					</xsl:with-param>
-				</xsl:call-template>
+				<xsl:choose>
+					<xsl:when test="$origin_text != '' or $citeas != ''">
+						<xsl:call-template name="insert_basic_link">
+							<xsl:with-param name="element">
+								<fo:basic-link internal-destination="{$bibitemid}" fox:alt-text="{$citeas}">
+									<xsl:choose>
+										<xsl:when test="$origin_text != ''">
+											<xsl:text> </xsl:text><xsl:apply-templates select="../itu:termsource/itu:origin/node()"/>
+										</xsl:when>
+										<!-- https://github.com/metanorma/isodoc/issues/614 -->
+										<!-- <xsl:when test="contains($citeas, '[')">
+											<xsl:text> </xsl:text><xsl:value-of select="$citeas"/>disable-output-escaping="yes"
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:text> [</xsl:text><xsl:value-of select="$citeas"/><xsl:text>]</xsl:text>
+										</xsl:otherwise> -->
+										<xsl:otherwise>
+											<xsl:text> </xsl:text><xsl:value-of select="$citeas"/>
+										</xsl:otherwise>
+									</xsl:choose>
+								</fo:basic-link>
+							</xsl:with-param>
+						</xsl:call-template>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="../itu:termsource">
+							<xsl:with-param name="process">true</xsl:with-param>
+						</xsl:apply-templates>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:if>
 			<xsl:if test="following-sibling::itu:definition/node()">
-				<xsl:text>: </xsl:text>
+				<xsl:if test="../itu:termsource">
+					<xsl:text>:</xsl:text>
+				</xsl:if>
+				<xsl:text> </xsl:text>
 				<!-- <xsl:apply-templates select="following-sibling::itu:definition/node()" mode="process"/>			 -->
 				<xsl:apply-templates select="following-sibling::itu:definition">
 					<xsl:with-param name="process">true</xsl:with-param>
@@ -2262,7 +2287,12 @@
 		</xsl:if> -->
 	</xsl:template> <!-- preferred -->
 
-	<xsl:template match="itu:term[itu:preferred]/itu:termsource" priority="2"/>
+	<xsl:template match="itu:term[itu:preferred]/itu:termsource" priority="2">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<xsl:apply-templates/>
+		</xsl:if>
+	</xsl:template>
 
 	<xsl:template match="itu:term[itu:preferred]/itu:definition" priority="2">
 		<xsl:param name="process">false</xsl:param>
@@ -2748,7 +2778,7 @@
 		</xsl:if>
 	</xsl:template>
 
-			<xsl:strip-space elements="itu:xref"/>
+			<!-- <xsl:strip-space elements="itu:xref"/> -->
 
 	<xsl:variable name="namespace_full" select="namespace-uri(/*)"/> <!-- example: https://www.metanorma.org/ns/iso -->
 	<xsl:variable name="root_element" select="local-name(/*)"/> <!-- example: iso-standard -->
@@ -3750,6 +3780,10 @@
 
 	<xsl:template name="refine_termnote-name-style">
 
+		<!-- <xsl:if test="$namespace = 'ieee'">
+			<xsl:attribute name="padding-right">0mm</xsl:attribute>
+		</xsl:if> -->
+
 	</xsl:template>
 
 	<xsl:attribute-set name="termnote-p-style">
@@ -4436,9 +4470,21 @@
 	<xsl:template name="processTables_Contents">
 		<tables>
 			<xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
-				<table id="{@id}" alt-text="{*[local-name() = 'name']}">
-					<xsl:copy-of select="*[local-name() = 'name']"/>
-				</table>
+				<xsl:choose>
+					<xsl:when test="*[local-name() = 'fmt-name']">
+						<xsl:variable name="fmt_name">
+							<xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
+						</xsl:variable>
+						<table id="{@id}" alt-text="{normalize-space($fmt_name)}">
+							<xsl:copy-of select="$fmt_name"/>
+						</table>
+					</xsl:when>
+					<xsl:otherwise>
+						<table id="{@id}" alt-text="{*[local-name() = 'name']}">
+							<xsl:copy-of select="*[local-name() = 'name']"/>
+						</table>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:for-each>
 		</tables>
 	</xsl:template>
@@ -4446,9 +4492,21 @@
 	<xsl:template name="processFigures_Contents">
 		<figures>
 			<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(*[local-name() = 'name'], 'Figure ') and normalize-space(@id) != '']">
-				<figure id="{@id}" alt-text="{*[local-name() = 'name']}">
-					<xsl:copy-of select="*[local-name() = 'name']"/>
-				</figure>
+				<xsl:choose>
+					<xsl:when test="*[local-name() = 'fmt-name']">
+						<xsl:variable name="fmt_name">
+							<xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
+						</xsl:variable>
+						<figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
+							<xsl:copy-of select="$fmt_name"/>
+						</figure>
+					</xsl:when>
+					<xsl:otherwise>
+						<figure id="{@id}" alt-text="{*[local-name() = 'name']}">
+							<xsl:copy-of select="*[local-name() = 'name']"/>
+						</figure>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:for-each>
 		</figures>
 	</xsl:template>
@@ -6296,7 +6354,10 @@
 
 								<xsl:value-of select="@reference"/>
 
+								<!-- commented https://github.com/metanorma/isodoc/issues/614 -->
+								<!-- <xsl:if test="$namespace = 'itu'">
 									<xsl:text>)</xsl:text>
+								</xsl:if> -->
 
 							</fo:inline>
 							<fo:inline xsl:use-attribute-sets="table-fn-body-style">
@@ -6307,7 +6368,7 @@
 
 			</xsl:if>
 		</xsl:for-each>
-	</xsl:template>
+	</xsl:template> <!-- table_fn_display -->
 
 	<xsl:template name="create_fn">
 		<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -6339,8 +6400,10 @@
 	<!-- EMD table's footnotes rendering -->
 	<!-- ============================ -->
 
+	<!-- ============================ -->
 	<!-- figure's footnotes rendering -->
-	<xsl:template name="fn_display_figure">
+	<!-- ============================ -->
+	<xsl:template name="fn_display_figure"> <!-- figure_fn_display -->
 
 		<!-- current figure id -->
 		<xsl:variable name="figure_id_">
@@ -6453,9 +6516,28 @@
 
 			</fo:block>
 		</xsl:if>
-
 	</xsl:template> <!-- fn_display_figure -->
 
+	<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
+	<!-- figure's footnote label -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'dl'][@key = 'true']/*[local-name() = 'dt']/     *[local-name() = 'p'][count(node()[normalize-space() != '']) = 1]/*[local-name() = 'sup']" priority="3">
+		<xsl:variable name="key_iso">
+
+		</xsl:variable>
+		<xsl:if test="normalize-space($key_iso) = 'true'">
+			<xsl:attribute name="font-size">10pt</xsl:attribute>
+
+		</xsl:if>
+		<fo:inline xsl:use-attribute-sets="figure-fn-number-style"> <!-- id="{@id}"  -->
+			<!-- <xsl:value-of select="@reference"/> -->
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
+	<!-- ============================ -->
+	<!-- END: figure's footnotes rendering -->
+	<!-- ============================ -->
+
 	<!-- fn reference in the text rendering (for instance, 'some text 1) some text' ) -->
 	<xsl:template match="*[local-name()='fn']">
 		<fo:inline xsl:use-attribute-sets="fn-reference-style">
@@ -6471,6 +6553,10 @@
 
 				<xsl:value-of select="@reference"/>
 
+				<!-- commented, https://github.com/metanorma/isodoc/issues/614 -->
+				<!-- <xsl:if test="$namespace = 'jis'">
+					<fo:inline font-weight="normal">)</fo:inline>
+				</xsl:if> -->
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template>
@@ -6631,17 +6717,22 @@
 						</fo:block>
 					</xsl:when>  <!-- END: a few components -->
 					<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
-						<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
+						<!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
+						<xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
 
-							<xsl:call-template name="refine_figure_key_style"/>
+									<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
 
-							<xsl:variable name="title-key">
-								<xsl:call-template name="getLocalizedString">
-									<xsl:with-param name="key">key</xsl:with-param>
-								</xsl:call-template>
-							</xsl:variable>
-							<xsl:value-of select="$title-key"/>
-						</fo:block>
+										<xsl:call-template name="refine_figure_key_style"/>
+
+										<xsl:variable name="title-key">
+											<xsl:call-template name="getLocalizedString">
+												<xsl:with-param name="key">key</xsl:with-param>
+											</xsl:call-template>
+										</xsl:variable>
+										<xsl:value-of select="$title-key"/>
+									</fo:block>
+
+						</xsl:if>
 					</xsl:when>  <!-- END: definition list in a figure -->
 				</xsl:choose>
 
@@ -6827,6 +6918,14 @@
 
 	</xsl:template> <!-- END: dl -->
 
+	<!-- caption for figure key and another caption, https://github.com/metanorma/isodoc/issues/607 -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'p'][@keep-with-next = 'true' and *[local-name() = 'strong']]" priority="3">
+		<fo:block text-align="left" margin-bottom="12pt" keep-with-next="always">
+			<xsl:call-template name="refine_figure_key_style"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template name="refine_dl_formula_where_style">
 
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -8869,6 +8968,39 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="@*|node()" mode="mathml_linebreak">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="mathml_linebreak"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!-- split math into two math -->
+	<xsl:template match="mathml:mo[@linebreak] | mathml:mspace[@linebreak]" mode="mathml_linebreak">
+		<xsl:variable name="math_elements_tree_">
+			<xsl:for-each select="ancestor::*[ancestor-or-self::mathml:math]">
+				<element pos="{position()}">
+					<xsl:copy-of select="@*[local-name() != 'id']"/>
+					<xsl:value-of select="name()"/>
+				</element>
+			</xsl:for-each>
+		</xsl:variable>
+
+		<xsl:variable name="math_elements_tree" select="xalan:nodeset($math_elements_tree_)"/>
+
+		<xsl:call-template name="insertClosingElements">
+			<xsl:with-param name="tree" select="$math_elements_tree"/>
+		</xsl:call-template>
+
+		<xsl:element name="br" namespace="{$namespace_full}"/>
+
+		<xsl:call-template name="insertOpeningElements">
+			<xsl:with-param name="tree" select="$math_elements_tree"/>
+			<xsl:with-param name="xmlns">http://www.w3.org/1998/Math/MathML</xsl:with-param>
+			<xsl:with-param name="add_continue">false</xsl:with-param>
+		</xsl:call-template>
+
+	</xsl:template>
+
 	<!-- Examples: 
 		<stem type="AsciiMath">x = 1</stem> 
 		<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
@@ -9120,9 +9252,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"> <!-- show in 'stem' template -->
+		<!-- https://github.com/metanorma/isodoc/issues/607 
 		<xsl:if test="normalize-space() != ''">
-			<xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
-		</xsl:if>
+			<xsl:text>(</xsl:text><xsl:apply-templates /><xsl:text>)</xsl:text>
+		</xsl:if> -->
+		<xsl:apply-templates/>
 	</xsl:template>
 
 	<!-- stem inside formula with name (with formula's number) -->
@@ -9193,6 +9327,8 @@
 
 									<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
 
+										<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
+
 										<xsl:call-template name="refine_note-name-style"/>
 
 										<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
@@ -9253,10 +9389,6 @@
 
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 
-				<xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
-					<xsl:attribute name="padding-right">1mm</xsl:attribute>
-				</xsl:if>
-
 				<xsl:call-template name="refine_termnote-name-style"/>
 
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
@@ -9282,8 +9414,17 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:text> – </xsl:text>
+					<!-- https://github.com/metanorma/isodoc/issues/607 -->
+					<!-- <xsl:if test="$namespace = 'ieee'">
+						<xsl:text>—</xsl:text> em dash &#x2014;
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece'  or $namespace = 'rsd'">
+						<xsl:text>:</xsl:text>
+					</xsl:if> -->
 
+					<!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp'  or $namespace = 'nist-sp'">				
+						<xsl:text> – </xsl:text> en dash &#x2013;
+					</xsl:if> -->
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -9302,8 +9443,16 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:text> – </xsl:text>
-
+					<!-- https://github.com/metanorma/isodoc/issues/607 -->
+					<!-- <xsl:if test="$namespace = 'ieee'">
+						<xsl:text>—</xsl:text> em dash &#x2014;
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'iso' or $namespace = 'iec' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' or $namespace = 'rsd' or $namespace = 'jcgm'">
+						<xsl:text>:</xsl:text>
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp'  or $namespace = 'nist-sp' or $namespace = 'unece-rec' or $namespace = 'unece'">				
+						<xsl:text> – </xsl:text> en dash &#x2013;
+					</xsl:if> -->
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -9386,17 +9535,29 @@
 			<!-- Example: Dimensions in millimeters -->
 			<xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
 
+			<xsl:variable name="show_figure_key_in_block_container">
+				true
+			</xsl:variable>
+
 			<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
 				<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
 			</fo:block>
-			<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
-				<xsl:call-template name="note"/>
-			</xsl:for-each>
-			<xsl:call-template name="fn_display_figure"/>
+
+			<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
+				<xsl:call-template name="showFigureKey"/>
+			</xsl:if>
 
 					<xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
 
 		</fo:block-container>
+
+	</xsl:template>
+
+	<xsl:template name="showFigureKey">
+		<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
+			<xsl:call-template name="note"/>
+		</xsl:for-each>
+		<xsl:call-template name="fn_display_figure"/>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']">
@@ -9592,6 +9753,22 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="getImageSrc">
+		<xsl:choose>
+			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:choose>
+					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+						<xsl:value-of select="@src"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="concat($basepath, @src)"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template name="getImageScale">
 		<xsl:param name="indent"/>
 		<xsl:variable name="indent_left">
@@ -9601,19 +9778,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="img_src">
-			<xsl:choose>
-				<xsl:when test="not(starts-with(@src, 'data:'))">
-					<xsl:choose>
-						<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
-							<xsl:value-of select="@src"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="concat($basepath, @src)"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when>
-				<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-			</xsl:choose>
+			<xsl:call-template name="getImageSrc"/>
 		</xsl:variable>
 
 		<xsl:variable name="image_width_effective">
@@ -9621,10 +9786,15 @@
 					<xsl:value-of select="$width_effective - number($indent_left)"/>
 
 		</xsl:variable>
+		<xsl:variable name="image_height_effective" select="$height_effective - number($indent_left)"/>
 		<!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
 		<xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
 		<xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
-		<xsl:variable name="scale" select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+		<xsl:variable name="scale">
+
+					<xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+
+		</xsl:variable>
 		<xsl:value-of select="$scale"/>
 	</xsl:template>
 
@@ -10177,20 +10347,48 @@
 	<xsl:template match="*[local-name() = 'emf']"/>
 
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
+		<xsl:if test="not(following-sibling::*[1][local-name() = 'fmt-name'])">
+			<xsl:apply-templates mode="contents"/>
+			<xsl:text> </xsl:text>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'title'][following-sibling::*[1][local-name() = 'fmt-title']]" mode="contents"/>
+
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fmt-name'] |                *[local-name() = 'table']/*[local-name() = 'fmt-name'] |               *[local-name() = 'permission']/*[local-name() = 'fmt-name'] |               *[local-name() = 'recommendation']/*[local-name() = 'fmt-name'] |               *[local-name() = 'requirement']/*[local-name() = 'fmt-name']" mode="contents">
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name'] |               *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
+		<xsl:if test="not(following-sibling::*[1][local-name() = 'fmt-name'])">
+			<xsl:apply-templates mode="bookmarks"/>
+			<xsl:text> </xsl:text>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fmt-name'] |                *[local-name() = 'table']/*[local-name() = 'fmt-name'] |               *[local-name() = 'permission']/*[local-name() = 'fmt-name'] |               *[local-name() = 'recommendation']/*[local-name() = 'fmt-name'] |               *[local-name() = 'requirement']/*[local-name() = 'fmt-name'] |               *[local-name() = 'sourcecode']/*[local-name() = 'fmt-name']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
+		<xsl:if test="not(../following-sibling::*[1][local-name() = 'fmt-name'])">
+			<xsl:value-of select="."/>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'fmt-name']/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
+		<xsl:if test="not(../following-sibling::*[1][local-name() = 'fmt-name'])">
+			<xsl:value-of select="."/>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'fmt-name']//text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template>
 
@@ -10211,7 +10409,7 @@
 	</xsl:template>
 
 	<!-- special case: ignore section-title if @depth different than @depth of parent clause, or @depth of parent clause = 1 -->
-	<xsl:template match="*[local-name() = 'clause']/*[local-name() = 'p'][@type = 'section-title' and (@depth != ../*[local-name() = 'title']/@depth or ../*[local-name() = 'title']/@depth = 1)]" priority="3" mode="contents"/>
+	<xsl:template match="*[local-name() = 'clause']/*[local-name() = 'p'][@type = 'section-title' and (@depth != ../*[local-name() = 'title' or local-name() = 'fmt-title']/@depth or ../*[local-name() = 'title' or local-name() = 'fmt-title']/@depth = 1)]" priority="3" mode="contents"/>
 
 	<xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" name="contents_section-title" mode="contents">
 		<xsl:variable name="level">
@@ -10223,6 +10421,9 @@
 		<xsl:variable name="section">
 			<xsl:choose>
 				<xsl:when test="@type = 'section-title'"/>
+				<xsl:when test="*[local-name() = 'span'][@class = 'fmt-caption-delim']">
+					<xsl:value-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/preceding-sibling::node()"/>
+				</xsl:when>
 				<xsl:otherwise>
 					<xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
 				</xsl:otherwise>
@@ -10245,6 +10446,19 @@
 
 			<xsl:variable name="title">
 				<xsl:choose>
+					<!-- https://github.com/metanorma/mn-native-pdf/issues/770 -->
+					<xsl:when test="*[local-name() = 'span'][@class = 'fmt-caption-delim']">
+						<xsl:choose>
+							<xsl:when test="@type = 'section-title'">
+								<xsl:value-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/preceding-sibling::node()"/>
+								<xsl:text>: </xsl:text>
+								<xsl:copy-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/following-sibling::node()[not(local-name = 'fmt-xref-label')]"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:copy-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/following-sibling::node()[not(local-name = 'fmt-xref-label')]"/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:when>
 					<xsl:when test="*[local-name() = 'tab']">
 						<xsl:choose>
 							<xsl:when test="@type = 'section-title'">
@@ -10280,7 +10494,7 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'title' or local-name() = 'name']//*[local-name() = 'stem']" mode="contents">
+	<xsl:template match="*[local-name() = 'title' or local-name() = 'name' or local-name() = 'fmt-title' or local-name() = 'fmt-name']//*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
 	</xsl:template>
 
@@ -10293,6 +10507,10 @@
 		<xsl:apply-templates mode="contents"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'semx']" mode="contents">
+		<xsl:apply-templates mode="contents"/>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template>
@@ -10302,9 +10520,14 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'semx']" mode="bookmarks">
+		<xsl:apply-templates mode="bookmarks"/>
+	</xsl:template>
+
 	<!-- Bookmarks -->
 	<xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
+		<xsl:param name="contents_addon"/>
 		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
 		<xsl:if test="$contents_nodes//item">
 			<fo:bookmark-tree>
@@ -10402,6 +10625,9 @@
 					</xsl:otherwise>
 				</xsl:choose>
 
+				<!-- for $namespace = 'nist-sp' $namespace = 'ogc' $namespace = 'ogc-white-paper' -->
+				<xsl:copy-of select="$contents_addon"/>
+
 			</fo:bookmark-tree>
 		</xsl:if>
 	</xsl:template>
@@ -10555,6 +10781,16 @@
 	<!-- ====== -->
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'title']" mode="contents_item">
+		<xsl:param name="mode">bookmarks</xsl:param>
+		<xsl:if test="not(following-sibling::*[1][local-name() = 'fmt-title'])">
+			<xsl:apply-templates mode="contents_item">
+				<xsl:with-param name="mode" select="$mode"/>
+			</xsl:apply-templates>
+			<!-- <xsl:text> </xsl:text> -->
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-title']" mode="contents_item">
 		<xsl:param name="mode">bookmarks</xsl:param>
 		<xsl:apply-templates mode="contents_item">
 			<xsl:with-param name="mode" select="$mode"/>
@@ -10562,12 +10798,38 @@
 		<!-- <xsl:text> </xsl:text> -->
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim']" mode="contents_item" priority="3">
+		<xsl:apply-templates mode="contents_item"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'semx']" mode="contents_item">
+		<xsl:apply-templates mode="contents_item"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-xref-label']" mode="contents_item"/>
+
 	<xsl:template name="getSection">
-		<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+		<xsl:choose>
+			<xsl:when test="*[local-name() = 'fmt-title']">
+				<xsl:variable name="fmt_title_section">
+					<xsl:copy-of select="*[local-name() = 'fmt-title']//*[local-name() = 'span'][@class = 'fmt-caption-delim'][*[local-name() = 'tab']][1]/preceding-sibling::node()[not(local-name() = 'review')]"/>
+				</xsl:variable>
+				<xsl:value-of select="normalize-space($fmt_title_section)"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template name="getName">
 		<xsl:choose>
+			<xsl:when test="*[local-name() = 'fmt-title']//*[local-name() = 'span'][@class = 'fmt-caption-delim'][*[local-name() = 'tab']]">
+				<xsl:copy-of select="*[local-name() = 'fmt-title']//*[local-name() = 'span'][@class = 'fmt-caption-delim'][*[local-name() = 'tab']][1]/following-sibling::node()"/>
+			</xsl:when>
+			<xsl:when test="*[local-name() = 'fmt-title']">
+				<xsl:copy-of select="*[local-name() = 'fmt-title']/node()"/>
+			</xsl:when>
 			<xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
 				<xsl:copy-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/following-sibling::node()"/>
 			</xsl:when>
@@ -10674,6 +10936,15 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'name']" mode="contents_item">
+		<xsl:param name="mode">bookmarks</xsl:param>
+		<xsl:if test="not(following-sibling::*[1][local-name() = 'fmt-name'])">
+			<xsl:apply-templates mode="contents_item">
+				<xsl:with-param name="mode" select="$mode"/>
+			</xsl:apply-templates>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-name']" mode="contents_item">
 		<xsl:param name="mode">bookmarks</xsl:param>
 		<xsl:apply-templates mode="contents_item">
 			<xsl:with-param name="mode" select="$mode"/>
@@ -11471,7 +11742,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:inline xsl:use-attribute-sets="termexample-name-style">
 				<xsl:call-template name="refine_termexample-name-style"/>
-				<xsl:apply-templates/>
+				<xsl:apply-templates/> <!-- commented $namespace = 'ieee', https://github.com/metanorma/isodoc/issues/614-->
 			</fo:inline>
 		</xsl:if>
 	</xsl:template>
@@ -11512,107 +11783,108 @@
 	-->
 	<xsl:template match="*[local-name() = 'example']">
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
+				<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
 
-			<xsl:call-template name="setBlockSpanAll"/>
+					<xsl:call-template name="setBlockSpanAll"/>
 
-			<xsl:call-template name="refine_example-style"/>
+					<xsl:call-template name="refine_example-style"/>
 
-			<xsl:variable name="fo_element">
-				<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
-				block
-			</xsl:variable>
+					<xsl:variable name="fo_element">
+						<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
+						block
+					</xsl:variable>
 
-			<fo:block-container margin-left="0mm" role="SKIP">
+					<fo:block-container margin-left="0mm" role="SKIP">
 
-				<xsl:choose>
+						<xsl:choose>
 
-					<xsl:when test="contains(normalize-space($fo_element), 'block')">
+							<xsl:when test="contains(normalize-space($fo_element), 'block')">
 
-						<!-- display name 'EXAMPLE' in a separate block  -->
-						<fo:block>
-							<xsl:apply-templates select="*[local-name()='name']">
-								<xsl:with-param name="fo_element" select="$fo_element"/>
-							</xsl:apply-templates>
-						</fo:block>
-
-						<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
-							<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
-								<xsl:variable name="example_body">
-									<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+								<!-- display name 'EXAMPLE' in a separate block  -->
+								<fo:block>
+									<xsl:apply-templates select="*[local-name()='name']">
 										<xsl:with-param name="fo_element" select="$fo_element"/>
 									</xsl:apply-templates>
+								</fo:block>
+
+								<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+									<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+										<xsl:variable name="example_body">
+											<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+												<xsl:with-param name="fo_element" select="$fo_element"/>
+											</xsl:apply-templates>
+										</xsl:variable>
+										<xsl:choose>
+											<xsl:when test="xalan:nodeset($example_body)/*">
+												<xsl:copy-of select="$example_body"/>
+											</xsl:when>
+											<xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
+										</xsl:choose>
+									</fo:block-container>
+								</fo:block-container>
+							</xsl:when> <!-- end block -->
+
+							<xsl:when test="contains(normalize-space($fo_element), 'list')">
+
+								<xsl:variable name="provisional_distance_between_starts_">
+									7
 								</xsl:variable>
-								<xsl:choose>
-									<xsl:when test="xalan:nodeset($example_body)/*">
-										<xsl:copy-of select="$example_body"/>
-									</xsl:when>
-									<xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
-								</xsl:choose>
-							</fo:block-container>
-						</fo:block-container>
-					</xsl:when> <!-- end block -->
+								<xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
+								<xsl:variable name="indent_">
+									0
+								</xsl:variable>
+								<xsl:variable name="indent" select="normalize-space($indent_)"/>
 
-					<xsl:when test="contains(normalize-space($fo_element), 'list')">
+								<fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
+									<fo:list-item>
+										<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
+											<fo:block>
+												<xsl:apply-templates select="*[local-name()='name']">
+													<xsl:with-param name="fo_element">block</xsl:with-param>
+												</xsl:apply-templates>
+											</fo:block>
+										</fo:list-item-label>
+										<fo:list-item-body start-indent="body-start()">
+											<fo:block>
+												<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+													<xsl:with-param name="fo_element" select="$fo_element"/>
+												</xsl:apply-templates>
+											</fo:block>
+										</fo:list-item-body>
+									</fo:list-item>
+								</fo:list-block>
+							</xsl:when> <!-- end list -->
 
-						<xsl:variable name="provisional_distance_between_starts_">
-							7
-						</xsl:variable>
-						<xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
-						<xsl:variable name="indent_">
-							0
-						</xsl:variable>
-						<xsl:variable name="indent" select="normalize-space($indent_)"/>
+							<xsl:otherwise> <!-- inline -->
 
-						<fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
-							<fo:list-item>
-								<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
-									<fo:block>
-										<xsl:apply-templates select="*[local-name()='name']">
-											<xsl:with-param name="fo_element">block</xsl:with-param>
-										</xsl:apply-templates>
-									</fo:block>
-								</fo:list-item-label>
-								<fo:list-item-body start-indent="body-start()">
-									<fo:block>
-										<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+								<!-- display 'EXAMPLE' and first element in the same line -->
+								<fo:block>
+									<xsl:apply-templates select="*[local-name()='name']">
+										<xsl:with-param name="fo_element" select="$fo_element"/>
+									</xsl:apply-templates>
+									<fo:inline>
+										<xsl:apply-templates select="*[not(local-name() = 'name')][1]">
 											<xsl:with-param name="fo_element" select="$fo_element"/>
 										</xsl:apply-templates>
-									</fo:block>
-								</fo:list-item-body>
-							</fo:list-item>
-						</fo:list-block>
-					</xsl:when> <!-- end list -->
-
-					<xsl:otherwise> <!-- inline -->
+									</fo:inline>
+								</fo:block>
 
-						<!-- display 'EXAMPLE' and first element in the same line -->
-						<fo:block>
-							<xsl:apply-templates select="*[local-name()='name']">
-								<xsl:with-param name="fo_element" select="$fo_element"/>
-							</xsl:apply-templates>
-							<fo:inline>
-								<xsl:apply-templates select="*[not(local-name() = 'name')][1]">
-									<xsl:with-param name="fo_element" select="$fo_element"/>
-								</xsl:apply-templates>
-							</fo:inline>
-						</fo:block>
+								<xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
+									<!-- display further elements in blocks -->
+									<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+										<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+											<xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
+												<xsl:with-param name="fo_element" select="'block'"/>
+											</xsl:apply-templates>
+										</fo:block-container>
+									</fo:block-container>
+								</xsl:if>
+							</xsl:otherwise> <!-- end inline -->
 
-						<xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
-							<!-- display further elements in blocks -->
-							<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
-								<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
-									<xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
-										<xsl:with-param name="fo_element" select="'block'"/>
-									</xsl:apply-templates>
-								</fo:block-container>
-							</fo:block-container>
-						</xsl:if>
-					</xsl:otherwise> <!-- end inline -->
+						</xsl:choose>
+					</fo:block-container>
+				</fo:block-container>
 
-				</xsl:choose>
-			</fo:block-container>
-		</fo:block-container>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']">
@@ -11633,7 +11905,7 @@
 			<xsl:otherwise>
 				<fo:inline xsl:use-attribute-sets="example-name-style">
 					<xsl:call-template name="refine_example-name-style"/>
-					<xsl:apply-templates/>
+					<xsl:apply-templates/> <!-- $namespace = 'ieee', see https://github.com/metanorma/isodoc/issues/614  -->
 				</fo:inline>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -11815,15 +12087,17 @@
 
 					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 						<fo:block role="BlockQuote">
-							<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
+							<xsl:apply-templates select="./node()[not(local-name() = 'author') and         not(local-name() = 'source') and         not(local-name() = 'attribution')]"/> <!-- process all nested nodes, except author and source -->
 						</fo:block>
 					</fo:block-container>
 				</fo:block-container>
-				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
+				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source'] or *[local-name() = 'attribution']">
 					<fo:block xsl:use-attribute-sets="quote-source-style">
 						<!-- — ISO, ISO 7301:2011, Clause 1 -->
 						<xsl:apply-templates select="*[local-name() = 'author']"/>
 						<xsl:apply-templates select="*[local-name() = 'source']"/>
+						<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
+						<xsl:apply-templates select="*[local-name() = 'attribution']/*[local-name() = 'p']/node()"/>
 					</fo:block>
 				</xsl:if>
 
@@ -11845,9 +12119,13 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'author']">
-		<xsl:text>— </xsl:text>
+		<xsl:if test="local-name(..) = 'quote'"> <!-- for old Presentation XML, https://github.com/metanorma/isodoc/issues/607 -->
+			<xsl:text>— </xsl:text>
+		</xsl:if>
 		<xsl:apply-templates/>
 	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'quote']//*[local-name() = 'referenceFrom']"/>
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -11989,6 +12267,13 @@
 
 	</xsl:template> <!-- tab -->
 
+	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
+	<xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
+
+	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab">
+
+	</xsl:template>
+
 	<xsl:template name="insertNonBreakSpaces">
 		<xsl:param name="count"/>
 		<xsl:if test="$count &gt; 0">
@@ -12028,8 +12313,12 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'domain']">
+		<!-- https://github.com/metanorma/isodoc/issues/607 
 		<fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
-		<xsl:text> </xsl:text>
+		<xsl:text> </xsl:text> -->
+		<xsl:if test="not(@hidden = 'true')">
+			<xsl:apply-templates/>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'admitted']">
@@ -12077,6 +12366,29 @@
 	<!-- END definition -->
 	<!-- ========== -->
 
+	<xsl:variable name="reviews_">
+		<xsl:for-each select="//*[local-name() = 'review'][@from]">
+			<xsl:copy>
+				<xsl:copy-of select="@from"/>
+				<xsl:copy-of select="@id"/>
+			</xsl:copy>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable name="reviews" select="xalan:nodeset($reviews_)"/>
+
+	<xsl:template name="addReviewHelper">
+		<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
+		<xsl:variable name="curr_id" select="@id"/>
+		<xsl:variable name="review_id" select="normalize-space($reviews//*[local-name() = 'review'][@from = $curr_id]/@id)"/>
+		<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
+			<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+		</xsl:if>
+		<!-- <fo:block>
+			<curr_id><xsl:value-of select="$curr_id"/></curr_id>
+			<xsl:copy-of select="$reviews"/>
+		</fo:block> -->
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
 
@@ -12085,6 +12397,8 @@
 
 			<xsl:call-template name="sections_element_style"/>
 
+			<xsl:call-template name="addReviewHelper"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 
@@ -12127,6 +12441,7 @@
 
 		<fo:block>
 			<xsl:call-template name="setId"/>
+			<xsl:call-template name="addReviewHelper"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -12163,6 +12478,8 @@
 
 			<xsl:call-template name="refine_clause_style"/>
 
+			<xsl:call-template name="addReviewHelper"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -12219,6 +12536,23 @@
 
 		<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
 
+		<xsl:if test="1 = 1">
+		<xsl:choose>
+			<!-- if there isn't the attribute '@from', then -->
+			<xsl:when test="$id_from = ''">
+				<fo:block id="{@id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
+			<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+		</xsl:choose>
+		</xsl:if>
+
+    <xsl:if test="1 = 2">
 		<xsl:choose>
 			<!-- if there isn't the attribute '@from', then -->
 			<xsl:when test="$id_from = ''">
@@ -12232,6 +12566,7 @@
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>
+    </xsl:if>
 
 	</xsl:template>
 
@@ -13512,6 +13847,10 @@
 	<!--   - Remove semantic xml part -->
 	<!--   - Remove image/emf (EMF vector image for Word) -->
 	<!--   - add @id, redundant for table auto-layout algorithm -->
+	<!--   - process 'passthrough' element -->
+	<!--   - split math by element with @linebreak into maths -->
+	<!--   - rename fmt-title to title, fmt-name to name and another changes to convert new presentation XML to  -->
+	<!--   - old XML without significant changes in XSLT -->
 	<!-- =========================================================================== -->
 	<xsl:template match="@*|node()" mode="update_xml_step1">
 		<xsl:copy>
@@ -13519,6 +13858,12 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="@*|node()" mode="update_xml_pres">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="update_xml_pres"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- change section's order based on @displayorder value -->
 	<xsl:template match="*[local-name() = 'preface']" mode="update_xml_step1">
 		<xsl:copy>
@@ -13595,7 +13940,7 @@
 	</xsl:template>
 
 	<!-- Example with 'class': <span class="stdpublisher">ISO</span> <span class="stddocNumber">10303</span>-<span class="stddocPartNumber">1</span>:<span class="stdyear">1994</span> -->
-	<xsl:template match="*[local-name() = 'span'][@style or @class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'span'][@style or @class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear' or @class = 'horizontal' or @class = 'norotate' or @class = 'halffontsize']" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>
@@ -13614,14 +13959,17 @@
 
 	<!-- remove semantic xml -->
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'metanorma']/*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'metanorma']/*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<!-- remove image/emf -->
 	<xsl:template match="*[local-name() = 'image']/*[local-name() = 'emf']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'image']/*[local-name() = 'emf']" mode="update_xml_pres"/>
 
 	<!-- remove preprocess-xslt -->
 	<xsl:template match="*[local-name() = 'preprocess-xslt']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'preprocess-xslt']" mode="update_xml_pres"/>
 
-	<xsl:template match="*[local-name() = 'stem'] |        *[local-name() = 'image'] |        *[local-name() = 'sourcecode'] |        *[local-name() = 'bibdata'] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
+	<xsl:template match="*[local-name() = 'stem'][not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])] |        *[local-name() = 'image'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'sourcecode'][not(.//*[local-name() = 'passthrough']) and not(.//*[local-name() = 'fmt-name'])] |        *[local-name() = 'bibdata'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
@@ -13687,6 +14035,93 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:variable name="regex_passthrough">.*\bpdf\b.*</xsl:variable>
+	<xsl:template match="*[local-name() = 'passthrough']" mode="update_xml_step1">
+		<!-- <xsl:if test="contains(@formats, ' pdf ')"> -->
+		<xsl:if test="normalize-space(java:matches(java:java.lang.String.new(@formats), $regex_passthrough)) = 'true'">
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:if>
+	</xsl:template>
+
+	<!-- split math by element with @linebreak into maths -->
+	<xsl:template match="mathml:math[.//mathml:mo[@linebreak] or .//mathml:mspace[@linebreak]]" mode="update_xml_step1">
+		<xsl:variable name="maths">
+			<xsl:apply-templates select="." mode="mathml_linebreak"/>
+		</xsl:variable>
+		<xsl:copy-of select="$maths"/>
+	</xsl:template>
+
+	<!-- update new Presentation XML -->
+	<xsl:template match="*[local-name() = 'title'][following-sibling::*[1][local-name() = 'fmt-title']]" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'title'][following-sibling::*[1][local-name() = 'fmt-title']]" mode="update_xml_pres"/>
+	<xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
+	<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
+
+	<xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+			<xsl:copy-of select="preceding-sibling::*[1][local-name() = 'section-title']/@depth"/>
+			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_pres">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_pres"/>
+			<xsl:copy-of select="preceding-sibling::*[1][local-name() = 'section-title']/@depth"/>
+			<xsl:apply-templates select="node()" mode="update_xml_pres"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-title']"/>
+	<xsl:template match="*[local-name() = 'fmt-title']" mode="update_xml_step1">
+		<xsl:element name="title" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-title']" mode="update_xml_pres">
+		<xsl:element name="title" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-name']"/>
+	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
+		<xsl:element name="name" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres">
+		<xsl:element name="name" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = '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:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_pres" priority="3">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'semx']" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'semx']" mode="update_xml_pres">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-xref-label']"/>
+	<xsl:template match="*[local-name() = 'fmt-xref-label']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'fmt-xref-label']" mode="update_xml_pres"/>
+
+	<!-- END: update new Presentation XML -->
+
 	<!-- =========================================================================== -->
 	<!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
 	<!-- =========================================================================== -->
@@ -13790,6 +14225,8 @@
 
 	<xsl:template name="insertOpeningElements">
 		<xsl:param name="tree"/>
+		<xsl:param name="xmlns"/>
+		<xsl:param name="add_continue">true</xsl:param>
 		<xsl:for-each select="$tree//element">
 			<xsl:text disable-output-escaping="yes">&lt;</xsl:text>
 				<xsl:value-of select="."/>
@@ -13800,7 +14237,8 @@
 					<xsl:value-of select="."/>
 					<xsl:text>"</xsl:text>
 				</xsl:for-each>
-				<xsl:if test="position() = 1"> continue="true"</xsl:if>
+				<xsl:if test="position() = 1 and $add_continue = 'true'"> continue="true"</xsl:if>
+				<xsl:if test="position() = 1 and $xmlns != ''"> xmlns="<xsl:value-of select="$xmlns"/>"</xsl:if>
 			<xsl:text disable-output-escaping="yes">&gt;</xsl:text>
 			<xsl:if test="$debug = 'true'">
 				<xsl:message>&lt;<xsl:value-of select="."/>&gt;</xsl:message>
@@ -13876,7 +14314,7 @@
 	<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
 	<xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::*[local-name() = 'name'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<xsl:variable name="parent" select="local-name(..)"/>
 
@@ -14455,6 +14893,7 @@
 		</pdf:catalog>
 		<x:xmpmeta xmlns:x="adobe:ns:meta/">
 			<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+				<!-- Commented after upgrade to Apache FOP 2.10
 				<rdf:Description xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#" xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" rdf:about="">
 					<pdfaExtension:schemas>
 						<rdf:Bag>
@@ -14487,7 +14926,7 @@
 							</rdf:li>
 						</rdf:Bag>
 					</pdfaExtension:schemas>
-				</rdf:Description>
+				</rdf:Description> -->
 				<rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
 				<!-- Dublin Core properties go here -->
 					<dc:title>
@@ -14534,7 +14973,7 @@
 					<xsl:variable name="dc_description">
 						<xsl:variable name="abstract">
 
-									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
+									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'fmt-title']) and not(ancestor::*[local-name() = 'title']) and not(ancestor::*[local-name() = 'fmt-xref-label'])]"/>
 
 						</xsl:variable>
 						<rdf:Alt>
@@ -15079,31 +15518,123 @@
 
 	<!-- END: insert cover page image -->
 
-	<xsl:variable name="regex_ja_spec">[\uFF08\uFF09]</xsl:variable>
+	<!-- https://github.com/metanorma/docs/blob/main/109.adoc -->
+	<xsl:variable name="regex_ja_spec_">[
+		<!-- Rotate 90° clockwise -->
+		\u0028  <!-- U+0028 LEFT PARENTHESIS (() -->
+		\uFF08 <!-- U+FF08 FULLWIDTH LEFT PARENTHESIS (（) -->
+		\u0029 <!-- U+0029 RIGHT PARENTHESIS ()) -->
+		\uFF09 <!-- U+FF09 FULLWIDTH RIGHT PARENTHESIS (）) -->
+		\u007B <!-- U+007B LEFT CURLY BRACKET ({) -->
+		\uFF5B <!-- U+FF5B FULLWIDTH LEFT CURLY BRACKET (｛) -->
+		\u007D <!-- U+007D RIGHT CURLY BRACKET (}) -->
+		\uFF5D <!-- U+FF5D FULLWIDTH RIGHT CURLY BRACKET (｝) -->
+		\u3014 <!-- U+3014 LEFT TORTOISE SHELL BRACKET (〔) -->
+		\u3015 <!-- U+3015 RIGHT TORTOISE SHELL BRACKET (〕) -->
+		\u3010 <!-- U+3010 LEFT BLACK LENTICULAR BRACKET (【) -->
+		\u3011 <!-- U+3011 RIGHT BLACK LENTICULAR BRACKET (】) -->
+		\u300A <!-- U+300A LEFT DOUBLE ANGLE BRACKET (《) -->
+		\u300B <!-- U+300B RIGHT DOUBLE ANGLE BRACKET (》) -->
+		\uFF62 <!-- U+FF62 HALFWIDTH LEFT CORNER BRACKET (｢) -->
+		\u300C <!-- U+300C LEFT CORNER BRACKET (「) -->
+		\uFF63 <!-- U+FF63 HALFWIDTH RIGHT CORNER BRACKET (｣) -->
+		\u300D <!-- U+300D RIGHT CORNER BRACKET (」) -->
+		\u300E <!-- U+300E LEFT WHITE CORNER BRACKET (『) -->
+		\u300F <!-- U+300F RIGHT WHITE CORNER BRACKET (』) -->
+		\u005B <!-- U+005B LEFT SQUARE BRACKET ([) -->
+		\uFF3B <!-- U+FF3B FULLWIDTH LEFT SQUARE BRACKET (［) -->
+		\u005D <!-- U+005D RIGHT SQUARE BRACKET (]) -->
+		\uFF3D <!-- U+FF3D FULLWIDTH RIGHT SQUARE BRACKET (］) -->
+		\u3008 <!-- U+3008 LEFT ANGLE BRACKET (〈) -->
+		\u3009 <!-- U+3009 RIGHT ANGLE BRACKET (〉) -->
+		\u3016 <!-- U+3016 LEFT WHITE LENTICULAR BRACKET (〖) -->
+		\u3017 <!-- U+3017 RIGHT WHITE LENTICULAR BRACKET (〗) -->
+
+		\u301A <!-- U+301A LEFT WHITE SQUARE BRACKET (〚) -->
+		\u301B <!-- U+301B RIGHT WHITE SQUARE BRACKET (〛) -->
+		\u301C <!-- U+301C WAVE DASH (〜) -->
+		\u3030 <!-- U+3030 WAVY DASH (〰 )-->
+		\u30FC <!-- U+30FC KATAKANA-HIRAGANA PROLONGED SOUND MARK (ー) -->
+		\u2329 <!-- U+2329 LEFT-POINTING ANGLE BRACKET (〈) -->
+		\u232A <!-- U+232A RIGHT-POINTING ANGLE BRACKET (〉) -->
+		\u3018 <!-- U+3018 LEFT WHITE TORTOISE SHELL BRACKET (〘) -->
+		\u3019 <!-- U+3019 RIGHT WHITE TORTOISE SHELL BRACKET (〙) -->
+		\u30A0 <!-- U+30A0 KATAKANA-HIRAGANA DOUBLE HYPHEN (゠) -->
+		\uFE59 <!-- U+FE59 SMALL LEFT PARENTHESIS (﹙) -->
+		\uFE5A <!-- U+FE5A SMALL RIGHT PARENTHESIS (﹚) -->
+		\uFE5B <!-- U+FE5B SMALL LEFT CURLY BRACKET (﹛) -->
+		\uFE5C <!-- U+FE5C SMALL RIGHT CURLY BRACKET (﹜) -->
+		\uFE5D <!-- U+FE5D SMALL LEFT TORTOISE SHELL BRACKET (﹝) -->
+		\uFE5E <!-- U+FE5E SMALL RIGHT TORTOISE SHELL BRACKET (﹞) -->
+		\uFF5C <!-- U+FF5C FULLWIDTH VERTICAL LINE (｜) -->
+		\uFF5F <!-- U+FF5F FULLWIDTH LEFT WHITE PARENTHESIS (｟) -->
+		\uFF60 <!-- U+FF60 FULLWIDTH RIGHT WHITE PARENTHESIS (｠) -->
+		\uFFE3 <!-- U+FFE3 FULLWIDTH MACRON (￣) -->
+		\uFF3F <!-- U+FF3F FULLWIDTH LOW LINE (＿) -->
+		\uFF5E <!-- U+FF5E FULLWIDTH TILDE (～) -->
+		<!-- Rotate 180° -->
+		\u309C <!-- U+309C KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK (゜) -->
+		\u3002 <!-- U+3002 IDEOGRAPHIC FULL STOP (。) -->
+		\uFE52 <!-- U+FE52 SMALL FULL STOP (﹒) -->
+		\uFF0E <!-- U+FF0E FULLWIDTH FULL STOP (．) -->
+		]</xsl:variable>
+	<xsl:variable name="regex_ja_spec"><xsl:value-of select="translate(normalize-space($regex_ja_spec_), ' ', '')"/></xsl:variable>
 	<xsl:template name="insertVerticalChar">
 		<xsl:param name="str"/>
 		<xsl:param name="writing-mode">lr-tb</xsl:param>
 		<xsl:param name="reference-orientation">90</xsl:param>
-		<xsl:if test="string-length($str) &gt; 0">
-			<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
-				<xsl:if test="normalize-space($writing-mode) != ''">
-					<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
-					<xsl:attribute name="reference-orientation">90</xsl:attribute>
-				</xsl:if>
-				<xsl:variable name="char" select="substring($str,1,1)"/>
-				<xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
-					<xsl:attribute name="reference-orientation">0</xsl:attribute>
+		<xsl:param name="add_zero_width_space">false</xsl:param>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'span'][@class = 'norotate']">
+				<xsl:value-of select="$str"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:if test="string-length($str) &gt; 0">
+					<xsl:variable name="horizontal_mode" select="normalize-space(ancestor::*[local-name() = 'span'][@class = 'horizontal'] and 1 = 1)"/>
+					<xsl:variable name="char" select="substring($str,1,1)"/>
+					<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
+						<xsl:if test="normalize-space($writing-mode) != ''">
+							<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
+							<xsl:attribute name="reference-orientation">90</xsl:attribute>
+						</xsl:if>
+						<xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
+							<xsl:attribute name="reference-orientation">0</xsl:attribute>
+						</xsl:if>
+						<xsl:if test="$char = '゜' or $char = '。' or $char = '﹒' or $char = '．'">
+							<!-- Rotate 180°: 
+								U+309C KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK (゜)
+								U+3002 IDEOGRAPHIC FULL STOP (。)
+								U+FE52 SMALL FULL STOP (﹒)
+								U+FF0E FULLWIDTH FULL STOP (．)
+							-->
+							<xsl:attribute name="reference-orientation">-90</xsl:attribute>
+						</xsl:if>
+						<fo:block-container width="1em">
+							<fo:block line-height="1em">
+								<xsl:choose>
+									<xsl:when test="$horizontal_mode = 'true'">
+										<xsl:value-of select="$str"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$char"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</fo:block>
+						</fo:block-container>
+					</fo:inline-container>
+					<xsl:if test="$add_zero_width_space = 'true' and ($char = ',' or $char = '.' or $char = ' ' or $char = '·' or $char = ')' or $char = ']' or $char = '}')"><xsl:value-of select="$zero_width_space"/></xsl:if>
+
+					<xsl:if test="$horizontal_mode = 'false'">
+						<xsl:call-template name="insertVerticalChar">
+							<xsl:with-param name="str" select="substring($str, 2)"/>
+							<xsl:with-param name="writing-mode" select="$writing-mode"/>
+							<xsl:with-param name="reference-orientation" select="$reference-orientation"/>
+							<xsl:with-param name="add_zero_width_space" select="$add_zero_width_space"/>
+						</xsl:call-template>
+					</xsl:if>
 				</xsl:if>
-				<fo:block-container width="1em">
-						<fo:block line-height="1em"><xsl:value-of select="$char"/></fo:block>
-				</fo:block-container>
-			</fo:inline-container>
-			<xsl:call-template name="insertVerticalChar">
-				<xsl:with-param name="str" select="substring($str, 2)"/>
-				<xsl:with-param name="writing-mode" select="$writing-mode"/>
-				<xsl:with-param name="reference-orientation" select="$reference-orientation"/>
-			</xsl:call-template>
-		</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template name="number-to-words">