metanorma-bipm 2.2.8 → 2.2.10

data/lib/isodoc/bipm/bipm.guide.xsl

@@ -176,7 +176,7 @@
 	<xsl:template name="generateContents">
 		<contents>
 
-			<xsl:apply-templates select="/*/bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')][position() &gt; 1]" mode="contents"/>
+			<xsl:apply-templates select="/*/bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition' or (local-name() = 'clause' and @type = 'toc'))][position() &gt; 1]" mode="contents"/>
 
 			<xsl:apply-templates select="/*/bipm:sections/*" mode="contents"/>
 			<xsl:apply-templates select="/*/bipm:bibliography/bipm:references[@normative='true']" mode="contents"/>
@@ -535,10 +535,14 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="bipm:semantic__bipm-standard" mode="flatxml" priority="2"/>
+
 	<xsl:template match="mathml:math" mode="flatxml" priority="2">
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
+	<xsl:template match="bipm:preface/bipm:clause[@type = 'toc']" mode="flatxml" priority="2"/>
+
 	<!-- enclosing starting elements annex/... in clause -->
 	<xsl:template match="bipm:annex" mode="flatxml">
 		<xsl:copy>
@@ -727,7 +731,7 @@
 		<xsl:value-of select="concat($lang, '_footnote_', @reference, '_', $number, '_', $gen_id)"/>
 	</xsl:template>
 
-	<xsl:template match="bipm:preface/bipm:clause[position() &gt; 1]" mode="flatxml">
+	<xsl:template match="bipm:preface/bipm:clause[not(@type = 'toc')][position() &gt; 1]" mode="flatxml">
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
@@ -771,20 +775,20 @@
 			<!-- if current li is first -->
 			<xsl:if test="not(preceding-sibling::*[local-name() = 'li'])">
 
-				<!-- move note for list (list level note) into first 'li' -->
-				<xsl:for-each select="following-sibling::bipm:li[last()]/following-sibling::*">
-					<xsl:choose>
-						<xsl:when test="local-name() = 'note'">
-							<xsl:call-template name="change_note_kind"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:copy-of select="."/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:for-each>
-
-				<!-- move note(s) after ul/ol into first 'li' -->
 				<xsl:if test="not(ancestor::bipm:quote)">
+					<!-- move note for list (list level note) into first 'li' -->
+					<xsl:for-each select="following-sibling::bipm:li[last()]/following-sibling::*">
+						<xsl:choose>
+							<xsl:when test="local-name() = 'note'">
+								<xsl:call-template name="change_note_kind"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:copy-of select="."/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
+
+					<!-- move note(s) after ul/ol into first 'li' -->
 					<xsl:variable name="list_id" select="generate-id(..)"/>
 					<xsl:for-each select="../following-sibling::bipm:note[generate-id(preceding-sibling::*[not(local-name()='note') and not(local-name()='quote')][1]) = $list_id]">
 						<xsl:call-template name="change_note_kind"/>
@@ -816,6 +820,13 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="bipm:note[ancestor::bipm:quote]" mode="flatxml_list">
+		<xsl:copy>
+			<xsl:attribute name="parent-type">quote</xsl:attribute>
+			<xsl:apply-templates select="@*|node()" mode="flatxml_list"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template name="fn_to_note_side">
 		<xsl:element name="note_side" namespace="https://www.metanorma.org/ns/bipm">
 
@@ -847,8 +858,8 @@
 	</xsl:template>
 
 	<!-- remove latest elements (after li), because they moved into latest 'li' -->
-	<xsl:template match="bipm:ul/*[not(local-name() = 'li') and not(following-sibling::*[local-name() = 'li'])]" mode="flatxml_list"/>
-	<xsl:template match="bipm:ol/*[not(local-name() = 'li') and not(following-sibling::*[local-name() = 'li'])]" mode="flatxml_list"/>
+	<xsl:template match="bipm:ul/*[not(local-name() = 'li') and not(following-sibling::*[local-name() = 'li']) and not(ancestor::bipm:quote)]" mode="flatxml_list"/>
+	<xsl:template match="bipm:ol/*[not(local-name() = 'li') and not(following-sibling::*[local-name() = 'li']) and not(ancestor::bipm:quote)]" mode="flatxml_list"/>
 
 	<xsl:template name="setListItemLabel">
 		<xsl:attribute name="label">
@@ -2900,61 +2911,69 @@
 	</xsl:template>
 
 	<xsl:template match="bipm:xref" priority="2">
-		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">
-
-			<xsl:if test="parent::*[local-name() = 'title']">
-				<xsl:attribute name="font-weight">normal</xsl:attribute>
-			</xsl:if>
-
-			<xsl:choose>
-				<xsl:when test="@pagenumber='true'"><!-- ToC in Appendix, and page in references like this: « Le BIPM et la Convention du Mètre » (page 5). -->
-					<fo:inline>
-						<!-- DEBUG -->
-						<xsl:if test="@id">
-							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-						</xsl:if>
-						<fo:page-number-citation ref-id="{@target}"/>
-						<!-- <xsl:if test="@to">&#x2013;<fo:page-number-citation ref-id="{@to}"/></xsl:if> -->
-					</fo:inline>
-				</xsl:when>
-				<xsl:when test="starts-with(normalize-space(following-sibling::node()[1]), ')')">
-					<!-- add , see p. N -->
-					<!-- add , voir p. N -->
-					<xsl:apply-templates/>
+		<xsl:call-template name="insert_basic_link">
+			<xsl:with-param name="element">
+				<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">
 
-					<xsl:variable name="nopage" select="normalize-space(@nopage)"/>
+					<xsl:if test="parent::*[local-name() = 'title']">
+						<xsl:attribute name="font-weight">normal</xsl:attribute>
+					</xsl:if>
 
-					<xsl:if test="$nopage != 'true'">
-						<xsl:text>, </xsl:text>
-						<xsl:variable name="nosee" select="normalize-space(@nosee)"/>
-						<xsl:if test="$nosee != 'true'">
-							<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+					<xsl:choose>
+						<xsl:when test="@pagenumber='true'"><!-- ToC in Appendix, and page in references like this: « Le BIPM et la Convention du Mètre » (page 5). -->
 							<fo:inline>
-								<xsl:if test="ancestor::bipm:note_side">
-									<xsl:attribute name="font-style">italic</xsl:attribute>
+								<!-- DEBUG -->
+								<xsl:if test="@id">
+									<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
 								</xsl:if>
-								<xsl:value-of select="ancestor::bipm:bipm-standard/bipm:localized-strings/bipm:localized-string[@key='see' and @language=$curr_lang]"/>
+								<fo:page-number-citation ref-id="{@target}"/>
+								<!-- <xsl:if test="@to">&#x2013;<fo:page-number-citation ref-id="{@to}"/></xsl:if> -->
 							</fo:inline>
-							<xsl:text> </xsl:text>
-						</xsl:if>
-						<xsl:text>p. </xsl:text>
-						<fo:page-number-citation ref-id="{@target}"/>
-					</xsl:if>
-				</xsl:when>
-				<xsl:otherwise>
-					<fo:inline><xsl:apply-templates/></fo:inline>
-				</xsl:otherwise>
-			</xsl:choose>
-		</fo:basic-link>
+						</xsl:when>
+						<xsl:when test="starts-with(normalize-space(following-sibling::node()[1]), ')')">
+							<!-- add , see p. N -->
+							<!-- add , voir p. N -->
+							<xsl:apply-templates/>
+
+							<xsl:variable name="nopage" select="normalize-space(@nopage)"/>
+
+							<xsl:if test="$nopage != 'true'">
+								<xsl:text>, </xsl:text>
+								<xsl:variable name="nosee" select="normalize-space(@nosee)"/>
+								<xsl:if test="$nosee != 'true'">
+									<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+									<fo:inline>
+										<xsl:if test="ancestor::bipm:note_side">
+											<xsl:attribute name="font-style">italic</xsl:attribute>
+										</xsl:if>
+										<xsl:value-of select="ancestor::bipm:bipm-standard/bipm:localized-strings/bipm:localized-string[@key='see' and @language=$curr_lang]"/>
+									</fo:inline>
+									<xsl:text> </xsl:text>
+								</xsl:if>
+								<xsl:text>p. </xsl:text>
+								<fo:page-number-citation ref-id="{@target}"/>
+							</xsl:if>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:inline><xsl:apply-templates/></fo:inline>
+						</xsl:otherwise>
+					</xsl:choose>
+				</fo:basic-link>
+			</xsl:with-param>
+		</xsl:call-template>
 	</xsl:template>
 
 	<xsl:template match="bipm:eref[.//bipm:locality[@type = 'anchor']]" priority="2">
 		<xsl:variable name="target" select=".//bipm:locality[@type = 'anchor']/bipm:referenceFrom"/>
-		<fo:basic-link internal-destination="{$target}" fox:alt-text="{$target}">
-			<xsl:if test="xalan:nodeset($ids)//id = $target">
-				<fo:page-number-citation ref-id="{$target}"/>
-			</xsl:if>
-		</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:if test="xalan:nodeset($ids)//id = $target">
+						<fo:page-number-citation ref-id="{$target}"/>
+					</xsl:if>
+				</fo:basic-link>
+			</xsl:with-param>
+		</xsl:call-template>
 	</xsl:template>
 
 	<xsl:template match="bipm:note[not(ancestor::bipm:preface)]/bipm:name" priority="2">
@@ -3109,7 +3128,7 @@
 
 	<!-- Decrease height of / and | -->
 	<!-- Decrease space before and after / -->
-	<xsl:template match="mathml:mo[normalize-space(text()) = '/' or normalize-space(text()) = '|']" mode="mathml">
+	<xsl:template match="mathml:mo[normalize-space(text()) = '/' or normalize-space(text()) = '|']" mode="mathml" priority="2">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="mathml"/>
 			<xsl:if test="not(@stretchy) and not(preceding-sibling::*[1][local-name() = 'mfrac'] and following-sibling::*[1][local-name() = 'mfrac'])">
@@ -3256,6 +3275,23 @@
 	<xsl:template match="bipm:clause[@type = 'toc']//bipm:title/text()[1][not(preceding-sibling::bipm:tab) and following-sibling::*[1][self::bipm:tab]]"/>
 	<xsl:template match="bipm:clause[@type = 'toc']//bipm:title/bipm:tab" priority="2"/>
 
+	<xsl:template match="*[local-name() = 'xref']" mode="toc_table_width" priority="2">
+		<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
+		<xsl:for-each select="*[local-name() = 'tab']">
+			<xsl:variable name="pos" select="position()"/>
+			<xsl:variable name="current_id" select="generate-id()"/>
+			<td>
+				<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="$pos = 1 and self::text()"><xsl:value-of select="translate(., ' ', ' ')"/></xsl:when>
+						<xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:for-each>
+			</td>
+		</xsl:for-each>
+		<td>333</td> <!-- page number, just for fill -->
+	</xsl:template>
+
 	<!-- =================== -->
 	<!-- End Table of Contents (ToC) processing -->
 	<!-- =================== -->
@@ -4251,6 +4287,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_link-style">
+
+	</xsl:template> <!-- refine_link-style -->
+
 	<xsl:attribute-set name="sourcecode-container-style">
 
 	</xsl:attribute-set>
@@ -4262,6 +4302,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>
@@ -4340,6 +4384,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-set> <!-- example-body-style -->
@@ -4354,6 +4402,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="font-style">italic</xsl:attribute>
@@ -4382,12 +4434,38 @@
 
 	</xsl:attribute-set> <!-- table-container-style -->
 
+	<xsl:template name="refine_table-container-style">
+		<xsl:param name="margin-side"/>
+
+			<xsl:if test="not(ancestor::*[local-name()='note_side'])">
+				<xsl:attribute name="font-size">10pt</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="ancestor-or-self::*[@parent-type = 'quote']">
+				<xsl:attribute name="font-family">Arial</xsl:attribute>
+				<xsl:attribute name="font-size">9pt</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>
 
 	</xsl:attribute-set><!-- table-style -->
 
+	<xsl:template name="refine_table-style">
+		<xsl:param name="margin-side"/>
+
+			<xsl:if test="not(ancestor::*[local-name()='preface']) and not(ancestor::*[local-name()='note_side']) and not(ancestor::*[local-name() = 'annex'] and .//*[local-name() = 'xref'][@pagenumber]) and not(ancestor::*[local-name() = 'doccontrol'])">
+				<xsl:attribute name="border-top">0.5pt solid black</xsl:attribute>
+				<xsl:attribute name="border-bottom">0.5pt solid black</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>
 
@@ -4400,6 +4478,11 @@
 
 	</xsl:attribute-set> <!-- table-name-style -->
 
+	<xsl:template name="refine_table-name-style">
+		<xsl:param name="continued"/>
+
+	</xsl:template> <!-- refine_table-name-style -->
+
 	<xsl:attribute-set name="table-row-style">
 		<xsl:attribute name="min-height">4mm</xsl:attribute>
 
@@ -4410,14 +4493,30 @@
 
 	</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-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>
@@ -4432,6 +4531,29 @@
 
 	</xsl:attribute-set> <!-- table-header-cell-style -->
 
+	<xsl:template name="refine_table-header-cell-style">
+
+			<xsl:if test="(ancestor::*[local-name() = 'annex'] and ancestor::*[local-name() = 'table']//*[local-name() = 'xref'][@pagenumber]) or ancestor::*[local-name() = 'doccontrol']"><!-- for Annex ToC -->
+				<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
+				<xsl:attribute name="border-bottom">solid black 0pt</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="ancestor::*[local-name() = 'doccontrol']">
+				<xsl:call-template name="setTextAlignment">
+					<xsl:with-param name="default">left</xsl:with-param>
+				</xsl:call-template>
+				<xsl:attribute name="display-align">before</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>
@@ -4441,6 +4563,29 @@
 
 	</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>
+
+			<xsl:variable name="rownum"><xsl:number count="*[local-name()='tr']"/></xsl:variable>
+			<xsl:if test="$rownum = 1">
+				<xsl:attribute name="padding-top">3mm</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="not(ancestor::*[local-name()='tr']/following-sibling::*[local-name()='tr'])"> <!-- last row -->
+				<xsl:attribute name="padding-bottom">2mm</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="ancestor::*[local-name() = 'doccontrol']">
+				<xsl:attribute name="display-align">before</xsl:attribute>
+			</xsl:if>
+
+		 <!-- bsi -->
+
+		<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>
@@ -4451,6 +4596,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>
@@ -4460,6 +4609,15 @@
 
 	</xsl:attribute-set><!-- table-note-style -->
 
+	<xsl:template name="refine_table-note-style">
+
+			<xsl:if test="ancestor::bipm:preface">
+				<xsl:attribute name="margin-top">18pt</xsl:attribute>
+				<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template> <!-- refine_table-note-style -->
+
 	<xsl:attribute-set name="table-fn-style">
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 
@@ -4521,6 +4679,10 @@
 
 	</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>
 
@@ -4528,6 +4690,10 @@
 
 	</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>
@@ -4541,6 +4707,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_dd-cell-style">
+
+	</xsl:template> <!-- refine_dd-cell-style -->
+
 	<!-- ========================== -->
 	<!-- END Definition's list styles -->
 	<!-- ========================== -->
@@ -4561,6 +4731,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="margin-bottom">12pt</xsl:attribute>
@@ -4568,6 +4744,15 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_note-style">
+
+			<xsl:if test="parent::*[local-name() = 'li']">
+				<xsl:attribute name="margin-top">4pt</xsl:attribute>
+				<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template>
+
 	<xsl:variable name="note-body-indent">10mm</xsl:variable>
 	<xsl:variable name="note-body-indent-table">5mm</xsl:variable>
 
@@ -4575,6 +4760,10 @@
 
 	</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>
 
@@ -4582,6 +4771,14 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_table-note-name-style">
+
+			<xsl:if test="ancestor::bipm:preface">
+				<xsl:attribute name="text-decoration">underline</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template> <!-- refine_table-note-name-style -->
+
 	<xsl:attribute-set name="note-p-style">
 
 			<xsl:attribute name="text-align">justify</xsl:attribute>
@@ -4595,12 +4792,20 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termnote-style">
+
+	</xsl:template> <!-- refine_termnote-style -->
+
 	<xsl:attribute-set name="termnote-name-style">
 
 			<xsl:attribute name="padding-right">1mm</xsl:attribute>
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termnote-name-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="termnote-p-style">
 
 			<xsl:attribute name="text-align">justify</xsl:attribute>
@@ -4613,6 +4818,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>
 
@@ -4622,6 +4831,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>
@@ -4658,6 +4871,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-set>
@@ -4676,6 +4893,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>
 
@@ -4687,6 +4908,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_image-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-pseudocode-p-style">
 
 	</xsl:attribute-set>
@@ -4773,10 +4998,22 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_mathml-style">
+
+			<xsl:if test="ancestor::*[local-name()='table']">
+				<xsl:attribute name="font-size">95%</xsl:attribute> <!-- base font in table is 10pt -->
+			</xsl:if>
+
+	</xsl:template>
+
 	<xsl:attribute-set name="list-style">
 
 	</xsl:attribute-set> <!-- list-style -->
 
+	<xsl:template name="refine_list-style">
+
+	</xsl:template> <!-- refine_list-style -->
+
 	<xsl:attribute-set name="list-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 
@@ -4788,14 +5025,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>
@@ -4810,6 +5059,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_fn-reference-style">
+
+	</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>
@@ -4835,6 +5088,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>
 
@@ -4844,6 +5101,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">
 
@@ -5515,15 +5776,9 @@
 
 			<fo:block-container xsl:use-attribute-sets="table-container-style">
 
-					<xsl:if test="not(ancestor::*[local-name()='note_side'])">
-						<xsl:attribute name="font-size">10pt</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="@parent-type = 'quote'">
-						<xsl:attribute name="font-family">Arial</xsl:attribute>
-						<xsl:attribute name="font-size">9pt</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) -->
 
@@ -5550,12 +5805,9 @@
 
 						<xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
 
-							<xsl:if test="not(ancestor::*[local-name()='preface']) and not(ancestor::*[local-name()='note_side']) and not(ancestor::*[local-name() = 'annex'] and .//*[local-name() = 'xref'][@pagenumber]) and not(ancestor::*[local-name() = 'doccontrol'])">
-								<xsl:attribute name="border-top">0.5pt solid black</xsl:attribute>
-								<xsl:attribute name="border-bottom">0.5pt solid black</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>
@@ -5621,7 +5873,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>
 
@@ -6110,6 +6362,8 @@
 		<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: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>
 						</xsl:apply-templates>
@@ -6122,6 +6376,10 @@
 		</fo:table-row>
 	</xsl:template> <!-- table-header-title -->
 
+	<xsl:template name="refine_table-header-title-style">
+
+	</xsl:template> <!-- refine_table-header-title-style -->
+
 	<xsl:template match="*[local-name()='thead']" mode="process_tbody">
 		<fo:table-body>
 			<xsl:apply-templates/>
@@ -6146,7 +6404,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">
 
@@ -6206,6 +6464,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 -->
@@ -6224,6 +6484,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']"/>
@@ -6355,7 +6616,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"/>
 
@@ -6389,6 +6650,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>
@@ -6402,9 +6665,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>
@@ -6430,24 +6694,7 @@
 				<xsl:with-param name="default">center</xsl:with-param>
 			</xsl:call-template>
 
-				<xsl:if test="(ancestor::*[local-name() = 'annex'] and ancestor::*[local-name() = 'table']//*[local-name() = 'xref'][@pagenumber]) or ancestor::*[local-name() = 'doccontrol']"><!-- for Annex ToC -->
-					<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
-					<xsl:attribute name="border-bottom">solid black 0pt</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="ancestor::*[local-name() = 'doccontrol']">
-					<xsl:call-template name="setTextAlignment">
-						<xsl:with-param name="default">left</xsl:with-param>
-					</xsl:call-template>
-					<xsl:attribute name="display-align">before</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/>
@@ -6489,24 +6736,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>
-
-				<xsl:variable name="rownum"><xsl:number count="*[local-name()='tr']"/></xsl:variable>
-				<xsl:if test="$rownum = 1">
-					<xsl:attribute name="padding-top">3mm</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="not(ancestor::*[local-name()='tr']/following-sibling::*[local-name()='tr'])"> <!-- last row -->
-					<xsl:attribute name="padding-bottom">2mm</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="ancestor::*[local-name() = 'doccontrol']">
-					<xsl:attribute name="display-align">before</xsl:attribute>
-				</xsl:if>
-
-			 <!-- bsi -->
-
-			<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>
@@ -6546,17 +6776,12 @@
 
 		<fo:block xsl:use-attribute-sets="table-note-style">
 
-				<xsl:if test="ancestor::bipm:preface">
-					<xsl:attribute name="margin-top">18pt</xsl:attribute>
-					<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-				</xsl:if>
+			<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:if test="ancestor::bipm:preface">
-						<xsl:attribute name="text-decoration">underline</xsl:attribute>
-					</xsl:if>
+				<xsl:call-template name="refine_table-note-name-style"/>
 
 				<xsl:apply-templates select="*[local-name() = 'name']"/>
 
@@ -6589,6 +6814,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_)"/>
 
@@ -6613,7 +6846,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>
 
@@ -6636,9 +6876,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>
 
@@ -6655,8 +6899,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/>
@@ -6708,6 +6956,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 -->
 	<!-- ============================ -->
@@ -6886,6 +7156,8 @@
 	<xsl:template match="*[local-name()='fn']">
 		<fo:inline xsl:use-attribute-sets="fn-reference-style">
 
+			<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-->
 
 					<fo:inline font-style="normal"> (</fo:inline>
@@ -6980,14 +7252,18 @@
 									<xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
 									<xsl:text> </xsl:text>
 									<xsl:apply-templates select="*[local-name()='dt']/*"/>
-									<xsl:text/>
-									<xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
+									<xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
+										<xsl:text> </xsl:text>
+									</xsl:if>
+									<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:call-template name="refine_dl_formula_where_style"/>
+
 							<!-- <xsl:variable name="title-where">
 								<xsl:call-template name="getLocalizedString">
 									<xsl:with-param name="key">where</xsl:with-param>
@@ -7001,6 +7277,8 @@
 					<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:call-template name="refine_figure_key_style"/>
+
 							<xsl:variable name="title-key">
 								<xsl:call-template name="getLocalizedString">
 									<xsl:with-param name="key">key</xsl:with-param>
@@ -7015,12 +7293,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>
@@ -7178,6 +7460,24 @@
 
 	</xsl:template> <!-- END: dl -->
 
+	<xsl:template name="refine_dl_formula_where_style">
+
+	</xsl:template> <!-- refine_dl_formula_where_style -->
+
+	<xsl:template name="refine_figure_key_style">
+
+	</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']]"/>
 
@@ -7397,6 +7697,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"/>
 
@@ -7404,6 +7706,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>
@@ -7423,6 +7727,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'">
@@ -7468,8 +7774,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) -->
@@ -7563,12 +7879,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>
@@ -8710,9 +9032,10 @@
 
 		<fo:inline xsl:use-attribute-sets="mathml-style">
 
-				<xsl:if test="ancestor::*[local-name()='table']">
-					<xsl:attribute name="font-size">95%</xsl:attribute> <!-- base font in table is 10pt -->
-				</xsl:if>
+			<!-- 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> -->
@@ -8843,12 +9166,7 @@
 
 		<fo:instream-foreign-object fox:alt-text="Math">
 
-				<xsl:if test="local-name(../..) = 'formula'">
-					<xsl:attribute name="width">95%</xsl:attribute>
-					<xsl:attribute name="content-height">100%</xsl:attribute>
-					<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
-					<xsl:attribute name="scaling">uniform</xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="refine_mathml_insteam_object_style"/>
 
 			<!-- put MathML in Actual Text -->
 			<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
@@ -8870,6 +9188,17 @@
 		</fo:instream-foreign-object>
 	</xsl:template>
 
+	<xsl:template name="refine_mathml_insteam_object_style">
+
+			<xsl:if test="local-name(../..) = 'formula'">
+				<xsl:attribute name="width">95%</xsl:attribute>
+				<xsl:attribute name="content-height">100%</xsl:attribute>
+				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+				<xsl:attribute name="scaling">uniform</xsl:attribute>
+			</xsl:if>
+
+	</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>
@@ -8933,6 +9262,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>
@@ -8941,9 +9343,7 @@
 	<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:if test="ancestor::*[local-name()='table']">
-					<xsl:attribute name="font-size">95%</xsl:attribute> <!-- base font in table is 10pt -->
-				</xsl:if>
+			<xsl:call-template name="refine_mathml-style"/>
 
 			<xsl:choose>
 				<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
@@ -8989,24 +9389,30 @@
 				<xsl:attribute name="keep-together.within-line">always</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>
@@ -9069,12 +9475,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://'))">
+						<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>
 
 	<!-- ====== -->
@@ -9129,6 +9542,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>
@@ -9170,24 +9585,18 @@
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
-				<xsl:if test="parent::*[local-name() = 'li']">
-					<xsl:attribute name="margin-top">4pt</xsl:attribute>
-					<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="refine_note-style"/>
 
 			<fo:block-container margin-left="0mm" margin-right="0mm">
 
 						<fo:block>
 
-								<xsl:if test="@parent-type = 'quote'">
-									<xsl:attribute name="font-family">Arial</xsl:attribute>
-									<xsl:attribute name="font-size">9pt</xsl:attribute>
-									<xsl:attribute name="line-height">130%</xsl:attribute>
-									<xsl:attribute name="text-align">justify</xsl:attribute>
-								</xsl:if>
+							<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']]">
@@ -9213,6 +9622,17 @@
 
 	</xsl:template>
 
+	<xsl:template name="refine_note_block_style">
+
+			<xsl:if test="@parent-type = 'quote'">
+				<xsl:attribute name="font-family">Arial</xsl:attribute>
+				<xsl:attribute name="font-size">9pt</xsl:attribute>
+				<xsl:attribute name="line-height">130%</xsl:attribute>
+				<xsl:attribute name="text-align">justify</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:choose>
@@ -9234,12 +9654,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']]">
@@ -9427,6 +9851,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>
@@ -9485,7 +9911,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"/>
@@ -9507,7 +9933,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)"/>
@@ -9893,15 +10319,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>
@@ -10286,6 +10716,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>
@@ -10549,6 +10981,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>
@@ -11253,6 +11687,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>
 				block
@@ -11380,6 +11816,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>
@@ -11396,6 +11834,7 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template> <!-- example/p -->
+
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -11407,6 +11846,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/>
@@ -11459,14 +11900,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 -->
@@ -11518,6 +11963,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 -->
@@ -11540,9 +11987,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']">
@@ -11588,37 +12039,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:attribute name="color">blue</xsl:attribute>
-								<xsl:attribute name="text-decoration">underline</xsl:attribute>
+									<xsl:call-template name="refine_basic_link_style"/>
 
-								<xsl:if test="parent::*[local-name() = 'title']">
-									<xsl:attribute name="color">inherit</xsl:attribute>
-									<xsl:attribute name="text-decoration">inherit</xsl:attribute>
-									<xsl:attribute name="font-weight">normal</xsl:attribute>
 								</xsl:if>
 
-						</xsl:if>
-
-						<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: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:apply-templates/>
+							</fo:basic-link>
+						</xsl:with-param>
+					</xsl:call-template>
 
 				</fo:inline>
 			</xsl:when>
@@ -11636,6 +12083,20 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
+
+	<xsl:template name="refine_basic_link_style">
+
+			<xsl:attribute name="color">blue</xsl:attribute>
+			<xsl:if test="not(parent::*[local-name() = 'title'])">
+				<xsl:attribute name="text-decoration">underline</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="parent::*[local-name() = 'title']">
+				<xsl:attribute name="color">inherit</xsl:attribute>
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template> <!-- refine_basic_link_style -->
+
 	<!-- ====== -->
 	<!-- END eref -->
 	<!-- ====== -->
@@ -11778,11 +12239,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>
@@ -11797,12 +12264,18 @@
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
-				<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			<xsl:call-template name="refine_clause_style"/>
 
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template name="refine_clause_style">
+
+			<xsl:attribute name="keep-with-next">always</xsl:attribute>
+
+	</xsl:template> <!-- refine_clause_style -->
+
 	<xsl:template match="*[local-name() = 'definitions']">
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
@@ -11815,10 +12288,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>
@@ -11857,7 +12336,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>
@@ -11982,7 +12464,7 @@
 						</xsl:choose>
 					</xsl:attribute>
 
-						<xsl:attribute name="margin-left">0mm</xsl:attribute>
+					<xsl:call-template name="refine_list_container_style"/>
 
 					<fo:block-container margin-left="0mm">
 						<fo:block>
@@ -11992,13 +12474,21 @@
 				</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:attribute name="margin-left">0mm</xsl:attribute>
+
+	</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']">
@@ -12009,7 +12499,7 @@
 
 			<xsl:variable name="provisional_distance_between_starts_">
 				<attributes xsl:use-attribute-sets="list-style">
-
+					<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)"/>
@@ -12045,6 +12535,8 @@
 				<addon><xsl:value-of select="$addon"/></addon> -->
 			</xsl:if>
 
+			<xsl:call-template name="refine_list-style"/>
+
 			<xsl:if test="*[local-name() = 'name']">
 				<xsl:attribute name="margin-top">0pt</xsl:attribute>
 			</xsl:if>
@@ -12057,6 +12549,10 @@
 		<xsl:apply-templates select="./*[local-name() = 'note']"/>
 	</xsl:template>
 
+	<xsl:template name="refine_list-style_provisional-distance-between-starts">
+
+	</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'">
@@ -12070,20 +12566,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"/>
+							<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')]" />
@@ -12401,6 +12904,7 @@
 
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
+
 		</fo:block>
 	</xsl:template>
 
@@ -12420,6 +12924,7 @@
 
 		<fo:block id="{@id}" xsl:use-attribute-sets="references-non-normative-style">
 			<xsl:apply-templates/>
+
 		</fo:block>
 
 	</xsl:template> <!-- references -->
@@ -12676,24 +13181,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>
@@ -12735,6 +13248,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>
@@ -12967,6 +13501,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' -->
@@ -13251,6 +13788,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(.)"/>
@@ -13265,8 +13810,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>