metanorma-bipm 2.0.7 → 2.1.1

data/lib/isodoc/bipm/bipm.rapport.xsl

@@ -5,8 +5,6 @@
 	<xsl:param name="initial_page_number"/>
 	<xsl:param name="doc_split_by_language"/>
 	
-	<xsl:param name="add_math_as_text">true</xsl:param>
-  
 	<xsl:param name="add_math_as_attachment">true</xsl:param>
 	
 	<xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" use="@reference"/>
@@ -220,7 +218,13 @@
 	
 	
 	<xsl:template match="/">
-		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
+		<fo:root xml:lang="{$lang}">
+			<xsl:variable name="root-style">
+				<root-style xsl:use-attribute-sets="root-style"/>
+			</xsl:variable>
+			<xsl:call-template name="insertRootStyle">
+				<xsl:with-param name="root-style" select="$root-style"/>
+			</xsl:call-template>
 			<fo:layout-master-set>
 			
 				<!-- blank page -->
@@ -979,7 +983,7 @@
 							<fo:block-container font-size="9pt" border-bottom="1pt solid black" width="68mm" text-align="center" margin-bottom="14pt">
 								<fo:block font-weight="bold" margin-bottom="2.5mm">
 									<fo:inline padding-right="10mm">
-										<xsl:apply-templates select="bipm:bibdata/bipm:edition">
+										<xsl:apply-templates select="bipm:bibdata/bipm:edition[normalize-space(@language) = '']">
 											<xsl:with-param name="font-size" select="'70%'"/>
 											<xsl:with-param name="baseline-shift" select="'45%'"/>
 											<xsl:with-param name="curr_lang" select="$curr_lang"/>
@@ -1259,7 +1263,7 @@
 							<fo:block-container font-size="9pt" border-bottom="1pt solid black" width="68mm" text-align="center" margin-bottom="14pt">
 								<fo:block font-weight="bold" margin-bottom="2.5mm">
 									<fo:inline padding-right="10mm">
-										<xsl:apply-templates select="bipm:bibdata/bipm:edition">
+										<xsl:apply-templates select="bipm:bibdata/bipm:edition[normalize-space(@language) = '']">
 											<xsl:with-param name="font-size" select="'70%'"/>
 											<xsl:with-param name="baseline-shift" select="'45%'"/>
 											<xsl:with-param name="curr_lang" select="$curr_lang"/>
@@ -1347,7 +1351,7 @@
 							<xsl:call-template name="getLanguages"/>
 						</xsl:variable>						
 						<xsl:variable name="editionFO">
-							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:edition">
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:edition[normalize-space(@language) = '']">
 								<xsl:with-param name="curr_lang" select="xalan:nodeset($languages)/lang[1]"/>
 							</xsl:apply-templates>
 						</xsl:variable>
@@ -1426,7 +1430,7 @@
 					
 					<xsl:variable name="edition_str">édition</xsl:variable>
 						
-					<fo:block font-size="14pt" font-weight="{$weight-bold}" margin-top="4mm"><xsl:value-of select="concat((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:edition, ' ', $edition_str, ' ', $copyrightYear)"/></fo:block>				
+					<fo:block font-size="14pt" font-weight="{$weight-bold}" margin-top="4mm"><xsl:value-of select="concat((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:edition[normalize-space(@language) = ''], ' ', $edition_str, ' ', $copyrightYear)"/></fo:block>				
 				</fo:block-container>
 				
 				<fo:block-container absolute-position="fixed" left="12.5mm" top="92mm" height="170mm" width="144mm" display-align="center">
@@ -2103,12 +2107,6 @@
 		<xsl:param name="baseline-shift" select="'30%'"/>
 		<xsl:param name="curr_lang" select="'fr'"/>
 		<fo:inline>
-			<xsl:variable name="title-edition">
-				<xsl:call-template name="getTitle">
-					<xsl:with-param name="name" select="'title-edition'"/>
-					<xsl:with-param name="lang" select="$curr_lang"/>
-				</xsl:call-template>
-			</xsl:variable>
 			<xsl:value-of select="."/>
 			<fo:inline font-size="{$font-size}" baseline-shift="{$baseline-shift}">
 				<xsl:call-template name="number-to-ordinal">
@@ -2117,7 +2115,9 @@
 				</xsl:call-template>
 			</fo:inline>
 			<xsl:text> </xsl:text>			
-			<xsl:value-of select="java:toLowerCase(java:java.lang.String.new($title-edition))"/>
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">edition</xsl:with-param>
+			</xsl:call-template>
 			<xsl:text/>
 		</fo:inline>
 	</xsl:template>
@@ -2727,6 +2727,7 @@
 
 	<xsl:template match="bipm:p" name="paragraph">
 		<xsl:param name="inline" select="'false'"/>
+		<xsl:param name="split_keep-within-line"/>
 		
 		<xsl:variable name="previous-element" select="local-name(preceding-sibling::*[1])"/>
 		<xsl:variable name="element-name">
@@ -2773,7 +2774,9 @@
 				<xsl:attribute name="role">BlockQuote</xsl:attribute>
 			</xsl:if>
 			<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
-			<xsl:apply-templates/>
+			<xsl:apply-templates>
+				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
+			</xsl:apply-templates>
 		</xsl:element>
 		<xsl:if test="$element-name = 'fo:inline' and not($inline = 'true') and not(local-name(..) = 'admonition')">
 			<fo:block margin-bottom="6pt">
@@ -3201,112 +3204,6 @@
 		<xsl:value-of select="translate(., ' ', ' ')"/>
 	</xsl:template>
 
-	<xsl:template match="mathml:math" priority="2">
-		<xsl:variable name="isAdded" select="@added"/>
-		<xsl:variable name="isDeleted" select="@deleted"/>
-		
-		<fo:inline xsl:use-attribute-sets="mathml-style">
-			
-			<xsl:if test="ancestor::*[local-name()='table']">
-				<xsl:attribute name="font-size">95%</xsl:attribute> <!-- base font in table is 10pt -->
-			</xsl:if>
-			
-			<xsl:call-template name="setTrackChangesStyles">
-				<xsl:with-param name="isAdded" select="$isAdded"/>
-				<xsl:with-param name="isDeleted" select="$isDeleted"/>
-			</xsl:call-template>
-			
-			<xsl:if test="$add_math_as_text = 'true'">
-				<!-- set unique font-size (fiction) -->
-				<xsl:variable name="font-size_sfx"><xsl:number level="any"/></xsl:variable>
-				<fo:inline color="white" font-size="1.{$font-size_sfx}pt" font-style="normal" font-weight="normal"><xsl:value-of select="$zero_width_space"/></fo:inline> <!-- zero width space -->
-			</xsl:if>
-			
-			<!-- <fo:wrapper role="artifact"> -->
-			
-			<xsl:variable name="mathml_content">
-				<xsl:apply-templates select="." mode="mathml_actual_text"/>
-			</xsl:variable>
-			<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
-			
-			<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
-			<xsl:variable name="comment_text_">
-				<xsl:choose>
-					<xsl:when test="normalize-space($comment_text_following) != ''">
-						<xsl:value-of select="$comment_text_following"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable> 
-			<xsl:variable name="comment_text_2" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
-			<xsl:variable name="comment_text" select="java:trim(java:java.lang.String.new($comment_text_2))"/>
-			
-			<xsl:variable name="filename" select="xalan:nodeset($mathml_attachments)//attachment[. = $mathml_content]/@filename"/>
-			<xsl:choose>
-				<xsl:when test="$add_math_as_attachment = 'true' and normalize-space($filename) != ''">
-					<xsl:variable name="url" select="concat('url(embedded-file:', $filename, ')')"/>
-					<fo:basic-link external-destination="{$url}" fox:alt-text="MathLink">
-						<xsl:if test="normalize-space($comment_text) != ''">
-						<!-- put Mathin Alternate Text -->
-							<xsl:attribute name="fox:alt-text">
-								<xsl:value-of select="$comment_text"/>
-							</xsl:attribute>
-						</xsl:if>
-						<xsl:call-template name="mathml_instream_object">
-							<xsl:with-param name="mathml_content" select="$mathml_content"/>
-							<xsl:with-param name="comment_text" select="$comment_text"/>
-						</xsl:call-template>
-					</fo:basic-link>
-					<!-- </xsl:if> -->
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:call-template name="mathml_instream_object">
-						<xsl:with-param name="mathml_content" select="$mathml_content"/>
-						<xsl:with-param name="comment_text" select="$comment_text"/>
-					</xsl:call-template>
-				</xsl:otherwise>
-			</xsl:choose>
-			<!-- </fo:wrapper> -->
-		</fo:inline>
-	</xsl:template>
-
-	<xsl:template name="mathml_instream_object">
-		<xsl:param name="mathml_content"/>
-		<xsl:param name="comment_text"/>
-	
-		<xsl:variable name="mathml">
-			<xsl:apply-templates select="." mode="mathml"/>
-		</xsl:variable>
-			
-		<fo:instream-foreign-object fox:alt-text="Math">
-					
-			<xsl:if test="local-name(../..) = 'formula'">
-				<xsl:attribute name="width">95%</xsl:attribute>
-				<xsl:attribute name="content-height">100%</xsl:attribute>
-				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
-				<xsl:attribute name="scaling">uniform</xsl:attribute>
-			</xsl:if>
-			
-			<!-- put MathML in Actual Text -->
-			<xsl:attribute name="fox:actual-text">
-				<xsl:value-of select="$mathml_content"/>
-			</xsl:attribute>
-			
-			<xsl:if test="$add_math_as_text = 'true'">
-				<xsl:if test="normalize-space($comment_text) != ''">
-				<!-- put Mathin Alternate Text -->
-					<xsl:attribute name="fox:alt-text">
-						<xsl:value-of select="$comment_text"/>
-					</xsl:attribute>
-				</xsl:if>
-			</xsl:if>
-		
-		<xsl:copy-of select="xalan:nodeset($mathml)"/>
-	</fo:instream-foreign-object>
-	</xsl:template>
-
 
 	<!-- =================== -->
 	<!-- Table of Contents (ToC) processing -->
@@ -3916,7 +3813,9 @@
 	</xsl:template>
 
 	
-<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: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: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
@@ -3931,20 +3830,7 @@
 	</xsl:variable><xsl:variable name="marginTop" select="normalize-space($marginTop_)"/><xsl:variable name="marginBottom_">
 		22
 	</xsl:variable><xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/><xsl:variable name="titles_">
-				
-		<title-edition lang="en">
-			
-					<xsl:text>Edition </xsl:text>
-				
-		</title-edition>
 		
-		<title-edition lang="fr">
-			<xsl:text>Édition </xsl:text>
-		</title-edition>
-		
-		<title-edition lang="ru">
-			<xsl:text>Издание </xsl:text>
-		</title-edition>
 		
 		<!-- These titles of Table of contents renders different than determined in localized-strings -->
 		<title-toc lang="en">
@@ -4027,7 +3913,7 @@
 	</xsl:variable><xsl:variable name="bibdata">
 		<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']"/>
 		<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'localized-strings']"/>
-	</xsl:variable><xsl:variable name="linebreak">&#8232;</xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:variable name="non_breaking_hyphen">‑</xsl:variable><xsl:variable name="thin_space"> </xsl:variable><xsl:variable name="zero_width_space">​</xsl:variable><xsl:variable name="en_dash">–</xsl:variable><xsl:template name="getTitle">
+	</xsl:variable><xsl:variable name="linebreak">&#8232;</xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:variable name="non_breaking_hyphen">‑</xsl:variable><xsl:variable name="thin_space"> </xsl:variable><xsl:variable name="zero_width_space">​</xsl:variable><xsl:variable name="hair_space"> </xsl:variable><xsl:variable name="en_dash">–</xsl:variable><xsl:template name="getTitle">
 		<xsl:param name="name"/>
 		<xsl:param name="lang"/>
 		<xsl:variable name="lang_">
@@ -4070,7 +3956,30 @@
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-style">
+	</xsl:attribute-set><xsl:template name="insertRootStyle">
+		<xsl:param name="root-style"/>
+		<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
+		
+		<xsl:variable name="additional_fonts_">
+			<xsl:for-each select="//*[contains(local-name(), '-standard')][1]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value'] |       //*[contains(local-name(), '-standard')][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
+				<xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
+		
+		<xsl:for-each select="$root-style_/root-style/@*">
+			<xsl:choose>
+				<xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
+					<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">
 		
 	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style">
 		
@@ -4139,7 +4048,6 @@
 		
 		
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-container-style">
-		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
@@ -4218,6 +4126,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="example-name-style">
 		
 		
@@ -4367,6 +4276,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>
 		
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -4391,6 +4301,7 @@
 		<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>
 		
 		
 			<xsl:attribute name="border">solid 0pt white</xsl:attribute>
@@ -4488,7 +4399,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>
 		
 		
@@ -4503,6 +4415,8 @@
 		
 		
 		
+	</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">
 		
 		
@@ -4589,7 +4503,7 @@
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
+	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
 		
 				
 		
@@ -5302,22 +5216,32 @@
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
-	</xsl:template><xsl:variable name="tag_open">###fo:inline###</xsl:variable><xsl:variable name="tag_close">###/fo:inline###</xsl:variable><xsl:template match="text()" name="text">
-		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
-		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_open,'$1',$tag_close))"/>
-		<xsl:call-template name="replace_fo_inline">
-			<xsl:with-param name="text" select="$text"/>
-		</xsl:call-template>
-	</xsl:template><xsl:template name="replace_fo_inline">
+	</xsl:template><xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable><xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable><xsl:template match="text()" name="text">
+		
+				<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
+				<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
+				<xsl:call-template name="replace_fo_inline_tags">
+					<xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
+					<xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
+					<xsl:with-param name="text" select="$text"/>
+				</xsl:call-template>
+			
+	</xsl:template><xsl:template name="replace_fo_inline_tags">
+		<xsl:param name="tag_open"/>
+		<xsl:param name="tag_close"/>
 		<xsl:param name="text"/>
 		<xsl:choose>
 			<xsl:when test="contains($text, $tag_open)">
 				<xsl:value-of select="substring-before($text, $tag_open)"/>
-				<xsl:text disable-output-escaping="yes">&lt;fo:inline keep-together.within-line="always"&gt;</xsl:text>
+				<!-- <xsl:text disable-output-escaping="yes">&lt;fo:inline keep-together.within-line="always"&gt;</xsl:text> -->
 				<xsl:variable name="text_after" select="substring-after($text, $tag_open)"/>
-				<xsl:value-of select="substring-before($text_after, $tag_close)"/>
-				<xsl:text disable-output-escaping="yes">&lt;/fo:inline&gt;</xsl:text>
-				<xsl:call-template name="replace_fo_inline">
+				<fo:inline keep-together.within-line="always">
+					<xsl:value-of select="substring-before($text_after, $tag_close)"/>
+				</fo:inline>
+				<!-- <xsl:text disable-output-escaping="yes">&lt;/fo:inline&gt;</xsl:text> -->
+				<xsl:call-template name="replace_fo_inline_tags">
+					<xsl:with-param name="tag_open" select="$tag_open"/>
+					<xsl:with-param name="tag_close" select="$tag_close"/>
 					<xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/>
 				</xsl:call-template>
 			</xsl:when>
@@ -5325,6 +5249,39 @@
 		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name()='br']">
 		<xsl:value-of select="$linebreak"/>
+	</xsl:template><xsl:template match="*[local-name() = 'keep-together_within-line']">
+		<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/>
@@ -5400,8 +5357,23 @@
 				</xsl:call-template>
 			
 	</xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
-		<!-- <xsl:call-template name="add-zero-spaces"/> -->
-		<xsl:call-template name="add-zero-spaces-java"/>
+		<xsl:choose>
+			<xsl:when test="parent::*[local-name() = 'keep-together_within-line']">
+				<xsl:value-of select="."/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="addZeroWidthSpacesToTextNodes"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="addZeroWidthSpacesToTextNodes">
+		<xsl:variable name="text"><text><xsl:call-template name="text"/></text></xsl:variable>
+		<!-- <xsl:copy-of select="$text"/> -->
+		<xsl:for-each select="xalan:nodeset($text)/text/node()">
+			<xsl:choose>
+				<xsl:when test="self::text()"><xsl:call-template name="add-zero-spaces-java"/></xsl:when>
+				<xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise> <!-- copy 'as-is' for <fo:inline keep-together.within-line="always" ...  -->
+			</xsl:choose>
+		</xsl:for-each>
 	</xsl:template><xsl:template match="*[local-name()='table']" name="table">
 	
 		<xsl:variable name="table-preamble">
@@ -5411,9 +5383,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 -->
@@ -5436,7 +5413,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">
@@ -5515,9 +5508,17 @@
 					</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="."/>
@@ -5531,31 +5532,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: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({.})"/>
-									</xsl:otherwise>
-								</xsl:choose>
-							</xsl:for-each>
-						</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>
 					
@@ -5662,11 +5679,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>
@@ -5704,16 +5732,22 @@
 						</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">
 										<xsl:with-param name="text" select="$td_text"/>
 									</xsl:call-template>
 								</xsl:variable>
+								<!-- <xsl:message>string_with_added_zerospaces=<xsl:value-of select="$string_with_added_zerospaces"/></xsl:message> -->
 								<xsl:call-template name="tokenize">
 									<!-- <xsl:with-param name="text" select="translate(td[$curr-col],'- —:', '    ')"/> -->
 									<!-- 2009 thinspace -->
@@ -5721,11 +5755,13 @@
 									<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)"/>
 								</xsl:call-template>
 							</xsl:variable>
+							<!-- <xsl:message>max_length=<xsl:value-of select="$max_length"/></xsl:message> -->
 							<width>
 								<xsl:variable name="divider">
 									<xsl:choose>
@@ -5744,6 +5780,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"/>
@@ -5752,79 +5790,377 @@
 					</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 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:for-each>
-		</xsl:variable>
+	</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="table"/>
+		<xsl:param name="if">false</xsl:param> <!-- 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_)"/>
 		
-		<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 -->
-	</xsl:template><xsl:template match="*[local-name()='thead']">
-		<xsl:param name="cols-count"/>
-		<fo:table-header>
-			
-			
-			<xsl:apply-templates/>
-		</fo:table-header>
-	</xsl:template><xsl:template name="table-header-title">
-		<xsl:param name="cols-count"/>
-		<!-- row for title -->
-		<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>
-				
-				
+		
+		<!-- 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:choose>
+				<xsl:when test="$if = 'true' and normalize-space($table-if) != ''"> <!-- if we read column's width from IF and there is table in IF -->
 				
-			</fo:table-cell>
-		</fo:table-row>
-	</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">		
-		<fo:table-body>
-			<xsl:apply-templates/>
-		</fo:table-body>
-	</xsl:template><xsl:template match="*[local-name()='tfoot']">
-		<xsl:apply-templates/>
-	</xsl:template><xsl:template name="insertTableFooter">
-		<xsl:param name="cols-count"/>
-		<xsl:if test="../*[local-name()='tfoot']">
-			<fo:table-footer>			
-				<xsl:apply-templates select="../*[local-name()='tfoot']"/>
-			</fo:table-footer>
+					<!-- Example: <column>10</column>
+							<column>11</column> 
+					-->
+					<xsl:apply-templates select="$table-if" mode="determine_cell_widths-if"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="xalan:nodeset($table)" mode="determine_cell_widths"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</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>
-	</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
-		<xsl:param name="table_attributes"/>
-		<xsl:param name="colwidths"/>
-		<xsl:param name="colgroup"/>
 		
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
 		
-		<xsl:variable name="isNoteOrFnExistShowAfterTable">
-			
+		<!-- 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_)"/>
 		
-		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
+		<!-- <column_widths>
+			<xsl:copy-of select="$column_widths"/>
+		</column_widths> -->
 		
-			<xsl:variable name="cols-count">
-				<xsl:choose>
-					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
+		<!-- 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="$if = 'true'"><xsl:value-of select="$table-if/@page-width"/></xsl:when>
+				<xsl:otherwise>75</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		
+		<xsl:if test="$table_if_debug = 'true'">
+			<table_width>
+				<xsl:copy-of select="$table_widths"/>
+			</table_width>
+			<!-- <debug>$table_widths/@width_min=<xsl:value-of select="$table_widths/table/@width_min"/></debug>
+			<debug>$table_widths/@width_max=<xsl:value-of select="$table_widths/table/@width_max"/></debug>
+			 -->
+			<debug>$page_width=<xsl:value-of select="$page_width"/></debug>
+		</xsl:if>
+		
+		
+		<!-- 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 match="@*|node()" mode="determine_cell_widths">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="determine_cell_widths"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="td | th" mode="determine_cell_widths">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			
+			 <!-- The maximum width is given by the widest line.  -->
+			<xsl:variable name="widths_max">
+				<xsl:for-each select=".//*[local-name() = 'p']">
+					<xsl:call-template name="add_width"/>
+				</xsl:for-each>
+				<xsl:if test="not(*[local-name() = 'p'])">
+					<xsl:call-template name="add_width"/>
+				</xsl:if>
+			</xsl:variable>
+			<xsl:variable name="width_max">
+				<xsl:for-each select="xalan:nodeset($widths_max)//width">
+					<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_max">
+				<xsl:value-of select="$width_max"/>
+			</xsl:attribute>
+			
+			<!-- The minimum width is given by the widest text element (word, image, etc.) -->
+			<!-- To do: image width -->
+			<xsl:variable name="td_text">
+				<xsl:apply-templates select="." mode="td_text"/>
+			</xsl:variable>
+			<xsl:variable name="words">
+				<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:call-template name="tokenize">
+					<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>
+			
+			<xsl:variable name="max_word_length">
+				<xsl:call-template name="max_length">
+					<xsl:with-param name="words" select="xalan:nodeset($words)"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:variable name="width_min">
+				<xsl:value-of select="$max_word_length"/>
+			</xsl:variable>
+			<xsl:attribute name="width_min">
+				<xsl:value-of select="$width_min"/>
+			</xsl:attribute>
+			<!-- width_max="1" width_min="1.5"> --> <!-- see 'tokenize' template, multiply 1.5 for all latin capitals -->
+			<xsl:if test="$width_min &gt; $width_max">
+				<xsl:attribute name="width_max">
+					<xsl:value-of select="$width_min"/>
+				</xsl:attribute>
+			</xsl:if>
+			<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"/>
+			
+		</xsl:copy>
+	</xsl:template><xsl:template name="add_width">
+		<xsl:variable name="p_text"><xsl:apply-templates select="." mode="td_text"/></xsl:variable>
+		<xsl:variable name="p_text_len_" select="string-length(normalize-space($p_text))"/>
+		
+		<xsl:variable name="p_text_len">
+			<xsl:choose>
+				<xsl:when test="normalize-space(translate($p_text, concat($upper,'0123456789'), '')) = ''"> <!-- english word in CAPITAL letters -->
+					<xsl:value-of select="$p_text_len_ * 1.5"/>
+				</xsl:when>
+				<xsl:otherwise><xsl:value-of select="$p_text_len_"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		
+		<xsl:variable name="math_addon_text">
+			<xsl:for-each select=".//*[local-name() = 'math']">
+				<xsl:apply-templates mode="td_text"/>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="math_addon_length" select="string-length(normalize-space($math_addon_text)) * 0.2"/> <!-- plus 20% -->
+		
+		<width><xsl:value-of select="$p_text_len + $math_addon_length"/></width>
+	</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>
+			
+			
+			<xsl:apply-templates/>
+		</fo:table-header>
+	</xsl:template><xsl:template name="table-header-title">
+		<xsl:param name="cols-count"/>
+		<!-- row for title -->
+		<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>
+				
+				
+				
+			</fo:table-cell>
+		</fo:table-row>
+	</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">		
+		<fo:table-body>
+			<xsl:apply-templates/>
+		</fo:table-body>
+	</xsl:template><xsl:template match="*[local-name()='tfoot']">
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template name="insertTableFooter">
+		<xsl:param name="cols-count"/>
+		<xsl:if test="../*[local-name()='tfoot']">
+			<fo:table-footer>			
+				<xsl:apply-templates select="../*[local-name()='tfoot']"/>
+			</fo:table-footer>
+		</xsl:if>
+	</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
+		<xsl:param name="table_attributes"/>
+		<xsl:param name="colwidths"/>
+		<xsl:param name="colgroup"/>
+		
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
+		
+		<xsl:variable name="isNoteOrFnExistShowAfterTable">
+			
+		</xsl:variable>
+		
+		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
+		
+			<xsl:variable name="cols-count">
+				<xsl:choose>
+					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
 						<xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
 					</xsl:when>
 					<xsl:otherwise>
@@ -5859,16 +6195,10 @@
 						</xsl:for-each>
 					</xsl:when>
 					<xsl:otherwise>
-						<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({.})"/>
-								</xsl:otherwise>
-							</xsl:choose>
-						</xsl:for-each>
+						<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
+						<xsl:call-template name="insertTableColumnWidth">
+							<xsl:with-param name="colwidths" select="$colwidths"/>
+						</xsl:call-template>
 					</xsl:otherwise>
 				</xsl:choose>
 				
@@ -5955,6 +6285,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">
 		
@@ -6059,7 +6435,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>
@@ -6104,8 +6480,18 @@
 			
 			<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:if test="not(.//bipm:image)">
 						<xsl:attribute name="line-stacking-strategy">font-height</xsl:attribute>
@@ -6118,6 +6504,9 @@
 				
 				
 				<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">
@@ -6331,9 +6720,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">
-							bipm
+					<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>
@@ -6344,7 +6733,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>
@@ -6355,7 +6744,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>
@@ -6479,8 +6868,10 @@
 					 <!-- and  (not(../@class) or ../@class !='pseudocode') -->
 				</xsl:variable>
 				
+				<xsl:variable name="onlyOneComponent" select="normalize-space($parent = 'formula' and count(*[local-name()='dt']) = 1)"/>
+				
 				<xsl:choose>
-					<xsl:when test="$parent = 'formula' and count(*[local-name()='dt']) = 1"> <!-- only one component -->
+					<xsl:when test="$onlyOneComponent = 'true'"> <!-- only one component -->
 						
 								<fo:block margin-bottom="12pt" text-align="left">
 									
@@ -6495,7 +6886,7 @@
 									<xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
 								</fo:block>
 							
-					</xsl:when>
+					</xsl:when> <!-- END: only one component -->
 					<xsl:when test="$parent = 'formula'"> <!-- a few components -->
 						<fo:block margin-bottom="12pt" text-align="left">
 							
@@ -6509,8 +6900,8 @@
 							</xsl:variable>
 							<xsl:value-of select="$title-where"/>
 						</fo:block>
-					</xsl:when>
-					<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')">
+					</xsl:when>  <!-- END: a few components -->
+					<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
 						<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
 							
 							
@@ -6523,11 +6914,11 @@
 							</xsl:variable>
 							<xsl:value-of select="$title-key"/>
 						</fo:block>
-					</xsl:when>
+					</xsl:when>  <!-- END: definition list in a figure -->
 				</xsl:choose>
 				
 				<!-- a few components -->
-				<xsl:if test="not($parent = 'formula' and count(*[local-name()='dt']) = 1)">
+				<xsl:if test="$onlyOneComponent = 'false'">
 					<fo:block>
 						
 						
@@ -6538,7 +6929,18 @@
 							
 							
 							
+							
+							<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'"/>
@@ -6547,54 +6949,143 @@
 										
 									</xsl:when>
 								</xsl:choose>
-								<!-- create virtual html table for dl/[dt and dd] -->
-								<xsl:variable name="html-table">
-									<xsl:variable name="doc_ns">
-										bipm
-									</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>
-								<!-- 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>
-								<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
-								<xsl:variable name="maxlength_dt">							
-									<xsl:call-template name="getMaxLength_dt"/>							
-								</xsl:variable>
-								<xsl:call-template name="setColumnWidth_dl">
-									<xsl:with-param name="colwidths" select="$colwidths"/>							
-									<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
-								</xsl:call-template>
-								<fo:table-body>
-									<xsl:apply-templates>
-										<xsl:with-param name="key_iso" select="normalize-space($key_iso)"/>
-									</xsl:apply-templates>
-								</fo:table-body>
+								
+								
+								<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>
+										-->
+										
+										<!-- 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>
+								
+										<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>
+				</xsl:if> <!-- END: a few components -->
 			</fo:block-container>
 		</fo:block-container>
 	</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="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
 				<fo:table-column column-width="50%"/>
@@ -6602,6 +7093,16 @@
 			</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"/>
+						</xsl:call-template>
+					</xsl:when>
 					<!-- to set width check most wide chars like `W` -->
 					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 2"> <!-- if dt contains short text like t90, a, etc -->
 						<fo:table-column column-width="7%"/>
@@ -6632,20 +7133,31 @@
 						<fo:table-column column-width="60%"/>
 					</xsl:when>
 					<xsl:otherwise>
-						<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({.})"/>
-								</xsl:otherwise>
-							</xsl:choose>
-						</xsl:for-each>
+						<xsl:call-template name="insertTableColumnWidth">
+							<xsl:with-param name="colwidths" select="$colwidths"/>
+						</xsl:call-template>
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:otherwise>
 		</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({.})"/> -->
+					<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>
 	</xsl:template><xsl:template name="getMaxLength_dt">
 		<xsl:variable name="lengths">
 			<xsl:for-each select="*[local-name()='dt']">
@@ -6669,7 +7181,6 @@
 		<xsl:value-of select="$maxLength"/>
 	</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
 		<xsl:param name="key_iso"/>
-		
 		<!-- <tr>
 			<td>NOTE</td>
 			<td>
@@ -6677,27 +7188,47 @@
 			</td>
 		</tr>
 		 -->
-		<fo:table-row>
+		<!-- OLD Variant -->
+		<!-- <fo:table-row>
 			<fo:table-cell>
 				<fo:block margin-top="6pt">
 					<xsl:if test="normalize-space($key_iso) = 'true'">
 						<xsl:attribute name="margin-top">0</xsl:attribute>
 					</xsl:if>
-					<xsl:apply-templates select="*[local-name() = 'name']"/>
+					<xsl:apply-templates select="*[local-name() = 'name']" />
 				</fo:block>
 			</fo:table-cell>
 			<fo:table-cell>
 				<fo:block>
-					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]" />
+				</fo:block>
+			</fo:table-cell>
+		</fo:table-row> -->
+		<!-- <tr>
+			<td number-columns-spanned="2">NOTE <xsl:apply-templates /> </td>
+		</tr> 
+		-->
+		<fo:table-row>
+			<fo:table-cell number-columns-spanned="2">
+				<fo:block>
+					<xsl:call-template name="note"/>
 				</fo:block>
 			</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>
@@ -6708,50 +7239,122 @@
 		
 	</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">
-			<fo:table-cell>
+			<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: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:if test="$isGenerateTableIF = 'true'">
+				<!-- border is mandatory, to calculate real width -->
+				<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
+			</xsl:if>
+		
+			<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()"/>
+					
+			</td>
+		</tr>
+		
+	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if"/><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>
@@ -6790,13 +7393,15 @@
 					<xsl:choose>
 						<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
 						<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
-						<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
+						<xsl:when test="ancestor::*[local-name()='note'] or ancestor::*[local-name()='example']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
 						<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
 					</xsl:choose>
 				</xsl:attribute>
 			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='tt']/text()" priority="2">
+		<xsl:call-template name="add_spaces_to_sourcecode"/>
 	</xsl:template><xsl:template match="*[local-name()='underline']">
 		<fo:inline text-decoration="underline">
 			<xsl:apply-templates/>
@@ -6944,54 +7549,120 @@
 		<fo:block break-after="page"/>
 		<fo:block> </fo:block>
 		<fo:block break-after="page"/>
+	</xsl:template><xsl:template match="*[local-name() = 'span']">
+		<xsl:apply-templates/>
 	</xsl:template><xsl:template name="tokenize">
 		<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="str_no_en_chars" select="normalize-space(translate($text, $en_chars, ''))"/>
-					<xsl:variable name="len_str_no_en_chars" select="string-length($str_no_en_chars)"/>
 					<xsl:variable name="len_str_tmp" select="string-length(normalize-space($text))"/>
-					<xsl:variable name="len_str">
-						<xsl:choose>
-							<xsl:when test="normalize-space(translate($text, $upper, '')) = ''"> <!-- english word in CAPITAL letters -->
-								<xsl:value-of select="$len_str_tmp * 1.5"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:value-of select="$len_str_tmp"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:variable> 
-					
-					<!-- <xsl:if test="$len_str_no_en_chars div $len_str &gt; 0.8">
-						<xsl:message>
-							div=<xsl:value-of select="$len_str_no_en_chars div $len_str"/>
-							len_str=<xsl:value-of select="$len_str"/>
-							len_str_no_en_chars=<xsl:value-of select="$len_str_no_en_chars"/>
-						</xsl:message>
-					</xsl:if> -->
-					<!-- <len_str_no_en_chars><xsl:value-of select="$len_str_no_en_chars"/></len_str_no_en_chars>
-					<len_str><xsl:value-of select="$len_str"/></len_str> -->
 					<xsl:choose>
-						<xsl:when test="$len_str_no_en_chars div $len_str &gt; 0.8"> <!-- means non-english string -->
-							<xsl:value-of select="$len_str - $len_str_no_en_chars"/>
+						<xsl:when test="normalize-space(translate($text, 'X', '')) = ''"> <!-- special case for keep-together.within-line -->
+							<xsl:value-of select="$len_str_tmp"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:value-of select="$len_str"/>
+							<xsl:variable name="str_no_en_chars" select="normalize-space(translate($text, $en_chars, ''))"/>
+							<xsl:variable name="len_str_no_en_chars" select="string-length($str_no_en_chars)"/>
+							<xsl:variable name="len_str">
+								<xsl:choose>
+									<xsl:when test="normalize-space(translate($text, $upper, '')) = ''"> <!-- english word in CAPITAL letters -->
+										<xsl:value-of select="$len_str_tmp * 1.5"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$len_str_tmp"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:variable> 
+							
+							<!-- <xsl:if test="$len_str_no_en_chars div $len_str &gt; 0.8">
+								<xsl:message>
+									div=<xsl:value-of select="$len_str_no_en_chars div $len_str"/>
+									len_str=<xsl:value-of select="$len_str"/>
+									len_str_no_en_chars=<xsl:value-of select="$len_str_no_en_chars"/>
+								</xsl:message>
+							</xsl:if> -->
+							<!-- <len_str_no_en_chars><xsl:value-of select="$len_str_no_en_chars"/></len_str_no_en_chars>
+							<len_str><xsl:value-of select="$len_str"/></len_str> -->
+							<xsl:choose>
+								<xsl:when test="$len_str_no_en_chars div $len_str &gt; 0.8"> <!-- means non-english string -->
+									<xsl:value-of select="$len_str - $len_str_no_en_chars"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$len_str"/>
+								</xsl:otherwise>
+							</xsl:choose>
 						</xsl:otherwise>
 					</xsl:choose>
 				</word>
 			</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">
@@ -7064,36 +7735,47 @@
 	</xsl:template><xsl:template name="add-zero-spaces-equal">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-equals">==========</xsl:variable>
+		<xsl:variable name="regex_zero-space-after-equals">(==========)</xsl:variable>
 		<xsl:variable name="zero-space-after-equal">=</xsl:variable>
+		<xsl:variable name="regex_zero-space-after-equal">(=)</xsl:variable>
 		<xsl:variable name="zero-space">​</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="contains($text, $zero-space-after-equals)">
-				<xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
+				<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
 				<xsl:value-of select="$zero-space-after-equals"/>
 				<xsl:value-of select="$zero-space"/>
 				<xsl:call-template name="add-zero-spaces-equal">
 					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equals)"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equals,concat('$1',$zero_width_space))"/>
 			</xsl:when>
 			<xsl:when test="contains($text, $zero-space-after-equal)">
-				<xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
+				<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
 				<xsl:value-of select="$zero-space-after-equal"/>
 				<xsl:value-of select="$zero-space"/>
 				<xsl:call-template name="add-zero-spaces-equal">
 					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equal)"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equal,concat('$1',$zero_width_space))"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="$text"/>
 			</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>
 			
@@ -7102,10 +7784,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">
@@ -7183,18 +7922,138 @@
 						</xsl:choose>
 				</xsl:for-each>
 		</xsl:variable>
-
-		<xsl:variable name="newRow">
-				<xsl:copy>
-						<xsl:copy-of select="$currentRow/@*"/>
-						<xsl:copy-of select="xalan:nodeset($normalizedTDs)"/>
-				</xsl:copy>
+
+		<xsl:variable name="newRow">
+				<xsl:copy>
+						<xsl:copy-of select="$currentRow/@*"/>
+						<xsl:copy-of select="xalan:nodeset($normalizedTDs)"/>
+				</xsl:copy>
+		</xsl:variable>
+		<xsl:copy-of select="$newRow"/>
+
+		<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:copy-of select="$newRow"/>
-
-		<xsl:apply-templates select="following-sibling::tr[1]" mode="simple-table-rowspan">
-				<xsl:with-param name="previousRow" select="$newRow"/>
-		</xsl:apply-templates>
+		
+		<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">
@@ -7249,81 +8108,125 @@
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		
 		<fo:inline xsl:use-attribute-sets="mathml-style">
+		
 			
 				<xsl:if test="ancestor::*[local-name()='table']">
 					<xsl:attribute name="font-size">95%</xsl:attribute> <!-- base font in table is 10pt -->
 				</xsl:if>
 			
 			
+			
+			
 			<xsl:call-template name="setTrackChangesStyles">
 				<xsl:with-param name="isAdded" select="$isAdded"/>
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 			
-			 <!-- insert helper tag -->
-				<xsl:if test="$add_math_as_text = 'true'">
-					<fo:inline color="white" font-size="1pt" font-style="normal" font-weight="normal">​</fo:inline> <!-- zero width space -->
-				</xsl:if>
-			
+			<xsl:if test="$add_math_as_text = 'true'">
+				<!-- insert helper tag -->
+				<!-- set unique font-size (fiction) -->
+				<xsl:variable name="font-size_sfx"><xsl:number level="any"/></xsl:variable>
+				<fo:inline color="white" font-size="1.{$font-size_sfx}pt" font-style="normal" font-weight="normal"><xsl:value-of select="$zero_width_space"/></fo:inline> <!-- zero width space -->
+			</xsl:if>
 			
-			<xsl:variable name="mathml">
-				<xsl:apply-templates select="." mode="mathml"/>
+			<xsl:variable name="mathml_content">
+				<xsl:apply-templates select="." mode="mathml_actual_text"/>
 			</xsl:variable>
-			<fo:instream-foreign-object fox:alt-text="Math">
 			
-				
-					<xsl:if test="local-name(../..) = 'formula'">
-						<xsl:attribute name="width">95%</xsl:attribute>
-						<xsl:attribute name="content-height">100%</xsl:attribute>
-						<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
-						<xsl:attribute name="scaling">uniform</xsl:attribute>
-					</xsl:if>
-					
-					<xsl:if test="$add_math_as_text = 'true'">
-						<!-- <xsl:variable name="comment_text" select="following-sibling::node()[1][self::comment()]"/> -->
-						<xsl:variable name="comment_text" select="normalize-space(translate(.,' ⁢','  '))"/>
-						<xsl:if test="normalize-space($comment_text) != ''">
-						<!-- put Mathin Alternate Text -->
-							<xsl:attribute name="fox:alt-text">
-								<xsl:value-of select="java:org.metanorma.fop.Util.unescape($comment_text)"/>
-							</xsl:attribute>
-						</xsl:if>
-					</xsl:if>
-				
-				
-				<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
-				<xsl:variable name="comment_text_">
+			
+					<xsl:variable name="filename" select="xalan:nodeset($mathml_attachments)//attachment[. = $mathml_content]/@filename"/>
 					<xsl:choose>
-						<xsl:when test="normalize-space($comment_text_following) != ''">
-							<xsl:value-of select="$comment_text_following"/>
+						<xsl:when test="$add_math_as_attachment = 'true' and normalize-space($filename) != ''">
+							<xsl:variable name="url" select="concat('url(embedded-file:', $filename, ')')"/>
+							<fo:basic-link external-destination="{$url}" fox:alt-text="MathLink">
+								<xsl:variable name="comment_text">
+									<xsl:call-template name="getMathml_comment_text"/>
+								</xsl:variable>
+								<xsl:if test="normalize-space($comment_text) != ''">
+								<!-- put Mathin Alternate Text -->
+									<xsl:attribute name="fox:alt-text">
+										<xsl:value-of select="$comment_text"/>
+									</xsl:attribute>
+								</xsl:if>
+								<xsl:call-template name="mathml_instream_object">
+									<xsl:with-param name="comment_text" select="$comment_text"/>
+									<xsl:with-param name="mathml_content" select="$mathml_content"/>
+								</xsl:call-template>
+							</fo:basic-link>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
+							<xsl:call-template name="mathml_instream_object">
+								<xsl:with-param name="mathml_content" select="$mathml_content"/>
+							</xsl:call-template>
 						</xsl:otherwise>
 					</xsl:choose>
-				</xsl:variable> 
-				<xsl:variable name="comment_text" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
+					<!-- end BSI -->
 				
-				<xsl:if test="normalize-space($comment_text) != ''">
-				<!-- put Mathin Alternate Text -->
-					<xsl:attribute name="fox:alt-text">
-						<xsl:value-of select="java:org.metanorma.fop.Util.unescape($comment_text)"/>
-					</xsl:attribute>
+			
+		</fo:inline>
+	</xsl:template><xsl:template name="getMathml_comment_text">
+		<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
+		<xsl:variable name="comment_text_">
+			<xsl:choose>
+				<xsl:when test="normalize-space($comment_text_following) != ''">
+					<xsl:value-of select="$comment_text_following"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable> 
+		<xsl:variable name="comment_text_2" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
+		<xsl:variable name="comment_text" select="java:trim(java:java.lang.String.new($comment_text_2))"/>
+		<xsl:value-of select="$comment_text"/>
+	</xsl:template><xsl:template name="mathml_instream_object">
+		<xsl:param name="comment_text"/>
+		<xsl:param name="mathml_content"/>
+	
+		<xsl:variable name="comment_text_">
+			<xsl:choose>
+				<xsl:when test="normalize-space($comment_text) != ''"><xsl:value-of select="$comment_text"/></xsl:when>
+				<xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+	
+		<xsl:variable name="mathml">
+			<xsl:apply-templates select="." mode="mathml"/>
+		</xsl:variable>
+			
+		<fo:instream-foreign-object fox:alt-text="Math">
+					
+			
+				<xsl:if test="local-name(../..) = 'formula'">
+					<xsl:attribute name="width">95%</xsl:attribute>
+					<xsl:attribute name="content-height">100%</xsl:attribute>
+					<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+					<xsl:attribute name="scaling">uniform</xsl:attribute>
 				</xsl:if>
-				
-				<xsl:variable name="mathml_content">
-					<xsl:apply-templates select="." mode="mathml_actual_text"/>
-				</xsl:variable>
-				<!-- put MathML in Actual Text -->
-				<xsl:attribute name="fox:actual-text">
-					<xsl:value-of select="$mathml_content"/>
+			
+			
+			
+			
+			
+			
+			<!-- put MathML in Actual Text -->
+			<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
+			<xsl:attribute name="fox:actual-text">
+				<xsl:value-of select="$mathml_content"/>
+			</xsl:attribute>
+			
+			<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
+			<xsl:if test="normalize-space($comment_text_) != ''">
+			<!-- put Mathin Alternate Text -->
+				<xsl:attribute name="fox:alt-text">
+					<xsl:value-of select="$comment_text_"/>
 				</xsl:attribute>
-				
-				
-				
-				<xsl:copy-of select="xalan:nodeset($mathml)"/>
-			</fo:instream-foreign-object>			
-		</fo:inline>
+			</xsl:if>
+			<!-- </xsl:if> -->
+		
+			<xsl:copy-of select="xalan:nodeset($mathml)"/>
+			
+		</fo:instream-foreign-object>
 	</xsl:template><xsl:template match="mathml:*" mode="mathml_actual_text">
 		<!-- <xsl:text>a+b</xsl:text> -->
 		<xsl:text>&lt;</xsl:text>
@@ -7354,7 +8257,9 @@
 			<!-- replace start and end spaces to non-break space -->
 			<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
 		</xsl:copy>
-	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
+	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="mathml:mtd/mathml:mo/text()[. = '/']" mode="mathml">
+		<xsl:value-of select="."/><xsl:value-of select="$zero_width_space"/>
+	</xsl:template><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
 				<xsl:when test="@updatetype = 'true'">
@@ -7595,7 +8500,12 @@
 			
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 			
+				<xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
+					<xsl:attribute name="padding-right">1mm</xsl:attribute>
+				</xsl:if>
+			
 				
+
 				
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
@@ -7960,18 +8870,33 @@
 	</xsl:template><xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="svg_update"/>
-			<xsl:variable name="viewbox">
+			<xsl:variable name="viewbox_">
 				<xsl:call-template name="split">
 					<xsl:with-param name="pText" select="@viewBox"/>
 					<xsl:with-param name="sep" select="' '"/>
 				</xsl:call-template>
 			</xsl:variable>
+			<xsl:variable name="viewbox" select="xalan:nodeset($viewbox_)"/>
+			<xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
+			<xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
+			
 			<xsl:attribute name="width">
-				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[3])"/>
+				<xsl:choose>
+					<xsl:when test="$width != ''">
+						<xsl:value-of select="round($width)"/>
+					</xsl:when>
+					<xsl:otherwise>400</xsl:otherwise> <!-- default width -->
+				</xsl:choose>
 			</xsl:attribute>
 			<xsl:attribute name="height">
-				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[4])"/>
+				<xsl:choose>
+					<xsl:when test="$height != ''">
+						<xsl:value-of select="round($height)"/>
+					</xsl:when>
+					<xsl:otherwise>400</xsl:otherwise> <!-- default height -->
+				</xsl:choose>
 			</xsl:attribute>
+			
 			<xsl:apply-templates mode="svg_update"/>
 		</xsl:copy>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3">
@@ -8166,7 +9091,11 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template match="*[local-name() = 'title' or local-name() = 'name']//*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'references']/*[local-name() = 'bibitem']" mode="contents"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'references']/*[local-name() = 'bibitem']" mode="contents"/><xsl:template match="*[local-name() = 'span']" mode="contents">
+		<xsl:apply-templates mode="contents"/>
+	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+		<xsl:apply-templates mode="bookmarks"/>
+	</xsl:template><xsl:template match="*[local-name() = 'span']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -8462,7 +9391,9 @@
 					<xsl:apply-templates/>
 				</xsl:otherwise>
 			</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() = 'tab']" mode="contents_item">
+	</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:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
 		<xsl:copy>
@@ -8493,9 +9424,22 @@
 			</xsl:when>
 			<xsl:otherwise><xsl:apply-templates mode="contents_item"/></xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template match="text()" mode="contents_item">
+		<xsl:call-template name="keep_together_standard_number"/>
+	</xsl:template><xsl:template match="*[local-name() = 'span']" mode="contents_item">
+		<xsl:apply-templates mode="contents_item"/>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
 	
 		<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
+		
+			<xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
+				<xsl:attribute name="margin-left">0mm</xsl:attribute>
+			</xsl:if>
+			
+			<xsl:if test="ancestor::*[local-name() = 'example']">
+				<xsl:attribute name="margin-right">0mm</xsl:attribute>
+			</xsl:if>
+			
 			<xsl:copy-of select="@id"/>
 			
 			<xsl:if test="parent::*[local-name() = 'note']">
@@ -8595,17 +9539,15 @@
 		
 		<!-- split text by zero-width space -->
 		<xsl:variable name="text_step4">
-			<xsl:call-template name="split">
+			<xsl:call-template name="split_for_interspers">
 				<xsl:with-param name="pText" select="$text_step3"/>
 				<xsl:with-param name="sep" select="$zero_width_space"/>
-				<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($text_step4)/item">
+		<xsl:for-each select="xalan:nodeset($text_step4)/node()">
 			<xsl:choose>
-				<xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
+				<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:with-param name="str" select="."/>
 					</xsl:call-template>
@@ -8616,6 +9558,30 @@
 			</xsl:choose>
 		</xsl:for-each>
 		
+	</xsl:template><xsl:variable name="interspers_tag_open">###interspers123###</xsl:variable><xsl:variable name="interspers_tag_close">###/interspers123###</xsl:variable><xsl:template name="split_for_interspers">
+		<xsl:param name="pText" select="."/>
+		<xsl:param name="sep" select="','"/>
+		<!-- word with length more than 30 will be interspersed with zero-width space -->
+		<xsl:variable name="regex" select="concat('([^', $zero_width_space, ']{31,})')"/> <!-- sequence of characters (more 31), that doesn't contains zero-width space -->
+		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new($pText),$regex,concat($interspers_tag_open,'$1',$interspers_tag_close))"/>
+		<xsl:call-template name="replace_tag_interspers">
+			<xsl:with-param name="text" select="$text"/>
+		</xsl:call-template>
+	</xsl:template><xsl:template name="replace_tag_interspers">
+		<xsl:param name="text"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $interspers_tag_open)">
+				<xsl:value-of select="substring-before($text, $interspers_tag_open)"/>
+				<xsl:variable name="text_after" select="substring-after($text, $interspers_tag_open)"/>
+				<interspers>
+					<xsl:value-of select="substring-before($text_after, $interspers_tag_close)"/>
+				</interspers>
+				<xsl:call-template name="replace_tag_interspers">
+					<xsl:with-param name="text" select="substring-after($text_after, $interspers_tag_close)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="interspers">
 		<xsl:param name="str"/>
 		<xsl:param name="char" select="$zero_width_space"/>
@@ -8844,7 +9810,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'])">
@@ -8951,39 +9919,67 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'example']">
-		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
-			
+		
+		<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style">
+		
 			
+		
 			<xsl:variable name="fo_element">
-				<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl']">block</xsl:if> 
+				<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if> 
 				block
 			</xsl:variable>
 			
-			<!-- display 'EXAMPLE' -->
-			<xsl:apply-templates select="*[local-name()='name']">
-				<xsl:with-param name="fo_element" select="$fo_element"/>
-			</xsl:apply-templates>
+			<fo:block-container margin-left="0mm">
 			
-			<xsl:choose>
-				<xsl:when test="contains(normalize-space($fo_element), 'block')">
-					<fo:block-container xsl:use-attribute-sets="example-body-style">
-						<fo:block-container margin-left="0mm" margin-right="0mm">
-							<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+				<xsl:choose>
+					
+					<xsl:when test="contains(normalize-space($fo_element), 'block')">
+					
+						<!-- display name 'EXAMPLE' in a separate block  -->
+						<fo:block>
+							<xsl:apply-templates select="*[local-name()='name']">
 								<xsl:with-param name="fo_element" select="$fo_element"/>
 							</xsl:apply-templates>
+						</fo:block>
+						
+						<fo:block-container xsl:use-attribute-sets="example-body-style">
+							<fo:block-container margin-left="0mm" margin-right="0mm"> 
+								<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+									<xsl:with-param name="fo_element" select="$fo_element"/>
+								</xsl:apply-templates>
+							</fo:block-container>
 						</fo:block-container>
-					</fo:block-container>
-				</xsl:when>
-				<xsl:otherwise>
-					<fo:inline>
-						<xsl:apply-templates select="node()[not(local-name() = 'name')]">
-							<xsl:with-param name="fo_element" select="$fo_element"/>
-						</xsl:apply-templates>
-					</fo:inline>
-				</xsl:otherwise>
-			</xsl:choose>
-			
-		</fo:block>
+					</xsl:when> <!-- end block -->
+					
+					<xsl:otherwise> <!-- inline -->
+					
+						<!-- display 'EXAMPLE' and first element in the same line -->
+						<fo:block>
+							<xsl:apply-templates select="*[local-name()='name']">
+								<xsl:with-param name="fo_element" select="$fo_element"/>
+							</xsl:apply-templates>
+							<fo:inline>
+								<xsl:apply-templates select="*[not(local-name() = 'name')][1]">
+									<xsl:with-param name="fo_element" select="$fo_element"/>
+								</xsl:apply-templates>
+							</fo:inline>
+						</fo:block> 
+						
+						<xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
+							<!-- display further elements in blocks -->
+							<fo:block-container xsl:use-attribute-sets="example-body-style">
+								<fo:block-container margin-left="0mm" margin-right="0mm">
+									<xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
+										<xsl:with-param name="fo_element" select="'block'"/>
+									</xsl:apply-templates>
+								</fo:block-container>
+							</fo:block-container>
+						</xsl:if>
+					</xsl:otherwise> <!-- end inline -->
+					
+				</xsl:choose>
+			</fo:block-container>
+		</fo:block-container>
 	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']">
 		<xsl:param name="fo_element">block</xsl:param>
 	
@@ -9015,10 +10011,16 @@
 		</xsl:variable>		
 		<xsl:choose>			
 			<xsl:when test="starts-with(normalize-space($element), 'block')">
-				<fo:block xsl:use-attribute-sets="example-p-style">
-					
-					<xsl:apply-templates/>
-				</fo:block>
+				<fo:block-container>
+					<xsl:if test="ancestor::*[local-name() = 'li'] and contains(normalize-space($fo_element), 'block')">
+						<xsl:attribute name="margin-left">0mm</xsl:attribute>
+						<xsl:attribute name="margin-right">0mm</xsl:attribute>
+					</xsl:if>
+					<fo:block xsl:use-attribute-sets="example-p-style">
+						
+						<xsl:apply-templates/>
+					</fo:block>
+				</fo:block-container>
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:inline xsl:use-attribute-sets="example-p-style">
@@ -9063,7 +10065,7 @@
 				</xsl:otherwise>
 			</xsl:choose> -->
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ') or     starts-with(., '[SOURCE: Quoted from: ') or     starts-with(., '[SOURCE: Modified from: ')]" priority="2">
 		<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
 		<xsl:if test="normalize-space() != ''">
@@ -9206,7 +10208,16 @@
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise> <!-- if there is key('bibitems_hidden', $current_bibitemid) -->
-				<fo:inline><xsl:apply-templates/></fo:inline>
+			
+				<!-- if in bibitem[@hidden='true'] there is url[@type='src'], then create hyperlink  -->
+				<xsl:variable name="uri_src" select="normalize-space($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'src'])"/>
+				<xsl:choose>
+					<xsl:when test="$uri_src != ''">
+						<fo:basic-link external-destination="{$uri_src}" fox:alt-text="{$uri_src}"><xsl:apply-templates/></fo:basic-link>
+					</xsl:when>
+					<xsl:otherwise><fo:inline><xsl:apply-templates/></fo:inline></xsl:otherwise>
+				</xsl:choose>
+				
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'tab']">
@@ -9379,10 +10390,24 @@
 			
 		</fo:block>
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'review']">
+	</xsl:template><xsl:template match="*[local-name() = 'review']"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
 		<!-- comment 2019-11-29 -->
 		<!-- <fo:block font-weight="bold">Review:</fo:block>
 		<xsl:apply-templates /> -->
+		
+		<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
+
+		<xsl:choose>
+			<!-- if there isn't the attribute '@from', then -->
+			<xsl:when test="$id_from = ''">
+				<fo:block id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
+			</xsl:when>
+			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
+			<xsl:when test="not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
+			</xsl:when>
+		</xsl:choose>
+		
 	</xsl:template><xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
@@ -9743,7 +10768,10 @@
 		<!-- to split by '_' and other chars -->
 		<xsl:call-template name="add-zero-spaces-java"/>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
-		<fo:inline id="{@id}" font-size="1pt"/>
+		<!-- <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() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'errata']">
 		<!-- <row>
 					<date>05-07-2013</date>
@@ -10303,6 +11331,120 @@
 				<xsl:apply-templates select="." mode="update_xml_step1"/>
 			</xsl:for-each>
 		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template><xsl:template match="@*|node()" mode="update_xml_enclose_keep-together_within-line">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="update_xml_enclose_keep-together_within-line"/>
+		</xsl:copy>
+	</xsl:template><xsl:variable name="express_reference_separators">_.\</xsl:variable><xsl:variable name="express_reference_characters" select="concat($upper,$lower,'1234567890',$express_reference_separators)"/><xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable><xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	
+		<!-- enclose standard's number into tag 'keep-together_within-line' -->
+		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
+		<xsl:variable name="tag_keep-together_within-line_open">###<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable>
+		<xsl:variable name="tag_keep-together_within-line_close">###/<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable>
+		<xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
+		<xsl:variable name="text"><text><xsl:call-template name="replace_text_tags">
+				<xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/>
+				<xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/>
+				<xsl:with-param name="text" select="$text_"/>
+			</xsl:call-template></text></xsl:variable>
+		
+		<xsl:variable name="parent" select="local-name(..)"/>
+		
+		<xsl:variable name="text2">
+			<text><xsl:for-each select="xalan:nodeset($text)/text/node()">
+					<xsl:copy-of select="."/>
+				</xsl:for-each></text>
+		</xsl:variable>
+		
+		<!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
+		<xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable>
+		<xsl:variable name="text3">
+			<text><xsl:for-each select="xalan:nodeset($text2)/text/node()">
+				<xsl:choose>
+					<xsl:when test="self::text()">
+						<xsl:variable name="text_units_" select="java:replaceAll(java:java.lang.String.new(.),$regex_solidus_units,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
+						<xsl:variable name="text_units"><text><xsl:call-template name="replace_text_tags">
+							<xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/>
+							<xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/>
+							<xsl:with-param name="text" select="$text_units_"/>
+						</xsl:call-template></text></xsl:variable>
+						<xsl:copy-of select="xalan:nodeset($text_units)/text/node()"/>
+					</xsl:when>
+					<xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise> <!-- copy 'as-is' for <fo:inline keep-together.within-line="always" ...  -->
+				</xsl:choose>
+			</xsl:for-each></text>
+		</xsl:variable>
+		
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'td' or local-name() = 'th']">
+				<!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b  in table's cell ONLY -->
+				<xsl:variable name="regex_dots_units">((\b((\S{1,3}\.\S+)|(\S+\.\S{1,3}))\b)|(\.\S{1,3})\b)</xsl:variable>
+				<xsl:for-each select="xalan:nodeset($text3)/text/node()">
+					<xsl:choose>
+						<xsl:when test="self::text()">
+							<xsl:variable name="text_dots_" select="java:replaceAll(java:java.lang.String.new(.),$regex_dots_units,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
+							<xsl:variable name="text_dots"><text><xsl:call-template name="replace_text_tags">
+								<xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/>
+								<xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/>
+								<xsl:with-param name="text" select="$text_dots_"/>
+							</xsl:call-template></text></xsl:variable>
+							<xsl:copy-of select="xalan:nodeset($text_dots)/text/node()"/>
+						</xsl:when>
+						<xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise> <!-- copy 'as-is' for <fo:inline keep-together.within-line="always" ...  -->
+					</xsl:choose>
+				</xsl:for-each>
+			</xsl:when>
+			<xsl:otherwise><xsl:copy-of select="xalan:nodeset($text3)/text/node()"/></xsl:otherwise>
+		</xsl:choose>
+		
+	</xsl:template><xsl:template name="replace_text_tags">
+		<xsl:param name="tag_open"/>
+		<xsl:param name="tag_close"/>
+		<xsl:param name="text"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $tag_open)">
+				<xsl:value-of select="substring-before($text, $tag_open)"/>
+				<xsl:variable name="text_after" select="substring-after($text, $tag_open)"/>
+				
+				<xsl:element name="{substring-before(substring-after($tag_open, '###'),'###')}">
+					<xsl:value-of select="substring-before($text_after, $tag_close)"/>
+				</xsl:element>
+				
+				<xsl:call-template name="replace_text_tags">
+					<xsl:with-param name="tag_open" select="$tag_open"/>
+					<xsl:with-param name="tag_close" select="$tag_close"/>
+					<xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+		</xsl:choose>
+	</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>
+		<xsl:choose>
+			<xsl:when test="$edition_i18n != ''">
+				<!-- Example: <edition language="fr">deuxième édition</edition> -->
+				<xsl:call-template name="capitalize">
+					<xsl:with-param name="str" select="$edition_i18n"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="edition" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'])"/>
+				<xsl:if test="$edition != ''"> <!-- Example: 1.3 -->
+					<xsl:call-template name="capitalize">
+						<xsl:with-param name="str">
+							<xsl:call-template name="getLocalizedString">
+								<xsl:with-param name="key">edition</xsl:with-param>
+							</xsl:call-template>
+						</xsl:with-param>
+					</xsl:call-template>
+					<xsl:text> </xsl:text>
+					<xsl:value-of select="$edition"/>
+				</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -10990,4 +12132,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>