RubyGems - metanorma-un - Versions diffs - 0.9.0 → 0.9.3 - Mend

metanorma-un 0.9.0 → 0.9.3

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

Files changed (16) hide show

checksums.yaml +4 -4
data/lib/isodoc/un/html/htmlstyle.css +6 -0
data/lib/isodoc/un/html/htmlstyle.scss +1 -0
data/lib/isodoc/un/html/unece.css +18 -12
data/lib/isodoc/un/html/unece.scss +17 -10
data/lib/isodoc/un/html/word_unece_titlepage.html +4 -4
data/lib/isodoc/un/i18n.rb +1 -1
data/lib/isodoc/un/presentation_xml_convert.rb +1 -1
data/lib/isodoc/un/un.plenary-attachment.xsl +1343 -274
data/lib/isodoc/un/un.plenary.xsl +1343 -274
data/lib/isodoc/un/un.recommendation.xsl +1340 -271
data/lib/isodoc/un/word_convert.rb +27 -21
data/lib/metanorma/un/biblio.rng +134 -39
data/lib/metanorma/un/isodoc.rng +16 -0
data/lib/metanorma/un/version.rb +1 -1
metadata +3 -3

data/lib/isodoc/un/un.plenary.xsl CHANGED Viewed

@@ -14,7 +14,7 @@
 		<contents>
 			<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
 			<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
-			<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
+			<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements' and local-name() != 'note' and local-name() != 'admonition']" mode="contents"/>
 			<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
 			<xsl:apply-templates select="/un:un-standard/un:sections/*" mode="contents"/>
@@ -289,10 +289,10 @@
 					</xsl:if>
 					<!-- Preface Pages (except Abstract, that showed in Summary on cover page`) -->
-					<xsl:if test="/un:un-standard/un:preface/*[not(local-name() = 'abstract')]">
+					<xsl:if test="/un:un-standard/un:preface/*[not(local-name() = 'abstract' or local-name() != 'note' or local-name() != 'admonition')]">
 						<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
 						<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
-						<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
+						<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements' and local-name() != 'note' and local-name() != 'admonition']"/>
 						<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
 						<fo:block break-after="page"/>
 					</xsl:if>
@@ -481,6 +481,7 @@
 	</xsl:template>
 	<xsl:template match="un:p" name="paragraph">
+		<xsl:param name="split_keep-within-line"/>
 		<fo:block margin-bottom="6pt" line-height="122%">
 			<xsl:if test="following-sibling::*">
 				<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -491,7 +492,9 @@
 					<xsl:otherwise>justify</xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>
-			<xsl:apply-templates/>
+			<xsl:apply-templates>
+				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
+			</xsl:apply-templates>
 		</fo:block>
 	</xsl:template>
@@ -679,86 +682,8 @@
 		</fo:block-container>
 	</xsl:template>
-	<!-- Examples:
-	[b-ASM]	b-ASM, http://www.eecs.umich.edu/gasm/ (accessed 20 March 2018).
-	[b-Börger & Stärk]	b-Börger & Stärk, Börger, E., and Stärk, R. S. (2003), Abstract State Machines: A Method for High-Level System Design and Analysis, Springer-Verlag.
-	-->
-	<xsl:template match="un:annex//un:bibitem">
-		<fo:block id="{@id}" margin-top="6pt" margin-left="12mm" text-indent="-12mm">
-				<xsl:if test="un:formattedref">
-					<xsl:choose>
-						<xsl:when test="un:docidentifier[@type = 'metanorma']">
-							<xsl:attribute name="margin-left">0</xsl:attribute>
-							<xsl:attribute name="text-indent">0</xsl:attribute>
-							<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-							<!-- create list -->
-							<fo:list-block>
-								<fo:list-item>
-									<fo:list-item-label end-indent="label-end()">
-										<fo:block>
-											<xsl:apply-templates select="un:docidentifier[@type = 'metanorma']" mode="process"/>
-										</fo:block>
-									</fo:list-item-label>
-									<fo:list-item-body start-indent="body-start()">
-										<fo:block margin-left="3mm">
-											<xsl:apply-templates select="un:formattedref"/>
-										</fo:block>
-									</fo:list-item-body>
-								</fo:list-item>
-							</fo:list-block>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:apply-templates select="un:formattedref"/>
-							<xsl:apply-templates select="un:docidentifier[(@type != 'metanorma' and @type != 'metanorma-ordinal') or not(@type)]" mode="process"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:if>
-				<xsl:if test="un:title">
-					<xsl:for-each select="un:contributor">
-						<xsl:value-of select="un:organization/un:name"/>
-						<xsl:if test="position() != last()">, </xsl:if>
-					</xsl:for-each>
-					<xsl:text> (</xsl:text>
-					<xsl:variable name="date">
-						<xsl:choose>
-							<xsl:when test="un:date[@type='issued']">
-								<xsl:value-of select="un:date[@type='issued']/un:on"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:value-of select="un:date/un:on"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:variable>
-					<xsl:value-of select="$date"/>
-					<xsl:text>) </xsl:text>
-					<fo:inline font-style="italic"><xsl:value-of select="un:title"/></fo:inline>
-					<xsl:if test="un:contributor[un:role/@type='publisher']/un:organization/un:name">
-						<xsl:text> (</xsl:text><xsl:value-of select="un:contributor[un:role/@type='publisher']/un:organization/un:name"/><xsl:text>)</xsl:text>
-					</xsl:if>
-					<xsl:text>, </xsl:text>
-					<xsl:value-of select="$date"/>
-					<xsl:text>. </xsl:text>
-					<xsl:value-of select="un:docidentifier"/>
-					<xsl:value-of select="$linebreak"/>
-					<xsl:value-of select="un:uri"/>
-				</xsl:if>
-		</fo:block>
-	</xsl:template>
-	<xsl:template match="un:annex//un:bibitem//un:formattedref">
-		<xsl:apply-templates/>
-	</xsl:template>
-	<xsl:template match="un:docidentifier[@type = 'metanorma' or @type = 'metanorma-ordinal']" mode="process">
-		<xsl:apply-templates/>
-	</xsl:template>
-	<xsl:template match="un:docidentifier[(@type != 'metanorma' and @type != 'metanorma-ordinal') or not(@type)]" mode="process">
-		<xsl:text> [</xsl:text><xsl:apply-templates/><xsl:text>]</xsl:text>
-	</xsl:template>
-	<xsl:template match="un:docidentifier"/>
 	<xsl:template match="un:dl" priority="2">
 		<fo:block-container margin-left="0mm">
 			<xsl:if test="parent::*[local-name() = 'note']">
@@ -833,12 +758,41 @@
 		<xsl:text>iVBORw0KGgoAAAANSUhEUgAAAJkAAAAmCAYAAADXwDkaAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA+lpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJNaWNyb3NvZnTCriBXb3JkIDIwMTYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MzM0NUVBQ0U2RUMzMTFFQUIzQjg4RDg3OEE1NEI2QzAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MzM0NUVBQ0Y2RUMzMTFFQUIzQjg4RDg3OEE1NEI2QzAiPiA8ZGM6Y3JlYXRvcj4gPHJkZjpTZXE+IDxyZGY6bGk+RGhhbmplZTwvcmRmOmxpPiA8L3JkZjpTZXE+IDwvZGM6Y3JlYXRvcj4gPGRjOnRpdGxlPiA8cmRmOkFsdD4gPHJkZjpsaSB4bWw6bGFuZz0ieC1kZWZhdWx0Ij4xODAxNzYzPC9yZGY6bGk+IDwvcmRmOkFsdD4gPC9kYzp0aXRsZT4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVm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</xsl:text>
 	</xsl:variable>
-<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:variable name="lang">
+<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:param name="table_if">false</xsl:param><xsl:param name="table_widths"/><xsl:variable name="table_widths_from_if" select="xalan:nodeset($table_widths)"/><xsl:variable name="table_widths_from_if_calculated_">
+		<xsl:for-each select="$table_widths_from_if//table">
+			<xsl:copy>
+				<xsl:copy-of select="@*"/>
+				<xsl:call-template name="calculate-column-widths-autolayout-algorithm"/>
+			</xsl:copy>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="table_widths_from_if_calculated" select="xalan:nodeset($table_widths_from_if_calculated_)"/><xsl:param name="table_if_debug">false</xsl:param><xsl:variable name="isGenerateTableIF_">
+		false
+	</xsl:variable><xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/><xsl:variable name="lang">
 		<xsl:call-template name="getLang"/>
-	</xsl:variable><xsl:variable name="pageWidth_">
-		210
+	</xsl:variable><xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/><xsl:variable name="papersize_width_">
+		<xsl:choose>
+			<xsl:when test="$papersize = 'letter'">215.9</xsl:when>
+			<xsl:when test="$papersize = 'a4'">210</xsl:when>
+		</xsl:choose>
+	</xsl:variable><xsl:variable name="papersize_width" select="normalize-space($papersize_width_)"/><xsl:variable name="papersize_height_">
+		<xsl:choose>
+			<xsl:when test="$papersize = 'letter'">279.4</xsl:when>
+			<xsl:when test="$papersize = 'a4'">297</xsl:when>
+		</xsl:choose>
+	</xsl:variable><xsl:variable name="papersize_height" select="normalize-space($papersize_height_)"/><xsl:variable name="pageWidth_">
+		<xsl:choose>
+			<xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
+			<xsl:otherwise>
+				210
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
-		297
+		<xsl:choose>
+			<xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
+			<xsl:otherwise>
+				297
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="marginLeftRight1_">
 		40
 	</xsl:variable><xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/><xsl:variable name="marginLeftRight2_">
@@ -950,7 +904,8 @@
 				<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:attribute-set name="root-style">
+	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable><xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable><xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable><xsl:attribute-set name="root-style">
@@ -967,7 +922,8 @@
-			<xsl:attribute name="font-family">Times New Roman, STIX Two Math, Source Han Sans</xsl:attribute>
+			<xsl:attribute name="font-family">Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_serif"/></xsl:attribute>
+			<xsl:attribute name="font-family-generic">Serif</xsl:attribute>
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 	</xsl:attribute-set><xsl:template name="insertRootStyle">
@@ -981,17 +937,60 @@
 		</xsl:variable>
 		<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
+		<xsl:variable name="font_family_generic" select="$root-style_/root-style/@font-family-generic"/>
 		<xsl:for-each select="$root-style_/root-style/@*">
 			<xsl:choose>
-				<xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
+				<xsl:when test="local-name() = 'font-family-generic'"><!-- skip, it's using for determine 'sans' or 'serif' --></xsl:when>
+				<xsl:when test="local-name() = 'font-family'">
+					<xsl:variable name="font_regional_prefix">
+						<xsl:choose>
+							<xsl:when test="$font_family_generic = 'Sans'">Noto Sans</xsl:when>
+							<xsl:otherwise>Noto Serif</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
 					<xsl:attribute name="{local-name()}">
-						<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
+						<xsl:variable name="font_extended">
+							<xsl:choose>
+								<xsl:when test="$lang = 'zh'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
+								<xsl:when test="$lang = 'hk'"><xsl:value-of select="$font_regional_prefix"/> HK</xsl:when>
+								<xsl:when test="$lang = 'jp'"><xsl:value-of select="$font_regional_prefix"/> JP</xsl:when>
+								<xsl:when test="$lang = 'kr'"><xsl:value-of select="$font_regional_prefix"/> KR</xsl:when>
+								<xsl:when test="$lang = 'sc'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
+								<xsl:when test="$lang = 'tc'"><xsl:value-of select="$font_regional_prefix"/> TC</xsl:when>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:if test="normalize-space($font_extended) != ''">
+							<xsl:value-of select="$font_regional_prefix"/><xsl:text>, </xsl:text>
+							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
+						</xsl:if>
+						<xsl:value-of select="."/>
+						<xsl:if test="$additional_fonts != ''">
+							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+						</xsl:if>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:copy-of select="."/>
 				</xsl:otherwise>
 			</xsl:choose>
+			<!-- <xsl:choose>
+				<xsl:when test="local-name() = 'font-family'">
+					<xsl:attribute name="{local-name()}">
+						<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
+					</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose> -->
 		</xsl:for-each>
 	</xsl:template><xsl:attribute-set name="copyright-statement-style">
@@ -1062,13 +1061,14 @@
-			<xsl:attribute name="font-family">Courier New</xsl:attribute>
+			<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -1106,6 +1106,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="example-style">
@@ -1121,6 +1122,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="example-body-style">
@@ -1140,6 +1142,7 @@
 			<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -1180,6 +1183,7 @@
 	</xsl:attribute-set><xsl:variable name="table-border_">
 	</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -1202,6 +1206,7 @@
 			<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
 			<xsl:attribute name="font-size">8pt</xsl:attribute>
@@ -1231,6 +1236,7 @@
 			<xsl:attribute name="border-top">0.5pt solid black</xsl:attribute>
@@ -1240,6 +1246,7 @@
@@ -1284,6 +1291,7 @@
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="border">solid black 1pt</xsl:attribute>
 		<xsl:attribute name="padding-left">1mm</xsl:attribute>
+		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		<xsl:attribute name="display-align">center</xsl:attribute>
@@ -1312,6 +1320,8 @@
 		<xsl:attribute name="display-align">center</xsl:attribute>
 		<xsl:attribute name="border">solid black 1pt</xsl:attribute>
 		<xsl:attribute name="padding-left">1mm</xsl:attribute>
+		<xsl:attribute name="padding-right">1mm</xsl:attribute>
@@ -1345,7 +1355,7 @@
@@ -1360,6 +1370,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="table-fn-style">
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -1368,6 +1379,8 @@
 	</xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -1383,6 +1396,7 @@
 			<xsl:attribute name="vertical-align">super</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
@@ -1406,7 +1420,8 @@
 	</xsl:attribute-set><xsl:attribute-set name="dt-row-style">
-	</xsl:attribute-set><xsl:attribute-set name="dt-style">
+	</xsl:attribute-set><xsl:attribute-set name="dt-cell-style">
+	</xsl:attribute-set><xsl:attribute-set name="dt-block-style">
 		<xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -1418,6 +1433,29 @@
+	</xsl:attribute-set><xsl:attribute-set name="dl-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="dd-cell-style">
+		<xsl:attribute name="padding-left">2mm</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
@@ -1447,6 +1485,7 @@
@@ -1514,6 +1553,8 @@
+	</xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">
 		<xsl:attribute name="margin-left">12mm</xsl:attribute>
 		<xsl:attribute name="margin-right">12mm</xsl:attribute>
@@ -1554,6 +1595,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
@@ -1598,6 +1640,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
@@ -1620,17 +1663,16 @@
 	</xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
 	</xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
+		<xsl:attribute name="width">100%</xsl:attribute>
+		<xsl:attribute name="content-height">100%</xsl:attribute>
+		<xsl:attribute name="scaling">uniform</xsl:attribute>
-			<xsl:attribute name="width">100%</xsl:attribute>
-			<xsl:attribute name="content-height">100%</xsl:attribute>
 			<xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
-			<xsl:attribute name="scaling">uniform</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="tt-style">
@@ -1708,10 +1750,29 @@
 			<xsl:attribute name="provisional-distance-between-starts">4mm</xsl:attribute>
 			<xsl:attribute name="margin-left">-8mm</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="list-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="list-item-style">
@@ -1755,6 +1816,7 @@
 			<xsl:attribute name="font-size">60%</xsl:attribute>
 			<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -1781,6 +1843,7 @@
 			<xsl:attribute name="font-size">9pt</xsl:attribute>
 			<xsl:attribute name="text-align">justify</xsl:attribute>
 			<xsl:attribute name="line-height">125%</xsl:attribute>
@@ -1805,6 +1868,7 @@
 			<xsl:attribute name="font-size">60%</xsl:attribute>
 			<xsl:attribute name="vertical-align">super</xsl:attribute>
 			<xsl:attribute name="padding-right">8mm</xsl:attribute>
@@ -1824,6 +1888,7 @@
 			<xsl:attribute name="border">0.25pt solid black</xsl:attribute>
 			<xsl:attribute name="margin-left">-3mm</xsl:attribute>
 			<xsl:attribute name="margin-right">-3mm</xsl:attribute>
@@ -1832,6 +1897,9 @@
 	</xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -1876,6 +1944,7 @@
 			<xsl:attribute name="text-align">justify</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 			<xsl:attribute name="line-height">122%</xsl:attribute>
@@ -1918,6 +1987,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-style">
@@ -1937,6 +2007,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
@@ -1963,6 +2034,7 @@
 			<xsl:attribute name="vertical-align">super</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
@@ -1983,6 +2055,7 @@
 			<xsl:attribute name="font-size">60%</xsl:attribute>
 			<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -2001,6 +2074,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
@@ -2112,13 +2186,13 @@
 	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/*[local-name()='preface']/*">
+			<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 				<node id="{@id}"/>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
-		<xsl:for-each select="/*/*[local-name()='preface']/*">
+		<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<!-- process Section's title -->
@@ -2184,7 +2258,7 @@
 			</xsl:for-each>
 		</figures>
 	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
-		<xsl:for-each select="/*/*[local-name()='preface']/*">
+		<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
@@ -2238,7 +2312,38 @@
 	</xsl:template><xsl:template match="*[local-name()='br']">
 		<xsl:value-of select="$linebreak"/>
 	</xsl:template><xsl:template match="*[local-name() = 'keep-together_within-line']">
-		<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
+		<xsl:param name="split_keep-within-line"/>
+		<!-- <fo:inline>split_keep-within-line='<xsl:value-of select="$split_keep-within-line"/>'</fo:inline> -->
+		<xsl:choose>
+			<xsl:when test="normalize-space($split_keep-within-line) = 'true'">
+				<xsl:variable name="sep">_</xsl:variable>
+				<xsl:variable name="items">
+					<xsl:call-template name="split">
+						<xsl:with-param name="pText" select="."/>
+						<xsl:with-param name="sep" select="$sep"/>
+						<xsl:with-param name="normalize-space">false</xsl:with-param>
+						<xsl:with-param name="keep_sep">true</xsl:with-param>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:for-each select="xalan:nodeset($items)/item">
+					<xsl:choose>
+						<xsl:when test=". = $sep">
+							<xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:for-each>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name()='copyright-statement']">
 		<fo:block xsl:use-attribute-sets="copyright-statement-style">
 			<xsl:apply-templates/>
@@ -2330,9 +2435,14 @@
 		<xsl:variable name="table">
-			<xsl:variable name="simple-table">
-				<xsl:call-template name="getSimpleTable"/>
+			<xsl:variable name="simple-table">
+				<xsl:call-template name="getSimpleTable">
+					<xsl:with-param name="id" select="@id"/>
+				</xsl:call-template>
 			</xsl:variable>
+			<!-- <xsl:variable name="simple-table" select="xalan:nodeset($simple-table_)"/> -->
+			<!-- simple-table=<xsl:copy-of select="$simple-table"/> -->
 			<!-- Display table's name before table as standalone block -->
@@ -2355,7 +2465,23 @@
 					</xsl:call-template>
 				</xsl:if>
 			</xsl:variable>
-			<!-- DEBUG colwidths=<xsl:copy-of select="$colwidths"/> -->
+			<!-- <xsl:variable name="colwidths" select="xalan:nodeset($colwidths_)"/> -->
+			<!-- DEBUG -->
+			<xsl:if test="$table_if_debug = 'true'">
+				<fo:block font-size="60%">
+					<xsl:apply-templates select="xalan:nodeset($colwidths)" mode="print_as_xml"/>
+				</fo:block>
+			</xsl:if>
+			<!-- <xsl:copy-of select="$colwidths"/> -->
+			<!-- <xsl:text disable-output-escaping="yes">&lt;!- -</xsl:text>
+			DEBUG
+			colwidths=<xsl:copy-of select="$colwidths"/>
+		<xsl:text disable-output-escaping="yes">- -&gt;</xsl:text> -->
 			<xsl:variable name="margin-side">
@@ -2380,6 +2506,8 @@
@@ -2424,12 +2552,22 @@
 					</xsl:element>
 				</xsl:variable>
+				<xsl:if test="$isGenerateTableIF = 'true'">
+					<!-- to determine start of table -->
+					<fo:block id="{concat('table_if_start_',@id)}" keep-with-next="always" font-size="1pt">Start table '<xsl:value-of select="@id"/>'.</fo:block>
+				</xsl:if>
 				<fo:table id="{@id}">
+					<xsl:if test="$isGenerateTableIF = 'true'">
+						<xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
+					</xsl:if>
 					<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
 						<xsl:attribute name="{local-name()}">
 							<xsl:value-of select="."/>
@@ -2443,24 +2581,47 @@
 					<xsl:choose>
-						<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
-							<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
-								<fo:table-column column-width="{@width}"/>
-							</xsl:for-each>
+						<xsl:when test="$isGenerateTableIF = 'true'">
+							<!-- generate IF for table widths -->
+							<!-- example:
+								<tr>
+									<td valign="top" align="left" id="tab-symdu_1_1">
+										<p>Symbol</p>
+										<word id="tab-symdu_1_1_word_1">Symbol</word>
+									</td>
+									<td valign="top" align="left" id="tab-symdu_1_2">
+										<p>Description</p>
+										<word id="tab-symdu_1_2_word_1">Description</word>
+									</td>
+								</tr>
+							-->
+							<xsl:apply-templates select="xalan:nodeset($simple-table)" mode="process_table-if"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:call-template name="insertTableColumnWidth">
-								<xsl:with-param name="colwidths" select="$colwidths"/>
-							</xsl:call-template>
-						</xsl:otherwise>
-					</xsl:choose>
-					<xsl:choose>
-						<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
-							<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() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer and note that renders separaterely -->
+							<xsl:choose>
+								<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
+									<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
+										<fo:table-column column-width="{@width}"/>
+									</xsl:for-each>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:call-template name="insertTableColumnWidth">
+										<xsl:with-param name="colwidths" select="$colwidths"/>
+									</xsl:call-template>
+								</xsl:otherwise>
+							</xsl:choose>
+							<xsl:choose>
+								<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
+									<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() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer and note that renders separaterely -->
+								</xsl:otherwise>
+							</xsl:choose>
 						</xsl:otherwise>
 					</xsl:choose>
@@ -2535,23 +2696,29 @@
 	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
-			<fo:block xsl:use-attribute-sets="table-name-style">
-				<xsl:choose>
-					<xsl:when test="$continued = 'true'">
+					<fo:block xsl:use-attribute-sets="table-name-style">
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:apply-templates/>
-					</xsl:otherwise>
-				</xsl:choose>
+						<xsl:choose>
+							<xsl:when test="$continued = 'true'">
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</fo:block>
-			</fo:block>
 		</xsl:if>
 	</xsl:template><xsl:template name="calculate-columns-numbers">
 		<xsl:param name="table-row"/>
@@ -2560,11 +2727,22 @@
 		<xsl:variable name="columns-with-colspan" select="count($table-row/*[@colspan])"/>
 		<xsl:value-of select="$columns-count + $sum-colspans - $columns-with-colspan"/>
 	</xsl:template><xsl:template name="calculate-column-widths">
+		<xsl:param name="table"/>
+		<xsl:param name="cols-count"/>
+				<xsl:call-template name="calculate-column-widths-proportional">
+					<xsl:with-param name="cols-count" select="$cols-count"/>
+					<xsl:with-param name="table" select="$table"/>
+				</xsl:call-template>
+	</xsl:template><xsl:template name="calculate-column-widths-proportional">
 		<xsl:param name="table"/>
 		<xsl:param name="cols-count"/>
 		<xsl:param name="curr-col" select="1"/>
 		<xsl:param name="width" select="0"/>
+		<!-- table=<xsl:copy-of select="$table"/> -->
 		<xsl:if test="$curr-col &lt;= $cols-count">
 			<xsl:variable name="widths">
 				<xsl:choose>
@@ -2602,10 +2780,15 @@
 						</xsl:for-each>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:for-each select="xalan:nodeset($table)/*/tr">
+						<!-- <curr_col><xsl:value-of select="$curr-col"/></curr_col> -->
+						<!-- <table><xsl:copy-of select="$table"/></table>
+						 -->
+						<xsl:for-each select="xalan:nodeset($table)/*/*[local-name()='tr']">
 							<xsl:variable name="td_text">
 								<xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
 							</xsl:variable>
+							<!-- <td_text><xsl:value-of select="$td_text"/></td_text> -->
 							<xsl:variable name="words">
 								<xsl:variable name="string_with_added_zerospaces">
 									<xsl:call-template name="add-zero-spaces-java">
@@ -2620,6 +2803,7 @@
 									<xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '', '  '))"/> <!-- replace zero-width-space and soft-hyphen to space -->
 								</xsl:call-template>
 							</xsl:variable>
+							<!-- words=<xsl:copy-of select="$words"/> -->
 							<xsl:variable name="max_length">
 								<xsl:call-template name="max_length">
 									<xsl:with-param name="words" select="xalan:nodeset($words)"/>
@@ -2644,6 +2828,8 @@
 				</xsl:choose>
 			</xsl:variable>
+			<!-- widths=<xsl:copy-of select="$widths"/> -->
 			<column>
 				<xsl:for-each select="xalan:nodeset($widths)//width">
 					<xsl:sort select="." data-type="number" order="descending"/>
@@ -2652,33 +2838,271 @@
 					</xsl:if>
 				</xsl:for-each>
 			</column>
-			<xsl:call-template name="calculate-column-widths">
+			<xsl:call-template name="calculate-column-widths-proportional">
 				<xsl:with-param name="cols-count" select="$cols-count"/>
 				<xsl:with-param name="curr-col" select="$curr-col +1"/>
 				<xsl:with-param name="table" select="$table"/>
 			</xsl:call-template>
 		</xsl:if>
-	</xsl:template><xsl:template match="*[@keep-together.within-line]/text()" priority="2" mode="td_text">
+	</xsl:template><xsl:template match="*[@keep-together.within-line or local-name() = 'keep-together_within-line']/text()" priority="2" mode="td_text">
 		<!-- <xsl:message>DEBUG t1=<xsl:value-of select="."/></xsl:message>
 		<xsl:message>DEBUG t2=<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'.','X')"/></xsl:message> -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'.','X')"/>
+		<!-- if all capitals english letters or digits -->
+		<xsl:if test="normalize-space(translate(., concat($upper,'0123456789'), '')) = ''">
+			<xsl:call-template name="repeat">
+				<xsl:with-param name="char" select="'X'"/>
+				<xsl:with-param name="count" select="string-length(normalize-space(.)) * 0.5"/>
+			</xsl:call-template>
+		</xsl:if>
 	</xsl:template><xsl:template match="text()" mode="td_text">
 		<xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name()='termsource']" mode="td_text">
 		<xsl:value-of select="*[local-name()='origin']/@citeas"/>
 	</xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
 		<xsl:value-of select="@target"/>
-	</xsl:template><xsl:template match="*[local-name()='math']" mode="td_text">
-		<xsl:variable name="mathml">
-			<xsl:for-each select="*">
-				<xsl:if test="local-name() != 'unit' and local-name() != 'prefix' and local-name() != 'dimension' and local-name() != 'quantity'">
-					<xsl:copy-of select="."/>
-				</xsl:if>
+	</xsl:template><xsl:template match="*[local-name()='math']" mode="td_text" name="math_length">
+		<xsl:if test="$isGenerateTableIF = 'false'">
+			<xsl:variable name="mathml_">
+				<xsl:for-each select="*">
+					<xsl:if test="local-name() != 'unit' and local-name() != 'prefix' and local-name() != 'dimension' and local-name() != 'quantity'">
+						<xsl:copy-of select="."/>
+					</xsl:if>
+				</xsl:for-each>
+			</xsl:variable>
+			<xsl:variable name="mathml" select="xalan:nodeset($mathml_)"/>
+			<xsl:variable name="math_text">
+				<xsl:value-of select="normalize-space($mathml)"/>
+				<xsl:for-each select="$mathml//@open"><xsl:value-of select="."/></xsl:for-each>
+				<xsl:for-each select="$mathml//@close"><xsl:value-of select="."/></xsl:for-each>
+			</xsl:variable>
+			<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
+		</xsl:if>
+	</xsl:template><xsl:template name="calculate-column-widths-autolayout-algorithm">
+		<xsl:param name="parent_table_page-width"/> <!-- for nested tables, in re-calculate step -->
+		<!-- via intermediate format -->
+		<!-- The algorithm uses two passes through the table data and scales linearly with the size of the table -->
+		<!-- In the first pass, line wrapping is disabled, and the user agent keeps track of the minimum and maximum width of each cell. -->
+		<!-- Since line wrap has been disabled, paragraphs are treated as long lines unless broken by BR elements. -->
+		<!-- get current table id -->
+		<xsl:variable name="table_id" select="@id"/>
+		<!-- find table by id in the file 'table_widths' -->
+	<!-- 	<xsl:variable name="table-if_" select="$table_widths_from_if//table[@id = $table_id]"/>
+		<xsl:variable name="table-if" select="xalan:nodeset($table-if_)"/> -->
+		<!-- table='<xsl:copy-of select="$table"/>' -->
+		<!-- table_id='<xsl:value-of select="$table_id"/>\ -->
+		<!-- table-if='<xsl:copy-of select="$table-if"/>' -->
+		<!-- table_widths_from_if='<xsl:copy-of select="$table_widths_from_if"/>' -->
+		<xsl:variable name="table_with_cell_widths_">
+			<xsl:apply-templates select="." mode="determine_cell_widths-if"/> <!-- read column's width from IF -->
+		</xsl:variable>
+		<xsl:variable name="table_with_cell_widths" select="xalan:nodeset($table_with_cell_widths_)"/>
+		<!-- <xsl:if test="$table_if_debug = 'true'">
+			<xsl:copy-of select="$table_with_cell_widths"/>
+		</xsl:if> -->
+		<!-- The minimum and maximum cell widths are then used to determine the corresponding minimum and maximum widths for the columns. -->
+		<xsl:variable name="column_widths_">
+			<!-- iteration of columns -->
+			<xsl:for-each select="$table_with_cell_widths//tr[1]/td">
+				<xsl:variable name="pos" select="position()"/>
+				<column>
+					<xsl:attribute name="width_max">
+						<xsl:for-each select="ancestor::tbody//tr/td[$pos]/@width_max">
+							<xsl:sort select="." data-type="number" order="descending"/>
+							<xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
+						</xsl:for-each>
+					</xsl:attribute>
+					<xsl:attribute name="width_min">
+						<xsl:for-each select="ancestor::tbody//tr/td[$pos]/@width_min">
+							<xsl:sort select="." data-type="number" order="descending"/>
+							<xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
+						</xsl:for-each>
+					</xsl:attribute>
+				</column>
 			</xsl:for-each>
 		</xsl:variable>
+		<xsl:variable name="column_widths" select="xalan:nodeset($column_widths_)"/>
+		<!-- <column_widths>
+			<xsl:copy-of select="$column_widths"/>
+		</column_widths> -->
+		<!-- These in turn, are used to find the minimum and maximum width for the table. -->
+		<xsl:variable name="table_widths_">
+			<table>
+				<xsl:attribute name="width_max">
+					<xsl:value-of select="sum($column_widths/column/@width_max)"/>
+				</xsl:attribute>
+				<xsl:attribute name="width_min">
+					<xsl:value-of select="sum($column_widths/column/@width_min)"/>
+				</xsl:attribute>
+			</table>
+		</xsl:variable>
+		<xsl:variable name="table_widths" select="xalan:nodeset($table_widths_)"/>
+		<xsl:variable name="page_width">
+			<xsl:choose>
+				<xsl:when test="$parent_table_page-width != ''">
+					<xsl:value-of select="$parent_table_page-width"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="@page-width"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:if test="$table_if_debug = 'true'">
+			<table_width>
+				<xsl:copy-of select="$table_widths"/>
+			</table_width>
+			<debug>$page_width=<xsl:value-of select="$page_width"/></debug>
+		</xsl:if>
-		<xsl:variable name="math_text" select="normalize-space(xalan:nodeset($mathml))"/>
-		<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
+		<!-- There are three cases: -->
+		<xsl:choose>
+			<!-- 1. The minimum table width is equal to or wider than the available space -->
+			<xsl:when test="$table_widths/table/@width_min &gt;= $page_width and 1 = 2"> <!-- this condition isn't working see case 3 below -->
+				<!-- call old algorithm -->
+				<case1/>
+				<!-- <xsl:variable name="cols-count" select="count(xalan:nodeset($table)/*/tr[1]/td)"/>
+				<xsl:call-template name="calculate-column-widths-proportional">
+					<xsl:with-param name="cols-count" select="$cols-count"/>
+					<xsl:with-param name="table" select="$table"/>
+				</xsl:call-template> -->
+			</xsl:when>
+			<!-- 2. The maximum table width fits within the available space. In this case, set the columns to their maximum widths. -->
+			<xsl:when test="$table_widths/table/@width_max &lt;= $page_width">
+				<case2/>
+				<autolayout/>
+				<xsl:for-each select="$column_widths/column/@width_max">
+					<column divider="100"><xsl:value-of select="."/></column>
+				</xsl:for-each>
+			</xsl:when>
+			<!-- 3. The maximum width of the table is greater than the available space, but the minimum table width is smaller.
+			In this case, find the difference between the available space and the minimum table width, lets call it W.
+			Lets also call D the difference between maximum and minimum width of the table.
+			For each column, let d be the difference between maximum and minimum width of that column.
+			Now set the column's width to the minimum width plus d times W over D.
+			This makes columns with large differences between minimum and maximum widths wider than columns with smaller differences. -->
+			<xsl:when test="($table_widths/table/@width_max &gt; $page_width and $table_widths/table/@width_min &lt; $page_width) or ($table_widths/table/@width_min &gt;= $page_width)">
+				<!-- difference between the available space and the minimum table width -->
+				<xsl:variable name="W" select="$page_width - $table_widths/table/@width_min"/>
+				<W><xsl:value-of select="$W"/></W>
+				<!-- difference between maximum and minimum width of the table -->
+				<xsl:variable name="D" select="$table_widths/table/@width_max - $table_widths/table/@width_min"/>
+				<D><xsl:value-of select="$D"/></D>
+				<case3/>
+				<autolayout/>
+				<xsl:if test="$table_widths/table/@width_min &gt;= $page_width">
+					<split_keep-within-line>true</split_keep-within-line>
+				</xsl:if>
+				<xsl:for-each select="$column_widths/column">
+					<!-- difference between maximum and minimum width of that column.  -->
+					<xsl:variable name="d" select="@width_max - @width_min"/>
+					<d><xsl:value-of select="$d"/></d>
+					<width_min><xsl:value-of select="@width_min"/></width_min>
+					<e><xsl:value-of select="$d * $W div $D"/></e>
+					<!-- set the column's width to the minimum width plus d times W over D.  -->
+					<column divider="100">
+						<xsl:value-of select="round(@width_min + $d * $W div $D)"/> <!--  * 10 -->
+					</column>
+				</xsl:for-each>
+			</xsl:when>
+			<xsl:otherwise><unknown_case/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="get-calculated-column-widths-autolayout-algorithm">
+		<!-- if nested 'dl' or 'table' -->
+		<xsl:variable name="parent_table_id" select="normalize-space(ancestor::*[local-name() = 'table' or local-name() = 'dl'][1]/@id)"/>
+		<parent_table_id><xsl:value-of select="$parent_table_id"/></parent_table_id>
+		<parent_element><xsl:value-of select="local-name(..)"/></parent_element>
+		<xsl:variable name="parent_table_page-width_">
+			<xsl:if test="$parent_table_id != ''">
+				<!-- determine column number in the parent table -->
+				<xsl:variable name="parent_table_column_number">
+					<xsl:choose>
+						<xsl:when test="parent::*[local-name() = 'dd']">2</xsl:when>
+						<xsl:otherwise> <!-- parent is table -->
+							<xsl:value-of select="count(ancestor::*[local-name() = 'td'][1]/preceding-sibling::*[local-name() = 'td']) + 1"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<!-- find table by id in the file 'table_widths' and get all Nth `<column>...</column> -->
+				<xsl:value-of select="$table_widths_from_if_calculated//table[@id = $parent_table_id]/column[number($parent_table_column_number)]"/>
+			</xsl:if>
+		</xsl:variable>
+		<xsl:variable name="parent_table_page-width" select="normalize-space($parent_table_page-width_)"/>
+		<!-- get current table id -->
+		<xsl:variable name="table_id" select="@id"/>
+		<xsl:choose>
+			<xsl:when test="$parent_table_id = '' or $parent_table_page-width = ''">
+				<!-- find table by id in the file 'table_widths' and get all `<column>...</column> -->
+				<xsl:copy-of select="$table_widths_from_if_calculated//table[@id = $table_id]/node()"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<!-- recalculate columns width based on parent table width -->
+				<xsl:for-each select="$table_widths_from_if//table[@id = $table_id]">
+					<xsl:call-template name="calculate-column-widths-autolayout-algorithm">
+						<xsl:with-param name="parent_table_page-width" select="$parent_table_page-width"/> <!-- padding-left = 2mm  = 50000-->
+					</xsl:call-template>
+				</xsl:for-each>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="@*|node()" mode="determine_cell_widths-if">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="determine_cell_widths-if"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="td | th" mode="determine_cell_widths-if">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			 <!-- The maximum width is given by the widest line.  -->
+			<xsl:attribute name="width_max">
+				<xsl:for-each select="p_len">
+					<xsl:sort select="." data-type="number" order="descending"/>
+					<xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
+				</xsl:for-each>
+			</xsl:attribute>
+			<!-- The minimum width is given by the widest text element (word, image, etc.) -->
+			<xsl:variable name="width_min">
+				<xsl:for-each select="word_len">
+					<xsl:sort select="." data-type="number" order="descending"/>
+					<xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
+				</xsl:for-each>
+			</xsl:variable>
+			<xsl:attribute name="width_min">
+				<xsl:value-of select="$width_min"/>
+			</xsl:attribute>
+			<xsl:if test="$width_min = 0">
+				<xsl:attribute name="width_min">1</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates select="node()" mode="determine_cell_widths-if"/>
+		</xsl:copy>
 	</xsl:template><xsl:template match="*[local-name()='thead']">
 		<xsl:param name="cols-count"/>
 		<fo:table-header>
@@ -2692,12 +3116,18 @@
 		<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:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
-					<xsl:with-param name="continued">true</xsl:with-param>
-				</xsl:apply-templates>
+						<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
+							<xsl:with-param name="continued">true</xsl:with-param>
+						</xsl:apply-templates>
 			</fo:table-cell>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -2763,6 +3193,7 @@
 						</xsl:for-each>
 					</xsl:when>
 					<xsl:otherwise>
+						<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
 						<xsl:call-template name="insertTableColumnWidth">
 							<xsl:with-param name="colwidths" select="$colwidths"/>
 						</xsl:call-template>
@@ -2797,7 +3228,10 @@
 							<!-- fn processing -->
-							<xsl:call-template name="table_fn_display"/>
+									<xsl:call-template name="table_fn_display"/>
 							<!-- for PAS display Notes after footnotes -->
@@ -2807,6 +3241,9 @@
 				</fo:table-body>
 			</fo:table>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='tbody']">
@@ -2842,6 +3279,52 @@
 		</fo:table-body>
+	</xsl:template><xsl:template match="/" mode="process_table-if">
+		<xsl:param name="table_or_dl">table</xsl:param>
+		<xsl:apply-templates mode="process_table-if">
+			<xsl:with-param name="table_or_dl" select="$table_or_dl"/>
+		</xsl:apply-templates>
+	</xsl:template><xsl:template match="*[local-name()='tbody']" mode="process_table-if">
+		<xsl:param name="table_or_dl">table</xsl:param>
+		<fo:table-body>
+			<xsl:for-each select="*[local-name() = 'tr']">
+				<xsl:variable name="col_count" select="count(*)"/>
+				<!-- iteration for each tr/td -->
+				<xsl:choose>
+					<xsl:when test="$table_or_dl = 'table'">
+						<xsl:for-each select="*[local-name() = 'td' or local-name() = 'th']/*">
+							<fo:table-row number-columns-spanned="{$col_count}">
+								<!-- <test_table><xsl:copy-of select="."/></test_table> -->
+								<xsl:call-template name="td"/>
+							</fo:table-row>
+						</xsl:for-each>
+					</xsl:when>
+					<xsl:otherwise> <!-- $table_or_dl = 'dl' -->
+						<xsl:for-each select="*[local-name() = 'td' or local-name() = 'th']">
+							<xsl:variable name="is_dt" select="position() = 1"/>
+							<xsl:for-each select="*">
+								<!-- <test><xsl:copy-of select="."/></test> -->
+								<fo:table-row number-columns-spanned="{$col_count}">
+									<xsl:choose>
+										<xsl:when test="$is_dt">
+											<xsl:call-template name="insert_dt_cell"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:call-template name="insert_dd_cell"/>
+										</xsl:otherwise>
+									</xsl:choose>
+								</fo:table-row>
+							</xsl:for-each>
+						</xsl:for-each>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:for-each>
+		</fo:table-body>
 	</xsl:template><xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2">
 		<fo:table-row xsl:use-attribute-sets="table-header-row-style">
@@ -2849,6 +3332,9 @@
 			<xsl:call-template name="setTableRowAttributes"/>
@@ -2868,6 +3354,8 @@
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -2932,7 +3420,7 @@
 				</xsl:choose>
 			</xsl:attribute>
 		</xsl:if>
-	</xsl:template><xsl:template match="*[local-name()='td']">
+	</xsl:template><xsl:template match="*[local-name()='td']" name="td">
 		<fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" -->
 			<xsl:call-template name="setTextAlignment">
 				<xsl:with-param name="default">left</xsl:with-param>
@@ -2953,6 +3441,8 @@
@@ -2966,11 +3456,24 @@
 			<xsl:call-template name="setTableCellAttributes"/>
+			<xsl:if test="$isGenerateTableIF = 'true'">
+				<xsl:attribute name="border">1pt solid black</xsl:attribute> <!-- border is mandatory, to determine page width -->
+				<xsl:attribute name="text-align">left</xsl:attribute>
+			</xsl:if>
 			<fo:block>
+				<xsl:if test="$isGenerateTableIF = 'true'">
+					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+				</xsl:if>
 				<xsl:apply-templates/>
+				<xsl:if test="$isGenerateTableIF = 'true'"><fo:inline id="{@id}_end">end</fo:inline></xsl:if> <!-- to determine width of text --> <!-- <xsl:value-of select="$hair_space"/> -->
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
@@ -3015,7 +3518,11 @@
 		<xsl:variable name="gen_id" select="generate-id(.)"/>
 		<xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
-		<xsl:variable name="reference" select="@reference"/>
+		<xsl:variable name="reference_">
+			<xsl:value-of select="@reference"/>
+			<xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
+		</xsl:variable>
+		<xsl:variable name="reference" select="normalize-space($reference_)"/>
 		<!-- fn sequence number in document -->
 		<xsl:variable name="current_fn_number">
 			<xsl:choose>
@@ -3090,7 +3597,7 @@
 						<xsl:copy-of select="node()"/>
 					</fn>
 				</xsl:for-each>
-				<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
+				<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='boilerplate']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
 					<xsl:sort select="@displayorder" data-type="number"/>
 					<xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] |      .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
 						<!-- copy unique fn -->
@@ -3171,9 +3678,9 @@
 			<!-- current hierarchy is 'figure' element -->
 			<xsl:variable name="following_dl_colwidths">
 				<xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
-					<xsl:variable name="html-table">
-						<xsl:variable name="doc_ns">
+					<xsl:variable name="simple-table">
+						<!-- <xsl:variable name="doc_ns">
+							<xsl:if test="$namespace = 'bipm'">bipm</xsl:if>
 						</xsl:variable>
 						<xsl:variable name="ns">
 							<xsl:choose>
@@ -3184,7 +3691,7 @@
 									<xsl:value-of select="substring-before(name(/*), '-')"/>
 								</xsl:otherwise>
 							</xsl:choose>
-						</xsl:variable>
+						</xsl:variable> -->
 						<xsl:for-each select="*[local-name() = 'dl'][1]">
 							<tbody>
@@ -3195,7 +3702,7 @@
 					<xsl:call-template name="calculate-column-widths">
 						<xsl:with-param name="cols-count" select="2"/>
-						<xsl:with-param name="table" select="$html-table"/>
+						<xsl:with-param name="table" select="$simple-table"/>
 					</xsl:call-template>
 				</xsl:if>
@@ -3370,12 +3877,31 @@
+						<xsl:if test="ancestor::*[local-name() = 'dd' or local-name() = 'td']">
+							<xsl:attribute name="margin-top">0</xsl:attribute>
+						</xsl:if>
 						<fo:block>
+							<xsl:apply-templates select="*[local-name() = 'name']">
+								<xsl:with-param name="process">true</xsl:with-param>
+							</xsl:apply-templates>
+							<xsl:if test="$isGenerateTableIF = 'true'">
+								<!-- to determine start of table -->
+								<fo:block id="{concat('table_if_start_',@id)}" keep-with-next="always" font-size="1pt">Start table '<xsl:value-of select="@id"/>'.</fo:block>
+							</xsl:if>
 							<fo:table width="95%" table-layout="fixed">
+								<xsl:if test="$isGenerateTableIF = 'true'">
+									<xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
+								</xsl:if>
 								<xsl:choose>
 									<xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
@@ -3384,69 +3910,173 @@
 									</xsl:when>
 								</xsl:choose>
-								<!-- create virtual html table for dl/[dt and dd] -->
-								<xsl:variable name="html-table">
-									<xsl:variable name="doc_ns">
+								<xsl:choose>
+									<xsl:when test="$isGenerateTableIF = 'true'">
+										<!-- generate IF for table widths -->
+										<!-- example:
+											<tr>
+												<td valign="top" align="left" id="tab-symdu_1_1">
+													<p>Symbol</p>
+													<word id="tab-symdu_1_1_word_1">Symbol</word>
+												</td>
+												<td valign="top" align="left" id="tab-symdu_1_2">
+													<p>Description</p>
+													<word id="tab-symdu_1_2_word_1">Description</word>
+												</td>
+											</tr>
+										-->
-									</xsl:variable>
-									<xsl:variable name="ns">
-										<xsl:choose>
-											<xsl:when test="normalize-space($doc_ns)  != ''">
-												<xsl:value-of select="normalize-space($doc_ns)"/>
-											</xsl:when>
-											<xsl:otherwise>
-												<xsl:value-of select="substring-before(name(/*), '-')"/>
-											</xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
-									<tbody>
-										<xsl:apply-templates mode="dl"/>
-									</tbody>
-								</xsl:variable>
-								<!-- DEBUG: html-table<xsl:copy-of select="$html-table"/> -->
-								<xsl:variable name="colwidths">
-									<xsl:call-template name="calculate-column-widths">
-										<xsl:with-param name="cols-count" select="2"/>
-										<xsl:with-param name="table" select="$html-table"/>
-									</xsl:call-template>
-								</xsl:variable>
-								<!-- DEBUG: colwidths=<xsl:copy-of select="$colwidths"/> -->
-								<xsl:variable name="maxlength_dt">
-									<xsl:call-template name="getMaxLength_dt"/>
-								</xsl:variable>
-								<xsl:variable name="isContainsKeepTogetherTag_">
-									false
-								</xsl:variable>
-								<xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/>
-								<!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
-								<xsl:call-template name="setColumnWidth_dl">
-									<xsl:with-param name="colwidths" select="$colwidths"/>
-									<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
-									<xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
-								</xsl:call-template>
+										<!-- create virtual html table for dl/[dt and dd] -->
+										<xsl:variable name="simple-table">
+											<xsl:variable name="dl_table">
+												<tbody>
+													<xsl:apply-templates mode="dl_if">
+														<xsl:with-param name="id" select="@id"/>
+													</xsl:apply-templates>
+												</tbody>
+											</xsl:variable>
+											<!-- dl_table='<xsl:copy-of select="$dl_table"/>' -->
+											<!-- Step: replace <br/> to <p>...</p> -->
+											<xsl:variable name="table_without_br">
+												<xsl:apply-templates select="xalan:nodeset($dl_table)" mode="table-without-br"/>
+											</xsl:variable>
+											<!-- table_without_br='<xsl:copy-of select="$table_without_br"/>' -->
+											<!-- Step: add id to each cell -->
+											<!-- add <word>...</word> for each word, image, math -->
+											<xsl:variable name="simple-table-id">
+												<xsl:apply-templates select="xalan:nodeset($table_without_br)" mode="simple-table-id">
+													<xsl:with-param name="id" select="@id"/>
+												</xsl:apply-templates>
+											</xsl:variable>
+											<!-- simple-table-id='<xsl:copy-of select="$simple-table-id"/>' -->
+											<xsl:copy-of select="xalan:nodeset($simple-table-id)"/>
+										</xsl:variable>
+										<!-- DEBUG: simple-table<xsl:copy-of select="$simple-table"/> -->
+										<xsl:apply-templates select="xalan:nodeset($simple-table)" mode="process_table-if">
+											<xsl:with-param name="table_or_dl">dl</xsl:with-param>
+										</xsl:apply-templates>
+									</xsl:when>
+									<xsl:otherwise>
-								<fo:table-body>
-									<xsl:apply-templates>
-										<xsl:with-param name="key_iso" select="normalize-space($key_iso)"/>
-									</xsl:apply-templates>
-								</fo:table-body>
+										<xsl:variable name="simple-table">
+											<xsl:variable name="dl_table">
+												<tbody>
+													<xsl:apply-templates mode="dl">
+														<xsl:with-param name="id" select="@id"/>
+													</xsl:apply-templates>
+												</tbody>
+											</xsl:variable>
+											<xsl:copy-of select="$dl_table"/>
+										</xsl:variable>
+										<xsl:variable name="colwidths">
+											<xsl:call-template name="calculate-column-widths">
+												<xsl:with-param name="cols-count" select="2"/>
+												<xsl:with-param name="table" select="$simple-table"/>
+											</xsl:call-template>
+										</xsl:variable>
+										<!-- <xsl:text disable-output-escaping="yes">&lt;!- -</xsl:text>
+											DEBUG
+											colwidths=<xsl:copy-of select="$colwidths"/>
+										<xsl:text disable-output-escaping="yes">- -&gt;</xsl:text> -->
+										<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
+										<xsl:variable name="maxlength_dt">
+											<xsl:call-template name="getMaxLength_dt"/>
+										</xsl:variable>
+										<xsl:variable name="isContainsKeepTogetherTag_">
+											false
+										</xsl:variable>
+										<xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/>
+										<!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
+										<xsl:call-template name="setColumnWidth_dl">
+											<xsl:with-param name="colwidths" select="$colwidths"/>
+											<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
+											<xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
+										</xsl:call-template>
+										<fo:table-body>
+											<!-- DEBUG -->
+											<xsl:if test="$table_if_debug = 'true'">
+												<fo:table-row>
+													<fo:table-cell number-columns-spanned="2" font-size="60%">
+														<xsl:apply-templates select="xalan:nodeset($colwidths)" mode="print_as_xml"/>
+													</fo:table-cell>
+												</fo:table-row>
+											</xsl:if>
+											<xsl:apply-templates>
+												<xsl:with-param name="key_iso" select="normalize-space($key_iso)"/>
+												<xsl:with-param name="split_keep-within-line" select="xalan:nodeset($colwidths)/split_keep-within-line"/>
+											</xsl:apply-templates>
+										</fo:table-body>
+									</xsl:otherwise>
+								</xsl:choose>
 							</fo:table>
 						</fo:block>
 					</fo:block>
 				</xsl:if> <!-- END: a few components -->
 			</fo:block-container>
 		</fo:block-container>
+		<xsl:if test="$isGenerateTableIF = 'true'"> <!-- process nested 'dl' -->
+			<xsl:apply-templates select="*[local-name() = 'dd']/*[local-name() = 'dl']"/>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'dl']/*[local-name() = 'name']">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:block xsl:use-attribute-sets="dl-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
 	</xsl:template><xsl:template name="setColumnWidth_dl">
 		<xsl:param name="colwidths"/>
 		<xsl:param name="maxlength_dt"/>
 		<xsl:param name="isContainsKeepTogetherTag"/>
+		<!-- <colwidths><xsl:copy-of select="$colwidths"/></colwidths> -->
 		<xsl:choose>
+			<xsl:when test="xalan:nodeset($colwidths)/autolayout">
+				<xsl:call-template name="insertTableColumnWidth">
+					<xsl:with-param name="colwidths" select="$colwidths"/>
+				</xsl:call-template>
+			</xsl:when>
 			<xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
 				<fo:table-column column-width="50%"/>
 				<fo:table-column column-width="50%"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:choose>
+					<xsl:when test="xalan:nodeset($colwidths)/autolayout">
+						<xsl:call-template name="insertTableColumnWidth">
+							<xsl:with-param name="colwidths" select="$colwidths"/>
+						</xsl:call-template>
+					</xsl:when>
 					<xsl:when test="$isContainsKeepTogetherTag">
 						<xsl:call-template name="insertTableColumnWidth">
 							<xsl:with-param name="colwidths" select="$colwidths"/>
@@ -3491,13 +4121,19 @@
 		</xsl:choose>
 	</xsl:template><xsl:template name="insertTableColumnWidth">
 		<xsl:param name="colwidths"/>
 		<xsl:for-each select="xalan:nodeset($colwidths)//column">
 			<xsl:choose>
 				<xsl:when test=". = 1 or . = 0">
 					<fo:table-column column-width="proportional-column-width(2)"/>
 				</xsl:when>
 				<xsl:otherwise>
-					<fo:table-column column-width="proportional-column-width({.})"/>
+					<!-- <fo:table-column column-width="proportional-column-width({.})"/> -->
+					<xsl:variable name="divider">
+						<xsl:value-of select="@divider"/>
+						<xsl:if test="not(@divider)">1</xsl:if>
+					</xsl:variable>
+					<fo:table-column column-width="proportional-column-width({round(. div $divider)})"/>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:for-each>
@@ -3559,65 +4195,157 @@
 			</fo:table-cell>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='dt']" mode="dl">
+		<xsl:param name="id"/>
+		<xsl:variable name="row_number" select="count(preceding-sibling::*[local-name()='dt']) + 1"/>
 		<tr>
 			<td>
+				<xsl:attribute name="id">
+					<xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
+				</xsl:attribute>
 				<xsl:apply-templates/>
 			</td>
 			<td>
+				<xsl:attribute name="id">
+					<xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
+				</xsl:attribute>
+						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
+							<xsl:with-param name="process">true</xsl:with-param>
+						</xsl:apply-templates>
+			</td>
+		</tr>
+	</xsl:template><xsl:template match="*[local-name()='dt']">
+		<xsl:param name="key_iso"/>
+		<xsl:param name="split_keep-within-line"/>
+		<fo:table-row xsl:use-attribute-sets="dt-row-style">
+			<xsl:call-template name="insert_dt_cell">
+				<xsl:with-param name="key_iso" select="$key_iso"/>
+				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
+			</xsl:call-template>
+			<xsl:for-each select="following-sibling::*[local-name()='dd'][1]">
+				<xsl:call-template name="insert_dd_cell">
+					<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
+				</xsl:call-template>
+			</xsl:for-each>
+		</fo:table-row>
+	</xsl:template><xsl:template name="insert_dt_cell">
+		<xsl:param name="key_iso"/>
+		<xsl:param name="split_keep-within-line"/>
+		<fo:table-cell xsl:use-attribute-sets="dt-cell-style">
+			<xsl:if test="$isGenerateTableIF = 'true'">
+				<!-- border is mandatory, to calculate real width -->
+				<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
+				<xsl:attribute name="text-align">left</xsl:attribute>
+			</xsl:if>
+			<fo:block xsl:use-attribute-sets="dt-block-style">
+				<xsl:copy-of select="@id"/>
+				<xsl:if test="normalize-space($key_iso) = 'true'">
+					<xsl:attribute name="margin-top">0</xsl:attribute>
+				</xsl:if>
+				<xsl:apply-templates>
+					<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
+				</xsl:apply-templates>
-						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
-							<xsl:with-param name="process">true</xsl:with-param>
-						</xsl:apply-templates>
-			</td>
-		</tr>
+				<xsl:if test="$isGenerateTableIF = 'true'"><fo:inline id="{@id}_end">end</fo:inline></xsl:if> <!-- to determine width of text --> <!-- <xsl:value-of select="$hair_space"/> -->
+			</fo:block>
+		</fo:table-cell>
+	</xsl:template><xsl:template name="insert_dd_cell">
+		<xsl:param name="split_keep-within-line"/>
+		<fo:table-cell xsl:use-attribute-sets="dd-cell-style">
-	</xsl:template><xsl:template match="*[local-name()='dt']">
-		<xsl:param name="key_iso"/>
+			<xsl:if test="$isGenerateTableIF = 'true'">
+				<!-- border is mandatory, to calculate real width -->
+				<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
+			</xsl:if>
-		<fo:table-row xsl:use-attribute-sets="dt-row-style">
-			<fo:table-cell>
+			<fo:block>
+				<xsl:if test="$isGenerateTableIF = 'true'">
+					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+				</xsl:if>
-				<fo:block xsl:use-attribute-sets="dt-style">
-					<xsl:copy-of select="@id"/>
-					<xsl:if test="normalize-space($key_iso) = 'true'">
-						<xsl:attribute name="margin-top">0</xsl:attribute>
-					</xsl:if>
-					<xsl:apply-templates/>
-				</fo:block>
-			</fo:table-cell>
-			<fo:table-cell>
-				<fo:block>
-					<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
-						<xsl:with-param name="process">true</xsl:with-param>
-					</xsl:apply-templates>
-				</fo:block>
-			</fo:table-cell>
-		</fo:table-row>
+				<xsl:choose>
+					<xsl:when test="$isGenerateTableIF = 'true'">
+						<xsl:apply-templates> <!-- following-sibling::*[local-name()='dd'][1] -->
+							<xsl:with-param name="process">true</xsl:with-param>
+						</xsl:apply-templates>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="."> <!-- following-sibling::*[local-name()='dd'][1] -->
+							<xsl:with-param name="process">true</xsl:with-param>
+							<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
+						</xsl:apply-templates>
+					</xsl:otherwise>
+				</xsl:choose>
+				<xsl:if test="$isGenerateTableIF = 'true'"><fo:inline id="{@id}_end">end</fo:inline></xsl:if> <!-- to determine width of text --> <!-- <xsl:value-of select="$hair_space"/> -->
+			</fo:block>
+		</fo:table-cell>
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']">
 		<xsl:param name="process">false</xsl:param>
+		<xsl:param name="split_keep-within-line"/>
 		<xsl:if test="$process = 'true'">
 			<xsl:apply-templates select="@language"/>
-			<xsl:apply-templates/>
+			<xsl:apply-templates>
+				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
+			</xsl:apply-templates>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
 		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
-	</xsl:template><xsl:template match="*[local-name()='em']">
+	</xsl:template><xsl:template match="*[local-name()='dt']" mode="dl_if">
+		<xsl:param name="id"/>
+		<xsl:variable name="row_number" select="count(preceding-sibling::*[local-name()='dt']) + 1"/>
+		<tr>
+			<td>
+				<xsl:copy-of select="node()"/>
+			</td>
+			<td>
+						<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/>
+						<!-- get paragraphs from nested 'dl' -->
+						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/>
+			</td>
+		</tr>
+	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if"/><xsl:template match="*[local-name()='dl']" mode="dl_if_nested">
+		<xsl:for-each select="*[local-name() = 'dt']">
+			<p>
+				<xsl:copy-of select="node()"/>
+				<xsl:text> </xsl:text>
+				<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'p']/node()"/>
+			</p>
+		</xsl:for-each>
+	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if_nested"/><xsl:template match="*[local-name()='em']">
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
+		<xsl:param name="split_keep-within-line"/>
 		<fo:inline font-weight="bold">
-			<xsl:apply-templates/>
+			<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 match="*[local-name()='padding']">
 		<fo:inline padding-right="{@value}"> </fo:inline>
@@ -3638,7 +4366,7 @@
+				 <!-- 10 -->
@@ -3818,6 +4546,10 @@
 		<xsl:param name="text"/>
 		<xsl:param name="separator" select="' '"/>
 		<xsl:choose>
+			<xsl:when test="$isGenerateTableIF = 'true' and not(contains($text, $separator))">
+				<word><xsl:value-of select="normalize-space($text)"/></word>
+			</xsl:when>
 			<xsl:when test="not(contains($text, $separator))">
 				<word>
 					<xsl:variable name="len_str_tmp" select="string-length(normalize-space($text))"/>
@@ -3862,13 +4594,66 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<word>
-					<xsl:value-of select="string-length(normalize-space(substring-before($text, $separator)))"/>
+					<xsl:variable name="word" select="normalize-space(substring-before($text, $separator))"/>
+					<xsl:choose>
+						<xsl:when test="$isGenerateTableIF = 'true'">
+							<xsl:value-of select="$word"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="string-length($word)"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</word>
 				<xsl:call-template name="tokenize">
 					<xsl:with-param name="text" select="substring-after($text, $separator)"/>
 				</xsl:call-template>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="tokenize_with_tags">
+		<xsl:param name="tags"/>
+		<xsl:param name="text"/>
+		<xsl:param name="separator" select="' '"/>
+		<xsl:choose>
+			<xsl:when test="not(contains($text, $separator))">
+				<word>
+					<xsl:call-template name="enclose_text_in_tags">
+						<xsl:with-param name="text" select="normalize-space($text)"/>
+						<xsl:with-param name="tags" select="$tags"/>
+					</xsl:call-template>
+				</word>
+			</xsl:when>
+			<xsl:otherwise>
+				<word>
+					<xsl:call-template name="enclose_text_in_tags">
+						<xsl:with-param name="text" select="normalize-space(substring-before($text, $separator))"/>
+						<xsl:with-param name="tags" select="$tags"/>
+					</xsl:call-template>
+				</word>
+				<xsl:call-template name="tokenize_with_tags">
+					<xsl:with-param name="text" select="substring-after($text, $separator)"/>
+				</xsl:call-template>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="enclose_text_in_tags">
+		<xsl:param name="text"/>
+		<xsl:param name="tags"/>
+		<xsl:param name="num">1</xsl:param> <!-- default (start) value -->
+		<xsl:variable name="tag_name" select="normalize-space(xalan:nodeset($tags)//tag[$num])"/>
+		<xsl:choose>
+			<xsl:when test="$tag_name = ''"><xsl:value-of select="$text"/></xsl:when>
+			<xsl:otherwise>
+				<xsl:element name="{$tag_name}">
+					<xsl:call-template name="enclose_text_in_tags">
+						<xsl:with-param name="text" select="$text"/>
+						<xsl:with-param name="tags" select="$tags"/>
+						<xsl:with-param name="num" select="$num + 1"/>
+					</xsl:call-template>
+				</xsl:element>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="max_length">
 		<xsl:param name="words"/>
 		<xsl:for-each select="$words//word">
@@ -3969,12 +4754,19 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template name="getSimpleTable">
+		<xsl:param name="id"/>
 		<xsl:variable name="simple-table">
+			<!-- Step 0. replace <br/> to <p>...</p> -->
+			<xsl:variable name="table_without_br">
+				<xsl:apply-templates mode="table-without-br"/>
+			</xsl:variable>
 			<!-- Step 1. colspan processing -->
 			<xsl:variable name="simple-table-colspan">
 				<tbody>
-					<xsl:apply-templates mode="simple-table-colspan"/>
+					<xsl:apply-templates select="xalan:nodeset($table_without_br)" mode="simple-table-colspan"/>
 				</tbody>
 			</xsl:variable>
@@ -3983,10 +4775,67 @@
 				<xsl:apply-templates select="xalan:nodeset($simple-table-colspan)" mode="simple-table-rowspan"/>
 			</xsl:variable>
-			<xsl:copy-of select="xalan:nodeset($simple-table-rowspan)"/>
+			<!-- Step 3: add id to each cell -->
+			<!-- add <word>...</word> for each word, image, math -->
+			<xsl:variable name="simple-table-id">
+				<xsl:apply-templates select="xalan:nodeset($simple-table-rowspan)" mode="simple-table-id">
+					<xsl:with-param name="id" select="$id"/>
+				</xsl:apply-templates>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($simple-table-id)"/>
 		</xsl:variable>
 		<xsl:copy-of select="$simple-table"/>
+	</xsl:template><xsl:template match="@*|node()" mode="table-without-br">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="table-without-br"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p'])]" mode="table-without-br">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<p>
+				<xsl:copy-of select="node()"/>
+			</p>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name()='th' or local-name()='td'][*[local-name()='br']]" mode="table-without-br">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:for-each select="*[local-name()='br']">
+				<xsl:variable name="current_id" select="generate-id()"/>
+				<p>
+					<xsl:for-each select="preceding-sibling::node()[following-sibling::*[local-name() = 'br'][1][generate-id() = $current_id]][not(local-name() = 'br')]">
+						<xsl:copy-of select="."/>
+					</xsl:for-each>
+				</p>
+				<xsl:if test="not(following-sibling::*[local-name() = 'br'])">
+					<p>
+						<xsl:for-each select="following-sibling::node()">
+							<xsl:copy-of select="."/>
+						</xsl:for-each>
+					</p>
+				</xsl:if>
+			</xsl:for-each>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'p'][*[local-name()='br']]" mode="table-without-br">
+		<xsl:for-each select="*[local-name()='br']">
+			<xsl:variable name="current_id" select="generate-id()"/>
+			<p>
+				<xsl:for-each select="preceding-sibling::node()[following-sibling::*[local-name() = 'br'][1][generate-id() = $current_id]][not(local-name() = 'br')]">
+					<xsl:copy-of select="."/>
+				</xsl:for-each>
+			</p>
+			<xsl:if test="not(following-sibling::*[local-name() = 'br'])">
+				<p>
+					<xsl:for-each select="following-sibling::node()">
+						<xsl:copy-of select="."/>
+					</xsl:for-each>
+				</p>
+			</xsl:if>
+		</xsl:for-each>
+	</xsl:template><xsl:template match="text()[not(ancestor::*[local-name() = 'sourcecode'])]" mode="table-without-br">
+		<xsl:variable name="text" select="translate(.,'&#9;&#10;&#13;','')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),' {2,}',' ')"/>
 	</xsl:template><xsl:template match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan">
 		<xsl:apply-templates mode="simple-table-colspan"/>
 	</xsl:template><xsl:template match="*[local-name()='fn']" mode="simple-table-colspan"/><xsl:template match="*[local-name()='th'] | *[local-name()='td']" mode="simple-table-colspan">
@@ -4076,6 +4925,126 @@
 		<xsl:apply-templates select="following-sibling::tr[1]" mode="simple-table-rowspan">
 				<xsl:with-param name="previousRow" select="$newRow"/>
 		</xsl:apply-templates>
+	</xsl:template><xsl:template match="/" mode="simple-table-id">
+		<xsl:param name="id"/>
+		<xsl:variable name="id_prefixed" select="concat('table_if_',$id)"/> <!-- table id prefixed by 'table_if_' to simple search in IF  -->
+		<xsl:apply-templates select="@*|node()" mode="simple-table-id">
+			<xsl:with-param name="id" select="$id_prefixed"/>
+		</xsl:apply-templates>
+	</xsl:template><xsl:template match="@*|node()" mode="simple-table-id">
+		<xsl:param name="id"/>
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="simple-table-id">
+					<xsl:with-param name="id" select="$id"/>
+				</xsl:apply-templates>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name()='tbody']" mode="simple-table-id">
+		<xsl:param name="id"/>
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
+			<xsl:apply-templates select="node()" mode="simple-table-id">
+				<xsl:with-param name="id" select="$id"/>
+			</xsl:apply-templates>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name()='th' or local-name()='td']" mode="simple-table-id">
+		<xsl:param name="id"/>
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:variable name="row_number" select="count(../preceding-sibling::*) + 1"/>
+			<xsl:variable name="col_number" select="count(preceding-sibling::*) + 1"/>
+			<xsl:attribute name="id">
+				<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number)"/>
+			</xsl:attribute>
+			<xsl:for-each select="*[local-name() = 'p']">
+				<xsl:copy>
+					<xsl:copy-of select="@*"/>
+					<xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
+					<xsl:attribute name="id">
+						<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num)"/>
+					</xsl:attribute>
+					<xsl:copy-of select="node()"/>
+				</xsl:copy>
+			</xsl:for-each>
+			<xsl:if test="$isGenerateTableIF = 'true'"> <!-- split each paragraph to words, image, math -->
+				<xsl:variable name="td_text">
+					<xsl:apply-templates select="." mode="td_text_with_formatting"/>
+				</xsl:variable>
+				<!-- td_text='<xsl:copy-of select="$td_text"/>' -->
+				<xsl:variable name="words">
+					<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
+						<word>
+							<xsl:copy-of select="."/>
+						</word>
+					</xsl:for-each>
+					<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']">
+						<xsl:copy-of select="."/>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:for-each select="xalan:nodeset($words)/word">
+					<xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
+					<xsl:copy>
+						<xsl:attribute name="id">
+							<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num)"/>
+						</xsl:attribute>
+						<xsl:copy-of select="node()"/>
+					</xsl:copy>
+				</xsl:for-each>
+			</xsl:if>
+		</xsl:copy>
+	</xsl:template><xsl:template match="@*|node()" mode="td_text_with_formatting">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="td_text_with_formatting"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'stem' or local-name() = 'image']" mode="td_text_with_formatting"/><xsl:template match="*[local-name() = 'keep-together_within-line']/text()" mode="td_text_with_formatting">
+		<xsl:variable name="formatting_tags">
+			<xsl:call-template name="getFormattingTags"/>
+		</xsl:variable>
+		<word>
+			<xsl:call-template name="enclose_text_in_tags">
+				<xsl:with-param name="text" select="normalize-space(.)"/>
+				<xsl:with-param name="tags" select="$formatting_tags"/>
+			</xsl:call-template>
+		</word>
+	</xsl:template><xsl:template match="*[local-name() != 'keep-together_within-line']/text()" mode="td_text_with_formatting">
+		<xsl:variable name="td_text" select="."/>
+		<xsl:variable name="string_with_added_zerospaces">
+			<xsl:call-template name="add-zero-spaces-java">
+				<xsl:with-param name="text" select="$td_text"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="formatting_tags">
+			<xsl:call-template name="getFormattingTags"/>
+		</xsl:variable>
+		<!-- <word>text</word> -->
+		<xsl:call-template name="tokenize_with_tags">
+			<xsl:with-param name="tags" select="$formatting_tags"/>
+			<xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '', '  '))"/> <!-- replace zero-width-space and soft-hyphen to space -->
+		</xsl:call-template>
+	</xsl:template><xsl:template name="getFormattingTags">
+		<tags>
+			<xsl:if test="ancestor::*[local-name() = 'strong']"><tag>strong</tag></xsl:if>
+			<xsl:if test="ancestor::*[local-name() = 'em']"><tag>em</tag></xsl:if>
+			<xsl:if test="ancestor::*[local-name() = 'sub']"><tag>sub</tag></xsl:if>
+			<xsl:if test="ancestor::*[local-name() = 'sup']"><tag>sup</tag></xsl:if>
+			<xsl:if test="ancestor::*[local-name() = 'tt']"><tag>tt</tag></xsl:if>
+			<xsl:if test="ancestor::*[local-name() = 'keep-together_within-line']"><tag>keep-together_within-line</tag></xsl:if>
+		</tags>
 	</xsl:template><xsl:template name="getLang">
 		<xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
 		<xsl:variable name="language">
@@ -4269,6 +5238,11 @@
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			<xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
+				<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
+			</xsl:if>
@@ -4547,7 +5521,19 @@
 			<xsl:value-of select="$suffix"/>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<xsl:variable name="num"><xsl:number/></xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
+				<fo:inline xsl:use-attribute-sets="termnote-p-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="termnote-p-style">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'terms']">
 		<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
 		<fo:block id="{@id}">
@@ -5364,7 +6350,7 @@
 			</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
+	</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
 		<xsl:copy>
@@ -5435,7 +6421,7 @@
+						<!-- 9 -->
@@ -5519,7 +6505,7 @@
 		<xsl:for-each select="xalan:nodeset($text_step4)/node()">
 			<xsl:choose>
 				<xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
-					<xsl:call-template name="interspers">
+					<xsl:call-template name="interspers-java">
 						<xsl:with-param name="str" select="."/>
 					</xsl:call-template>
 				</xsl:when>
@@ -5569,6 +6555,10 @@
 				<xsl:with-param name="char" select="$char"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template name="interspers-java">
+		<xsl:param name="str"/>
+		<xsl:param name="char" select="$zero_width_space"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($str),'([^ -.:=_—])',concat('$1', $char))"/> <!-- insert $char after each char excep space, - . : = _ etc. -->
 	</xsl:template><xsl:template match="*" mode="syntax_highlight">
 		<xsl:apply-templates mode="syntax_highlight"/>
 	</xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -5781,7 +6771,9 @@
 						<!-- <xsl:attribute name="border">0.5pt solid black</xsl:attribute> -->
 					</xsl:if>
 					<xsl:variable name="simple-table">
-						<xsl:call-template name="getSimpleTable"/>
+						<xsl:call-template name="getSimpleTable">
+							<xsl:with-param name="id" select="@id"/>
+						</xsl:call-template>
 					</xsl:variable>
 					<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
 					<xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
@@ -6211,6 +7203,7 @@
 				<xsl:choose>
 					<xsl:when test="ancestor::un:sections and $depth = 1">12</xsl:when>
 					<xsl:when test="ancestor::un:sections">8</xsl:when>
@@ -6526,6 +7519,11 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
+		<xsl:apply-templates select="*[local-name() = 'name']">
+			<xsl:with-param name="process">true</xsl:with-param>
+		</xsl:apply-templates>
 		<fo:list-block xsl:use-attribute-sets="list-style">
@@ -6536,12 +7534,23 @@
+			<xsl:if test="*[local-name() = 'name']">
+				<xsl:attribute name="margin-top">0pt</xsl:attribute>
+			</xsl:if>
 			<xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
 		</fo:list-block>
 		<!-- <xsl:for-each select="./iho:note">
 			<xsl:call-template name="note"/>
 		</xsl:for-each> -->
 		<xsl:apply-templates select="./*[local-name() = 'note']"/>
+	</xsl:template><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'">
+			<fo:block xsl:use-attribute-sets="list-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='li']">
 		<fo:list-item xsl:use-attribute-sets="list-item-style">
 			<xsl:copy-of select="@id"/>
@@ -6741,7 +7750,7 @@
 		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
 		<fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
 		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
-		<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"> </xsl:if>
+		<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'errata']">
 		<!-- <row>
 					<date>05-07-2013</date>
@@ -6819,22 +7828,11 @@
 	</xsl:template><xsl:template name="processBibitem">
+				<!-- start UNECE bibitem processing -->
 				<fo:inline padding-right="5mm">[<xsl:value-of select="un:docidentifier"/>]</fo:inline><xsl:value-of select="un:docidentifier"/>
-				<xsl:if test="un:title">
-					<fo:inline font-style="italic">
-						<xsl:text>, </xsl:text>
-						<xsl:choose>
-							<xsl:when test="un:title[@type = 'main' and @language = 'en']">
-								<xsl:apply-templates select="un:title[@type = 'main' and @language = 'en']"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates select="un:title"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</fo:inline>
-				</xsl:if>
+				<xsl:text> </xsl:text>
 				<xsl:apply-templates select="un:formattedref"/>
+				<!-- END UNECE bibitem processing -->
 	</xsl:template><xsl:template name="processBibitemDocId">
 		<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
@@ -7142,12 +8140,16 @@
 				<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
 							<fo:block-container xsl:use-attribute-sets="admonition-container-style">
 										<fo:block-container margin-left="0mm" margin-right="0mm">
 											<fo:block>
 												<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
@@ -7159,25 +8161,32 @@
 				</fo:block-container>
 	</xsl:template><xsl:template name="displayAdmonitionName">
+		<xsl:param name="sep"/> <!-- Example: ' - ' -->
+		<!-- <xsl:choose>
+			<xsl:when test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
+				<xsl:choose>
+					<xsl:when test="@type='important'"><xsl:apply-templates select="@type"/></xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise>
 				<xsl:apply-templates select="*[local-name() = 'name']"/>
 				<xsl:if test="not(*[local-name() = 'name'])">
 					<xsl:apply-templates select="@type"/>
 				</xsl:if>
-	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
-		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'admonition']/@type">
-		<xsl:variable name="admonition_type_">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">admonition.<xsl:value-of select="."/></xsl:with-param>
-			</xsl:call-template>
+			</xsl:otherwise>
+		</xsl:choose> -->
+		<xsl:variable name="name">
+			<xsl:apply-templates select="*[local-name() = 'name']"/>
 		</xsl:variable>
-		<xsl:variable name="admonition_type" select="normalize-space(java:toUpperCase(java:java.lang.String.new($admonition_type_)))"/>
-		<xsl:value-of select="$admonition_type"/>
-		<xsl:if test="$admonition_type = ''">
-			<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
+		<xsl:copy-of select="$name"/>
+		<xsl:if test="normalize-space($name) != ''">
+			<xsl:value-of select="$sep"/>
 		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
+		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
 				<fo:block xsl:use-attribute-sets="admonition-p-style">
@@ -7348,6 +8357,8 @@
 			</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name() = 'lang_none']">
+		<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
 	</xsl:template><xsl:template name="printEdition">
 		<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
 		<xsl:text> </xsl:text>
@@ -7454,6 +8465,27 @@
 			</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="getMonthLocalizedByNum">
+		<xsl:param name="num"/>
+		<xsl:variable name="monthStr">
+			<xsl:choose>
+				<xsl:when test="$num = '01'">january</xsl:when>
+				<xsl:when test="$num = '02'">february</xsl:when>
+				<xsl:when test="$num = '03'">march</xsl:when>
+				<xsl:when test="$num = '04'">april</xsl:when>
+				<xsl:when test="$num = '05'">may</xsl:when>
+				<xsl:when test="$num = '06'">june</xsl:when>
+				<xsl:when test="$num = '07'">july</xsl:when>
+				<xsl:when test="$num = '08'">august</xsl:when>
+				<xsl:when test="$num = '09'">september</xsl:when>
+				<xsl:when test="$num = '10'">october</xsl:when>
+				<xsl:when test="$num = '11'">november</xsl:when>
+				<xsl:when test="$num = '12'">december</xsl:when>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:call-template name="getLocalizedString">
+			<xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param>
+		</xsl:call-template>
 	</xsl:template><xsl:template name="insertKeywords">
 		<xsl:param name="sorting" select="'true'"/>
 		<xsl:param name="charAtEnd" select="'.'"/>
@@ -7647,6 +8679,7 @@
 				<xsl:value-of select="document('')//*/namespace::un"/>
@@ -8060,4 +9093,40 @@
 				<xsl:value-of select="$value"/>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template match="*" mode="print_as_xml">
+		<xsl:param name="level">0</xsl:param>
+		<fo:block margin-left="{2*$level}mm">
+			<xsl:text>
+&lt;</xsl:text>
+			<xsl:value-of select="local-name()"/>
+			<xsl:for-each select="@*">
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="local-name()"/>
+				<xsl:text>="</xsl:text>
+				<xsl:value-of select="."/>
+				<xsl:text>"</xsl:text>
+			</xsl:for-each>
+			<xsl:text>&gt;</xsl:text>
+			<xsl:if test="not(*)">
+				<fo:inline font-weight="bold"><xsl:value-of select="."/></fo:inline>
+				<xsl:text>&lt;/</xsl:text>
+					<xsl:value-of select="local-name()"/>
+					<xsl:text>&gt;</xsl:text>
+			</xsl:if>
+		</fo:block>
+		<xsl:if test="*">
+			<fo:block>
+				<xsl:apply-templates mode="print_as_xml">
+					<xsl:with-param name="level" select="$level + 1"/>
+				</xsl:apply-templates>
+			</fo:block>
+			<fo:block margin-left="{2*$level}mm">
+				<xsl:text>&lt;/</xsl:text>
+				<xsl:value-of select="local-name()"/>
+				<xsl:text>&gt;</xsl:text>
+			</fo:block>
+		</xsl:if>
 	</xsl:template></xsl:stylesheet>