metanorma-jis 0.0.5 → 0.0.7

data/lib/isodoc/jis/jis.international-standard.xsl

@@ -272,7 +272,7 @@
 					<xsl:variable name="paged_xml_preface" select="xalan:nodeset($paged_xml_preface_)"/>
 
 					<xsl:if test="$paged_xml_preface/*[local-name()='page'] and count($paged_xml_preface/*[local-name()='page']/*) != 0">
-						<!-- BSI Preface pages -->
+						<!-- Preface pages -->
 						<fo:page-sequence master-reference="document_preface" force-page-count="no-force">
 
 							<fo:static-content flow-name="xsl-footnote-separator">
@@ -298,7 +298,7 @@
 									</xsl:for-each>
 								</fo:block>
 							</fo:flow>
-						</fo:page-sequence> <!-- END BSI Preface pages -->
+						</fo:page-sequence> <!-- END Preface pages -->
 					</xsl:if>
 
 					<!-- Document type rendering -->
@@ -467,6 +467,12 @@
 		</fo:root>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'references'][not(@hidden = 'true')]" mode="linear_xml" priority="2">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="linear_xml"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'colon_gothic']">
 		<!-- replace : to ： (Fullwidth colon) and render it in the font IPAexGothic -->
 		<fo:inline font-family="IPAexGothic">：</fo:inline>
@@ -941,7 +947,7 @@
 						<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
 					</xsl:if>
 
-					<xsl:if test="parent::jis:li or following-sibling::*[1][self::jis:ol or self::jis:ul or self::jis:note or self::jis:example]">
+					<xsl:if test="parent::jis:li or following-sibling::*[1][self::jis:ol or self::jis:ul or self::jis:note or self::jis:example] or parent::jis:quote">
 						<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
 					</xsl:if>
 
@@ -989,6 +995,119 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="*[local-name()='li']" priority="2">
+		<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:variable name="list_item_label_">
+						<xsl:call-template name="getListItemFormat"/>
+					</xsl:variable>
+
+					<xsl:variable name="list_item_label">
+						<xsl:choose>
+							<xsl:when test="(../@type = 'arabic' or ../@type = 'alphabet' or ../@type = 'alphabetic' or ../@type = 'roman') and not(java:endsWith(java:java.lang.String.new($list_item_label_),')'))">
+								<xsl:value-of select="concat($list_item_label_, ')')"/>
+							</xsl:when>
+							<xsl:otherwise><xsl:value-of select="$list_item_label_"/></xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+
+					<xsl:choose>
+						<xsl:when test="contains($list_item_label, ')')">
+							<xsl:value-of select="substring-before($list_item_label,')')"/>
+							<fo:inline font-weight="normal">)</fo:inline>
+							<xsl:value-of select="substring-after($list_item_label,')')"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="$list_item_label"/>
+						</xsl:otherwise>
+					</xsl:choose>
+
+				</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 mode="list_jis"/>
+
+					<!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />
+					
+					<xsl:for-each select="./bsi:note">
+						<xsl:call-template name="note"/>
+					</xsl:for-each> -->
+				</fo:block>
+			</fo:list-item-body>
+		</fo:list-item>
+	</xsl:template>
+
+	<xsl:template match="node()" priority="2" mode="list_jis">
+		<xsl:apply-templates select="."/>
+	</xsl:template>
+
+	<!-- display footnote after last element in li, except ol or ul -->
+	<xsl:template match="*[local-name()='li']/*[not(local-name() = 'ul') and not(local-name() = 'ol')][last()]" priority="3" mode="list_jis">
+		<xsl:apply-templates select="."/>
+
+		<xsl:variable name="list_id" select="ancestor::*[local-name() = 'ul' or local-name() = 'ol'][1]/@id"/>
+		<!-- render footnotes after current list-item, if there aren't footnotes anymore in the list -->
+		<!-- i.e. i.e. if list-item is latest with footnote -->
+		<xsl:if test="ancestor::*[local-name() = 'li'][1]//jis:fn[ancestor::*[local-name() = 'ul' or local-name() = 'ol'][1][@id = $list_id]] and   not(ancestor::*[local-name() = 'li'][1]/following-sibling::*[local-name() = 'li'][.//jis:fn[ancestor::*[local-name() = 'ul' or local-name() = 'ol'][1][@id = $list_id]]])">
+			<xsl:apply-templates select="ancestor::*[local-name() = 'ul' or local-name() = 'ol'][1]//jis:fn[ancestor::*[local-name() = 'ul' or local-name() = 'ol'][1][@id = $list_id]][generate-id(.)=generate-id(key('kfn',@reference)[1])]" mode="fn_after_element">
+				<xsl:with-param name="ancestor">li</xsl:with-param>
+			</xsl:apply-templates>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="jis:fn" mode="fn_after_element">
+		<xsl:param name="ancestor">li</xsl:param>
+
+		<xsl:variable name="ancestor_tree_">
+			<xsl:for-each select="ancestor::*[local-name() != 'p' and local-name() != 'bibitem' and local-name() != 'biblio-tag']">
+				<item><xsl:value-of select="local-name()"/></item>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="ancestor_tree" select="xalan:nodeset($ancestor_tree_)"/>
+		<!-- <debug><xsl:copy-of select="$ancestor_tree"/></debug>
+		<debug><ancestor><xsl:value-of select="$ancestor"/></ancestor></debug> -->
+
+		<xsl:if test="$ancestor_tree//item[last()][. = $ancestor]">
+			<fo:block-container margin-left="11mm" margin-bottom="4pt" id="{@ref_id}">
+
+				<xsl:if test="position() = last()">
+					<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+				</xsl:if>
+				<fo:block-container margin-left="0mm">
+					<fo:list-block provisional-distance-between-starts="10mm">
+						<fo:list-item>
+							<fo:list-item-label end-indent="label-end()">
+								<fo:block xsl:use-attribute-sets="note-name-style">注 <fo:inline xsl:use-attribute-sets="fn-num-style"><xsl:value-of select="@current_fn_number"/><fo:inline font-weight="normal">)</fo:inline></fo:inline></fo:block>
+							</fo:list-item-label>
+							<fo:list-item-body start-indent="body-start()">
+								<fo:block>
+									<xsl:apply-templates/>
+								</fo:block>
+							</fo:list-item-body>
+						</fo:list-item>
+					</fo:list-block>
+				</fo:block-container>
+			</fo:block-container>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="makePagedXML">
 		<xsl:param name="structured_xml"/>
 		<xsl:choose>
@@ -1062,6 +1181,18 @@
 		<xsl:copy-of select="xalan:nodeset($text_en)/text/node()"/>
 	</xsl:template>
 
+	<!-- for $contents -->
+	<xsl:template match="title/text()">
+		<xsl:variable name="regex_en_contents">([^\u3000-\u9FFF\uF900-\uFFFF\(\)]{1,})</xsl:variable>
+		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en_contents, concat($tag_font_en_bold_open,'$1',$tag_font_en_bold_close))"/>
+		<xsl:variable name="text_en"><text><xsl:call-template name="replace_text_tags">
+			<xsl:with-param name="tag_open" select="$tag_font_en_bold_open"/>
+			<xsl:with-param name="tag_close" select="$tag_font_en_bold_close"/>
+			<xsl:with-param name="text" select="$text_en_"/>
+		</xsl:call-template></text></xsl:variable>
+		<xsl:apply-templates select="xalan:nodeset($text_en)/text/node()"/>
+	</xsl:template>
+
 	<!-- move example title to the first paragraph -->
 	<xsl:template match="jis:example[contains(jis:name/text(), ' — ')]" mode="update_xml_step1">
 		<xsl:copy>
@@ -1615,6 +1746,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>
@@ -1626,6 +1761,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>
@@ -1707,6 +1846,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 -->
@@ -1723,6 +1866,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-family">IPAexGothic</xsl:attribute>
@@ -1751,6 +1898,12 @@
 
 	</xsl:attribute-set> <!-- table-container-style -->
 
+	<xsl:template name="refine_table-container-style">
+		<xsl:param name="margin-side"/>
+
+		<!-- 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>
@@ -1759,6 +1912,17 @@
 
 	</xsl:attribute-set><!-- table-style -->
 
+	<xsl:template name="refine_table-style">
+		<xsl:param name="margin-side"/>
+
+		<xsl:call-template name="setBordersTableArray"/>
+
+			<xsl:if test="ancestor::*[local-name()='preface']">
+				<xsl:attribute name="border">none</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template> <!-- refine_table-style -->
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 
@@ -1768,6 +1932,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>
 
@@ -1781,6 +1950,17 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_table-header-row-style">
+
+		<xsl:call-template name="setBordersTableArray"/>
+
+			<xsl:if test="ancestor::*[local-name() = 'preface']">
+				<xsl:attribute name="border-top">none</xsl:attribute>
+				<xsl:attribute name="border-bottom">none</xsl:attribute>
+			</xsl:if>
+
+	</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"><xsl:value-of select="$table-border"/></xsl:attribute>
@@ -1788,10 +1968,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>
@@ -1805,6 +1995,24 @@
 
 	</xsl:attribute-set> <!-- table-header-cell-style -->
 
+	<xsl:template name="refine_table-header-cell-style">
+
+			<xsl:attribute name="text-align">center</xsl:attribute>
+
+		<xsl:call-template name="setBordersTableArray"/>
+
+			<xsl:if test="ancestor::*[local-name()='preface']">
+				<xsl:attribute name="border">none</xsl:attribute>
+			</xsl:if>
+
+		<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>
@@ -1815,6 +2023,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:call-template name="setBordersTableArray"/>
+
+			<xsl:if test="ancestor::*[local-name() = 'preface']">
+				<xsl:attribute name="border">none</xsl:attribute>
+			</xsl:if>
+
+	</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>
@@ -1826,12 +2050,20 @@
 
 	</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>
 
 	</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>
 
@@ -1894,6 +2126,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>
 
@@ -1901,6 +2137,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>
@@ -1912,6 +2152,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_dd-cell-style">
+
+	</xsl:template> <!-- refine_dd-cell-style -->
+
 	<!-- ========================== -->
 	<!-- END Definition's list styles -->
 	<!-- ========================== -->
@@ -1925,7 +2169,6 @@
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="xref-style">
-		<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 
 			<xsl:attribute name="font-family">IPAexGothic</xsl:attribute>
 
@@ -1935,6 +2178,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="text-indent">0mm</xsl:attribute>
@@ -1942,6 +2191,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>
 
@@ -1951,11 +2204,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-set>
@@ -1968,12 +2229,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="font-family">IPAexGothic</xsl:attribute>
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termnote-name-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="termnote-p-style">
 
 	</xsl:attribute-set>
@@ -1982,8 +2251,19 @@
 		<xsl:attribute name="margin-left">12mm</xsl:attribute>
 		<xsl:attribute name="margin-right">12mm</xsl:attribute>
 
+			<xsl:attribute name="margin-left">0mm</xsl:attribute>
+			<xsl:attribute name="margin-right">0mm</xsl:attribute>
+
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_quote-style">
+
+			<xsl:if test="ancestor::*[local-name() = 'li']">
+				<xsl:attribute name="margin-left">7.5mm</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template>
+
 	<xsl:attribute-set name="quote-source-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
 
@@ -1995,6 +2275,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>
@@ -2036,6 +2320,15 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_figure-name-style">
+
+			<xsl:if test="ancestor::jis:figure">
+				<xsl:attribute name="margin-top">0</xsl:attribute>
+				<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template> <!-- refine_figure-name-style -->
+
 	<xsl:attribute-set name="figure-source-style">
 
 	</xsl:attribute-set>
@@ -2052,6 +2345,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>
 
@@ -2063,6 +2360,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_image-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-pseudocode-p-style">
 
 	</xsl:attribute-set>
@@ -2153,6 +2454,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">7.5mm</xsl:attribute>
@@ -2160,6 +2465,10 @@
 
 	</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>
 
@@ -2169,16 +2478,33 @@
 
 	</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 name="line-height">1.5</xsl:attribute>
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_list-item-label-style">
+
+			<xsl:if test="parent::*[local-name() = 'ol']">
+				<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+				<xsl:attribute name="font-weight">bold</xsl:attribute>
+			</xsl:if>
+
+	</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>
@@ -2194,6 +2520,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>
@@ -2216,6 +2546,12 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_fn-body-style">
+
+			<xsl:attribute name="font-family">IPAexMincho</xsl:attribute> <!-- prevent font for footnote in Times New Roman main text -->
+
+	</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>
 
@@ -2226,6 +2562,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">
 
@@ -2293,6 +2633,11 @@
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">65%</xsl:attribute>
 
+			<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+			<xsl:attribute name="font-size">67%</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+			<xsl:attribute name="vertical-align">super</xsl:attribute>
+
 	</xsl:attribute-set> <!-- bibitem-note-fn-style -->
 
 	<!-- footnote number on the page bottom -->
@@ -2854,7 +3199,9 @@
 
 			<fo:block-container xsl:use-attribute-sets="table-container-style">
 
-				<!-- 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) -->
 
@@ -2875,11 +3222,9 @@
 
 						<xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
 
-						<xsl:call-template name="setBordersTableArray"/>
-
-							<xsl:if test="ancestor::*[local-name()='preface']">
-								<xsl:attribute name="border">none</xsl:attribute>
-							</xsl:if>
+						<xsl:call-template name="refine_table-style">
+							<xsl:with-param name="margin-side" select="$margin-side"/>
+						</xsl:call-template>
 
 					</xsl:element>
 				</xsl:variable>
@@ -2901,7 +3246,7 @@
 						</xsl:attribute>
 					</xsl:for-each>
 
-					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
+					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
 					<xsl:if test="$isNoteOrFnExist = 'true'">
 						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
 					</xsl:if>
@@ -2945,7 +3290,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() = 'example') 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>
 
@@ -3015,6 +3360,10 @@
 
 					<fo:block xsl:use-attribute-sets="table-name-style">
 
+						<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'">
 
@@ -3397,6 +3746,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>
@@ -3409,6 +3760,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/>
@@ -3433,7 +3788,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()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
 
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 
@@ -3493,6 +3848,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 -->
@@ -3501,8 +3858,10 @@
 
 								<!-- 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()='example']"/>
 										<xsl:apply-templates select="../*[local-name()='source']"/>
 
 								<xsl:variable name="isDisplayRowSeparator">
@@ -3511,7 +3870,7 @@
 
 								<!-- horizontal row separator -->
 								<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
-									<xsl:if test="../*[local-name()='note'] and normalize-space($table_fn_block) != ''">
+									<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
 										<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
 
 											<xsl:call-template name="setBordersTableArray"/>
@@ -3632,12 +3991,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:if test="ancestor::*[local-name() = 'preface']">
-					<xsl:attribute name="border-top">none</xsl:attribute>
-					<xsl:attribute name="border-bottom">none</xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="refine_table-header-row-style"/>
 
 			<xsl:call-template name="setTableRowAttributes"/>
 
@@ -3671,6 +4025,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>
@@ -3684,9 +4040,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>
@@ -3705,19 +4062,7 @@
 				<xsl:with-param name="default">center</xsl:with-param>
 			</xsl:call-template>
 
-				<xsl:attribute name="text-align">center</xsl:attribute>
-
-			<xsl:call-template name="setBordersTableArray"/>
-
-				<xsl:if test="ancestor::*[local-name()='preface']">
-					<xsl:attribute name="border">none</xsl:attribute>
-				</xsl:if>
-
-			<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/>
@@ -3759,17 +4104,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:call-template name="setBordersTableArray"/>
-
-				<xsl:if test="ancestor::*[local-name() = 'preface']">
-					<xsl:attribute name="border">none</xsl:attribute>
-				</xsl:if>
+			<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>
@@ -3796,13 +4131,17 @@
 		</fo:table-cell>
 	</xsl:template> <!-- td -->
 
-	<xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
+	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
 		<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<!-- Table's note name (NOTE, for example) -->
+			<xsl:call-template name="refine_table-note-style"/>
+
+			<!-- Table's note/example 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>
@@ -3812,7 +4151,7 @@
 
 	</xsl:template> <!-- table/note -->
 
-	<xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
+	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
 		<xsl:apply-templates/>
 	</xsl:template>
 
@@ -3830,6 +4169,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_)"/>
 
@@ -3852,9 +4199,18 @@
 		<xsl:variable name="current_fn_number_text">
 			<xsl:value-of select="$current_fn_number"/>
 
+				<fo:inline font-weight="normal">)</fo:inline>
+
 		</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>
 
@@ -3880,7 +4236,7 @@
 				<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:value-of select="$current_fn_number_text"/>
+							<xsl:copy-of select="$current_fn_number_text"/>
 						</fo:basic-link>
 					</xsl:with-param>
 				</xsl:call-template>
@@ -3900,8 +4256,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/>
@@ -3953,6 +4313,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 -->
 	<!-- ============================ -->
@@ -4139,6 +4521,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-->
 
 				<xsl:value-of select="@reference"/>
@@ -4240,6 +4624,8 @@
 					<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>
@@ -4253,6 +4639,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>
@@ -4267,12 +4655,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>
@@ -4430,6 +4822,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']]"/>
 
@@ -4649,6 +5059,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"/>
 
@@ -4656,6 +5068,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>
@@ -4675,6 +5089,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'">
@@ -4817,15 +5233,20 @@
 	<!-- ========================= -->
 	<xsl:template match="*[local-name()='em']">
 		<fo:inline font-style="italic">
+			<xsl:call-template name="refine_italic_style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
 
+	<xsl:template name="refine_italic_style">
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<xsl:param name="split_keep-within-line"/>
 		<fo:inline font-weight="bold">
 
-				<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+			<xsl:call-template name="refine_strong_style"/>
 
 			<xsl:apply-templates>
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -4833,6 +5254,12 @@
 		</fo:inline>
 	</xsl:template>
 
+	<xsl:template name="refine_strong_style">
+
+			<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='padding']">
 		<fo:inline padding-right="{@value}"> </fo:inline>
 	</xsl:template>
@@ -5303,7 +5730,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">
@@ -5978,6 +6408,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>
@@ -6082,6 +6517,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">
@@ -6102,6 +6539,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>
@@ -6246,6 +6687,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>
@@ -6290,6 +6733,8 @@
 				<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/>
@@ -6377,6 +6822,9 @@
 		<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>
@@ -6438,6 +6886,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>
@@ -6479,6 +6929,8 @@
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
+			<xsl:call-template name="refine_note-style"/>
+
 			<fo:block-container margin-left="0mm" margin-right="0mm">
 
 						<fo:list-block>
@@ -6509,6 +6961,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>
@@ -6530,12 +6986,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']]">
@@ -6705,6 +7165,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>
@@ -7554,10 +8016,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 
-					<xsl:if test="ancestor::jis:figure">
-						<xsl:attribute name="margin-top">0</xsl:attribute>
-						<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-					</xsl:if>
+				<xsl:call-template name="refine_figure-name-style"/>
 
 				<xsl:apply-templates/>
 			</fo:block>
@@ -7822,6 +8281,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>
@@ -8526,6 +8987,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>
 				list
@@ -8636,6 +9099,12 @@
 
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
+		<fo:inline xsl:use-attribute-sets="example-name-style">
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
 		<xsl:param name="fo_element">block</xsl:param>
 
@@ -8653,6 +9122,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>
@@ -8669,6 +9140,7 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template> <!-- example/p -->
+
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -8680,6 +9152,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/>
@@ -8795,6 +9269,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 -->
@@ -8809,6 +9285,11 @@
 					</fo:block>
 				</xsl:if>
 
+					<!-- render footnotes after references -->
+					<xsl:apply-templates select=".//jis:fn[generate-id(.)=generate-id(key('kfn',@reference)[1])]" mode="fn_after_element">
+						<xsl:with-param name="ancestor">quote</xsl:with-param>
+					</xsl:apply-templates>
+
 			</fo:block-container>
 		</fo:block-container>
 	</xsl:template>
@@ -8869,8 +9350,7 @@
 
 					</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"/>
 
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
@@ -8880,6 +9360,8 @@
 								</xsl:if>
 								<xsl:if test="@type = 'inline'">
 
+									<xsl:call-template name="refine_basic_link_style"/>
+
 								</xsl:if>
 
 								<xsl:choose>
@@ -8912,6 +9394,11 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
+
+	<xsl:template name="refine_basic_link_style">
+
+	</xsl:template> <!-- refine_basic_link_style -->
+
 	<!-- ====== -->
 	<!-- END eref -->
 	<!-- ====== -->
@@ -9049,11 +9536,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>
@@ -9068,10 +9561,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/>
@@ -9084,10 +9583,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>
@@ -9165,6 +9670,9 @@
 					<xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
+			<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
+				<xsl:value-of select="@label"/>
+			</xsl:when>
 			<xsl:otherwise> <!-- for ordered lists 'ol' -->
 
 				<!-- Example: for BSI <?list-start 2?> -->
@@ -9222,10 +9730,10 @@
 						<xsl:when test="$type = 'arabic'">
 							1)
 						</xsl:when>
-						<xsl:when test="$type = 'alphabet'">
+						<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
 							a)
 						</xsl:when>
-						<xsl:when test="$type = 'alphabet_upper'">
+						<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
 							A.
 						</xsl:when>
 						<xsl:when test="$type = 'roman'">
@@ -9253,6 +9761,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"/>
@@ -9277,6 +9787,10 @@
 		</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']">
@@ -9287,7 +9801,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)"/>
@@ -9323,6 +9837,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>
@@ -9335,6 +9851,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'">
@@ -9348,13 +9868,12 @@
 		<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:if test="parent::*[local-name() = 'ol']">
-							<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
-							<xsl:attribute name="font-weight">bold</xsl:attribute>
-						</xsl:if>
+					<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']]">
@@ -9362,11 +9881,14 @@
 					</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')]" />
@@ -9684,6 +10206,12 @@
 
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
+
+				<!-- render footnotes after references -->
+				<xsl:apply-templates select=".//jis:fn[generate-id(.)=generate-id(key('kfn',@reference)[1])]" mode="fn_after_element">
+					<xsl:with-param name="ancestor">references</xsl:with-param>
+				</xsl:apply-templates>
+
 		</fo:block>
 	</xsl:template>
 
@@ -9703,6 +10231,12 @@
 
 		<fo:block id="{@id}" xsl:use-attribute-sets="references-non-normative-style">
 			<xsl:apply-templates/>
+
+				<!-- render footnotes after references -->
+				<xsl:apply-templates select=".//jis:fn[generate-id(.)=generate-id(key('kfn',@reference)[1])]" mode="fn_after_element">
+					<xsl:with-param name="ancestor">references</xsl:with-param>
+				</xsl:apply-templates>
+
 		</fo:block>
 
 	</xsl:template> <!-- references -->
@@ -10283,6 +10817,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' -->
@@ -10671,6 +11208,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(.)"/>
@@ -10685,8 +11230,17 @@
 			<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:choose>
+							<xsl:when test="ancestor::*[local-name() = 'ul' or local-name() ='ol' or local-name() = 'bibitem' or local-name() = 'quote']">true</xsl:when>
+							<xsl:otherwise><xsl:value-of select="$skip_footnote_body_"/></xsl:otherwise>
+						</xsl:choose>
+
+			</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>