RubyGems - metanorma-iec - Versions diffs - 2.2.8 → 2.2.10 - Mend

metanorma-iec 2.2.8 → 2.2.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

checksums.yaml +4 -4
data/lib/isodoc/iec/base_convert.rb +14 -20
data/lib/isodoc/iec/html/html_iec_intro.html +0 -1
data/lib/isodoc/iec/html/word_iec_intro.html +0 -3
data/lib/isodoc/iec/iec.international-standard.xsl +834 -251
data/lib/isodoc/iec/presentation_xml_convert.rb +59 -11
data/lib/isodoc/iec/word_convert.rb +21 -17
data/lib/metanorma/iec/iec.rng +6 -9
data/lib/metanorma/iec/isodoc.rng +16 -7
data/lib/metanorma/iec/isostandard.rng +5 -8
data/lib/metanorma/iec/version.rb +1 -1
metadata +2 -2

data/lib/isodoc/iec/iec.international-standard.xsl CHANGED Viewed

@@ -452,10 +452,10 @@
 								</fo:block>
 								<fo:block-container margin-left="1.5mm">
 									<fo:block-container margin-left="0mm">
-										<fo:block-container border="0.5pt solid black" font-size="10pt" margin-top="8mm" font-weight="bold" padding-left="1.5mm" padding-top="0.5mm" width="102%" height="11mm" display-align="center">
-											<fo:block margin-left="2mm">Warning! Make sure that you obtained this publication from an authorized distributor.</fo:block>
+										<fo:block-container border="0.5pt solid black" font-size="10pt" margin-top="8mm" font-weight="bold" padding-left="1.5mm" padding-top="0.5mm" width="102%" height="11mm" display-align="center" id="__internal_layout__warning_block">
+											<fo:block margin-left="1mm">Warning! Make sure that you obtained this publication from an authorized distributor.</fo:block>
 											<xsl:if test="//iec:iec-standard/iec:bibdata/iec:title[@language = 'fr']">
-												<fo:block margin-left="2mm" margin-top="3pt">Attention! Veuillez vous assurer que vous avez obtenu cette publication via un distributeur agréé.</fo:block>
+												<fo:block margin-left="1mm" margin-top="3pt">Attention! Veuillez vous assurer que vous avez obtenu cette publication via un distributeur agréé.</fo:block>
 											</xsl:if>
 										</fo:block-container>
 									</fo:block-container>
@@ -869,9 +869,9 @@
 					<xsl:for-each select="xalan:nodeset($current_document)">
-						<xsl:variable name="docid">
+						<!-- <xsl:variable name="docid">
 							<xsl:call-template name="getDocumentId"/>
-						</xsl:variable>
+						</xsl:variable> -->
 						<fo:page-sequence master-reference="document" format="1" force-page-count="no-force"> <!-- initial-page-number="2"   -->
@@ -883,17 +883,22 @@
 							</xsl:if>
 							<xsl:call-template name="insertHeaderFooter"/>
-								<fo:flow flow-name="xsl-region-body">
+							<fo:flow flow-name="xsl-region-body">
+								<xsl:call-template name="processPrefaceSectionsDefault"/>
+								<!--
 								<xsl:call-template name="insertTOCpages">
 									<xsl:with-param name="contents" select="$contents/doc[@id = $docid]"/>
 								</xsl:call-template>
 								<xsl:call-template name="insertPrefacepages">
 									<xsl:with-param name="lang" select="$lang"/>
 								</xsl:call-template>
+								-->
-								</fo:flow>
+								<fo:block/> <!-- for prevent empty preface -->
+							</fo:flow>
 						</fo:page-sequence>
 						<xsl:call-template name="insertBodypages">
@@ -1191,7 +1196,7 @@
 	<xsl:template name="insertTOCpages">
 		<xsl:param name="contents"/>
-		<fo:block-container>
+		<!-- <fo:block-container>
 			<fo:block role="TOC">
 				<fo:block font-size="12pt" text-align="center" margin-bottom="22pt" role="H1">
 					<xsl:variable name="title-toc">
@@ -1202,90 +1207,90 @@
 					<xsl:call-template name="addLetterSpacing">
 						<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($title-toc))"/>
 					</xsl:call-template>
-				</fo:block>
-				<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [@display = 'true']
-																																											[@level &lt;= 3]
-																																											[not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
-					<fo:block text-align-last="justify" role="TOCI">
-						<xsl:if test="@level = 1">
-							<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
-						</xsl:if>
-						<xsl:if test="@level = 2">
-							<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
-						</xsl:if>
-						<xsl:if test="@level &gt;= 3">
-							<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
-						</xsl:if>
-						<xsl:if test="@type = 'indexsect'">
-							<xsl:attribute name="space-before">16pt</xsl:attribute>
-						</xsl:if>
-						<xsl:if test="@type = 'references'">
-							<xsl:attribute name="space-before">5pt</xsl:attribute>
-						</xsl:if>
-						<fo:list-block>
-							<xsl:attribute name="margin-left">
-								<xsl:choose>
-									<xsl:when test="title/@variant-title = 'true'">0mm</xsl:when>
-									<xsl:when test="@level = 2">8mm</xsl:when>
-									<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 23"/>mm</xsl:when>
-									<xsl:otherwise>0mm</xsl:otherwise>
-								</xsl:choose>
-							</xsl:attribute>
-							<xsl:attribute name="provisional-distance-between-starts">
-								<xsl:choose>
-									<xsl:when test="@section = ''">0mm</xsl:when>
-									<xsl:when test="@level = 1">8mm</xsl:when>
-									<xsl:when test="@level = 2">15mm</xsl:when>
-									<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 19"/>mm</xsl:when>
-									<xsl:otherwise>0mm</xsl:otherwise>
-								</xsl:choose>
-							</xsl:attribute>
-							<fo:list-item>
-								<fo:list-item-label end-indent="label-end()">
-									<fo:block>
-										<xsl:value-of select="@section"/>
-									</fo:block>
-								</fo:list-item-label>
-								<fo:list-item-body start-indent="body-start()">
-									<fo:block text-align-last="justify">
-										<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
-											<xsl:variable name="title">
-												<xsl:apply-templates select="title"/>
-											</xsl:variable>
-											<xsl:call-template name="addLetterSpacing">
-												<xsl:with-param name="text" select="$title"/>
-											</xsl:call-template>
-											<xsl:text> </xsl:text>
-											<fo:inline keep-together.within-line="always">
-												<fo:leader leader-pattern="dots"/>
-												<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
-											</fo:inline>
-										</fo:basic-link>
-									</fo:block>
-								</fo:list-item-body>
-							</fo:list-item>
-						</fo:list-block>
-					</fo:block>
-				</xsl:for-each>
-				<xsl:if test="$contents//figures/figure">
-					<fo:block margin-bottom="5pt"> </fo:block>
-					<xsl:for-each select="$contents//figures/figure">
-						<xsl:call-template name="insertListOf_Item"/>
-					</xsl:for-each>
+				</fo:block> -->
+		<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [@display = 'true']
+																																									[@level &lt;= 3]
+																																									[not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
+			<fo:block text-align-last="justify" role="TOCI">
+				<xsl:if test="@level = 1">
+					<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
 				</xsl:if>
-				<xsl:if test="$contents//tables/table">
-					<fo:block margin-bottom="5pt"> </fo:block>
-					<xsl:for-each select="$contents//tables/table">
-						<xsl:call-template name="insertListOf_Item"/>
-					</xsl:for-each>
+				<xsl:if test="@level = 2">
+					<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="@level &gt;= 3">
+					<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="@type = 'indexsect'">
+					<xsl:attribute name="space-before">16pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="@type = 'references'">
+					<xsl:attribute name="space-before">5pt</xsl:attribute>
 				</xsl:if>
+				<fo:list-block>
+					<xsl:attribute name="margin-left">
+						<xsl:choose>
+							<xsl:when test="title/@variant-title = 'true'">0mm</xsl:when>
+							<xsl:when test="@level = 2">8mm</xsl:when>
+							<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 23"/>mm</xsl:when>
+							<xsl:otherwise>0mm</xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+					<xsl:attribute name="provisional-distance-between-starts">
+						<xsl:choose>
+							<xsl:when test="@section = ''">0mm</xsl:when>
+							<xsl:when test="@level = 1">8mm</xsl:when>
+							<xsl:when test="@level = 2">15mm</xsl:when>
+							<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 19"/>mm</xsl:when>
+							<xsl:otherwise>0mm</xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+					<fo:list-item>
+						<fo:list-item-label end-indent="label-end()">
+							<fo:block>
+								<xsl:value-of select="@section"/>
+							</fo:block>
+						</fo:list-item-label>
+						<fo:list-item-body start-indent="body-start()">
+							<fo:block text-align-last="justify">
+								<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
+									<xsl:variable name="title">
+										<xsl:apply-templates select="title"/>
+									</xsl:variable>
+									<xsl:call-template name="addLetterSpacing">
+										<xsl:with-param name="text" select="$title"/>
+									</xsl:call-template>
+									<xsl:text> </xsl:text>
+									<fo:inline keep-together.within-line="always">
+										<fo:leader leader-pattern="dots"/>
+										<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+									</fo:inline>
+								</fo:basic-link>
+							</fo:block>
+						</fo:list-item-body>
+					</fo:list-item>
+				</fo:list-block>
 			</fo:block>
-		</fo:block-container>
+		</xsl:for-each>
+		<xsl:if test="$contents//figures/figure">
+			<fo:block margin-bottom="5pt"> </fo:block>
+			<xsl:for-each select="$contents//figures/figure">
+				<xsl:call-template name="insertListOf_Item"/>
+			</xsl:for-each>
+		</xsl:if>
+		<xsl:if test="$contents//tables/table">
+			<fo:block margin-bottom="5pt"> </fo:block>
+			<xsl:for-each select="$contents//tables/table">
+				<xsl:call-template name="insertListOf_Item"/>
+			</xsl:for-each>
+		</xsl:if>
+			<!-- </fo:block>
+		</fo:block-container> -->
 	</xsl:template>
 	<xsl:template name="insertListOf_Item">
@@ -1300,6 +1305,49 @@
 		</fo:block>
 	</xsl:template>
+	<xsl:template match="iec:preface/iec:clause[@type = 'toc']" priority="3">
+		<fo:block-container>
+			<fo:block role="TOC">
+				<xsl:apply-templates/>
+				<xsl:if test="count(*) = 1 and *[local-name() = 'title']"> <!-- if there isn't user ToC -->
+					<xsl:variable name="docid">
+						<xsl:call-template name="getDocumentId"/>
+					</xsl:variable>
+					<xsl:call-template name="insertTOCpages">
+						<xsl:with-param name="contents" select="$contents/doc[@id = $docid]"/>
+					</xsl:call-template>
+				</xsl:if>
+			</fo:block>
+		</fo:block-container>
+	</xsl:template>
+	<xsl:template match="iec:preface/iec:clause[@type = 'toc']/iec:title" priority="3">
+		<fo:block font-size="12pt" text-align="center" margin-bottom="22pt" role="H1">
+			<xsl:call-template name="addLetterSpacing">
+				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new(.))"/>
+			</xsl:call-template>
+		</fo:block>
+	</xsl:template>
+	<xsl:template match="iec:preface/iec:pagebreak" priority="3">
+		<fo:block break-after="page"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'preface' or local-name() = 'sections']/iec:p[starts-with(@class, 'zzSTDTitle')]" priority="3">
+		<fo:block-container font-size="12pt" text-align="center">
+			<xsl:if test="following-sibling::*[1][not(self::iec:p[starts-with(@class, 'zzSTDTitle')])]">
+				<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
+			</xsl:if>
+			<fo:block>
+				<xsl:if test="iec:strong"> <!-- title -->
+					<xsl:attribute name="role">H1</xsl:attribute>
+				</xsl:if>
+				<xsl:apply-templates/>
+			</fo:block>
+		</fo:block-container>
+	</xsl:template>
 	<xsl:template name="insertPrefacepages">
 		<xsl:param name="lang" select="$lang"/>
 		<fo:block break-after="page"/>
@@ -1622,14 +1670,21 @@
 				<xsl:with-param name="text" select="iec:title"/>
 			</xsl:call-template>
 		</fo:block>
-		<fo:block font-size="8.2pt" text-align="justify"> <!--  margin-left="6.3mm" -->
+		<!--  margin-left="6.3mm" -->
+		<!-- <fo:block font-size="8.2pt" text-align="justify">
 			<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:legal-statement/*"/>
-		</fo:block>
+		</fo:block> -->
 		<fo:block>
 			<xsl:apply-templates select="*[not(local-name() = 'title')]"/>
 		</fo:block>
 	</xsl:template>
+	<xsl:template match="iec:clause[@type = 'boilerplate_legal']" priority="3">
+		<fo:block font-size="8.2pt" text-align="justify">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
 	<xsl:template match="iec:annex//iec:clause" priority="2">
 		<fo:block id="{@id}" margin-top="5pt" margin-bottom="10pt" text-align="justify">
 			<xsl:apply-templates/>
@@ -1806,7 +1861,7 @@
 			<xsl:if test="ancestor::iec:ul">
 				<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
 			</xsl:if>
-			<xsl:if test="ancestor::iec:legal-statement">
+			<xsl:if test="ancestor::iec:legal-statement or ancestor::iec:clause[@type = 'boilerplate_legal']">
 				<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
 			</xsl:if>
 			<xsl:apply-templates/>
@@ -1844,14 +1899,18 @@
 	</xsl:template>
 	<xsl:template match="iec:xref[@pagenumber = 'true']" priority="2">
-		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
-			<fo:inline>
-				<xsl:if test="@id">
-					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-				</xsl:if>
-				<fo:page-number-citation ref-id="{@target}"/>
-			</fo:inline>
-		</fo:basic-link>
+		<xsl:call-template name="insert_basic_link">
+			<xsl:with-param name="element">
+				<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
+					<fo:inline>
+						<xsl:if test="@id">
+							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+						</xsl:if>
+						<fo:page-number-citation ref-id="{@target}"/>
+					</fo:inline>
+				</fo:basic-link>
+			</xsl:with-param>
+		</xsl:call-template>
 	</xsl:template>
 	<!-- =================== -->
@@ -2430,6 +2489,14 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_link-style">
+			<xsl:if test="ancestor::*[local-name()='feedback-statement' or local-name() = 'copyright-statement']">
+				<xsl:attribute name="color">blue</xsl:attribute>
+			</xsl:if>
+	</xsl:template> <!-- refine_link-style -->
 	<xsl:attribute-set name="sourcecode-container-style">
 	</xsl:attribute-set>
@@ -2445,6 +2512,10 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_sourcecode-style">
+	</xsl:template> <!-- refine_sourcecode-style -->
 	<xsl:attribute-set name="pre-style">
 		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -2529,6 +2600,10 @@
 	</xsl:attribute-set> <!-- example-style -->
+	<xsl:template name="refine_example-style">
+	</xsl:template> <!-- refine_example-style -->
 	<xsl:attribute-set name="example-body-style">
 			<xsl:attribute name="margin-left">10mm</xsl:attribute>
@@ -2548,6 +2623,10 @@
 	</xsl:attribute-set> <!-- example-p-style -->
+	<xsl:template name="refine_example-p-style">
+	</xsl:template> <!-- refine_example-p-style -->
 	<xsl:attribute-set name="termexample-name-style">
 			<xsl:attribute name="padding-right">10mm</xsl:attribute>
@@ -2576,6 +2655,19 @@
 	</xsl:attribute-set> <!-- table-container-style -->
+	<xsl:template name="refine_table-container-style">
+		<xsl:param name="margin-side"/>
+			<xsl:attribute name="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
+			<xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
+			<xsl:if test="ancestor::*[local-name() = 'preface']">
+				<xsl:attribute name="space-after">16pt</xsl:attribute>
+			</xsl:if>
+		<!-- end table block-container attributes -->
+	</xsl:template> <!-- refine_table-container-style -->
 	<xsl:attribute-set name="table-style">
 		<xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
 		<xsl:attribute name="table-layout">fixed</xsl:attribute>
@@ -2584,6 +2676,18 @@
 	</xsl:attribute-set><!-- table-style -->
+	<xsl:template name="refine_table-style">
+		<xsl:param name="margin-side"/>
+			<xsl:if test="$margin-side != 0">
+				<xsl:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
+				<xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
+			</xsl:if>
+		<xsl:call-template name="setBordersTableArray"/>
+	</xsl:template> <!-- refine_table-style -->
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -2595,6 +2699,16 @@
 	</xsl:attribute-set> <!-- table-name-style -->
+	<xsl:template name="refine_table-name-style">
+		<xsl:param name="continued"/>
+			<xsl:if test="$continued = 'true'">
+				<xsl:attribute name="font-size">10pt</xsl:attribute>
+				<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			</xsl:if>
+	</xsl:template> <!-- refine_table-name-style -->
 	<xsl:attribute-set name="table-row-style">
 		<xsl:attribute name="min-height">4mm</xsl:attribute>
@@ -2608,6 +2722,12 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_table-header-row-style">
+		<xsl:call-template name="setBordersTableArray"/>
+	</xsl:template> <!-- refine_table-header-row-style -->
 	<xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
 			<xsl:attribute name="border-left">solid black 0.5pt</xsl:attribute>
@@ -2615,10 +2735,20 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_table-footer-row-style">
+	</xsl:template> <!-- refine_table-footer-row-style -->
 	<xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_table-body-row-style">
+		<xsl:call-template name="setBordersTableArray"/>
+	</xsl:template> <!-- refine_table-body-row-style -->
 	<xsl:attribute-set name="table-header-cell-style">
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="padding-left">1mm</xsl:attribute>
@@ -2631,6 +2761,23 @@
 	</xsl:attribute-set> <!-- table-header-cell-style -->
+	<xsl:template name="refine_table-header-cell-style">
+			<xsl:attribute name="text-align">center</xsl:attribute>
+			<xsl:if test="ancestor::*[local-name()='preface']">
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+			</xsl:if>
+		<xsl:call-template name="setBordersTableArray"/>
+		<xsl:if test="$lang = 'ar'">
+			<xsl:attribute name="padding-right">1mm</xsl:attribute>
+		</xsl:if>
+		<xsl:call-template name="setTableCellAttributes"/>
+	</xsl:template> <!-- refine_table-header-cell-style -->
 	<xsl:attribute-set name="table-cell-style">
 		<xsl:attribute name="display-align">center</xsl:attribute>
 		<xsl:attribute name="padding-left">1mm</xsl:attribute>
@@ -2641,6 +2788,22 @@
 	</xsl:attribute-set> <!-- table-cell-style -->
+	<xsl:template name="refine_table-cell-style">
+		<xsl:if test="$lang = 'ar'">
+			<xsl:attribute name="padding-right">1mm</xsl:attribute>
+		</xsl:if>
+		 <!-- bsi -->
+			<xsl:if test="ancestor::*[local-name()='preface']">
+				<xsl:attribute name="text-align">center</xsl:attribute>
+			</xsl:if>
+		<xsl:call-template name="setBordersTableArray"/>
+	</xsl:template> <!-- refine_table-cell-style -->
 	<xsl:attribute-set name="table-footer-cell-style">
 		<xsl:attribute name="border">solid black 1pt</xsl:attribute>
 		<xsl:attribute name="padding-left">1mm</xsl:attribute>
@@ -2651,6 +2814,10 @@
 	</xsl:attribute-set> <!-- table-footer-cell-style -->
+	<xsl:template name="refine_table-footer-cell-style">
+	</xsl:template> <!-- refine_table-footer-cell-style -->
 	<xsl:attribute-set name="table-note-style">
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -2660,6 +2827,10 @@
 	</xsl:attribute-set><!-- table-note-style -->
+	<xsl:template name="refine_table-note-style">
+	</xsl:template> <!-- refine_table-note-style -->
 	<xsl:attribute-set name="table-fn-style">
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -2726,11 +2897,19 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_dt-cell-style">
+	</xsl:template> <!-- refine_dt-cell-style -->
 	<xsl:attribute-set name="dt-block-style">
 		<xsl:attribute name="margin-top">0pt</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_dt-block-style">
+	</xsl:template> <!-- refine_dt-block-style -->
 	<xsl:attribute-set name="dl-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -2744,6 +2923,10 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_dd-cell-style">
+	</xsl:template> <!-- refine_dd-cell-style -->
 	<!-- ========================== -->
 	<!-- END Definition's list styles -->
 	<!-- ========================== -->
@@ -2771,6 +2954,12 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_eref-style">
+		<xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
+		<xsl:variable name="text" select="normalize-space()"/>
+	</xsl:template> <!-- refine_eref-style -->
 	<xsl:attribute-set name="note-style">
 			<xsl:attribute name="font-size">8pt</xsl:attribute>
@@ -2779,6 +2968,10 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_note-style">
+	</xsl:template>
 	<xsl:variable name="note-body-indent">10mm</xsl:variable>
 	<xsl:variable name="note-body-indent-table">5mm</xsl:variable>
@@ -2788,11 +2981,19 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_note-name-style">
+	</xsl:template> <!-- refine_note-name-style -->
 	<xsl:attribute-set name="table-note-name-style">
 		<xsl:attribute name="padding-right">2mm</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_table-note-name-style">
+	</xsl:template> <!-- refine_table-note-name-style -->
 	<xsl:attribute-set name="note-p-style">
 			<xsl:attribute name="margin-top">5pt</xsl:attribute>
@@ -2807,10 +3008,18 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_termnote-style">
+	</xsl:template> <!-- refine_termnote-style -->
 	<xsl:attribute-set name="termnote-name-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_termnote-name-style">
+	</xsl:template>
 	<xsl:attribute-set name="termnote-p-style">
 	</xsl:attribute-set>
@@ -2824,6 +3033,10 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_quote-style">
+	</xsl:template>
 	<xsl:attribute-set name="quote-source-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
@@ -2840,6 +3053,10 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_termsource-style">
+	</xsl:template> <!-- refine_termsource-style -->
 	<xsl:attribute-set name="termsource-text-style">
 	</xsl:attribute-set>
@@ -2878,6 +3095,10 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_figure-name-style">
+	</xsl:template> <!-- refine_figure-name-style -->
 	<xsl:attribute-set name="figure-source-style">
 			<xsl:attribute name="font-size">6pt</xsl:attribute>
@@ -2898,6 +3119,10 @@
 	</xsl:attribute-set> <!-- formula-stem-block-style -->
+	<xsl:template name="refine_formula-stem-block-style">
+	</xsl:template> <!-- refine_formula-stem-block-style -->
 	<xsl:attribute-set name="formula-stem-number-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
@@ -2911,6 +3136,10 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_image-style">
+	</xsl:template>
 	<xsl:attribute-set name="figure-pseudocode-p-style">
 	</xsl:attribute-set>
@@ -3009,6 +3238,10 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_mathml-style">
+	</xsl:template>
 	<xsl:attribute-set name="list-style">
 			<xsl:attribute name="provisional-distance-between-starts">6mm</xsl:attribute>
@@ -3016,6 +3249,14 @@
 	</xsl:attribute-set> <!-- list-style -->
+	<xsl:template name="refine_list-style">
+			<xsl:if test="ancestor::iec:ul or ancestor::iec:ol">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
+	</xsl:template> <!-- refine_list-style -->
 	<xsl:attribute-set name="list-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -3027,14 +3268,26 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_list-item-style">
+	</xsl:template> <!-- refine_list-item-style -->
 	<xsl:attribute-set name="list-item-label-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_list-item-label-style">
+	</xsl:template> <!-- refine_list-item-label-style -->
 	<xsl:attribute-set name="list-item-body-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_list-item-body-style">
+	</xsl:template> <!-- refine_list-item-body-style -->
 	<xsl:attribute-set name="toc-style">
 		<xsl:attribute name="line-height">135%</xsl:attribute>
 	</xsl:attribute-set>
@@ -3045,6 +3298,15 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_fn-reference-style">
+			<xsl:if test="ancestor::*[local-name()='table']">
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+				<xsl:attribute name="baseline-shift">15%</xsl:attribute>
+			</xsl:if>
+	</xsl:template> <!-- refine_fn-reference-style -->
 	<xsl:attribute-set name="fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 	</xsl:attribute-set>
@@ -3068,6 +3330,10 @@
 	</xsl:attribute-set>
+	<xsl:template name="refine_fn-body-style">
+	</xsl:template> <!-- refine_fn-body-style -->
 	<xsl:attribute-set name="fn-body-num-style">
 		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
@@ -3076,6 +3342,10 @@
 	</xsl:attribute-set> <!-- fn-body-num-style -->
+	<xsl:template name="refine_fn-body-num-style">
+	</xsl:template> <!-- refine_fn-body-num-style -->
 	<!-- admonition -->
 	<xsl:attribute-set name="admonition-style">
@@ -3739,14 +4009,9 @@
 			<fo:block-container xsl:use-attribute-sets="table-container-style">
-					<xsl:attribute name="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
-					<xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
-					<xsl:if test="ancestor::*[local-name() = 'preface']">
-						<xsl:attribute name="space-after">16pt</xsl:attribute>
-					</xsl:if>
-				<!-- end table block-container attributes -->
+				<xsl:call-template name="refine_table-container-style">
+					<xsl:with-param name="margin-side" select="$margin-side"/>
+				</xsl:call-template>
 				<!-- display table's name before table for PAS inside block-container (2-columnn layout) -->
@@ -3767,12 +4032,9 @@
 						<xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
-							<xsl:if test="$margin-side != 0">
-								<xsl:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
-								<xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
-							</xsl:if>
-						<xsl:call-template name="setBordersTableArray"/>
+						<xsl:call-template name="refine_table-style">
+							<xsl:with-param name="margin-side" select="$margin-side"/>
+						</xsl:call-template>
 					</xsl:element>
 				</xsl:variable>
@@ -3838,7 +4100,7 @@
 									<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
 								</xsl:when>
 								<xsl:otherwise>
-									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl') and not(local-name() = 'source')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
+									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
 								</xsl:otherwise>
 							</xsl:choose>
@@ -3933,10 +4195,9 @@
 					<fo:block xsl:use-attribute-sets="table-name-style">
-							<xsl:if test="$continued = 'true'">
-								<xsl:attribute name="font-size">10pt</xsl:attribute>
-								<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-							</xsl:if>
+						<xsl:call-template name="refine_table-name-style">
+							<xsl:with-param name="continued" select="$continued"/>
+						</xsl:call-template>
 						<xsl:choose>
 							<xsl:when test="$continued = 'true'">
@@ -4334,10 +4595,7 @@
 		<fo:table-row>
 			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
-					<xsl:attribute name="border-left">1pt solid white</xsl:attribute>
-					<xsl:attribute name="border-right">1pt solid white</xsl:attribute>
-					<xsl:attribute name="border-top">1pt solid white</xsl:attribute>
-					<xsl:attribute name="border-bottom">none</xsl:attribute>
+				<xsl:call-template name="refine_table-header-title-style"/>
 						<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
 							<xsl:with-param name="continued">true</xsl:with-param>
@@ -4351,6 +4609,15 @@
 		</fo:table-row>
 	</xsl:template> <!-- table-header-title -->
+	<xsl:template name="refine_table-header-title-style">
+			<xsl:attribute name="border-left">1pt solid white</xsl:attribute>
+			<xsl:attribute name="border-right">1pt solid white</xsl:attribute>
+			<xsl:attribute name="border-top">1pt solid white</xsl:attribute>
+			<xsl:attribute name="border-bottom">none</xsl:attribute>
+	</xsl:template> <!-- refine_table-header-title-style -->
 	<xsl:template match="*[local-name()='thead']" mode="process_tbody">
 		<fo:table-body>
 			<xsl:apply-templates/>
@@ -4375,7 +4642,7 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source']"/>
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
@@ -4435,6 +4702,8 @@
 						<fo:table-row>
 							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
+								<xsl:call-template name="refine_table-footer-cell-style"/>
 								<xsl:call-template name="setBordersTableArray"/>
 								<!-- fn will be processed inside 'note' processing -->
@@ -4447,6 +4716,7 @@
 								<!-- except gb and bsi  -->
+										<xsl:apply-templates select="../*[local-name()='p']"/>
 										<xsl:apply-templates select="../*[local-name()='dl']"/>
 										<xsl:apply-templates select="../*[local-name()='note']"/>
 										<xsl:apply-templates select="../*[local-name()='source']"/>
@@ -4623,7 +4893,7 @@
 	<xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2">
 		<fo:table-row xsl:use-attribute-sets="table-header-row-style">
-			<xsl:call-template name="setBordersTableArray"/>
+			<xsl:call-template name="refine_table-header-row-style"/>
 			<xsl:call-template name="setTableRowAttributes"/>
@@ -4657,6 +4927,8 @@
 	<xsl:template match="*[local-name()='tfoot']/*[local-name()='tr']" priority="2">
 		<fo:table-row xsl:use-attribute-sets="table-footer-row-style">
+			<xsl:call-template name="refine_table-footer-row-style"/>
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -4670,9 +4942,10 @@
 				<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			</xsl:if>
-			<xsl:call-template name="setBordersTableArray"/>
+			<xsl:call-template name="refine_table-body-row-style"/>
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
 	</xsl:template>
@@ -4691,18 +4964,7 @@
 				<xsl:with-param name="default">center</xsl:with-param>
 			</xsl:call-template>
-				<xsl:attribute name="text-align">center</xsl:attribute>
-				<xsl:if test="ancestor::*[local-name()='preface']">
-					<xsl:attribute name="font-weight">normal</xsl:attribute>
-				</xsl:if>
-			<xsl:call-template name="setBordersTableArray"/>
-			<xsl:if test="$lang = 'ar'">
-				<xsl:attribute name="padding-right">1mm</xsl:attribute>
-			</xsl:if>
-			<xsl:call-template name="setTableCellAttributes"/>
+			<xsl:call-template name="refine_table-header-cell-style"/>
 			<fo:block>
 				<xsl:apply-templates/>
@@ -4744,17 +5006,7 @@
 				<xsl:with-param name="default">left</xsl:with-param>
 			</xsl:call-template>
-			<xsl:if test="$lang = 'ar'">
-				<xsl:attribute name="padding-right">1mm</xsl:attribute>
-			</xsl:if>
-			 <!-- bsi -->
-				<xsl:if test="ancestor::*[local-name()='preface']">
-					<xsl:attribute name="text-align">center</xsl:attribute>
-				</xsl:if>
-			<xsl:call-template name="setBordersTableArray"/>
+			<xsl:call-template name="refine_table-cell-style"/>
 			<xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
@@ -4785,9 +5037,13 @@
 		<fo:block xsl:use-attribute-sets="table-note-style">
+			<xsl:call-template name="refine_table-note-style"/>
 			<!-- Table's note name (NOTE, for example) -->
 			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+				<xsl:call-template name="refine_table-note-name-style"/>
 				<xsl:apply-templates select="*[local-name() = 'name']"/>
 			</fo:inline>
@@ -4815,6 +5071,14 @@
 		<!-- list of footnotes to calculate actual footnotes number -->
 		<xsl:variable name="p_fn_">
 			<xsl:call-template name="get_fn_list"/>
+			<!-- <xsl:choose>
+				<xsl:when test="$namespace = 'jis'">
+					<xsl:call-template name="get_fn_list_for_element"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:call-template name="get_fn_list"/>
+				</xsl:otherwise>
+			</xsl:choose> -->
 		</xsl:variable>
 		<xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
@@ -4839,7 +5103,14 @@
 		</xsl:variable>
-		<xsl:variable name="ref_id" select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
+		<xsl:variable name="ref_id">
+			<xsl:choose>
+				<xsl:when test="normalize-space(@ref_id) != ''"><xsl:value-of select="@ref_id"/></xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<xsl:variable name="footnote_inline">
 			<fo:inline>
@@ -4862,9 +5133,13 @@
 					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
 				</xsl:if>
-				<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
-					<xsl:value-of select="$current_fn_number_text"/>
-				</fo:basic-link>
+				<xsl:call-template name="insert_basic_link">
+					<xsl:with-param name="element">
+						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
+							<xsl:copy-of select="$current_fn_number_text"/>
+						</fo:basic-link>
+					</xsl:with-param>
+				</xsl:call-template>
 			</fo:inline>
 		</xsl:variable>
@@ -4881,8 +5156,12 @@
 							<fo:block xsl:use-attribute-sets="fn-body-style">
+								<xsl:call-template name="refine_fn-body-style"/>
 								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
+									<xsl:call-template name="refine_fn-body-num-style"/>
 									<xsl:value-of select="$current_fn_number_text"/>
 								</fo:inline>
 								<xsl:apply-templates/>
@@ -4934,6 +5213,28 @@
 		</xsl:choose>
 	</xsl:template>
+	<xsl:template name="get_fn_list_for_element">
+		<xsl:choose>
+			<xsl:when test="@current_fn_number"> <!-- footnote reference number calculated already -->
+				<fn gen_id="{generate-id(.)}">
+					<xsl:copy-of select="@*"/>
+					<xsl:copy-of select="node()"/>
+				</fn>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:for-each select="ancestor::*[local-name() = 'ul' or local-name() = 'ol'][1]">
+					<xsl:variable name="element_id" select="@id"/>
+					<xsl:for-each select=".//*[local-name() = 'fn'][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
+						<!-- copy unique fn -->
+						<fn gen_id="{generate-id(.)}">
+							<xsl:copy-of select="@*"/>
+							<xsl:copy-of select="node()"/>
+						</fn>
+					</xsl:for-each>
+				</xsl:for-each>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
 	<!-- ============================ -->
 	<!-- table's footnotes rendering -->
 	<!-- ============================ -->
@@ -5108,10 +5409,7 @@
 	<xsl:template match="*[local-name()='fn']">
 		<fo:inline xsl:use-attribute-sets="fn-reference-style">
-				<xsl:if test="ancestor::*[local-name()='table']">
-					<xsl:attribute name="font-weight">normal</xsl:attribute>
-					<xsl:attribute name="baseline-shift">15%</xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="refine_fn-reference-style"/>
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
@@ -5210,14 +5508,14 @@
 									<xsl:apply-templates select="*[local-name()='dt']/*"/>
 									<xsl:text> </xsl:text>
-									<xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
+									<xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
 								</fo:block>
 					</xsl:when> <!-- END: only one component -->
 					<xsl:when test="$parent = 'formula'"> <!-- a few components -->
 						<fo:block margin-bottom="12pt" text-align="left">
-								<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+							<xsl:call-template name="refine_dl_formula_where_style"/>
 							<!-- <xsl:variable name="title-where">
 								<xsl:call-template name="getLocalizedString">
@@ -5232,8 +5530,7 @@
 					<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
 						<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
-								<xsl:attribute name="font-size">8pt</xsl:attribute>
-								<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+							<xsl:call-template name="refine_figure_key_style"/>
 							<xsl:variable name="title-key">
 								<xsl:call-template name="getLocalizedString">
@@ -5249,12 +5546,16 @@
 				<xsl:if test="$onlyOneComponent = 'false'">
 					<fo:block>
+						<xsl:call-template name="refine_multicomponent_style"/>
 						<xsl:if test="ancestor::*[local-name() = 'dd' or local-name() = 'td']">
 							<xsl:attribute name="margin-top">0</xsl:attribute>
 						</xsl:if>
 						<fo:block>
+							<xsl:call-template name="refine_multicomponent_block_style"/>
 							<xsl:apply-templates select="*[local-name() = 'name']">
 								<xsl:with-param name="process">true</xsl:with-param>
 							</xsl:apply-templates>
@@ -5414,6 +5715,29 @@
 	</xsl:template> <!-- END: dl -->
+	<xsl:template name="refine_dl_formula_where_style">
+			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+	</xsl:template> <!-- refine_dl_formula_where_style -->
+	<xsl:template name="refine_figure_key_style">
+			<xsl:attribute name="font-size">8pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+	</xsl:template> <!-- refine_figure_key_style -->
+	<xsl:template name="refine_multicomponent_style">
+		<xsl:variable name="parent" select="local-name(..)"/>
+	</xsl:template> <!-- refine_multicomponent_style -->
+	<xsl:template name="refine_multicomponent_block_style">
+		<xsl:variable name="parent" select="local-name(..)"/>
+	</xsl:template> <!-- refine_multicomponent_block_style -->
 	<!-- ignore 'p' with 'where' in formula, before 'dl' -->
 	<xsl:template match="*[local-name() = 'formula']/*[local-name() = 'p' and @keep-with-next = 'true' and following-sibling::*[1][local-name() = 'dl']]"/>
@@ -5633,6 +5957,8 @@
 			</xsl:if>
+			<xsl:call-template name="refine_dt-cell-style"/>
 			<fo:block xsl:use-attribute-sets="dt-block-style">
 				<xsl:copy-of select="@id"/>
@@ -5640,6 +5966,8 @@
 					<xsl:attribute name="margin-top">0</xsl:attribute>
 				</xsl:if>
+				<xsl:call-template name="refine_dt-block-style"/>
 				<xsl:apply-templates>
 					<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
 				</xsl:apply-templates>
@@ -5659,6 +5987,8 @@
 				<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
 			</xsl:if>
+			<xsl:call-template name="refine_dd-cell-style"/>
 			<fo:block>
 				<xsl:if test="$isGenerateTableIF = 'true'">
@@ -5704,8 +6034,18 @@
 		</xsl:if>
 	</xsl:template>
-	<xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
-		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
+	<xsl:template match="*[local-name()='dd']/*" mode="inline">
+		<xsl:variable name="is_inline_element_after_where">
+			<xsl:if test="(local-name() = 'p') and not(preceding-sibling::node()[normalize-space() != ''])">true</xsl:if>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$is_inline_element_after_where = 'true'">
+				<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates select="."/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 	<!-- virtual html table for dl/[dt and dd] for IF (Intermediate Format) -->
@@ -5799,12 +6139,18 @@
 		<xsl:param name="split_keep-within-line"/>
 		<fo:inline font-weight="bold">
+			<xsl:call-template name="refine_strong_style"/>
 			<xsl:apply-templates>
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
 			</xsl:apply-templates>
 		</fo:inline>
 	</xsl:template>
+	<xsl:template name="refine_strong_style">
+	</xsl:template>
 	<xsl:template match="*[local-name()='padding']">
 		<fo:inline padding-right="{@value}"> </fo:inline>
 	</xsl:template>
@@ -6344,7 +6690,10 @@
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:value-of select="$text9"/>
+		<!-- replace sequence #x200B and space TO space -->
+		<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
+		<xsl:value-of select="$text10"/>
 	</xsl:template>
 	<xsl:template name="add-zero-spaces-link-java">
@@ -7019,6 +7368,11 @@
 		<fo:inline xsl:use-attribute-sets="mathml-style">
+			<!-- DEBUG -->
+			<!-- <xsl:copy-of select="ancestor::*[local-name() = 'stem']/@font-family"/> -->
+			<xsl:call-template name="refine_mathml-style"/>
 			<xsl:if test="$isGenerateTableIF = 'true' and ancestor::*[local-name() = 'td' or local-name() = 'th' or local-name() = 'dl'] and not(following-sibling::node()[not(self::comment())][normalize-space() != ''])"> <!-- math in table cell, and math is last element -->
 				<!-- <xsl:attribute name="padding-right">1mm</xsl:attribute> -->
 			</xsl:if>
@@ -7123,6 +7477,8 @@
 		<fo:instream-foreign-object fox:alt-text="Math">
+			<xsl:call-template name="refine_mathml_insteam_object_style"/>
 			<!-- put MathML in Actual Text -->
 			<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
 			<xsl:attribute name="fox:actual-text">
@@ -7143,6 +7499,10 @@
 		</fo:instream-foreign-object>
 	</xsl:template>
+	<xsl:template name="refine_mathml_insteam_object_style">
+	</xsl:template> <!-- refine_mathml_insteam_object_style -->
 	<xsl:template match="mathml:*" mode="mathml_actual_text">
 		<!-- <xsl:text>a+b</xsl:text> -->
 		<xsl:text>&lt;</xsl:text>
@@ -7206,6 +7566,79 @@
 		<xsl:value-of select="."/><xsl:value-of select="$zero_width_space"/>
 	</xsl:template>
+	<!-- special case for:
+		<math xmlns="http://www.w3.org/1998/Math/MathML">
+			<mstyle displaystyle="true">
+				<msup>
+					<mi color="#00000000">C</mi>
+					<mtext>R</mtext>
+				</msup>
+				<msubsup>
+					<mtext>C</mtext>
+					<mi>n</mi>
+					<mi>k</mi>
+				</msubsup>
+			</mstyle>
+		</math>
+	-->
+	<xsl:template match="mathml:msup/mathml:mi[. = '‌' or . = ''][not(preceding-sibling::*)][following-sibling::mathml:mtext]" mode="mathml">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:variable name="next_mtext" select="ancestor::mathml:msup/following-sibling::*[1][self::mathml:msubsup or self::mathml:msub or self::mathml:msup]/mathml:mtext"/>
+			<xsl:if test="string-length($next_mtext) != ''">
+				<xsl:attribute name="color">#00000000</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+			<xsl:value-of select="$next_mtext"/>
+		</xsl:copy>
+	</xsl:template>
+	<!-- special case for:
+				<msup>
+					<mtext/>
+					<mn>1</mn>
+				</msup>
+		convert to (add mspace after mtext and enclose them into mrow):
+			<msup>
+				<mrow>
+					<mtext/>
+					<mspace height="1.47ex"/>
+				</mrow>
+				<mn>1</mn>
+			</msup>
+	-->
+	<xsl:template match="mathml:msup/mathml:mtext[not(preceding-sibling::*)]" mode="mathml">
+		<mathml:mrow>
+			<xsl:copy-of select="."/>
+			<mathml:mspace height="1.47ex"/>
+		</mathml:mrow>
+	</xsl:template>
+	<!-- add space around vertical line -->
+	<xsl:template match="mathml:mo[normalize-space(text()) = '|']" mode="mathml">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="mathml"/>
+			<xsl:if test="not(@lspace)">
+				<xsl:attribute name="lspace">0.4em</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="not(@rspace)">
+				<xsl:attribute name="rspace">0.4em</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates mode="mathml"/>
+		</xsl:copy>
+	</xsl:template>
+	<!-- decrease fontsize for 'Circled Times' char -->
+	<xsl:template match="mathml:mo[normalize-space(text()) = '⊗']" mode="mathml">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="mathml"/>
+			<xsl:if test="not(@fontsize)">
+				<xsl:attribute name="fontsize">55%</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates mode="mathml"/>
+		</xsl:copy>
+	</xsl:template>
 	<!-- Examples:
 		<stem type="AsciiMath">x = 1</stem>
 		<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
@@ -7214,6 +7647,8 @@
 	<xsl:template match="*[local-name() = 'stem'][@type = 'AsciiMath'][count(*) = 0]/text() | *[local-name() = 'stem'][@type = 'AsciiMath'][*[local-name() = 'asciimath']]" priority="3">
 		<fo:inline xsl:use-attribute-sets="mathml-style">
+			<xsl:call-template name="refine_mathml-style"/>
 			<xsl:choose>
 				<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
 				<xsl:otherwise>
@@ -7258,28 +7693,30 @@
 				<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 			</xsl:if>
-				<xsl:if test="ancestor::*[local-name()='feedback-statement' or local-name() = 'copyright-statement']">
-					<xsl:attribute name="color">blue</xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="refine_link-style"/>
 			<xsl:choose>
 				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
 				</xsl:when>
 				<xsl:otherwise>
-					<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
-						<xsl:choose>
-							<xsl:when test="normalize-space(.) = ''">
-								<xsl:call-template name="add-zero-spaces-link-java">
-									<xsl:with-param name="text" select="$target_text"/>
-								</xsl:call-template>
-							</xsl:when>
-							<xsl:otherwise>
-								<!-- output text from <link>text</link> -->
-								<xsl:apply-templates/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</fo:basic-link>
+					<xsl:call-template name="insert_basic_link">
+						<xsl:with-param name="element">
+							<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
+								<xsl:choose>
+									<xsl:when test="normalize-space(.) = ''">
+										<xsl:call-template name="add-zero-spaces-link-java">
+											<xsl:with-param name="text" select="$target_text"/>
+										</xsl:call-template>
+									</xsl:when>
+									<xsl:otherwise>
+										<!-- output text from <link>text</link> -->
+										<xsl:apply-templates/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</fo:basic-link>
+						</xsl:with-param>
+					</xsl:call-template>
 				</xsl:otherwise>
 			</xsl:choose>
 		</fo:inline>
@@ -7342,12 +7779,19 @@
 	</xsl:template>
 	<xsl:template match="*[local-name() = 'xref']">
-		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
-			<xsl:if test="parent::*[local-name() = 'add']">
-				<xsl:call-template name="append_add-style"/>
-			</xsl:if>
-			<xsl:apply-templates/>
-		</fo:basic-link>
+		<xsl:call-template name="insert_basic_link">
+			<xsl:with-param name="element">
+				<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
+					<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
+						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="parent::*[local-name() = 'add']">
+						<xsl:call-template name="append_add-style"/>
+					</xsl:if>
+					<xsl:apply-templates/>
+				</fo:basic-link>
+			</xsl:with-param>
+		</xsl:call-template>
 	</xsl:template>
 	<!-- ====== -->
@@ -7402,6 +7846,8 @@
 						<fo:table-cell display-align="center">
 							<fo:block xsl:use-attribute-sets="formula-stem-block-style">
+								<xsl:call-template name="refine_formula-stem-block-style"/>
 								<xsl:apply-templates/>
 							</fo:block>
 						</fo:table-cell>
@@ -7443,12 +7889,18 @@
 			<xsl:call-template name="setBlockSpanAll"/>
+			<xsl:call-template name="refine_note-style"/>
 			<fo:block-container margin-left="0mm" margin-right="0mm">
 						<fo:block>
+							<xsl:call-template name="refine_note_block_style"/>
 							<fo:inline xsl:use-attribute-sets="note-name-style">
+								<xsl:call-template name="refine_note-name-style"/>
 								<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 								<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
 								<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -7474,6 +7926,10 @@
 	</xsl:template>
+	<xsl:template name="refine_note_block_style">
+	</xsl:template>
 	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:choose>
@@ -7495,12 +7951,16 @@
 			<xsl:call-template name="setBlockSpanAll"/>
+			<xsl:call-template name="refine_termnote-style"/>
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 				<xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
 					<xsl:attribute name="padding-right">1mm</xsl:attribute>
 				</xsl:if>
+				<xsl:call-template name="refine_termnote-name-style"/>
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
 				<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -7674,6 +8134,8 @@
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="image-style">
+					<xsl:call-template name="refine_image-style"/>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -7732,7 +8194,7 @@
 				<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
-				<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+				<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="@src"/>
@@ -7754,7 +8216,7 @@
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
 				<xsl:variable name="src">
-					<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+					<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
 				</xsl:variable>
 				<xsl:variable name="file" select="java:java.io.File.new(@src)"/>
 				<xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/>
@@ -8140,15 +8602,19 @@
 		<xsl:param name="dest"/>
 		<fo:block-container position="absolute" left="{$left}px" top="{$top}px" width="{$width}px" height="{$height}px">
 		 <fo:block font-size="1pt">
-			<fo:basic-link internal-destination="{$dest}" fox:alt-text="svg link">
-				<fo:inline-container inline-progression-dimension="100%">
-					<fo:block-container height="{$height - 1}px" width="100%">
-						<!-- DEBUG <xsl:if test="local-name()='polygon'">
-							<xsl:attribute name="background-color">magenta</xsl:attribute>
-						</xsl:if> -->
-					<fo:block> </fo:block></fo:block-container>
-				</fo:inline-container>
-			</fo:basic-link>
+			<xsl:call-template name="insert_basic_link">
+				<xsl:with-param name="element">
+					<fo:basic-link internal-destination="{$dest}" fox:alt-text="svg link">
+						<fo:inline-container inline-progression-dimension="100%">
+							<fo:block-container height="{$height - 1}px" width="100%">
+								<!-- DEBUG <xsl:if test="local-name()='polygon'">
+									<xsl:attribute name="background-color">magenta</xsl:attribute>
+								</xsl:if> -->
+							<fo:block> </fo:block></fo:block-container>
+						</fo:inline-container>
+					</fo:basic-link>
+				</xsl:with-param>
+			</xsl:call-template>
 		 </fo:block>
 	  </fo:block-container>
 	</xsl:template>
@@ -8530,6 +8996,8 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="figure-name-style">
+				<xsl:call-template name="refine_figure-name-style"/>
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -8795,6 +9263,8 @@
 								</xsl:attribute>
 							</xsl:for-each>
+							<xsl:call-template name="refine_sourcecode-style"/>
 							<!-- remove margin between rows in the table with sourcecode line numbers -->
 							<xsl:if test="ancestor::*[local-name() = 'sourcecode'][@linenums = 'true'] and ancestor::*[local-name() = 'tr'][1]/following-sibling::*[local-name() = 'tr']">
 								<xsl:attribute name="margin-top">0pt</xsl:attribute>
@@ -9499,6 +9969,8 @@
 			<xsl:call-template name="setBlockSpanAll"/>
+			<xsl:call-template name="refine_example-style"/>
 			<xsl:variable name="fo_element">
 				<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
@@ -9632,6 +10104,8 @@
 					</xsl:if>
 					<fo:block xsl:use-attribute-sets="example-p-style">
+						<xsl:call-template name="refine_example-p-style"/>
 						<xsl:apply-templates/>
 					</fo:block>
 				</fo:block-container>
@@ -9648,6 +10122,7 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template> <!-- example/p -->
 	<!-- ====== -->
 	<!-- ====== -->
@@ -9659,6 +10134,8 @@
 	<xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			<xsl:call-template name="refine_termsource-style"/>
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>
@@ -9711,14 +10188,18 @@
 	</xsl:template>
 	<xsl:template match="*[local-name() = 'origin']">
-		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-			<xsl:if test="normalize-space(@citeas) = ''">
-				<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
-			</xsl:if>
-			<fo:inline xsl:use-attribute-sets="origin-style">
-				<xsl:apply-templates/>
-			</fo:inline>
-		</fo:basic-link>
+		<xsl:call-template name="insert_basic_link">
+			<xsl:with-param name="element">
+				<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
+					<xsl:if test="normalize-space(@citeas) = ''">
+						<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
+					</xsl:if>
+					<fo:inline xsl:use-attribute-sets="origin-style">
+						<xsl:apply-templates/>
+					</fo:inline>
+				</fo:basic-link>
+			</xsl:with-param>
+		</xsl:call-template>
 	</xsl:template>
 	<!-- not using, see https://github.com/glossarist/iev-document/issues/23 -->
@@ -9770,6 +10251,8 @@
 			<fo:block-container margin-left="0mm">
 				<fo:block-container xsl:use-attribute-sets="quote-style">
+					<xsl:call-template name="refine_quote-style"/>
 					<fo:block-container margin-left="0mm" margin-right="0mm">
 						<fo:block role="BlockQuote">
 							<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
@@ -9792,9 +10275,13 @@
 		<xsl:if test="../*[local-name() = 'author']">
 			<xsl:text>, </xsl:text>
 		</xsl:if>
-		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-			<xsl:apply-templates/>
-		</fo:basic-link>
+		<xsl:call-template name="insert_basic_link">
+			<xsl:with-param name="element">
+				<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
+					<xsl:apply-templates/>
+				</fo:basic-link>
+			</xsl:with-param>
+		</xsl:call-template>
 	</xsl:template>
 	<xsl:template match="*[local-name() = 'author']">
@@ -9840,28 +10327,33 @@
 					</xsl:if>
-					<xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
-					<xsl:variable name="text" select="normalize-space()"/>
+					<xsl:call-template name="refine_eref-style"/>
-					<fo:basic-link fox:alt-text="{@citeas}">
-						<xsl:if test="normalize-space(@citeas) = ''">
-							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
-						</xsl:if>
-						<xsl:if test="@type = 'inline'">
+					<xsl:call-template name="insert_basic_link">
+						<xsl:with-param name="element">
+							<fo:basic-link fox:alt-text="{@citeas}">
+								<xsl:if test="normalize-space(@citeas) = ''">
+									<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
+								</xsl:if>
+								<xsl:if test="@type = 'inline'">
-						</xsl:if>
+									<xsl:call-template name="refine_basic_link_style"/>
-						<xsl:choose>
-							<xsl:when test="$external-destination != ''"> <!-- external hyperlink -->
-								<xsl:attribute name="external-destination"><xsl:value-of select="$external-destination"/></xsl:attribute>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:attribute name="internal-destination"><xsl:value-of select="@bibitemid"/></xsl:attribute>
-							</xsl:otherwise>
-						</xsl:choose>
+								</xsl:if>
-						<xsl:apply-templates/>
-					</fo:basic-link>
+								<xsl:choose>
+									<xsl:when test="$external-destination != ''"> <!-- external hyperlink -->
+										<xsl:attribute name="external-destination"><xsl:value-of select="$external-destination"/></xsl:attribute>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:attribute name="internal-destination"><xsl:value-of select="@bibitemid"/></xsl:attribute>
+									</xsl:otherwise>
+								</xsl:choose>
+								<xsl:apply-templates/>
+							</fo:basic-link>
+						</xsl:with-param>
+					</xsl:call-template>
 				</fo:inline>
 			</xsl:when>
@@ -9879,6 +10371,11 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
+	<xsl:template name="refine_basic_link_style">
+	</xsl:template> <!-- refine_basic_link_style -->
 	<!-- ====== -->
 	<!-- END eref -->
 	<!-- ====== -->
@@ -10027,11 +10524,17 @@
 		<fo:block>
 			<xsl:call-template name="setId"/>
+			<xsl:call-template name="sections_element_style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
+	<xsl:template name="sections_element_style">
+	</xsl:template> <!-- sections_element_style -->
 	<xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
 		<fo:block break-after="page"/>
 		<fo:block>
@@ -10046,10 +10549,16 @@
 			<xsl:call-template name="setBlockSpanAll"/>
+			<xsl:call-template name="refine_clause_style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
+	<xsl:template name="refine_clause_style">
+	</xsl:template> <!-- refine_clause_style -->
 	<xsl:template match="*[local-name() = 'definitions']">
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
@@ -10062,10 +10571,16 @@
 			<xsl:call-template name="setBlockSpanAll"/>
+			<xsl:call-template name="refine_annex_style"/>
 		</fo:block>
 		<xsl:apply-templates/>
 	</xsl:template>
+	<xsl:template name="refine_annex_style">
+	</xsl:template>
 	<xsl:template match="*[local-name() = 'review']"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
 		<!-- comment 2019-11-29 -->
 		<!-- <fo:block font-weight="bold">Review:</fo:block>
@@ -10104,7 +10619,10 @@
 	<xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
 	<xsl:template name="setULLabel">
-		<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		<xsl:variable name="list_level__">
+			<xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		</xsl:variable>
+		<xsl:variable name="list_level_" select="number($list_level__)"/>
 		<xsl:variable name="list_level">
 			<xsl:choose>
 				<xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
@@ -10229,6 +10747,8 @@
 						</xsl:choose>
 					</xsl:attribute>
+					<xsl:call-template name="refine_list_container_style"/>
 					<fo:block-container margin-left="0mm">
 						<fo:block>
 							<xsl:apply-templates select="." mode="list"/>
@@ -10237,13 +10757,19 @@
 				</fo:block-container>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block>
-					<xsl:apply-templates select="." mode="list"/>
-				</fo:block>
+						<fo:block>
+							<xsl:apply-templates select="." mode="list"/>
+						</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
+	<xsl:template name="refine_list_container_style">
+	</xsl:template> <!-- refine_list_container_style -->
 	<xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
 		<xsl:apply-templates select="*[local-name() = 'name']">
@@ -10254,11 +10780,7 @@
 			<xsl:variable name="provisional_distance_between_starts_">
 				<attributes xsl:use-attribute-sets="list-style">
-						<xsl:if test="ancestor::iec:legal-statement">
-							<xsl:attribute name="provisional-distance-between-starts">5mm</xsl:attribute>
-						</xsl:if>
+					<xsl:call-template name="refine_list-style_provisional-distance-between-starts"/>
 				</attributes>
 			</xsl:variable>
 			<xsl:variable name="provisional_distance_between_starts" select="normalize-space(xalan:nodeset($provisional_distance_between_starts_)/attributes/@provisional-distance-between-starts)"/>
@@ -10294,9 +10816,7 @@
 				<addon><xsl:value-of select="$addon"/></addon> -->
 			</xsl:if>
-				<xsl:if test="ancestor::iec:ul or ancestor::iec:ol">
-					<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="refine_list-style"/>
 			<xsl:if test="*[local-name() = 'name']">
 				<xsl:attribute name="margin-top">0pt</xsl:attribute>
@@ -10310,6 +10830,14 @@
 		<xsl:apply-templates select="./*[local-name() = 'note']"/>
 	</xsl:template>
+	<xsl:template name="refine_list-style_provisional-distance-between-starts">
+			<xsl:if test="ancestor::iec:legal-statement or ancestor::iec:clause[@type = 'boilerplate_legal']">
+				<xsl:attribute name="provisional-distance-between-starts">5mm</xsl:attribute>
+			</xsl:if>
+	</xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
 	<xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
@@ -10323,20 +10851,27 @@
 		<fo:list-item xsl:use-attribute-sets="list-item-style">
 			<xsl:copy-of select="@id"/>
+			<xsl:call-template name="refine_list-item-style"/>
 			<fo:list-item-label end-indent="label-end()">
 				<fo:block xsl:use-attribute-sets="list-item-label-style">
+					<xsl:call-template name="refine_list-item-label-style"/>
 					<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 					<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
 						<xsl:call-template name="append_add-style"/>
 					</xsl:if>
 					<xsl:call-template name="getListItemFormat"/>
 				</fo:block>
 			</fo:list-item-label>
 			<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
 				<fo:block>
+					<xsl:call-template name="refine_list-item-body-style"/>
 					<xsl:apply-templates/>
 					<!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />
@@ -10654,6 +11189,7 @@
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -10673,6 +11209,7 @@
 		<fo:block id="{@id}" xsl:use-attribute-sets="references-non-normative-style">
 			<xsl:apply-templates/>
 		</fo:block>
 			<!-- horizontal line -->
@@ -10936,24 +11473,32 @@
 		<xsl:for-each select="*[local-name() = 'tab']">
 			<xsl:variable name="current_id" select="generate-id()"/>
 			<fo:table-cell>
-				<fo:block>
-					<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
-						<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
-							<xsl:choose>
-								<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
-								<xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise>
-							</xsl:choose>
-						</xsl:for-each>
-					</fo:basic-link>
+				<fo:block line-height-shift-adjustment="disregard-shifts">
+					<xsl:call-template name="insert_basic_link">
+						<xsl:with-param name="element">
+							<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
+								<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
+									<xsl:choose>
+										<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
+										<xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise>
+									</xsl:choose>
+								</xsl:for-each>
+							</fo:basic-link>
+						</xsl:with-param>
+					</xsl:call-template>
 				</fo:block>
 			</fo:table-cell>
 		</xsl:for-each>
 		<!-- last column - for page numbers -->
 		<fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
 			<fo:block>
-				<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
-					<fo:page-number-citation ref-id="{$target}"/>
-				</fo:basic-link>
+				<xsl:call-template name="insert_basic_link">
+					<xsl:with-param name="element">
+						<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
+							<fo:page-number-citation ref-id="{$target}"/>
+						</fo:basic-link>
+					</xsl:with-param>
+				</xsl:call-template>
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template>
@@ -10995,6 +11540,27 @@
 	<!-- End Table of Contents (ToC) processing -->
 	<!-- =================== -->
+	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
+	<xsl:template name="insert_basic_link">
+		<xsl:param name="element"/>
+		<xsl:variable name="element_node" select="xalan:nodeset($element)"/>
+		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
+		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
+		<xsl:choose>
+			<xsl:when test="$external-destination = 'true' or $internal-destination = 'true'">
+				<xsl:copy-of select="$element_node"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline>
+					<xsl:for-each select="$element_node/fo:basic-link/@*[local-name() != 'external-destination' and local-name() != 'internal-destination' and local-name() != 'alt-text']">
+						<xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
+					</xsl:for-each>
+					<xsl:copy-of select="$element_node/fo:basic-link/node()"/>
+				</fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
 	<xsl:template match="*[local-name() = 'variant-title']"/> <!-- [@type = 'sub'] -->
 	<xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
 		<fo:inline padding-right="5mm"> </fo:inline>
@@ -11226,6 +11792,9 @@
 		</xsl:copy>
 	</xsl:template>
+	<!-- prevent empty thead processing in XSL-FO, remove it -->
+	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'thead'][count(*) = 0]" mode="update_xml_step1"/>
 	<xsl:template name="add_id">
 		<xsl:if test="not(@id)">
 			<!-- add @id - first element with @id plus '_element_name' -->
@@ -11510,6 +12079,14 @@
 	<xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))]" mode="linear_xml" name="linear_xml_fn">
 		<xsl:variable name="p_fn_">
 			<xsl:call-template name="get_fn_list"/>
+			<!-- <xsl:choose>
+				<xsl:when test="$namespace = 'jis'">
+					<xsl:call-template name="get_fn_list_for_element"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:call-template name="get_fn_list"/>
+				</xsl:otherwise>
+			</xsl:choose> -->
 		</xsl:variable>
 		<xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
 		<xsl:variable name="gen_id" select="generate-id(.)"/>
@@ -11524,8 +12101,14 @@
 			<xsl:attribute name="current_fn_number">
 				<xsl:value-of select="$current_fn_number"/>
 			</xsl:attribute>
+			<xsl:variable name="skip_footnote_body_" select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
 			<xsl:attribute name="skip_footnote_body"> <!-- false for repeatable footnote -->
-				<xsl:value-of select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
+						<xsl:value-of select="$skip_footnote_body_"/>
+			</xsl:attribute>
+			<xsl:attribute name="ref_id">
+				<xsl:value-of select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
 			</xsl:attribute>
 			<xsl:apply-templates select="node()" mode="linear_xml"/>
 		</xsl:copy>