From 6196c7ebe054332c2efcb50eb8a8ef2a5de8e59d Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Thu, 12 Dec 2024 16:36:07 +0300
Subject: [PATCH 01/14] JIS xslt updated to render biblio-tag in horizontal,
 metanorma/metanorma-jis#257, metanorma/metanorma-jis#226

---
 xslt_src/common.xsl                          | 19 ++++++
 xslt_src/jis.international-standard.core.xsl | 72 ++++++++++++++++++++
 2 files changed, 91 insertions(+)

diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index a980861bb..1d841268c 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -21344,6 +21344,25 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template name="insertHorizontalChars">
+		<xsl:param name="str"/>
+		<xsl:param name="writing-mode">lr-tb</xsl:param>
+		<xsl:param name="reference-orientation">90</xsl:param>
+		<xsl:param name="add_zero_width_space">false</xsl:param>
+		<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>
+			<fo:block-container width="1em">
+				<fo:block line-height="1em">
+					<xsl:value-of select="$str"/>
+				</fo:block>
+			</fo:block-container>
+		</fo:inline-container>
+	</xsl:template>
  
 	<xsl:template name="number-to-words">
 		<xsl:param name="number" />
diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index 7bde61550..9d09d5cfe 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -2511,6 +2511,8 @@
 	</xsl:variable>
 	<xsl:variable name="regex_en" select="normalize-space($regex_en_)"/>
 	
+	<xsl:variable name="regex_horizontal">(\d{1,3})</xsl:variable>
+	
 	<xsl:variable name="element_name_font_en">font_en</xsl:variable>
 	<xsl:variable name="tag_font_en_open">###<xsl:value-of select="$element_name_font_en"/>###</xsl:variable>
 	<xsl:variable name="tag_font_en_close">###/<xsl:value-of select="$element_name_font_en"/>###</xsl:variable>
@@ -2520,6 +2522,9 @@
 	<xsl:variable name="element_name_font_en_vertical">font_en_vertical</xsl:variable>
 	<xsl:variable name="tag_font_en_vertical_open">###<xsl:value-of select="$element_name_font_en_vertical"/>###</xsl:variable>
 	<xsl:variable name="tag_font_en_vertical_close">###/<xsl:value-of select="$element_name_font_en_vertical"/>###</xsl:variable>
+	<xsl:variable name="element_name_font_en_horizontal">font_en_horizontal</xsl:variable>
+	<xsl:variable name="tag_font_en_horizontal_open">###<xsl:value-of select="$element_name_font_en_horizontal"/>###</xsl:variable>
+	<xsl:variable name="tag_font_en_horizontal_close">###/<xsl:value-of select="$element_name_font_en_horizontal"/>###</xsl:variable>
 	
 	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata']) and not(ancestor::jis:p[@class = 'zzSTDTitle2'])]" mode="update_xml_step1">
 		<xsl:choose>
@@ -2545,6 +2550,37 @@
 		</xsl:choose>
 	</xsl:template>
 	
+	<!-- <biblio-tag>[15]<tab/>JIS...</biblio-tag>
+		to
+		<biblio-tag><font_en_vertical>[</font_en_vertical><font_en_horizontal>15</font_en_horizontal><font_en_vertical>]</font_en_vertical><tab/>JIS...
+	-->
+	<xsl:template match="jis:references[@normative = 'false']//jis:biblio-tag/text()[not(preceding-sibling::node())]" mode="update_xml_step1" priority="2">
+		<xsl:choose>
+			<xsl:when test="$vertical_layout = 'true'">
+				<xsl:variable name="biblio_tag_text_nodes">
+					<xsl:call-template name="enclose_text_in_vertical_tag">
+						<xsl:with-param name="regex" select="concat('((', $regex_ja_spec, '){1,})')"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:for-each select="xalan:nodeset($biblio_tag_text_nodes)/node()">
+					<xsl:choose>
+						<xsl:when test="self::text()">
+							<xsl:call-template name="enclose_text_in_horizontal_tag">
+								<xsl:with-param name="regex" select="$regex_horizontal"/>
+							</xsl:call-template>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:copy-of select="."/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:for-each>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="enclose_text_in_font_en_tag"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
 	<xsl:template name="enclose_text_in_vertical_tag">
 		<xsl:param name="text" select="."/>
 		<xsl:param name="regex" select="$regex_en"/>
@@ -2561,6 +2597,22 @@
 		<xsl:copy-of select="xalan:nodeset($text_vertical)/*[local-name() = 'text']/node()"/>
 	</xsl:template>
 	
+	<xsl:template name="enclose_text_in_horizontal_tag">
+		<xsl:param name="text" select="."/>
+		<xsl:param name="regex" select="$regex_horizontal"/>
+		<xsl:variable name="text_horizontal_" select="java:replaceAll(java:java.lang.String.new($text), $regex, concat($tag_font_en_horizontal_open,'$1',$tag_font_en_horizontal_close))"/>
+		<xsl:variable name="text_horizontal">
+			<xsl:element name="text" namespace="{$namespace_full}">
+				<xsl:call-template name="replace_text_tags">
+					<xsl:with-param name="tag_open" select="$tag_font_en_horizontal_open"/>
+					<xsl:with-param name="tag_close" select="$tag_font_en_horizontal_close"/>
+					<xsl:with-param name="text" select="$text_horizontal_"/>
+				</xsl:call-template>
+			</xsl:element>
+		</xsl:variable>
+		<xsl:copy-of select="xalan:nodeset($text_horizontal)/*[local-name() = 'text']/node()"/>
+	</xsl:template>
+	
 	<xsl:template name="enclose_text_in_font_en_tag">
 		<xsl:param name="text" select="."/>
 		<xsl:param name="regex" select="$regex_en"/>
@@ -2839,6 +2891,26 @@
 		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']"><xsl:value-of select="$zero_width_space"/></xsl:if>
 	</xsl:template>
 	
+	<!-- English text in vertical layout, in horizontal mode -->
+	<xsl:template match="*[local-name() = 'font_en_horizontal'][normalize-space() != '']">
+		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']"><xsl:value-of select="$zero_width_space"/></xsl:if>
+		<fo:inline>
+			<xsl:for-each select="node()">
+				<xsl:choose>
+					<xsl:when test="self::text()">
+						<xsl:call-template name="insertHorizontalChars">
+							<xsl:with-param name="str" select="."/>
+						</xsl:call-template>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="."/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:for-each>
+		</fo:inline>
+		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']"><xsl:value-of select="$zero_width_space"/></xsl:if>
+	</xsl:template>
+	
 	<!-- ========================= -->
 	<!-- END: Allocate non-Japanese text -->
 	<!-- ========================= -->

From bcc29302995fb62a7b8dce1496730f9c57991864 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Thu, 12 Dec 2024 19:00:56 +0300
Subject: [PATCH 02/14] JIS xslt updated for horizontal position,
 metanorma/metanorma-jis#257, metanorma/metanorma-jis#226

---
 xslt_src/common.xsl | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index 1d841268c..b826b3c9e 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -21224,15 +21224,22 @@
 	<!-- END: insert cover page image -->
  
 	<!-- https://github.com/metanorma/docs/blob/main/109.adoc -->
+	<xsl:variable name="regex_ja_spec_half_width">
+		\u0028  <!-- U+0028 LEFT PARENTHESIS (() -->
+		\u0029 <!-- U+0029 RIGHT PARENTHESIS ()) -->
+		\u007B <!-- U+007B LEFT CURLY BRACKET ({) -->
+		\u007D <!-- U+007D RIGHT CURLY BRACKET (}) -->
+		\uFF62 <!-- U+FF62 HALFWIDTH LEFT CORNER BRACKET (｢) -->
+		\uFF63 <!-- U+FF63 HALFWIDTH RIGHT CORNER BRACKET (｣) -->
+		\u005B <!-- U+005B LEFT SQUARE BRACKET ([) -->
+		\u005D <!-- U+005D RIGHT SQUARE BRACKET (]) -->
+	</xsl:variable>
 	<xsl:variable name="regex_ja_spec_">[
 		<!-- Rotate 90° clockwise -->
-		\u0028  <!-- U+0028 LEFT PARENTHESIS (() -->
+		<xsl:value-of select="$regex_ja_spec_half_width"/>
 		\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 (〕) -->
@@ -21240,21 +21247,16 @@
 		\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 (〜) -->
@@ -21297,9 +21299,16 @@
 				<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)"/>
+					
+					<xsl:variable name="char_half_width" select="normalize-space(java:matches(java:java.lang.String.new($char), concat('([', $regex_ja_spec_half_width, ']{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="$char_half_width = 'true'">
+						 <xsl:attribute name="width">0.5em</xsl:attribute>
+						 <xsl:attribute name="baseline-shift">7%</xsl:attribute>
+						</xsl:if>
 						<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>
@@ -21316,7 +21325,10 @@
 							-->
 							<xsl:attribute name="reference-orientation">-90</xsl:attribute>
 						</xsl:if>
-						<fo:block-container width="1em">
+						<fo:block-container width="1em"><!-- border="0.5pt solid blue" -->
+							<xsl:if test="$char_half_width = 'true'">
+								<xsl:attribute name="width">0.5em</xsl:attribute>
+							</xsl:if>
 							<fo:block line-height="1em">
 								<xsl:choose>
 									<xsl:when test="$horizontal_mode = 'true'">
@@ -21356,7 +21368,7 @@
 				<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
 				<xsl:attribute name="reference-orientation">90</xsl:attribute>
 			</xsl:if>
-			<fo:block-container width="1em">
+			<fo:block-container width="1em"> <!-- border="0.5pt solid green" -->
 				<fo:block line-height="1em">
 					<xsl:value-of select="$str"/>
 				</fo:block>

From bb628a215b51b8960f25f645c81d6cfe79125170 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Fri, 13 Dec 2024 00:40:56 +0300
Subject: [PATCH 03/14] JIS xslt refactored for horizontal digits,
 metanorma/metanorma-jis#257, metanorma/metanorma-jis#226

---
 xslt_src/common.xsl                          | 110 ++++++++++---------
 xslt_src/jis.international-standard.core.xsl |  52 ++++++++-
 2 files changed, 104 insertions(+), 58 deletions(-)

diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index b826b3c9e..3288160bf 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -21224,7 +21224,7 @@
 	<!-- END: insert cover page image -->
  
 	<!-- https://github.com/metanorma/docs/blob/main/109.adoc -->
-	<xsl:variable name="regex_ja_spec_half_width">
+	<xsl:variable name="regex_ja_spec_half_width_">
 		\u0028  <!-- U+0028 LEFT PARENTHESIS (() -->
 		\u0029 <!-- U+0029 RIGHT PARENTHESIS ()) -->
 		\u007B <!-- U+007B LEFT CURLY BRACKET ({) -->
@@ -21234,6 +21234,7 @@
 		\u005B <!-- U+005B LEFT SQUARE BRACKET ([) -->
 		\u005D <!-- U+005D RIGHT SQUARE BRACKET (]) -->
 	</xsl:variable>
+	<xsl:variable name="regex_ja_spec_half_width" select="translate(normalize-space($regex_ja_spec_half_width_), ' ', '')"/>
 	<xsl:variable name="regex_ja_spec_">[
 		<!-- Rotate 90° clockwise -->
 		<xsl:value-of select="$regex_ja_spec_half_width"/>
@@ -21297,60 +21298,65 @@
 			</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="horizontal_mode" select="normalize-space(ancestor::*[local-name() = 'span'][@class = 'horizontal'] and 1 = 1)"/> -->
 					<xsl:variable name="char" select="substring($str,1,1)"/>
 					
 					<xsl:variable name="char_half_width" select="normalize-space(java:matches(java:java.lang.String.new($char), concat('([', $regex_ja_spec_half_width, ']{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="$char_half_width = 'true'">
-						 <xsl:attribute name="width">0.5em</xsl:attribute>
-						 <xsl:attribute name="baseline-shift">7%</xsl:attribute>
-						</xsl:if>
-						<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"><!-- border="0.5pt solid blue" -->
-							<xsl:if test="$char_half_width = 'true'">
-								<xsl:attribute name="width">0.5em</xsl:attribute>
-							</xsl:if>
-							<fo:block line-height="1em">
-								<xsl:choose>
-									<xsl:when test="$horizontal_mode = 'true'">
-										<xsl:value-of select="$str"/>
-									</xsl:when>
-									<xsl:otherwise>
+					<xsl:choose>
+						<xsl:when test="$char_half_width = 'true'">
+							<fo:inline>
+								<xsl:attribute name="baseline-shift">7%</xsl:attribute>
+								<xsl:value-of select="$char"/>
+							</fo:inline>
+						</xsl:when>
+						<xsl:otherwise>
+							<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" role="SKIP">
+								<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" role="SKIP"><!-- border="0.5pt solid blue" -->
+									<fo:block line-height="1em" role="SKIP">
+										<!-- <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> -->
 										<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>
+									</fo:block>
+								</fo:block-container>
+							</fo:inline-container>
+						</xsl:otherwise>
+					</xsl:choose>
 					
-					<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 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>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -21363,13 +21369,13 @@
 		<xsl:param name="add_zero_width_space">false</xsl:param>
 		<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">
+								 text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm" role="SKIP">
 			<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>
-			<fo:block-container width="1em"> <!-- border="0.5pt solid green" -->
-				<fo:block line-height="1em">
+			<fo:block-container width="1em" role="SKIP"> <!-- border="0.5pt solid green" -->
+				<fo:block line-height="1em" role="SKIP">
 					<xsl:value-of select="$str"/>
 				</fo:block>
 			</fo:block-container>
diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index 9d09d5cfe..e72149aad 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -2368,6 +2368,7 @@
 	</xsl:template>
 	
 	
+	<!-- replace horizontal to vertical oriented character -->
 	<xsl:template match="text()" mode="update_xml_step0">
 		<!-- from https://github.com/metanorma/docs/blob/main/109.adoc -->
 		<!-- 
@@ -2498,6 +2499,19 @@
 	<!-- Allocate non-Japanese text -->
 	<!-- ========================= -->
 	
+	<xsl:template match="*[local-name() = 'span'][@class = 'horizontal']" mode="update_xml_step1" priority="3">
+		<xsl:element name="{$element_name_font_en_horizontal}" namespace="{$namespace_full}">
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'span'][@class = 'horizontal']//text()" mode="update_xml_step1" priority="3">
+		<xsl:value-of select="."/>
+	</xsl:template>
+	
+	<xsl:template match="*[local-name() = 'span'][@class = 'norotate']" mode="update_xml_step1" priority="3">
+		<xsl:copy-of select="."/>
+	</xsl:template>
+	
 	<!-- if vertical_layout = 'true', then font_en and font_en_bold are using for text rotation -->
 	<xsl:variable name="regex_en_base">\u00A0\u2002-\u200B\u3000-\u9FFF\uF900-\uFFFF</xsl:variable>
 	<xsl:variable name="regex_en_">
@@ -2584,17 +2598,43 @@
 	<xsl:template name="enclose_text_in_vertical_tag">
 		<xsl:param name="text" select="."/>
 		<xsl:param name="regex" select="$regex_en"/>
-		<xsl:variable name="text_vertical_" select="java:replaceAll(java:java.lang.String.new($text), $regex, concat($tag_font_en_vertical_open,'$1',$tag_font_en_vertical_close))"/>
-		<xsl:variable name="text_vertical">
+		
+		<xsl:variable name="regex_two_digits">(^|[^\d])(\d{2,3})($|[^\d])</xsl:variable>
+		
+		<xsl:variable name="text_width_two_or_three_digits_" select="java:replaceAll(java:java.lang.String.new($text), $regex_two_digits, concat('$1',$tag_font_en_horizontal_open,'$2',$tag_font_en_horizontal_close,'$3'))"/>
+		<xsl:variable name="text_width_two_or_three_digits">
 			<xsl:element name="text" namespace="{$namespace_full}">
 				<xsl:call-template name="replace_text_tags">
-					<xsl:with-param name="tag_open" select="$tag_font_en_vertical_open"/>
-					<xsl:with-param name="tag_close" select="$tag_font_en_vertical_close"/>
-					<xsl:with-param name="text" select="$text_vertical_"/>
+					<xsl:with-param name="tag_open" select="$tag_font_en_horizontal_open"/>
+					<xsl:with-param name="tag_close" select="$tag_font_en_horizontal_close"/>
+					<xsl:with-param name="text" select="$text_width_two_or_three_digits_"/>
 				</xsl:call-template>
 			</xsl:element>
 		</xsl:variable>
-		<xsl:copy-of select="xalan:nodeset($text_vertical)/*[local-name() = 'text']/node()"/>
+		
+		<!-- <xsl:copy-of select="$text_width_two_or_three_digits"/> -->
+		
+		<xsl:for-each select="xalan:nodeset($text_width_two_or_three_digits)/*[local-name() = 'text']/node()">
+		
+			<xsl:choose>
+				<xsl:when test="self::text()">
+					<xsl:variable name="text_vertical_" select="java:replaceAll(java:java.lang.String.new(.), $regex, concat($tag_font_en_vertical_open,'$1',$tag_font_en_vertical_close))"/>
+					<xsl:variable name="text_vertical">
+						<xsl:element name="text" namespace="{$namespace_full}">
+							<xsl:call-template name="replace_text_tags">
+								<xsl:with-param name="tag_open" select="$tag_font_en_vertical_open"/>
+								<xsl:with-param name="tag_close" select="$tag_font_en_vertical_close"/>
+								<xsl:with-param name="text" select="$text_vertical_"/>
+							</xsl:call-template>
+						</xsl:element>
+					</xsl:variable>
+					<xsl:copy-of select="xalan:nodeset($text_vertical)/*[local-name() = 'text']/node()"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
 	</xsl:template>
 	
 	<xsl:template name="enclose_text_in_horizontal_tag">

From b391385073d41989cfe6c3921588861d90a5e4fc Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Fri, 13 Dec 2024 15:05:54 +0300
Subject: [PATCH 04/14] JIS xslt refactored for copyright text,
 metanorma/metanorma-jis#226

---
 xslt_src/common.xsl                          |  4 ++
 xslt_src/jis.international-standard.core.xsl | 61 +++++++++++++++-----
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index 3288160bf..f3089a25f 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -21010,6 +21010,7 @@
 		<xsl:param name="formatted">false</xsl:param>
 		<xsl:param name="lang"/>
 		<xsl:param name="returnEmptyIfNotFound">false</xsl:param>
+		<xsl:param name="bibdata_updated"/>
 		
 		<xsl:variable name="curr_lang">
 			<xsl:choose>
@@ -21023,6 +21024,9 @@
 		
 		<xsl:variable name="data_value">
 			<xsl:choose>
+				<xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
+					<xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+				</xsl:when>
 				<xsl:when test="$formatted = 'true'">
 					<xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 				</xsl:when>
diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index e72149aad..4793e8c8d 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -483,6 +483,8 @@
 					<xsl:variable name="copyrightText">
 						<xsl:call-template name="getLocalizedString">
 							<xsl:with-param name="key">permission_footer</xsl:with-param>
+							<xsl:with-param name="formatted" select="$vertical_layout"/> <!-- $vertical_layout = 'true' -->
+							<xsl:with-param name="bibdata_updated" select="/*/jis:bibdata"/> <!-- $vertical_layout = 'true' -->
 						</xsl:call-template>
 					</xsl:variable>
 					
@@ -571,7 +573,9 @@
 												<xsl:with-param name="i18n_JIS" select="$i18n_JIS"/>
 												<xsl:with-param name="docidentifier" select="concat('JIS ', $docidentifier_JIS)"/>
 												<xsl:with-param name="edition" select="$edition"/>
-												<xsl:with-param name="copyrightText" select="$copyrightText"/>
+												<xsl:with-param name="copyrightText">
+													<xsl:copy-of select="$copyrightText"/>
+												</xsl:with-param>
 											</xsl:call-template>
 										</xsl:when>
 										<xsl:otherwise>
@@ -646,7 +650,9 @@
 													<xsl:with-param name="i18n_JIS" select="$i18n_JIS"/>
 													<xsl:with-param name="docidentifier" select="concat('JIS ', $docidentifier_JIS)"/>
 													<xsl:with-param name="edition" select="$edition"/>
-													<xsl:with-param name="copyrightText" select="$copyrightText"/>
+													<xsl:with-param name="copyrightText">
+														<xsl:copy-of select="$copyrightText"/>
+													</xsl:with-param>
 													<!-- <xsl:with-param name="insertLast">true</xsl:with-param> -->
 													<xsl:with-param name="bibdata" select="$bibdata"/>
 												</xsl:call-template>
@@ -844,7 +850,9 @@
 										<xsl:with-param name="i18n_JIS" select="$i18n_JIS"/>
 										<xsl:with-param name="docidentifier" select="concat('JIS ', $docidentifier_JIS)"/>
 										<xsl:with-param name="edition" select="$edition"/>
-										<xsl:with-param name="copyrightText" select="$copyrightText"/>
+										<xsl:with-param name="copyrightText">
+											<xsl:copy-of select="$copyrightText"/>
+										</xsl:with-param>
 										<xsl:with-param name="insertLast" select="normalize-space(position() = last())"/>
 										<xsl:with-param name="bibdata" select="$bibdata"/>
 									</xsl:call-template>
@@ -947,7 +955,9 @@
 					<xsl:if test="$vertical_layout = 'true'">
 						<xsl:call-template name="insertBackPage2024">
 							<xsl:with-param name="num" select="$num"/>
-							<xsl:with-param name="copyrightText" select="$copyrightText"/>
+							<xsl:with-param name="copyrightText">
+								<xsl:copy-of select="$copyrightText"/>
+							</xsl:with-param>
 						</xsl:call-template>
 					</xsl:if>
 				
@@ -1461,7 +1471,10 @@
 						<xsl:text>改正</xsl:text>
 					</fo:inline>
 				</fo:block>
-				<fo:block font-size="12pt" margin-top="7mm" text-align="right"><xsl:value-of select="$copyrightText"/></fo:block>
+				<fo:block font-size="12pt" margin-top="7mm" text-align="right">
+					<!-- <xsl:value-of select="$copyrightText"/> -->
+					<xsl:copy-of select="$copyrightText"/>
+				</fo:block>
 			</fo:flow>
 		</fo:page-sequence>
 	</xsl:template> <!-- insertBackPage2024 -->
@@ -2369,7 +2382,8 @@
 	
 	
 	<!-- replace horizontal to vertical oriented character -->
-	<xsl:template match="text()" mode="update_xml_step0">
+	<xsl:template match="text()" mode="update_xml_step0" name="replace_horizontal_to_vertical_form">
+		<xsl:param name="text" select="."/>
 		<!-- from https://github.com/metanorma/docs/blob/main/109.adoc -->
 		<!-- 
 		U+3001 IDEOGRAPHIC COMMA (、)
@@ -2388,7 +2402,7 @@
 		to
 		U+FE10 PRESENTATION FORM FOR VERTICAL COMMA (︐)
 		-->
-		<xsl:variable name="text1" select="translate(.,'&#x3001;&#xFE50;&#xFE51;&#xFF0C;','&#xFE11;&#xFE10;&#xFE11;&#xFE10;')"/>
+		<xsl:variable name="text1" select="translate($text,'&#x3001;&#xFE50;&#xFE51;&#xFF0C;','&#xFE11;&#xFE10;&#xFE11;&#xFE10;')"/>
 		
 		<!-- 
 		U+FF1A FULLWIDTH COLON (：)
@@ -2418,6 +2432,24 @@
 	<!-- END STEP 0: Replace characters with vertical form -->
 	<!-- =========================================================================== -->
 	
+	<xsl:template match="*[local-name() = 'bibdata'][not(.//*[local-name() = 'passthrough'])] | 
+						*[local-name() = 'localized-strings']" mode="update_xml_step1" priority="2">
+		<xsl:choose>
+			<xsl:when test="$vertical_layout = 'true'">
+				<xsl:copy>
+					<xsl:apply-templates select="@* | node()" mode="update_xml_step1"/>
+				</xsl:copy>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy-of select="."/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
+	<xsl:template match="*[local-name() = 'bibdata']/*[local-name() = 'title']" mode="update_xml_step1" priority="2">
+		<xsl:copy-of select="."/>
+	</xsl:template>
+	
 	<xsl:template match="*[local-name() = 'span'][@class = 'surname' or @class = 'givenname' or @class = 'JIS' or @class = 'EffectiveYear' or @class = 'CommentaryEffectiveYear']" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:apply-templates select="@* | node()" mode="update_xml_step1"/>
@@ -2540,7 +2572,7 @@
 	<xsl:variable name="tag_font_en_horizontal_open">###<xsl:value-of select="$element_name_font_en_horizontal"/>###</xsl:variable>
 	<xsl:variable name="tag_font_en_horizontal_close">###/<xsl:value-of select="$element_name_font_en_horizontal"/>###</xsl:variable>
 	
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata']) and not(ancestor::jis:p[@class = 'zzSTDTitle2'])]" mode="update_xml_step1">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] and ancestor::*[local-name() = 'title']) and not(ancestor::jis:p[@class = 'zzSTDTitle2'])][normalize-space() != '']" mode="update_xml_step1">
 		<xsl:choose>
 			<xsl:when test="$vertical_layout = 'true'">
 				<xsl:call-template name="enclose_text_in_vertical_tag"/>
@@ -2551,9 +2583,9 @@
 		</xsl:choose>
 	</xsl:template>
 	
-	<xsl:template match="jis:p//text()[not(ancestor::jis:strong) and not(ancestor::jis:p[@class = 'zzSTDTitle2'])] |
-						jis:dt/text() | 
-						jis:biblio-tag/text()" mode="update_xml_step1">
+	<xsl:template match="jis:p//text()[not(ancestor::jis:strong) and not(ancestor::jis:p[@class = 'zzSTDTitle2'])][normalize-space() != ''] |
+						jis:dt/text()[normalize-space() != ''] | 
+						jis:biblio-tag/text()[normalize-space() != '']" mode="update_xml_step1">
 		<xsl:choose>
 			<xsl:when test="$vertical_layout = 'true'">
 				<xsl:call-template name="enclose_text_in_vertical_tag"/>
@@ -2568,7 +2600,7 @@
 		to
 		<biblio-tag><font_en_vertical>[</font_en_vertical><font_en_horizontal>15</font_en_horizontal><font_en_vertical>]</font_en_vertical><tab/>JIS...
 	-->
-	<xsl:template match="jis:references[@normative = 'false']//jis:biblio-tag/text()[not(preceding-sibling::node())]" mode="update_xml_step1" priority="2">
+	<xsl:template match="jis:references[@normative = 'false']//jis:biblio-tag/text()[not(preceding-sibling::node())][normalize-space() != '']" mode="update_xml_step1" priority="2">
 		<xsl:choose>
 			<xsl:when test="$vertical_layout = 'true'">
 				<xsl:variable name="biblio_tag_text_nodes">
@@ -3244,7 +3276,10 @@
 					
 					<fo:inline keep-together.within-line="always">
 						<fo:leader leader-pattern="space"/>
-						<fo:inline font-size="6pt" baseline-shift="-10%"><xsl:value-of select="$copyrightText"/></fo:inline>
+						<fo:inline font-size="6pt" baseline-shift="-10%">
+							<!-- <xsl:value-of select="$copyrightText"/> -->
+							<xsl:copy-of select="$copyrightText"/>
+						</fo:inline>
 					</fo:inline >
 				
 				<!-- <fo:table table-layout="fixed" width="100%">

From 3f894ff6e0fd56dc4f0b1eb3914fa5b2307ca747 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Fri, 13 Dec 2024 16:13:06 +0300
Subject: [PATCH 05/14] JIS xslt refactored for footer,
 metanorma/metanorma-jis#226

---
 xslt_src/jis.international-standard.core.xsl | 32 ++++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index 4793e8c8d..c3b97dae5 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -1083,8 +1083,11 @@
 				<xsl:with-param name="key">table_of_contents</xsl:with-param>
 			</xsl:call-template> -->
 			<fo:marker marker-class-name="section_title">
-				<xsl:variable name="section_title"><xsl:apply-templates/></xsl:variable>
-				<xsl:value-of select="translate($section_title, '　', '')"/>
+				<xsl:variable name="section_title_"><xsl:apply-templates/></xsl:variable>
+				<xsl:variable name="section_title" select="translate($section_title_, '　', '')"/>
+				<xsl:call-template name="insertVerticalChar">
+					<xsl:with-param name="str" select="$section_title"/>
+				</xsl:call-template>
 			</fo:marker>
 			<xsl:apply-templates/>
 		</fo:block>
@@ -1957,12 +1960,18 @@
 											<xsl:value-of select="."/>
 										</xsl:for-each>
 									</xsl:variable>
-									<xsl:value-of select="$stitle"/>
+									<!-- <xsl:value-of select="$stitle"/> -->
+									<xsl:call-template name="insertVerticalChar">
+										<xsl:with-param name="str" select="$stitle"/>
+									</xsl:call-template>
 								</xsl:when>
 								<xsl:otherwise>
 									<xsl:variable name="stitle"><xsl:call-template name="extractTitle"/></xsl:variable>
-									<xsl:variable name="section_title"><xsl:value-of select="normalize-space(concat($section, ' ', $stitle))"/></xsl:variable>
-									<xsl:value-of select="translate($section_title, ' ', '　')"/>
+									<xsl:variable name="section_title_"><xsl:value-of select="normalize-space(concat($section, ' ', $stitle))"/></xsl:variable>
+									<xsl:variable name="section_title" select="translate($section_title_, ' ', '　')"/>
+									<xsl:call-template name="insertVerticalChar">
+										<xsl:with-param name="str" select="$section_title"/>
+									</xsl:call-template>
 								</xsl:otherwise>
 							</xsl:choose>
 						</fo:marker>
@@ -3278,7 +3287,18 @@
 						<fo:leader leader-pattern="space"/>
 						<fo:inline font-size="6pt" baseline-shift="-10%">
 							<!-- <xsl:value-of select="$copyrightText"/> -->
-							<xsl:copy-of select="$copyrightText"/>
+							<xsl:for-each select="xalan:nodeset($copyrightText)/node()">
+								<xsl:choose>
+									<xsl:when test="self::text()">
+										<xsl:call-template name="insertVerticalChar">
+											<xsl:with-param name="str" select="."/>
+										</xsl:call-template>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:copy-of select="."/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:for-each>
 						</fo:inline>
 					</fo:inline >
 				

From 89a2bc2f96bcd0351793b529bf69bf9ef14d757d Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 16 Dec 2024 16:58:03 +0300
Subject: [PATCH 06/14] JIS xslt updated for span norotate,
 metanorma/metanorma-jis#226

---
 xslt_src/jis.international-standard.core.xsl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index c3b97dae5..fb92e9a76 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -3038,7 +3038,7 @@
 	
 	<xsl:template match="*[local-name() = 'span'][@class = 'norotate']//text()" name="norotate" priority="3">
 		<xsl:param name="str" select="."/>
-		<xsl:choose>
+		<!-- <xsl:choose>
 			<xsl:when test="$vertical_layout = 'true'">
 				<xsl:if test="string-length($str) &gt; 0">
 					<xsl:variable name="char" select="substring($str,1,1)"/>
@@ -3057,7 +3057,8 @@
 			 </xsl:if>
 			</xsl:when>
 			<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-		</xsl:choose>
+		</xsl:choose> -->
+		<xsl:value-of select="."/>
 	</xsl:template>
  
 	<xsl:template match="*[local-name() = 'span'][@class = 'halffontsize']" priority="3">

From e8e3563038455c5f11e5576837cb538bb31339b9 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 16 Dec 2024 17:24:24 +0300
Subject: [PATCH 07/14] JIS xslt updated for span norotate for http links,
 metanorma/metanorma-jis#226

---
 xslt_src/common.xsl                          |  2 +-
 xslt_src/jis.international-standard.core.xsl | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index f3089a25f..708403bce 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -21352,7 +21352,7 @@
 						</xsl:otherwise>
 					</xsl:choose>
 					
-					<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="$add_zero_width_space = 'true' and ($char = ',' or $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)"/>
diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index fb92e9a76..18490ad06 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -2740,7 +2740,15 @@
 						jis:origin/text()" mode="update_xml_step1">
 		<xsl:choose>
 			<xsl:when test="$vertical_layout = 'true'">
-				<xsl:call-template name="enclose_text_in_vertical_tag"/>
+				<xsl:choose>
+					<xsl:when test="ancestor::jis:xref and 
+					(starts-with(., 'http:') or starts-with(., 'https') or starts-with(., 'www') or starts-with(., 'mailto') or starts-with(., 'ftp'))">
+						<xsl:value-of select="."/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="enclose_text_in_vertical_tag"/>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:call-template name="enclose_text_in_font_en_bold_tag"/>

From 64588d0d0144eaa640ab587f0ea667b6d23b708f Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 16 Dec 2024 18:12:55 +0300
Subject: [PATCH 08/14] JIS xslt updated for table auto layout width,
 metanorma/metanorma-jis#226

---
 xslt_src/common.xsl                          | 36 +++++---
 xslt_src/jis.international-standard.core.xsl | 91 +++++++++++---------
 2 files changed, 72 insertions(+), 55 deletions(-)

diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index 708403bce..4dcb190d8 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -21297,6 +21297,9 @@
 		<xsl:param name="reference-orientation">90</xsl:param>
 		<xsl:param name="add_zero_width_space">false</xsl:param>
 		<xsl:choose>
+			<xsl:when test="$isGenerateTableIF = 'true'">
+				<xsl:value-of select="$str"/>
+			</xsl:when>
 			<xsl:when test="ancestor::*[local-name() = 'span'][@class = 'norotate']">
 				<xsl:value-of select="$str"/>
 			</xsl:when>
@@ -21371,19 +21374,26 @@
 		<xsl:param name="writing-mode">lr-tb</xsl:param>
 		<xsl:param name="reference-orientation">90</xsl:param>
 		<xsl:param name="add_zero_width_space">false</xsl:param>
-		<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" role="SKIP">
-			<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>
-			<fo:block-container width="1em" role="SKIP"> <!-- border="0.5pt solid green" -->
-				<fo:block line-height="1em" role="SKIP">
-					<xsl:value-of select="$str"/>
-				</fo:block>
-			</fo:block-container>
-		</fo:inline-container>
+		<xsl:choose>
+			<xsl:when test="$isGenerateTableIF = 'true'">
+				<xsl:value-of select="$str"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<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" role="SKIP">
+					<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>
+					<fo:block-container width="1em" role="SKIP"> <!-- border="0.5pt solid green" -->
+						<fo:block line-height="1em" role="SKIP">
+							<xsl:value-of select="$str"/>
+						</fo:block>
+					</fo:block-container>
+				</fo:inline-container>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
  
 	<xsl:template name="number-to-words">
diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index 18490ad06..d6c1692c5 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -2393,48 +2393,55 @@
 	<!-- replace horizontal to vertical oriented character -->
 	<xsl:template match="text()" mode="update_xml_step0" name="replace_horizontal_to_vertical_form">
 		<xsl:param name="text" select="."/>
-		<!-- from https://github.com/metanorma/docs/blob/main/109.adoc -->
-		<!-- 
-		U+3001 IDEOGRAPHIC COMMA (、)
-		to
-		U+FE11 PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA (︑) 
-		
-		U+FE50 SMALL COMMA (﹐)
-		to
-		U+FE10 PRESENTATION FORM FOR VERTICAL COMMA (︐)
-		
-		U+FE51 SMALL IDEOGRAPHIC COMMA (﹑)
-		to
-		U+FE11 PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA (︑)
-		
-		U+FF0C FULLWIDTH COMMA (，)
-		to
-		U+FE10 PRESENTATION FORM FOR VERTICAL COMMA (︐)
-		-->
-		<xsl:variable name="text1" select="translate($text,'&#x3001;&#xFE50;&#xFE51;&#xFF0C;','&#xFE11;&#xFE10;&#xFE11;&#xFE10;')"/>
-		
-		<!-- 
-		U+FF1A FULLWIDTH COLON (：)
-		to
-		U+FE13 PRESENTATION FORM FOR VERTICAL COLON (︓)
-		
-		U+FF1B FULLWIDTH SEMICOLON (；)
-		to
-		U+FE14 PRESENTATION FORM FOR VERTICAL SEMICOLON (︔)
-		-->
-		<xsl:variable name="text2" select="translate($text1,'&#xFF1A;&#xFF1B;','&#xFE13;&#xFE14;')"/>
-		
-		<!-- 
-		U+FF01 FULLWIDTH EXCLAMATION MARK (！)
-		to
-		U+FE15 PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK (︕)
-		
-		U+FF1F FULLWIDTH QUESTION MARK (？)
-		to
-		U+FE16 PRESENTATION FORM FOR VERTICAL QUESTION MARK (︖)
-		-->
-		<xsl:variable name="text3" select="translate($text2,'&#xFF01;&#xFF1F;','&#xFE15;&#xFE16;')"/>
-		<xsl:value-of select="$text3"/>
+		<xsl:choose>
+			<xsl:when test="$isGenerateTableIF = 'false'">
+				<!-- from https://github.com/metanorma/docs/blob/main/109.adoc -->
+				<!-- 
+				U+3001 IDEOGRAPHIC COMMA (、)
+				to
+				U+FE11 PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA (︑) 
+				
+				U+FE50 SMALL COMMA (﹐)
+				to
+				U+FE10 PRESENTATION FORM FOR VERTICAL COMMA (︐)
+				
+				U+FE51 SMALL IDEOGRAPHIC COMMA (﹑)
+				to
+				U+FE11 PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA (︑)
+				
+				U+FF0C FULLWIDTH COMMA (，)
+				to
+				U+FE10 PRESENTATION FORM FOR VERTICAL COMMA (︐)
+				-->
+				<xsl:variable name="text1" select="translate($text,'&#x3001;&#xFE50;&#xFE51;&#xFF0C;','&#xFE11;&#xFE10;&#xFE11;&#xFE10;')"/>
+				
+				<!-- 
+				U+FF1A FULLWIDTH COLON (：)
+				to
+				U+FE13 PRESENTATION FORM FOR VERTICAL COLON (︓)
+				
+				U+FF1B FULLWIDTH SEMICOLON (；)
+				to
+				U+FE14 PRESENTATION FORM FOR VERTICAL SEMICOLON (︔)
+				-->
+				<xsl:variable name="text2" select="translate($text1,'&#xFF1A;&#xFF1B;','&#xFE13;&#xFE14;')"/>
+				
+				<!-- 
+				U+FF01 FULLWIDTH EXCLAMATION MARK (！)
+				to
+				U+FE15 PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK (︕)
+				
+				U+FF1F FULLWIDTH QUESTION MARK (？)
+				to
+				U+FE16 PRESENTATION FORM FOR VERTICAL QUESTION MARK (︖)
+				-->
+				<xsl:variable name="text3" select="translate($text2,'&#xFF01;&#xFF1F;','&#xFE15;&#xFE16;')"/>
+				<xsl:value-of select="$text3"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$text"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 	
 	<!-- =========================================================================== -->

From b85d32ca08e6e8179d508ca9725c25040c32151e Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 16 Dec 2024 22:16:10 +0300
Subject: [PATCH 09/14] JIS xslt updated for ToC text rotation,
 metanorma/metanorma-jis#226

---
 xslt_src/jis.international-standard.core.xsl | 29 ++++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index d6c1692c5..e415273bd 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -60,6 +60,23 @@
 	</xsl:variable>
 	<xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
 	
+	<xsl:variable name="updated_contents_xml_step0">
+		<xsl:if test="$vertical_layout = 'true'">
+			<xsl:apply-templates select="$contents" mode="update_xml_step0"/>
+		</xsl:if>
+	</xsl:variable>
+	<xsl:variable name="updated_contents_xml_">
+		<xsl:choose>
+			<xsl:when test="$vertical_layout = 'true'">
+				<xsl:apply-templates select="xalan:nodeset($updated_contents_xml_step0)" mode="update_xml_step1"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy-of select="$contents"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+	<xsl:variable name="updated_contents_xml" select="xalan:nodeset($updated_contents_xml_)"/>
+	
 	<xsl:variable name="ids">
 		<xsl:for-each select="//*[@id]">
 			<id><xsl:value-of select="@id"/></id>
@@ -412,6 +429,11 @@
 					<xsl:copy-of select="$contents"/>
 				</redirect:write>
 			</xsl:if>
+			<xsl:if test="$debug = 'true'">
+				<redirect:write file="contents_updated_.xml">
+					<xsl:copy-of select="$updated_contents_xml"/>
+				</redirect:write>
+			</xsl:if>
 			
 			<xsl:variable name="updated_xml_step0">
 				<xsl:if test="$vertical_layout = 'true'">
@@ -1002,8 +1024,8 @@
 					<xsl:attribute name="font-size">10.5pt</xsl:attribute>
 				</xsl:if>
 			
-				<xsl:if test="$contents/doc[@num = $num]//item[@display = 'true']">
-					<xsl:for-each select="$contents/doc[@num = $num]//item[@display = 'true'][@level &lt;= $toc_level or @type='figure' or @type = 'table']">
+				<xsl:if test="$updated_contents_xml/doc[@num = $num]//item[@display = 'true']">
+					<xsl:for-each select="$updated_contents_xml/doc[@num = $num]//item[@display = 'true'][@level &lt;= $toc_level or @type='figure' or @type = 'table']">
 						<fo:block role="TOCI">
 							<xsl:choose>
 								<xsl:when test="@type = 'annex' or @type = 'bibliography'">
@@ -2601,7 +2623,8 @@
 	
 	<xsl:template match="jis:p//text()[not(ancestor::jis:strong) and not(ancestor::jis:p[@class = 'zzSTDTitle2'])][normalize-space() != ''] |
 						jis:dt/text()[normalize-space() != ''] | 
-						jis:biblio-tag/text()[normalize-space() != '']" mode="update_xml_step1">
+						jis:biblio-tag/text()[normalize-space() != ''] |
+						item/title/text()" mode="update_xml_step1">
 		<xsl:choose>
 			<xsl:when test="$vertical_layout = 'true'">
 				<xsl:call-template name="enclose_text_in_vertical_tag"/>

From fb5345d696ec90ba09ebd40b924e66e46b4a1bb0 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Tue, 17 Dec 2024 16:29:21 +0300
Subject: [PATCH 10/14] JIS xslt updated for ToC alignment issue,
 metanorma/metanorma-jis#262

---
 xslt_src/common.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index 4dcb190d8..0ec4397a4 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -21321,7 +21321,7 @@
 						<xsl:otherwise>
 							<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" role="SKIP">
+										 text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm" role="SKIP" text-align-last="center">
 								<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>

From f313953b4877305974281c69d37ec9e79e99e22a Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Wed, 18 Dec 2024 09:37:22 +0300
Subject: [PATCH 11/14] JIS xslt updated for annex clause number letter
 rotation, metanorma/metanorma-jis#263

---
 xslt_src/jis.international-standard.core.xsl | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index e415273bd..5652dbc8e 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -2018,7 +2018,15 @@
 										<xsl:attribute name="font-weight">bold</xsl:attribute>
 									</xsl:if>
 									<!-- <xsl:value-of select="translate($section, '．', '・')"/> -->
-									<xsl:value-of select="$section"/>
+									<xsl:choose>
+										<xsl:when test="$vertical_layout = 'true'">
+											<!-- Example: <title depth="2"><font_en_vertical>G</font_en_vertical>・一<tab/>一般</title> -->
+											<xsl:apply-templates select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:value-of select="$section"/>
+										</xsl:otherwise>
+									</xsl:choose>
 									<fo:inline padding-right="4mm">&#xa0;</fo:inline>
 								</fo:inline>
 							</xsl:otherwise>
@@ -3318,7 +3326,7 @@
 				
 					<fo:inline baseline-shift="-20%">
 						<fo:inline>
-							<fo:retrieve-marker retrieve-class-name="section_title" retrieve-position="last-ending-within-page" retrieve-boundary="page"/>
+							<fo:retrieve-marker retrieve-class-name="section_title" retrieve-position="last-ending-within-page" retrieve-boundary="page-sequence"/>
 						</fo:inline><!-- <fo:inline padding-bottom="5mm">三</fo:inline>用語及び定義 -->
 					</fo:inline>
 					

From a1eb45cc1252132d3a965481c2a623155550febe Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Wed, 18 Dec 2024 19:35:37 +0300
Subject: [PATCH 12/14] JIS xslt updated for letter spacing,
 metanorma/metanorma-jis#264

---
 xslt_src/common.xsl                          |  9 ++++
 xslt_src/jis.international-standard.core.xsl | 46 ++++++++++++++++++--
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index 0ec4397a4..00c7dca3d 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -21293,6 +21293,7 @@
 	<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="char_prev"/>
 		<xsl:param name="writing-mode">lr-tb</xsl:param>
 		<xsl:param name="reference-orientation">90</xsl:param>
 		<xsl:param name="add_zero_width_space">false</xsl:param>
@@ -21308,6 +21309,7 @@
 				
 					<!-- <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)"/>
+					<xsl:variable name="char_next" select="substring($str,2,1)"/>
 					
 					<xsl:variable name="char_half_width" select="normalize-space(java:matches(java:java.lang.String.new($char), concat('([', $regex_ja_spec_half_width, ']{1,})')))"/>
 					
@@ -21319,6 +21321,9 @@
 							</fo:inline>
 						</xsl:when>
 						<xsl:otherwise>
+							<xsl:if test="ancestor::*[local-name() = 'title'] and ($char_prev = '' and ../preceding-sibling::node())">
+								<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
+							</xsl:if>
 							<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" role="SKIP" text-align-last="center">
@@ -21352,6 +21357,9 @@
 									</fo:block>
 								</fo:block-container>
 							</fo:inline-container>
+							<xsl:if test="ancestor::*[local-name() = 'title' or local-name() = 'name'] and ($char_next != '' or ../following-sibling::node())">
+								<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
+							</xsl:if>
 						</xsl:otherwise>
 					</xsl:choose>
 					
@@ -21359,6 +21367,7 @@
 						<!-- <xsl:if test="$horizontal_mode = 'false'"> -->
 							<xsl:call-template name="insertVerticalChar">
 								<xsl:with-param name="str" select="substring($str, 2)"/>
+								<xsl:with-param name="char_prev" select="$char"/>
 								<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"/>
diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index 5652dbc8e..a286c623f 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -1957,8 +1957,10 @@
 					</xsl:if>
 					
 					<xsl:if test="$vertical_layout = 'true'">
-						<xsl:attribute name="letter-spacing">1mm</xsl:attribute>
-						<xsl:attribute name="margin-left">-6mm</xsl:attribute>
+						<!-- <xsl:attribute name="letter-spacing">1mm</xsl:attribute> -->
+						<xsl:if test="not($text-align = 'center')">
+							<xsl:attribute name="margin-left">-6mm</xsl:attribute>
+						</xsl:if>
 					</xsl:if>
 					
 					<!-- if first and last childs are `add` ace-tag, then move start ace-tag before title -->
@@ -2020,6 +2022,7 @@
 									<!-- <xsl:value-of select="translate($section, '．', '・')"/> -->
 									<xsl:choose>
 										<xsl:when test="$vertical_layout = 'true'">
+											<xsl:attribute name="letter-spacing">1mm</xsl:attribute>
 											<!-- Example: <title depth="2"><font_en_vertical>G</font_en_vertical>・一<tab/>一般</title> -->
 											<xsl:apply-templates select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
 										</xsl:when>
@@ -2034,7 +2037,21 @@
 						
 					</xsl:if>
 					
-					<xsl:call-template name="extractTitle"/>
+					<xsl:choose>
+						<xsl:when test="$vertical_layout = 'true'">
+							<!-- <xsl:call-template name="extractTitle"/> -->
+							<xsl:variable name="title_fo">
+								<title_fo>
+									<xsl:call-template name="extractTitle"/>
+								</title_fo>
+							</xsl:variable>
+							<!-- title_fo='<xsl:copy-of select="xalan:nodeset($title_fo)"/>' -->
+							<xsl:apply-templates select="xalan:nodeset($title_fo)" mode="letter_spacing"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:call-template name="extractTitle"/>
+						</xsl:otherwise>
+					</xsl:choose>
 					
 					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 				</xsl:element>
@@ -2042,6 +2059,29 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<!-- ============================= -->
+	<!-- add letter-spacing between characters letter_spacing -->
+	<!-- ============================= -->
+	<xsl:template match="@*|node()" mode="letter_spacing">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="letter_spacing"/>
+		</xsl:copy>
+	</xsl:template>
+	
+	<xsl:template match="title_fo" mode="letter_spacing">
+		<xsl:apply-templates mode="letter_spacing"/>
+	</xsl:template>
+	
+	<xsl:template match="title_fo/text() | fo:inline[@font-family]/text()" mode="letter_spacing">
+		<xsl:call-template name="add-letter-spacing">
+			<xsl:with-param name="text" select="."/>
+			<xsl:with-param name="letter-spacing">1</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	<!-- ============================= -->
+	<!-- END: letter_spacing -->
+	<!-- ============================= -->
+
 	<xsl:template match="*[local-name() = 'term']" priority="2">
 		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
 			<xsl:if test="$namespace = 'jis'">

From a41a91dd60db10dc032097623cf4eb3fef86e241 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Wed, 18 Dec 2024 22:24:14 +0300
Subject: [PATCH 13/14] JIS xslt updated for letter spacing,
 metanorma/metanorma-jis#264

---
 xslt_src/common.xsl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index 00c7dca3d..92b39524e 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -21321,7 +21321,8 @@
 							</fo:inline>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:if test="ancestor::*[local-name() = 'title'] and ($char_prev = '' and ../preceding-sibling::node())">
+							<!--  namespace-uri(ancestor::*[local-name() = 'title']) != '' to skip title from $contents  -->
+							<xsl:if test="namespace-uri(ancestor::*[local-name() = 'title']) != '' and ($char_prev = '' and ../preceding-sibling::node())">
 								<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
 							</xsl:if>
 							<fo:inline-container text-align="center"
@@ -21357,7 +21358,7 @@
 									</fo:block>
 								</fo:block-container>
 							</fo:inline-container>
-							<xsl:if test="ancestor::*[local-name() = 'title' or local-name() = 'name'] and ($char_next != '' or ../following-sibling::node())">
+							<xsl:if test="namespace-uri(ancestor::*[local-name() = 'title']) != '' and ($char_next != '' or ../following-sibling::node())">
 								<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
 							</xsl:if>
 						</xsl:otherwise>

From 83f8ed7ffa937c3b1ed273b670df387d76ebe455 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Thu, 19 Dec 2024 23:17:05 +0300
Subject: [PATCH 14/14] JIS xslt updated for auto layout algorithm,
 metanorma/metanorma-jis#265

---
 xslt_src/common.xsl                          | 64 ++++++++++++++++----
 xslt_src/jis.international-standard.core.xsl | 17 ++++++
 2 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index 92b39524e..e268c4479 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -9071,10 +9071,19 @@
 			<fo:block role="SKIP">
 			
 				<xsl:if test="$isGenerateTableIF = 'true'">
-					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+					<xsl:choose>
+						<xsl:when test="$namespace = 'jis'">
+							<fo:inline>
+								<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+								<xsl:value-of select="$hair_space"/>
+							</fo:inline>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:if>
 			
-			
 				<xsl:if test="$namespace = 'bipm'">
 					<xsl:if test="not(.//bipm:image)">
 						<xsl:attribute name="line-stacking-strategy">font-height</xsl:attribute>
@@ -10586,7 +10595,25 @@
 			<xsl:call-template name="refine_dt-cell-style"/>
 			
 			<fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
-				<xsl:copy-of select="@id"/>
+			
+				<xsl:choose>
+					<xsl:when test="$isGenerateTableIF = 'true'">
+						<xsl:choose>
+						<xsl:when test="$namespace = 'jis'">
+							<fo:inline>
+								<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+								<xsl:value-of select="$hair_space"/>
+							</fo:inline>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:copy-of select="@id"/>
+						</xsl:otherwise>
+						</xsl:choose>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:copy-of select="@id"/>
+					</xsl:otherwise>
+				</xsl:choose>
 				
 				<xsl:if test="normalize-space($key_iso) = 'true'">
 					<xsl:attribute name="margin-top">0</xsl:attribute>
@@ -10619,7 +10646,17 @@
 			<fo:block role="SKIP">
 			
 				<xsl:if test="$isGenerateTableIF = 'true'">
-					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+					<xsl:choose>
+						<xsl:when test="$namespace = 'jis'">
+							<fo:inline>
+								<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+								<xsl:value-of select="$hair_space"/>
+							</fo:inline>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:if>
 			
 				<xsl:if test="$namespace = 'itu'">
@@ -12030,6 +12067,14 @@
 						<xsl:copy-of select="."/>
 					</xsl:for-each>
 				</xsl:variable>
+				
+				<!-- <xsl:if test="$debug = 'true'">
+					<redirect:write file="{generate-id()}_words_with_width_sorted.xml">
+						<td_text><xsl:copy-of select="$td_text"/></td_text>
+						<words_with_width><xsl:copy-of select="$words_with_width"/></words_with_width>
+						<xsl:copy-of select="$words_with_width_sorted"/>
+					</redirect:write>
+				</xsl:if> -->
 			
 				<xsl:variable name="words">
 					<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
@@ -12157,6 +12202,7 @@
 			<xsl:if test="ancestor::*[local-name() = 'tt']"><tag>tt</tag></xsl:if>
 			<xsl:if test="ancestor::*[local-name() = 'sourcecode']"><tag>sourcecode</tag></xsl:if>
 			<xsl:if test="ancestor::*[local-name() = 'keep-together_within-line']"><tag>keep-together_within-line</tag></xsl:if>
+			<xsl:if test="ancestor::*[local-name() = 'font_en_vertical']"><tag>font_en_vertical</tag></xsl:if>
 		</tags>
 	</xsl:template>
 	<!-- =============================== -->
@@ -19410,7 +19456,9 @@
 	<xsl:template name="add_id">
 		<xsl:if test="not(@id)">
 			<!-- add @id - first element with @id plus '_element_name' -->
-			<xsl:attribute name="id"><xsl:value-of select="(.//*[@id])[1]/@id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
+			<xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
+			<xsl:variable name="prefix_id"><xsl:value-of select="$prefix_id_"/><xsl:if test="normalize-space($prefix_id_) = ''"><xsl:value-of select="generate-id()"/></xsl:if></xsl:variable>
+			<xsl:attribute name="id"><xsl:value-of select="$prefix_id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
 		</xsl:if>
 	</xsl:template>
 	
@@ -21298,9 +21346,6 @@
 		<xsl:param name="reference-orientation">90</xsl:param>
 		<xsl:param name="add_zero_width_space">false</xsl:param>
 		<xsl:choose>
-			<xsl:when test="$isGenerateTableIF = 'true'">
-				<xsl:value-of select="$str"/>
-			</xsl:when>
 			<xsl:when test="ancestor::*[local-name() = 'span'][@class = 'norotate']">
 				<xsl:value-of select="$str"/>
 			</xsl:when>
@@ -21385,9 +21430,6 @@
 		<xsl:param name="reference-orientation">90</xsl:param>
 		<xsl:param name="add_zero_width_space">false</xsl:param>
 		<xsl:choose>
-			<xsl:when test="$isGenerateTableIF = 'true'">
-				<xsl:value-of select="$str"/>
-			</xsl:when>
 			<xsl:otherwise>
 				<fo:inline-container text-align="center"
 										 alignment-baseline="central" width="1em" margin="0" padding="0"
diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index a286c623f..1bf328b77 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -269,6 +269,10 @@
 			
 			
 				<fo:simple-page-master master-name="document_2024" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+					<xsl:if test="$isGenerateTableIF = 'true'">
+						<xsl:attribute name="page-width"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
+						<xsl:attribute name="page-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
+					</xsl:if>
 					<!-- Note (for writing-mode="tb-rl", may be due the update for support 'tb-rl' mode):
 					 fo:region-body/@margin-top = left margin
 					 fo:region-body/@margin-bottom = right margin
@@ -288,6 +292,10 @@
 				</fo:simple-page-master>
 			
 				<fo:simple-page-master master-name="document_2024_page" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+					<xsl:if test="$isGenerateTableIF = 'true'">
+						<xsl:attribute name="page-width"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
+						<xsl:attribute name="page-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
+					</xsl:if>
 					<!-- Note (for writing-mode="tb-rl", may be due the update for support 'tb-rl' mode):
 					 fo:region-body/@margin-top = left margin
 					 fo:region-body/@margin-bottom = right margin
@@ -306,6 +314,10 @@
 					<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> <!--  background-color="red" -->
 				</fo:simple-page-master>
 				<fo:simple-page-master master-name="document_2024_last" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+					<xsl:if test="$isGenerateTableIF = 'true'">
+						<xsl:attribute name="page-width"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
+						<xsl:attribute name="page-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
+					</xsl:if>
 					<!-- Note (for writing-mode="tb-rl", may be due the update for support 'tb-rl' mode):
 					 fo:region-body/@margin-top = left margin
 					 fo:region-body/@margin-bottom = right margin
@@ -535,6 +547,7 @@
 						<xsl:call-template name="getLang"/>
 					</xsl:variable>
 					
+					<xsl:if test="$isGenerateTableIF = 'false'">
 					<xsl:choose>
 						<xsl:when test="$vertical_layout = 'true'">
 							<xsl:call-template name="insertCoverPage2024">
@@ -561,6 +574,7 @@
 						<xsl:with-param name="copyrightText" select="$copyrightText"/>
 					</xsl:call-template>
 					</xsl:if>
+					</xsl:if>
 				
 				
 					<!-- ========================== -->
@@ -965,6 +979,7 @@
 					</xsl:for-each>
 					
 					
+					<xsl:if test="$isGenerateTableIF = 'false'">
 					<!-- insert Last Cover Page on English for Japanese document -->
 					<xsl:if test="$doctype = 'technical-specification' and $doclang != 'en'">
 						<xsl:call-template name="insertCoverPageJSA">
@@ -982,6 +997,7 @@
 							</xsl:with-param>
 						</xsl:call-template>
 					</xsl:if>
+					</xsl:if>
 				
 				</xsl:for-each>
 			
@@ -2637,6 +2653,7 @@
 			<!-- ( ) [ ] _ { } U+FF08 FULLWIDTH LEFT PARENTHESIS U+FF09 FULLWIDTH RIGHT PARENTHESIS-->
 			<!-- <xsl:when test="$vertical_layout = 'true'">((<xsl:value-of select="$regex_ja_spec"/>)|([^\u0028\u0029\u005B\u005D\u005F\u007B\u007D<xsl:value-of select="$regex_en_base"/>]){1,})</xsl:when> -->
 			<!-- regex for find characters to rotation -->
+			<xsl:when test="$isGenerateTableIF = 'true' and $vertical_layout = 'true'">(([^\u005F<xsl:value-of select="$regex_ja_spec"/><xsl:value-of select="$regex_en_base"/>]){1,})</xsl:when> <!-- \u0028\u0029\u005B\u005D \u007B\u007D -->
 			<xsl:when test="$vertical_layout = 'true'">((<xsl:value-of select="$regex_ja_spec"/>)|([^\u005F<xsl:value-of select="$regex_en_base"/>]){1,})</xsl:when> <!-- \u0028\u0029\u005B\u005D \u007B\u007D -->
 			<xsl:otherwise>([^<xsl:value-of select="$regex_en_base"/>]{1,})</xsl:otherwise>
 		</xsl:choose>