metanorma-ogc 2.3.9 → 2.3.10

data/lib/isodoc/ogc/ogc.test-suite.xsl

@@ -423,174 +423,24 @@
 							</fo:block>
 						</fo:block-container>
 
-						<fo:block color="{$color_blue}">
+						<!-- Contents, Abstract, Keywords, Preface, Submitting Organizations, Submitters -->
 
-							<xsl:variable name="title-toc">
-								<xsl:call-template name="getTitle">
-									<xsl:with-param name="name" select="'title-toc'"/>
-								</xsl:call-template>
-							</xsl:variable>
-
-							<fo:block-container margin-left="-18mm">
-								<fo:block-container margin-left="0mm">
-									<fo:block margin-bottom="40pt">
-										<fo:block font-size="33pt" margin-bottom="4pt" role="H1">
-											<xsl:call-template name="addLetterSpacing">
-												<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($title-toc))"/>
-												<xsl:with-param name="letter-spacing" select="1.1"/>
-											</xsl:call-template>
-										</fo:block>
-										<fo:block-container width="22.5mm" border-bottom="2pt solid {$color_design}">
-											<fo:block margin-top="4pt"> </fo:block>
-										</fo:block-container>
-									</fo:block>
-								</fo:block-container>
-							</fo:block-container>
-
-							<fo:block-container line-height="130%">
-								<fo:block role="TOC">
-									<xsl:for-each select="$contents//item[@display = 'true' and normalize-space(@id) != '']">
-
-										<fo:block role="TOCI">
-											<xsl:if test="@level = 1">
-												<xsl:attribute name="margin-top">14pt</xsl:attribute>
-											</xsl:if>
-											<xsl:if test="@level = 1 or @parent = 'annex'">
-												<xsl:attribute name="font-size">12pt</xsl:attribute>
-											</xsl:if>
-											<xsl:if test="@level &gt;= 2"> <!-- and not(@parent = 'annex') -->
-												<xsl:attribute name="font-size">10pt</xsl:attribute>
-											</xsl:if>
+						<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
+							<xsl:sort select="@displayorder" data-type="number"/>
 
-											<xsl:choose>
-												<xsl:when test="@level = 1">
-													<fo:list-block provisional-distance-between-starts="8mm">
-														<xsl:if test="@type = 'annex'">
-															<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
-														</xsl:if>
-														<fo:list-item>
-															<fo:list-item-label end-indent="label-end()">
-																<fo:block>
-																	<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
-																</fo:block>
-															</fo:list-item-label>
-															<fo:list-item-body start-indent="body-start()">
-																<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
-																	<fo:basic-link internal-destination="{@id}">
-																		<xsl:call-template name="setAltText">
-																			<xsl:with-param name="value" select="text()"/>
-																		</xsl:call-template>
-																		<xsl:variable name="sectionTitle">
-																			<xsl:apply-templates select="title"/>
-																		</xsl:variable>
-																		<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($sectionTitle))"/>
-																		<xsl:text> </xsl:text>
-																		<fo:inline keep-together.within-line="always">
-																			<fo:leader leader-pattern="dots"/>
-																			<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
-																		</fo:inline>
-																	</fo:basic-link>
-																</fo:block>
-															</fo:list-item-body>
-														</fo:list-item>
-													</fo:list-block>
-												</xsl:when>
-												<xsl:otherwise>
-													<xsl:variable name="margin-left">
-														<xsl:choose>
-															<xsl:when test="number(@level) != 'NaN'"><xsl:value-of select="(@level - 1) * 8"/></xsl:when>
-															<xsl:otherwise>8</xsl:otherwise>
-														</xsl:choose>
-													</xsl:variable>
-													<fo:block text-align-last="justify" margin-left="{$margin-left}mm">
-														<fo:basic-link internal-destination="{@id}">
-															<xsl:call-template name="setAltText">
-																<xsl:with-param name="value" select="text()"/>
-															</xsl:call-template>
-															<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
-															<xsl:text> </xsl:text>
-															<xsl:apply-templates select="title"/>
-															<xsl:text> </xsl:text>
-															<fo:inline keep-together.within-line="always">
-																<fo:leader leader-pattern="dots"/>
-																<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
-															</fo:inline>
-														</fo:basic-link>
-													</fo:block>
-												</xsl:otherwise>
-											</xsl:choose>
-
-										</fo:block>
-									</xsl:for-each>
-								</fo:block>
-							</fo:block-container>
-
-							<!-- List of Tables -->
-							<xsl:if test="$contents//tables/table">
-								<xsl:call-template name="insertListOf_Title">
-									<xsl:with-param name="title" select="$title-list-tables"/>
-								</xsl:call-template>
-								<fo:block-container line-height="130%">
-									<xsl:for-each select="$contents//tables/table">
-										<xsl:call-template name="insertListOf_Item"/>
-									</xsl:for-each>
-								</fo:block-container>
-							</xsl:if>
-
-							<!-- List of Figures -->
-							<xsl:if test="$contents//figures/figure">
-								<xsl:call-template name="insertListOf_Title">
-									<xsl:with-param name="title" select="$title-list-figures"/>
-								</xsl:call-template>
-								<fo:block-container line-height="130%">
-									<xsl:for-each select="$contents//figures/figure">
-										<xsl:call-template name="insertListOf_Item"/>
-									</xsl:for-each>
-								</fo:block-container>
-							</xsl:if>
-
-							<!-- List of Recommendations -->
-							<xsl:if test="//ogc:table[.//ogc:p[@class = 'RecommendationTitle']]">
-								<xsl:call-template name="insertListOf_Title">
-									<xsl:with-param name="title" select="$title-list-recommendations"/>
-								</xsl:call-template>
-								<fo:block-container line-height="130%">
-									<xsl:for-each select="xalan:nodeset($toc_recommendations)/*[normalize-space(@id) != '']">
-										<fo:block text-align-last="justify" margin-top="6pt" role="TOCI">
-											<fo:basic-link internal-destination="{@id}">
-												<xsl:call-template name="setAltText">
-													<xsl:with-param name="value" select="@alt-text"/>
-												</xsl:call-template>
-												<xsl:copy-of select="title/node()"/>
-												<xsl:text> </xsl:text>
-												<fo:inline keep-together.within-line="always">
-													<fo:leader leader-pattern="dots"/>
-													<fo:page-number-citation ref-id="{@id}"/>
-												</fo:inline>
-											</fo:basic-link>
-										</fo:block>
-									</xsl:for-each>
-								</fo:block-container>
+							<xsl:if test="local-name() = 'foreword' or         (local-name() = 'clause' and @type = 'security') or        (local-name() = 'clause' and @type = 'submitting_orgs') or         local-name() = 'introduction'">
+								<fo:block break-after="page"/>
 							</xsl:if>
 
-						</fo:block>
-
-						<fo:block break-after="page"/>
-
-						<fo:block line-height="125%">
-							<!-- Abstract, Keywords, Preface, Submitting Organizations, Submitters -->
-
-							<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
-								<xsl:sort select="@displayorder" data-type="number"/>
-
-								<xsl:if test="local-name() = 'foreword' or          (local-name() = 'clause' and @type = 'security') or         (local-name() = 'clause' and @type = 'submitting_orgs') or          local-name() = 'introduction'">
-									<fo:block break-after="page"/>
+							<fo:block>
+								<xsl:if test="not(local-name() = 'clause' and @type = 'toc')">
+									<xsl:attribute name="line-height">125%</xsl:attribute>
 								</xsl:if>
 
 								<xsl:apply-templates select="."/>
-							</xsl:for-each>
+							</fo:block>
+						</xsl:for-each>
 
-						</fo:block>
 					</fo:flow>
 				</fo:page-sequence>
 
@@ -656,6 +506,170 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="ogc:preface/ogc:clause[@type = 'toc']" priority="4">
+		<fo:block color="{$color_blue}">
+
+			<xsl:apply-templates/>
+
+			<xsl:if test="count(*) = 1 and *[local-name() = 'title']"> <!-- if there isn't user ToC -->
+
+				<fo:block-container line-height="130%">
+					<fo:block role="TOC">
+						<xsl:for-each select="$contents//item[@display = 'true' and normalize-space(@id) != '']">
+
+							<fo:block role="TOCI">
+								<xsl:if test="@level = 1">
+									<xsl:attribute name="margin-top">14pt</xsl:attribute>
+								</xsl:if>
+								<xsl:if test="@level = 1 or @parent = 'annex'">
+									<xsl:attribute name="font-size">12pt</xsl:attribute>
+								</xsl:if>
+								<xsl:if test="@level &gt;= 2"> <!-- and not(@parent = 'annex') -->
+									<xsl:attribute name="font-size">10pt</xsl:attribute>
+								</xsl:if>
+
+								<xsl:choose>
+									<xsl:when test="@level = 1">
+										<fo:list-block provisional-distance-between-starts="8mm">
+											<xsl:if test="@type = 'annex'">
+												<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
+											</xsl:if>
+											<fo:list-item>
+												<fo:list-item-label end-indent="label-end()">
+													<fo:block>
+														<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
+													</fo:block>
+												</fo:list-item-label>
+												<fo:list-item-body start-indent="body-start()">
+													<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
+														<fo:basic-link internal-destination="{@id}">
+															<xsl:call-template name="setAltText">
+																<xsl:with-param name="value" select="text()"/>
+															</xsl:call-template>
+															<xsl:variable name="sectionTitle">
+																<xsl:apply-templates select="title"/>
+															</xsl:variable>
+															<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($sectionTitle))"/>
+															<xsl:text> </xsl:text>
+															<fo:inline keep-together.within-line="always">
+																<fo:leader leader-pattern="dots"/>
+																<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+															</fo:inline>
+														</fo:basic-link>
+													</fo:block>
+												</fo:list-item-body>
+											</fo:list-item>
+										</fo:list-block>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:variable name="margin-left">
+											<xsl:choose>
+												<xsl:when test="number(@level) != 'NaN'"><xsl:value-of select="(@level - 1) * 8"/></xsl:when>
+												<xsl:otherwise>8</xsl:otherwise>
+											</xsl:choose>
+										</xsl:variable>
+										<fo:block text-align-last="justify" margin-left="{$margin-left}mm">
+											<fo:basic-link internal-destination="{@id}">
+												<xsl:call-template name="setAltText">
+													<xsl:with-param name="value" select="text()"/>
+												</xsl:call-template>
+												<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
+												<xsl:text> </xsl:text>
+												<xsl:apply-templates select="title"/>
+												<xsl:text> </xsl:text>
+												<fo:inline keep-together.within-line="always">
+													<fo:leader leader-pattern="dots"/>
+													<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+												</fo:inline>
+											</fo:basic-link>
+										</fo:block>
+									</xsl:otherwise>
+								</xsl:choose>
+
+							</fo:block>
+						</xsl:for-each>
+					</fo:block>
+				</fo:block-container>
+
+				<!-- List of Tables -->
+				<xsl:if test="$contents//tables/table">
+					<xsl:call-template name="insertListOf_Title">
+						<xsl:with-param name="title" select="$title-list-tables"/>
+					</xsl:call-template>
+					<fo:block-container line-height="130%">
+						<xsl:for-each select="$contents//tables/table">
+							<xsl:call-template name="insertListOf_Item"/>
+						</xsl:for-each>
+					</fo:block-container>
+				</xsl:if>
+
+				<!-- List of Figures -->
+				<xsl:if test="$contents//figures/figure">
+					<xsl:call-template name="insertListOf_Title">
+						<xsl:with-param name="title" select="$title-list-figures"/>
+					</xsl:call-template>
+					<fo:block-container line-height="130%">
+						<xsl:for-each select="$contents//figures/figure">
+							<xsl:call-template name="insertListOf_Item"/>
+						</xsl:for-each>
+					</fo:block-container>
+				</xsl:if>
+
+				<!-- List of Recommendations -->
+				<xsl:if test="//ogc:table[.//ogc:p[@class = 'RecommendationTitle']]">
+					<xsl:call-template name="insertListOf_Title">
+						<xsl:with-param name="title" select="$title-list-recommendations"/>
+					</xsl:call-template>
+					<fo:block-container line-height="130%">
+						<xsl:for-each select="xalan:nodeset($toc_recommendations)/*[normalize-space(@id) != '']">
+							<fo:block text-align-last="justify" margin-top="6pt" role="TOCI">
+								<fo:basic-link internal-destination="{@id}">
+									<xsl:call-template name="setAltText">
+										<xsl:with-param name="value" select="@alt-text"/>
+									</xsl:call-template>
+									<xsl:copy-of select="title/node()"/>
+									<xsl:text> </xsl:text>
+									<fo:inline keep-together.within-line="always">
+										<fo:leader leader-pattern="dots"/>
+										<fo:page-number-citation ref-id="{@id}"/>
+									</fo:inline>
+								</fo:basic-link>
+							</fo:block>
+						</xsl:for-each>
+					</fo:block-container>
+				</xsl:if>
+			</xsl:if>
+		</fo:block>
+
+		<fo:block break-after="page"/>
+
+	</xsl:template>
+
+	<xsl:template match="ogc:preface/ogc:clause[@type = 'toc']/ogc:title" priority="3">
+		<xsl:variable name="title-toc">
+			<xsl:apply-templates/>
+			<!-- <xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-toc'"/>
+			</xsl:call-template> -->
+		</xsl:variable>
+
+		<fo:block-container margin-left="-18mm">
+			<fo:block-container margin-left="0mm">
+				<fo:block margin-bottom="40pt">
+					<fo:block font-size="33pt" margin-bottom="4pt" role="H1">
+						<xsl:call-template name="addLetterSpacing">
+							<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($title-toc))"/>
+							<xsl:with-param name="letter-spacing" select="1.1"/>
+						</xsl:call-template>
+					</fo:block>
+					<fo:block-container width="22.5mm" border-bottom="2pt solid {$color_design}">
+						<fo:block margin-top="4pt"> </fo:block>
+					</fo:block-container>
+				</fo:block>
+			</fo:block-container>
+		</fo:block-container>
+	</xsl:template>
+
 	<!-- Lato font doesn't contain 'thin space' glyph -->
 	<xsl:template match="text()" priority="1">
 		<xsl:value-of select="translate(., $thin_space, ' ')"/>
@@ -739,7 +753,7 @@
 	<!-- ============================= -->
 
 	<!-- element with title -->
-	<xsl:template match="*[ogc:title]" mode="contents">
+	<xsl:template match="*[ogc:title][not(@type = 'toc')]" mode="contents">
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel">
 				<xsl:with-param name="depth" select="ogc:title/@depth"/>
@@ -1883,6 +1897,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>
@@ -1898,6 +1916,14 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_sourcecode-style">
+
+			<xsl:if test="parent::*[local-name() = 'example']">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
+
+	</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>
@@ -2020,6 +2046,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 -->
@@ -2036,6 +2066,10 @@
 
 	</xsl:attribute-set> <!-- example-p-style -->
 
+	<xsl:template name="refine_example-p-style">
+
+	</xsl:template> <!-- refine_example-p-style -->
+
 	<xsl:attribute-set name="termexample-name-style">
 
 			<xsl:attribute name="padding-right">10mm</xsl:attribute>
@@ -2063,12 +2097,29 @@
 
 	</xsl:attribute-set> <!-- table-container-style -->
 
+	<xsl:template name="refine_table-container-style">
+		<xsl:param name="margin-side"/>
+
+			<!-- <xsl:if test="ancestor::*[local-name()='sections']"> -->
+				<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: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>
 
@@ -2080,6 +2131,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>
 
@@ -2095,14 +2151,38 @@
 
 	</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:variable name="number"><xsl:number/></xsl:variable>
+			<xsl:attribute name="background-color">
+				<xsl:choose>
+					<xsl:when test="$number mod 2 = 0">rgb(252, 246, 222)</xsl:when>
+					<xsl:otherwise>rgb(254, 252, 245)</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+
+	</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>
@@ -2115,6 +2195,24 @@
 
 	</xsl:attribute-set> <!-- table-header-cell-style -->
 
+	<xsl:template name="refine_table-header-cell-style">
+
+		<xsl:call-template name="setBordersTableArray"/>
+
+			<xsl:if test="starts-with(ancestor::*[local-name() = 'table'][1]/@type, 'recommend') and normalize-space(@align) = ''">
+				<xsl:call-template name="setTextAlignment">
+					<xsl:with-param name="default">left</xsl:with-param>
+				</xsl:call-template>
+			</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>
@@ -2126,6 +2224,18 @@
 
 	</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: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>
@@ -2136,12 +2246,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>
 
@@ -2205,6 +2323,15 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_dt-cell-style">
+
+			<xsl:if test="not(ancestor::ogc:sourcecode)">
+				<!-- <xsl:attribute name="border-left">1pt solid <xsl:value-of select="$color_design"/></xsl:attribute> -->
+				<xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dt"/></xsl:attribute>
+			</xsl:if>
+
+	</xsl:template> <!-- refine_dt-cell-style -->
+
 	<xsl:attribute-set name="dt-block-style">
 		<xsl:attribute name="margin-top">0pt</xsl:attribute>
 
@@ -2212,6 +2339,17 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_dt-block-style">
+
+			<xsl:if test="ancestor::ogc:sourcecode">
+				<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="not(following-sibling::ogc:dt)"> <!-- last dt -->
+				<xsl:attribute name="margin-bottom">0</xsl:attribute>
+			</xsl:if>
+
+	</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>
@@ -2228,6 +2366,14 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_dd-cell-style">
+
+			<xsl:if test="not(ancestor::ogc:sourcecode)">
+				<xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dd"/></xsl:attribute>
+			</xsl:if>
+
+	</xsl:template> <!-- refine_dd-cell-style -->
+
 	<!-- ========================== -->
 	<!-- END Definition's list styles -->
 	<!-- ========================== -->
@@ -2250,7 +2396,6 @@
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="xref-style">
-		<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 
 	</xsl:attribute-set>
 
@@ -2258,6 +2403,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-top">12pt</xsl:attribute>
@@ -2265,6 +2416,14 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_note-style">
+
+			<xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol and not(ancestor::ogc:note[1]/following-sibling::*)">
+				<xsl:attribute name="margin-bottom">0pt</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>
 
@@ -2275,11 +2434,19 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_note-name-style">
+
+	</xsl:template> <!-- refine_note-name-style -->
+
 	<xsl:attribute-set name="table-note-name-style">
 		<xsl:attribute name="padding-right">2mm</xsl:attribute>
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_table-note-name-style">
+
+	</xsl:template> <!-- refine_table-note-name-style -->
+
 	<xsl:attribute-set name="note-p-style">
 
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -2294,6 +2461,10 @@
 
 	</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-weight">bold</xsl:attribute>
@@ -2301,6 +2472,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termnote-name-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="termnote-p-style">
 
 			<xsl:attribute name="space-before">4pt</xsl:attribute>
@@ -2316,6 +2491,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>
 
@@ -2330,6 +2509,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termsource-style">
+
+	</xsl:template> <!-- refine_termsource-style -->
+
 	<xsl:attribute-set name="termsource-text-style">
 
 			<xsl:attribute name="padding-right">1mm</xsl:attribute>
@@ -2372,6 +2555,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>
@@ -2390,6 +2577,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>
 
@@ -2404,6 +2595,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_image-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-pseudocode-p-style">
 
 	</xsl:attribute-set>
@@ -2496,6 +2691,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">12mm</xsl:attribute>
@@ -2504,6 +2703,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>
 
@@ -2516,16 +2719,36 @@
 
 	</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 name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_list-item-body-style">
+
+			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+			<xsl:if test="ancestor::ogc:table[not(@class)]">
+				<xsl:attribute name="margin-bottom">1mm</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template> <!-- refine_list-item-body-style -->
+
 	<xsl:attribute-set name="toc-style">
 		<xsl:attribute name="line-height">135%</xsl:attribute>
 	</xsl:attribute-set>
@@ -2538,6 +2761,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>
@@ -2564,6 +2791,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>
 
@@ -2572,6 +2803,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">
 
@@ -3242,11 +3477,9 @@
 
 			<fo:block-container xsl:use-attribute-sets="table-container-style">
 
-					<!-- <xsl:if test="ancestor::*[local-name()='sections']"> -->
-						<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) -->
 
@@ -3273,7 +3506,9 @@
 
 						<xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
 
-						<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>
@@ -3339,7 +3574,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>
 
@@ -3426,6 +3661,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'">
 
@@ -3808,6 +4047,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>
@@ -3820,6 +4061,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/>
@@ -3844,7 +4089,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">
 
@@ -3904,6 +4149,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 -->
@@ -3912,6 +4159,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']"/>
@@ -4043,7 +4291,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"/>
 
@@ -4077,6 +4325,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>
@@ -4090,17 +4340,10 @@
 				<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			</xsl:if>
 
-			<xsl:call-template name="setBordersTableArray"/>
-
-				<xsl:variable name="number"><xsl:number/></xsl:variable>
-				<xsl:attribute name="background-color">
-					<xsl:choose>
-						<xsl:when test="$number mod 2 = 0">rgb(252, 246, 222)</xsl:when>
-						<xsl:otherwise>rgb(254, 252, 245)</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
+			<xsl:call-template name="refine_table-body-row-style"/>
 
 			<xsl:call-template name="setTableRowAttributes"/>
+
 			<xsl:apply-templates/>
 		</fo:table-row>
 	</xsl:template>
@@ -4119,19 +4362,7 @@
 				<xsl:with-param name="default">center</xsl:with-param>
 			</xsl:call-template>
 
-			<xsl:call-template name="setBordersTableArray"/>
-
-				<xsl:if test="starts-with(ancestor::*[local-name() = 'table'][1]/@type, 'recommend') and normalize-space(@align) = ''">
-					<xsl:call-template name="setTextAlignment">
-						<xsl:with-param name="default">left</xsl:with-param>
-					</xsl:call-template>
-				</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/>
@@ -4173,13 +4404,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: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>
@@ -4210,9 +4435,13 @@
 
 		<fo:block xsl:use-attribute-sets="table-note-style">
 
+			<xsl:call-template name="refine_table-note-style"/>
+
 			<!-- Table's note name (NOTE, for example) -->
 			<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
+				<xsl:call-template name="refine_table-note-name-style"/>
+
 				<xsl:apply-templates select="*[local-name() = 'name']"/>
 
 			</fo:inline>
@@ -4240,6 +4469,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_)"/>
 
@@ -4264,7 +4501,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>
 
@@ -4290,7 +4534,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>
@@ -4310,8 +4554,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/>
@@ -4363,6 +4611,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 -->
 	<!-- ============================ -->
@@ -4543,6 +4813,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:attribute name="internal-destination">
@@ -4647,6 +4919,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>
@@ -4660,6 +4934,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>
@@ -4674,12 +4950,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>
@@ -4837,6 +5117,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']]"/>
 
@@ -5063,10 +5361,7 @@
 
 			</xsl:if>
 
-				<xsl:if test="not(ancestor::ogc:sourcecode)">
-					<!-- <xsl:attribute name="border-left">1pt solid <xsl:value-of select="$color_design"/></xsl:attribute> -->
-					<xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dt"/></xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="refine_dt-cell-style"/>
 
 			<fo:block xsl:use-attribute-sets="dt-block-style">
 				<xsl:copy-of select="@id"/>
@@ -5075,12 +5370,7 @@
 					<xsl:attribute name="margin-top">0</xsl:attribute>
 				</xsl:if>
 
-					<xsl:if test="ancestor::ogc:sourcecode">
-						<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="not(following-sibling::ogc:dt)"> <!-- last dt -->
-						<xsl:attribute name="margin-bottom">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"/>
@@ -5101,9 +5391,7 @@
 				<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
 			</xsl:if>
 
-				<xsl:if test="not(ancestor::ogc:sourcecode)">
-					<xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dd"/></xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="refine_dd-cell-style"/>
 
 			<fo:block>
 
@@ -5255,12 +5543,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>
@@ -6407,6 +6701,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>
@@ -6511,6 +6810,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">
@@ -6531,6 +6832,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>
@@ -6675,6 +6980,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>
@@ -6719,6 +7026,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/>
@@ -6810,6 +7119,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://'))">
+						<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>
@@ -6871,6 +7183,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>
@@ -6912,16 +7226,18 @@
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
-				<xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol and not(ancestor::ogc:note[1]/following-sibling::*)">
-					<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="refine_note-style"/>
 
 			<fo:block-container margin-left="0mm" margin-right="0mm">
 
 						<fo:block>
 
+							<xsl:call-template name="refine_note_block_style"/>
+
 							<fo:inline xsl:use-attribute-sets="note-name-style">
 
+								<xsl:call-template name="refine_note-name-style"/>
+
 								<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 								<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
 								<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -6947,6 +7263,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>
@@ -6968,12 +7288,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']]">
@@ -7147,6 +7471,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>
@@ -8014,6 +8340,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>
@@ -8286,9 +8614,7 @@
 								</xsl:attribute>
 							</xsl:for-each>
 
-								<xsl:if test="parent::*[local-name() = 'example']">
-									<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-								</xsl:if>
+							<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']">
@@ -9020,6 +9346,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>
 				inline
@@ -9147,6 +9475,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>
@@ -9163,6 +9493,7 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template> <!-- example/p -->
+
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -9174,6 +9505,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/>
@@ -9289,6 +9622,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 -->
@@ -9363,8 +9698,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">
@@ -9374,6 +9708,8 @@
 								</xsl:if>
 								<xsl:if test="@type = 'inline'">
 
+									<xsl:call-template name="refine_basic_link_style"/>
+
 								</xsl:if>
 
 								<xsl:choose>
@@ -9406,6 +9742,11 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
+
+	<xsl:template name="refine_basic_link_style">
+
+	</xsl:template> <!-- refine_basic_link_style -->
+
 	<!-- ====== -->
 	<!-- END eref -->
 	<!-- ====== -->
@@ -9549,16 +9890,22 @@
 		<fo:block>
 			<xsl:call-template name="setId"/>
 
-				<xsl:variable name="pos"><xsl:number count="ogc:sections/ogc:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable> <!--  | ogc:sections/ogc:terms -->
-				<xsl:if test="$pos &gt;= 2">
-					<xsl:attribute name="space-before">18pt</xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="sections_element_style"/>
 
 			<xsl:apply-templates/>
 		</fo:block>
 
 	</xsl:template>
 
+	<xsl:template name="sections_element_style">
+
+			<xsl:variable name="pos"><xsl:number count="ogc:sections/ogc:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable> <!--  | ogc:sections/ogc:terms -->
+			<xsl:if test="$pos &gt;= 2">
+				<xsl:attribute name="space-before">18pt</xsl:attribute>
+			</xsl:if>
+
+	</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>
@@ -9573,10 +9920,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/>
@@ -9589,10 +9942,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>
@@ -9757,6 +10116,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"/>
@@ -9774,6 +10135,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']">
@@ -9784,7 +10149,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)"/>
@@ -9820,6 +10185,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>
@@ -9832,6 +10199,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'">
@@ -9845,27 +10216,26 @@
 		<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:attribute name="margin-bottom">10pt</xsl:attribute>
-						<xsl:if test="ancestor::ogc:table[not(@class)]">
-							<xsl:attribute name="margin-bottom">1mm</xsl:attribute>
-						</xsl:if>
-						<xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
-							<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-						</xsl:if>
+					<xsl:call-template name="refine_list-item-body-style"/>
 
 					<xsl:apply-templates/>
 
@@ -10184,6 +10554,7 @@
 
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
+
 		</fo:block>
 	</xsl:template>
 
@@ -10203,6 +10574,7 @@
 
 		<fo:block id="{@id}" xsl:use-attribute-sets="references-non-normative-style">
 			<xsl:apply-templates/>
+
 		</fo:block>
 
 	</xsl:template> <!-- references -->
@@ -10781,6 +11153,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' -->
@@ -11065,6 +11440,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(.)"/>
@@ -11079,8 +11462,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>