metanorma-bipm 2.5.8 → 2.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25dd92a7dd70c253d1d2e15fdfa2e90626a107a9dd2d4b3713dab963f59c061d
-  data.tar.gz: e3a45c0697e91c1faacc6efadcf5e199fdf6281e1df1b1bd1b28ffe13435ccba
+  metadata.gz: 9a808a19b6ff81b587516fee73852d0b9bc7c3317a2b642ee56335e199631f4f
+  data.tar.gz: b262ffd071d210ff90ea09c5797fcfbd86698699e847bfba21c84ff756f7cc62
 SHA512:
-  metadata.gz: 89bc9c415a3dd71c89b49deeddf3333c2254867ce982424584473fd54722bdfad4aade14dd2d56b8eeffe7396b7c6882ff9aea6d5c0000cf6a7affee066b7555
-  data.tar.gz: cf1cf5a6e1b6671cb6f8e1b134fc930f89728a241f4d206e008b20fd0a63e26adb69d122291dec4e275052e1d6ee54223df7e94e8069d1e67dfeffe0cf5ec3e0
+  metadata.gz: 9ee4c018e4e186d058a5bbdf4716a9e20bce298645be4af2977b179eb4115fa3a16f0652622beb60a1d10ade20a2e09c15fec1848b397e51837c1c4633be0dfe
+  data.tar.gz: 0f0e97a0e2d637ec76274db80d85f9de6aaf2ed346b1117d89a559ea5bbbb15ed77a51a65a8c1b2145e27b8e4a64791220efb4ad4b417fc9541fa599a2519586

data/lib/isodoc/bipm/bipm.brochure.xsl

@@ -432,9 +432,15 @@
 								</xsl:variable> -->
 
 								<xsl:variable name="update_xml_pres">
-									<xsl:apply-templates mode="update_xml_pres"/>
+									<xsl:apply-templates select="." mode="update_xml_pres"/>
 								</xsl:variable>
 
+								<xsl:if test="$debug = 'true'">
+									<redirect:write file="update_xml_pres.xml">
+										<xsl:copy-of select="xalan:nodeset($update_xml_pres)"/>
+									</redirect:write>
+								</xsl:if>
+
 								<xsl:message>START flatxml_</xsl:message>
 								<xsl:variable name="startTime2" select="java:getTime(java:java.util.Date.new())"/>
 								<xsl:variable name="flatxml__">
@@ -477,9 +483,15 @@
 								</xsl:variable> -->
 
 								<xsl:variable name="update_xml_pres">
-									<xsl:apply-templates mode="update_xml_pres"/>
+									<xsl:apply-templates select="." mode="update_xml_pres"/>
 								</xsl:variable>
 
+								<xsl:if test="$debug = 'true'">
+									<redirect:write file="update_xml_pres.xml">
+										<xsl:copy-of select="xalan:nodeset($update_xml_pres)"/>
+									</redirect:write>
+								</xsl:if>
+
 								<xsl:variable name="flatxml__">
 									<!-- <xsl:apply-templates select="xalan:nodeset($title_eref)" mode="flatxml"/> -->
 									<!-- <xsl:apply-templates select="." mode="flatxml"/> -->
@@ -552,6 +564,12 @@
 
 					<!-- indexes=<xsl:copy-of select="$indexes"/> -->
 
+					<xsl:if test="$debug = 'true'">
+						<redirect:write file="flatxml.xml">
+							<xsl:copy-of select="$flatxml"/>
+						</redirect:write>
+					</xsl:if>
+
 					<xsl:apply-templates select="xalan:nodeset($flatxml)/bipm:bipm-standard" mode="bipm-standard">
 						<xsl:with-param name="curr_docnum" select="1"/>
 					</xsl:apply-templates>
@@ -583,6 +601,20 @@
 	<!-- END Move eref inside title -->
 	<!-- ================================= -->
 
+	<xsl:template match="*[local-name() = 'fmt-title']" mode="update_xml_pres" priority="2">
+		<xsl:element name="title" namespace="https://www.metanorma.org/ns/bipm">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres" priority="2">
+		<xsl:element name="name" namespace="https://www.metanorma.org/ns/bipm">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<!-- ================================= -->
 	<!-- Flattening xml for fit notes at page sides (margins) -->
 	<!-- ================================= -->
@@ -1160,10 +1192,10 @@
 								<!-- <xsl:copy-of select="$contents"/> -->
 
 								<xsl:if test="$contents/doc[@id = $docid]//item[@display='true']">
-									<fo:table table-layout="fixed" width="100%" id="__internal_layout__toc_{generate-id()}">
+									<fo:table table-layout="fixed" width="100%" id="__internal_layout__toc_{generate-id()}" role="SKIP">
 										<fo:table-column column-width="127mm"/>
 										<fo:table-column column-width="12mm"/>
-										<fo:table-body>
+										<fo:table-body role="SKIP">
 											<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and not(@type = 'annex') and not(@type = 'index') and not(@parent = 'annex')]">
 												<xsl:call-template name="insertContentItem"/>
 											</xsl:for-each>
@@ -1838,7 +1870,7 @@
 
 	<xsl:template name="insertContentItem">
 		<xsl:param name="keep-with-next"/>
-		<fo:table-row>
+		<fo:table-row role="TOCI">
 			<xsl:if test="$keep-with-next = 'true'">
 				<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			</xsl:if>
@@ -1856,14 +1888,14 @@
 				</xsl:choose>
 			</xsl:variable>
 
-			<fo:table-cell>
+			<fo:table-cell role="SKIP">
 				<xsl:if test="normalize-space($space-before) != ''">
 					<xsl:attribute name="padding-top"><xsl:value-of select="normalize-space($space-before)"/></xsl:attribute>
 				</xsl:if>
 				<xsl:if test="normalize-space($space-after) != ''">
 					<xsl:attribute name="padding-bottom"><xsl:value-of select="normalize-space($space-after)"/></xsl:attribute>
 				</xsl:if>
-				<fo:block role="TOCI">
+				<fo:block role="SKIP">
 					<xsl:if test="@level = 1">
 						<xsl:attribute name="font-family">Arial</xsl:attribute>
 						<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -1891,7 +1923,7 @@
 						<xsl:attribute name="space-before">14pt</xsl:attribute>
 					</xsl:if>
 
-					<fo:list-block>
+					<fo:list-block role="SKIP">
 						<xsl:attribute name="provisional-distance-between-starts">
 							<xsl:choose>
 								<xsl:when test="@section = '' or @level &gt; 3">0mm</xsl:when>
@@ -1902,9 +1934,9 @@
 							</xsl:choose>
 						</xsl:attribute>
 
-						<fo:list-item>
-							<fo:list-item-label end-indent="label-end()">
-								<fo:block>
+						<fo:list-item role="SKIP">
+							<fo:list-item-label end-indent="label-end()" role="SKIP">
+								<fo:block role="SKIP">
 									<xsl:if test="@level = 1 or (@level = 2 and not(@parent = 'annex'))">
 										<xsl:value-of select="@section"/>
 										<xsl:if test="normalize-space(@section) != '' and @type = 'annex'">.</xsl:if>
@@ -1912,18 +1944,18 @@
 
 								</fo:block>
 							</fo:list-item-label>
-							<fo:list-item-body start-indent="body-start()">
-								<fo:block>
+							<fo:list-item-body start-indent="body-start()" role="SKIP">
+								<fo:block role="SKIP">
 									<xsl:if test="@level &gt;= 3">
 										<xsl:attribute name="margin-left">11mm</xsl:attribute>
 										<xsl:attribute name="text-indent">-11mm</xsl:attribute>
 									</xsl:if>
-									<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
+									<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}" role="SKIP">
 										<xsl:if test="@level &gt;= 3">
-											<fo:inline padding-right="2mm"><xsl:value-of select="@section"/></fo:inline>
+											<fo:inline padding-right="2mm" role="SKIP"><xsl:value-of select="@section"/></fo:inline>
 										</xsl:if>
 
-										<fo:inline>
+										<fo:inline role="SKIP">
 											<xsl:apply-templates select="title"/>
 										</fo:inline>
 
@@ -1934,16 +1966,16 @@
 					</fo:list-block>
 				</fo:block>
 			</fo:table-cell>
-			<fo:table-cell text-align="right">
+			<fo:table-cell text-align="right" role="SKIP">
 				<xsl:if test="normalize-space($space-before) != ''">
 					<xsl:attribute name="padding-top"><xsl:value-of select="normalize-space($space-before)"/></xsl:attribute>
 				</xsl:if>
 				<xsl:if test="normalize-space($space-after) != ''">
 					<xsl:attribute name="padding-bottom"><xsl:value-of select="normalize-space($space-after)"/></xsl:attribute>
 				</xsl:if>
-				<fo:block>
-					<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
-						<fo:inline font-family="Arial" font-weight="bold" font-size="10pt"><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+				<fo:block role="SKIP">
+					<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}" role="SKIP">
+						<fo:inline font-family="Arial" font-weight="bold" font-size="10pt" role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
 					</fo:basic-link>
 				</fo:block>
 			</fo:table-cell>
@@ -2287,6 +2319,10 @@
 					<xsl:otherwise>
 						<fo:block role="H{$level}">
 
+							<xsl:if test="ancestor::*[local-name() = 'clause'][@type = 'toc'] and $level &gt;= 3">
+								<xsl:attribute name="role">Caption</xsl:attribute>
+							</xsl:if>
+
 							<xsl:choose>
 								<xsl:when test="ancestor::bipm:annex and $level &gt;= 2">
 									<xsl:if test="$level &gt;= 3">
@@ -3296,7 +3332,7 @@
 	<!-- Table of Contents (ToC) processing -->
 	<!-- =================== -->
 	<xsl:template match="bipm:clause[@type = 'toc']" priority="3">
-		<fo:block role="TOC">
+		<fo:block>
 			<xsl:copy-of select="@id"/>
 			<xsl:apply-templates select="bipm:title[1]"/>
 
@@ -3314,12 +3350,12 @@
 				</xsl:call-template>
 			</xsl:variable>
 
-			<fo:table width="100%" table-layout="fixed">
+			<fo:table width="100%" table-layout="fixed" role="TOC">
 				<fo:table-column column-width="100%"/>
-				<fo:table-header>
-					<fo:table-row font-weight="bold">
-						<fo:table-cell text-align="right" font-size="9pt" font-family="Arial">
-							<fo:block>
+				<fo:table-header role="SKIP">
+					<fo:table-row font-weight="bold" role="SKIP">
+						<fo:table-cell text-align="right" font-size="9pt" font-family="Arial" role="SKIP">
+							<fo:block role="Caption">
 								<xsl:variable name="page">
 									<xsl:call-template name="getLocalizedString">
 										<xsl:with-param name="key">Page.sg</xsl:with-param>
@@ -3330,10 +3366,10 @@
 						</fo:table-cell>
 					</fo:table-row>
 				</fo:table-header>
-				<fo:table-body>
-					<fo:table-row>
-						<fo:table-cell>
-							<fo:block>
+				<fo:table-body role="SKIP">
+					<fo:table-row role="SKIP">
+						<fo:table-cell role="SKIP">
+							<fo:block role="SKIP">
 								<xsl:variable name="title_id" select="generate-id(bipm:title[1])"/>
 								<xsl:apply-templates select="*[not(generate-id() = $title_id)]">
 									<xsl:with-param name="colwidths" select="$colwidths"/>
@@ -7296,7 +7332,9 @@
 			<fo:block role="SKIP">
 
 				<xsl:if test="$isGenerateTableIF = 'true'">
-					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+
+							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+
 				</xsl:if>
 
 					<xsl:if test="not(.//bipm:image)">
@@ -8337,7 +8375,17 @@
 			<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:copy-of select="@id"/>
+
+					</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>
@@ -8369,7 +8417,9 @@
 			<fo:block role="SKIP">
 
 				<xsl:if test="$isGenerateTableIF = 'true'">
-					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+
+							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+
 				</xsl:if>
 
 				<xsl:choose>
@@ -9607,6 +9657,14 @@
 					</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']">
 						<word>
@@ -9732,6 +9790,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>
 	<!-- =============================== -->
@@ -10304,7 +10363,16 @@
 									</xsl:when>
 									<xsl:otherwise>
 										<!-- output text from <link>text</link> -->
-										<xsl:apply-templates/>
+										<xsl:choose>
+											<xsl:when test="starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.')">
+												<xsl:call-template name="add-zero-spaces-link-java">
+													<xsl:with-param name="text" select="."/>
+												</xsl:call-template>
+											</xsl:when>
+											<xsl:otherwise>
+												<xsl:apply-templates/>
+											</xsl:otherwise>
+										</xsl:choose>
 									</xsl:otherwise>
 								</xsl:choose>
 							</fo:basic-link>
@@ -10964,16 +11032,29 @@
 	<xsl:template name="getImageSrc">
 		<xsl:choose>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:call-template name="getImageSrcExternal"/>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="getImageSrcExternal">
+		<xsl:choose>
+			<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+				<xsl:value-of select="@src"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="src_with_basepath" select="concat($basepath, @src)"/>
+				<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($src_with_basepath)))"/>
 				<xsl:choose>
-					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
-						<xsl:value-of select="@src"/>
+					<xsl:when test="$file_exists = 'true'">
+						<xsl:value-of select="$src_with_basepath"/>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:value-of select="concat($basepath, @src)"/>
+						<xsl:value-of select="@src"/>
 					</xsl:otherwise>
 				</xsl:choose>
-			</xsl:when>
-			<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
 
@@ -11021,14 +11102,8 @@
 				<xsl:value-of select="concat('url(file:///',$basepath, $src_png, ')')"/>
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
-				<xsl:choose>
-					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
-						<xsl:value-of select="concat('url(file:///', @src, ')')"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
-					</xsl:otherwise>
-				</xsl:choose>
+				<xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
+				<xsl:value-of select="concat('url(file:///', $src_external, ')')"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="@src"/>
@@ -11049,16 +11124,8 @@
 				</svg>
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
-				<xsl:variable name="src">
-					<xsl:choose>
-						<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
-							<xsl:value-of select="concat('url(file:///', @src, ')')"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable>
+				<xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
+				<xsl:variable name="src" select="concat('url(file:///', $src_external, ')')"/>
 				<xsl:variable name="file" select="java:java.io.File.new(@src)"/>
 				<xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/>
 				<xsl:variable name="width" select="java:getWidth($bufferedImage)"/>
@@ -15190,7 +15257,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>
 
@@ -16122,7 +16191,14 @@
 						<xsl:variable name="title">
 							<xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
 
-										<xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
+										<xsl:choose>
+											<xsl:when test="*[local-name() = 'title'][@language = $lang and @type = 'main']">
+												<xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
+											</xsl:when>
+											<xsl:otherwise>
+												<xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'title-main']"/>
+											</xsl:otherwise>
+										</xsl:choose>
 
 							</xsl:for-each>
 						</xsl:variable>
@@ -16495,6 +16571,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>
@@ -16508,6 +16585,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>
@@ -16679,14 +16759,8 @@
 				<xsl:value-of select="$src"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:choose>
-					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
-						<xsl:value-of select="concat('url(file:///', @src, ')')"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
-					</xsl:otherwise>
-				</xsl:choose>
+				<xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
+				<xsl:value-of select="concat('url(file:///', $src_external, ')')"/>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
@@ -16708,15 +16782,23 @@
 	<!-- 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_half_width" select="translate(normalize-space($regex_ja_spec_half_width_), ' ', '')"/>
 	<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 (〕) -->
@@ -16724,21 +16806,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 (〜) -->
@@ -16770,6 +16847,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>
@@ -16779,53 +16857,99 @@
 			</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)"/>
-					<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: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,})')))"/>
+
+					<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>
+							<!--  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" 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">
+								<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>
-
-					<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>
+									</fo:block>
+								</fo:block-container>
+							</fo:inline-container>
+							<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>
+					</xsl:choose>
+
+					<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)"/>
+								<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"/>
+							</xsl:call-template>
+						<!-- </xsl:if> -->
 				</xsl:if>
 			</xsl:otherwise>
 		</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>
+		<xsl:choose>
+			<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">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>