metanorma-iso 1.8.5 → 1.9.1

data/lib/isodoc/iso/iso.amendment.xsl

@@ -23,13 +23,6 @@
 	<xsl:variable name="marginTop" select="27.4"/>
 	<xsl:variable name="marginBottom" select="13"/>
 
-	<xsl:variable name="figure_name_height">14</xsl:variable>
-	<xsl:variable name="width_effective" select="$pageWidth - $marginLeftRight1 - $marginLeftRight2"/><!-- paper width minus margins -->
-	<xsl:variable name="height_effective" select="$pageHeight - $marginTop - $marginBottom - $figure_name_height"/><!-- paper height minus margins and title height -->
-	<xsl:variable name="image_dpi" select="96"/>
-	<xsl:variable name="width_effective_px" select="$width_effective div 25.4 * $image_dpi"/>
-	<xsl:variable name="height_effective_px" select="$height_effective div 25.4 * $image_dpi"/>
-
 	<xsl:variable name="docidentifierISO" select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso'] | /iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'ISO']"/>
 
 	<xsl:variable name="all_rights_reserved">
@@ -1915,257 +1908,6 @@
 		</fo:block>
 	</xsl:template>
 	
-	<!-- =================== -->
-	<!-- SVG images processing -->
-	<!-- =================== -->
-	<xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image']) and *[local-name() = 'svg']]/*[local-name() = 'name']/*[local-name() = 'bookmark']" priority="2"/>
-	<xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image'])]/*[local-name() = 'svg']" priority="2" name="image_svg">
-		<xsl:param name="name"/>
-		
-		<xsl:variable name="svg_content">
-			<xsl:apply-templates select="." mode="svg_update"/>
-		</xsl:variable>
-		
-		<xsl:variable name="alt-text">
-			<xsl:choose>
-				<xsl:when test="normalize-space(../*[local-name() = 'name']) != ''">
-					<xsl:value-of select="../*[local-name() = 'name']"/>
-				</xsl:when>
-				<xsl:when test="normalize-space($name) != ''">
-					<xsl:value-of select="$name"/>
-				</xsl:when>
-				<xsl:otherwise>Figure</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		
-		<xsl:choose>
-			<xsl:when test=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]">
-				<fo:block>
-					<xsl:variable name="width" select="@width"/>
-					<xsl:variable name="height" select="@height"/>
-					
-					<xsl:variable name="scale_x">
-						<xsl:choose>
-							<xsl:when test="$width &gt; $width_effective_px">
-								<xsl:value-of select="$width_effective_px div $width"/>
-							</xsl:when>
-							<xsl:otherwise>1</xsl:otherwise>
-						</xsl:choose>
-					</xsl:variable>
-					
-					<xsl:variable name="scale_y">
-						<xsl:choose>
-							<xsl:when test="$height * $scale_x &gt; $height_effective_px">
-								<xsl:value-of select="$height_effective_px div ($height * $scale_x)"/>
-							</xsl:when>
-							<xsl:otherwise>1</xsl:otherwise>
-						</xsl:choose>
-					</xsl:variable>
-					
-					<xsl:variable name="scale">
-						<xsl:choose>
-							<xsl:when test="$scale_y != 1">
-								<xsl:value-of select="$scale_x * $scale_y"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:value-of select="$scale_x"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:variable>
-					 
-					<xsl:variable name="width_scale" select="round($width * $scale)"/>
-					<xsl:variable name="height_scale" select="round($height * $scale)"/>
-					
-					<fo:table table-layout="fixed" width="100%">
-						<fo:table-column column-width="proportional-column-width(1)"/>
-						<fo:table-column column-width="{$width_scale}px"/>
-						<fo:table-column column-width="proportional-column-width(1)"/>
-						<fo:table-body>
-							<fo:table-row>
-								<fo:table-cell column-number="2">
-									<fo:block>
-										<fo:block-container width="{$width_scale}px" height="{$height_scale}px">
-											<xsl:if test="../*[local-name() = 'name']/*[local-name() = 'bookmark']">
-												<fo:block line-height="0" font-size="0">
-													<xsl:for-each select="../*[local-name() = 'name']/*[local-name() = 'bookmark']">
-														<xsl:call-template name="bookmark"/>
-													</xsl:for-each>
-												</fo:block>
-											</xsl:if>
-											<fo:block text-depth="0" line-height="0" font-size="0">
-
-												<fo:instream-foreign-object fox:alt-text="{$alt-text}">
-													<xsl:attribute name="width">100%</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:apply-templates select="xalan:nodeset($svg_content)" mode="svg_remove_a"/>
-												</fo:instream-foreign-object>
-											</fo:block>
-											
-											<xsl:apply-templates select=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]" mode="svg_imagemap_links">
-												<xsl:with-param name="scale" select="$scale"/>
-											</xsl:apply-templates>
-										</fo:block-container>
-									</fo:block>
-								</fo:table-cell>
-							</fo:table-row>
-						</fo:table-body>
-					</fo:table>
-				</fo:block>
-				
-			</xsl:when>
-			<xsl:otherwise>
-				<fo:block xsl:use-attribute-sets="image-style">
-					<fo:instream-foreign-object fox:alt-text="{$alt-text}">
-						<xsl:attribute name="width">100%</xsl:attribute>
-						<xsl:attribute name="content-height">100%</xsl:attribute>
-						<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
-						<!-- effective height 297 - 27.4 - 13 =  256.6 -->
-						<!-- effective width 210 - 12.5 - 25 = 172.5 -->
-						<!-- effective height / width = 1.48, 1.4 - with title -->
-						<xsl:if test="@height &gt; (@width * 1.4)"> <!-- for images with big height -->
-							<xsl:variable name="width" select="((@width * 1.4) div @height) * 100"/>
-							<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
-						</xsl:if>
-						<xsl:attribute name="scaling">uniform</xsl:attribute>
-						<xsl:copy-of select="$svg_content"/>
-					</fo:instream-foreign-object>
-				</fo:block>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-	
-	<xsl:template match="@*|node()" mode="svg_update">
-		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="svg_update"/>
-		</xsl:copy>
-	</xsl:template>
-	
-	<xsl:template match="*[local-name() = 'image']/@href" mode="svg_update">
-		<xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink">
-			<xsl:value-of select="."/>
-		</xsl:attribute>
-	</xsl:template>
-	
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
-		<xsl:variable name="svg_content" select="document(@src)"/>
-		<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
-		<xsl:for-each select="xalan:nodeset($svg_content)/node()">
-			<xsl:call-template name="image_svg">
-				<xsl:with-param name="name" select="$name"/>
-			</xsl:call-template>
-		</xsl:for-each>
-	</xsl:template>
-	
-	<xsl:template match="@*|node()" mode="svg_remove_a">
-		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="svg_remove_a"/>
-		</xsl:copy>
-	</xsl:template>
-
-	<xsl:template match="*[local-name() = 'a']" mode="svg_remove_a">
-		<xsl:apply-templates mode="svg_remove_a"/>
-	</xsl:template>
-	
-	<xsl:template match="*[local-name() = 'a']" mode="svg_imagemap_links">
-		<xsl:param name="scale"/>
-		<xsl:variable name="dest">
-			<xsl:choose>
-				<xsl:when test="starts-with(@href, '#')">
-					<xsl:value-of select="substring-after(@href, '#')"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="@href"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<xsl:for-each select="./*[local-name() = 'rect']">
-			<xsl:call-template name="insertSVGMapLink">
-				<xsl:with-param name="left" select="floor(@x * $scale)"/>
-				<xsl:with-param name="top" select="floor(@y * $scale)"/>
-				<xsl:with-param name="width" select="floor(@width * $scale)"/>
-				<xsl:with-param name="height" select="floor(@height * $scale)"/>
-				<xsl:with-param name="dest" select="$dest"/>
-			</xsl:call-template>
-		</xsl:for-each>
-		
-		<xsl:for-each select="./*[local-name() = 'polygon']">
-			<xsl:variable name="points">
-				<xsl:call-template name="split">
-					<xsl:with-param name="pText" select="@points"/>
-				</xsl:call-template>
-			</xsl:variable>
-			<xsl:variable name="x_coords">
-				<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
-					<xsl:sort select="." data-type="number"/>
-					<x><xsl:value-of select="."/></x>
-				</xsl:for-each>
-			</xsl:variable>
-			<xsl:variable name="y_coords">
-				<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
-					<xsl:sort select="." data-type="number"/>
-					<y><xsl:value-of select="."/></y>
-				</xsl:for-each>
-			</xsl:variable>
-			<xsl:variable name="x" select="xalan:nodeset($x_coords)//x[1]"/>
-			<xsl:variable name="y" select="xalan:nodeset($y_coords)//y[1]"/>
-			<xsl:variable name="width" select="xalan:nodeset($x_coords)//x[last()] - $x"/>
-			<xsl:variable name="height" select="xalan:nodeset($y_coords)//y[last()] - $y"/>
-			<xsl:call-template name="insertSVGMapLink">
-				<xsl:with-param name="left" select="floor($x * $scale)"/>
-				<xsl:with-param name="top" select="floor($y * $scale)"/>
-				<xsl:with-param name="width" select="floor($width * $scale)"/>
-				<xsl:with-param name="height" select="floor($height * $scale)"/>
-				<xsl:with-param name="dest" select="$dest"/>
-			</xsl:call-template>
-		</xsl:for-each>
-		
-		<xsl:for-each select="./*[local-name() = 'circle']">
-			<xsl:call-template name="insertSVGMapLink">
-				<xsl:with-param name="left" select="floor((@cx - @r) * $scale)"/>
-				<xsl:with-param name="top" select="floor((@cy - @r) * $scale)"/>
-				<xsl:with-param name="width" select="floor(@r * 2 * $scale)"/>
-				<xsl:with-param name="height" select="floor(@r * 2 * $scale)"/>
-				<xsl:with-param name="dest" select="$dest"/>
-			</xsl:call-template>
-		</xsl:for-each>
-		<xsl:for-each select="./*[local-name() = 'ellipse']">
-			<xsl:call-template name="insertSVGMapLink">
-				<xsl:with-param name="left" select="floor((@cx - @rx) * $scale)"/>
-				<xsl:with-param name="top" select="floor((@cy - @ry) * $scale)"/>
-				<xsl:with-param name="width" select="floor(@rx * 2 * $scale)"/>
-				<xsl:with-param name="height" select="floor(@ry * 2 * $scale)"/>
-				<xsl:with-param name="dest" select="$dest"/>
-			</xsl:call-template>
-		</xsl:for-each>
-	</xsl:template>
-	
-	<xsl:template name="insertSVGMapLink">
-		<xsl:param name="left"/>
-		<xsl:param name="top"/>
-		<xsl:param name="width"/>
-		<xsl:param name="height"/>
-		<xsl:param name="dest"/>
-		<fo:block-container position="absolute" left="{$left}px" top="{$top}px" width="{$width}px" height="{$height}px">
-		 <fo:block font-size="1pt">
-			<fo:basic-link internal-destination="{$dest}" fox:alt-text="svg link">
-				<fo:inline-container inline-progression-dimension="100%">
-					<fo:block-container height="{$height - 1}px" width="100%">
-						<!-- DEBUG <xsl:if test="local-name()='polygon'">
-							<xsl:attribute name="background-color">magenta</xsl:attribute>
-						</xsl:if> -->
-					<fo:block> </fo:block></fo:block-container>
-				</fo:inline-container>
-			</fo:basic-link>
-		 </fo:block>
-	  </fo:block-container>
-	</xsl:template>
-	
-	<!-- =================== -->
-	<!-- End SVG images processing -->
-	<!-- =================== -->
 	
 	<!-- For express listings PDF attachments -->
 	<xsl:template match="*[local-name() = 'eref'][contains(@bibitemid, '.exp')]" priority="2">
@@ -2357,88 +2099,6 @@
 		<xsl:text>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</xsl:text>
 	</xsl:variable>
 	
-		<xsl:template name="number-to-words">
-		<xsl:param name="number"/>
-		<xsl:variable name="words">
-			<words>
-				<word cardinal="1">One-</word>
-				<word ordinal="1">First </word>
-				<word cardinal="2">Two-</word>
-				<word ordinal="2">Second </word>
-				<word cardinal="3">Three-</word>
-				<word ordinal="3">Third </word>
-				<word cardinal="4">Four-</word>
-				<word ordinal="4">Fourth </word>
-				<word cardinal="5">Five-</word>
-				<word ordinal="5">Fifth </word>
-				<word cardinal="6">Six-</word>
-				<word ordinal="6">Sixth </word>
-				<word cardinal="7">Seven-</word>
-				<word ordinal="7">Seventh </word>
-				<word cardinal="8">Eight-</word>
-				<word ordinal="8">Eighth </word>
-				<word cardinal="9">Nine-</word>
-				<word ordinal="9">Ninth </word>
-				<word ordinal="10">Tenth </word>
-				<word ordinal="11">Eleventh </word>
-				<word ordinal="12">Twelfth </word>
-				<word ordinal="13">Thirteenth </word>
-				<word ordinal="14">Fourteenth </word>
-				<word ordinal="15">Fifteenth </word>
-				<word ordinal="16">Sixteenth </word>
-				<word ordinal="17">Seventeenth </word>
-				<word ordinal="18">Eighteenth </word>
-				<word ordinal="19">Nineteenth </word>
-				<word cardinal="20">Twenty-</word>
-				<word ordinal="20">Twentieth </word>
-				<word cardinal="30">Thirty-</word>
-				<word ordinal="30">Thirtieth </word>
-				<word cardinal="40">Forty-</word>
-				<word ordinal="40">Fortieth </word>
-				<word cardinal="50">Fifty-</word>
-				<word ordinal="50">Fiftieth </word>
-				<word cardinal="60">Sixty-</word>
-				<word ordinal="60">Sixtieth </word>
-				<word cardinal="70">Seventy-</word>
-				<word ordinal="70">Seventieth </word>
-				<word cardinal="80">Eighty-</word>
-				<word ordinal="80">Eightieth </word>
-				<word cardinal="90">Ninety-</word>
-				<word ordinal="90">Ninetieth </word>
-				<word cardinal="100">Hundred-</word>
-				<word ordinal="100">Hundredth </word>
-			</words>
-		</xsl:variable>
-
-		<xsl:variable name="ordinal" select="xalan:nodeset($words)//word[@ordinal = $number]/text()"/>
-
-		<xsl:choose>
-			<xsl:when test="$ordinal != ''">
-				<xsl:value-of select="$ordinal"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:choose>
-					<xsl:when test="$number &lt; 100">
-						<xsl:variable name="decade" select="concat(substring($number,1,1), '0')"/>
-						<xsl:variable name="digit" select="substring($number,2)"/>
-						<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $decade]/text()"/>
-						<xsl:value-of select="xalan:nodeset($words)//word[@ordinal = $digit]/text()"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<!-- more 100 -->
-						<xsl:variable name="hundred" select="substring($number,1,1)"/>
-						<xsl:variable name="digits" select="number(substring($number,2))"/>
-						<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $hundred]/text()"/>
-						<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = '100']/text()"/>
-						<xsl:call-template name="number-to-words">
-							<xsl:with-param name="number" select="$digits"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-	
 	<xsl:template name="printEdition">
 		<xsl:variable name="edition" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:edition)"/>
 		<xsl:text> </xsl:text>
@@ -2783,7 +2443,9 @@
 		
 				
 				
-	</xsl:attribute-set><xsl:attribute-set name="table-name-style">
+	</xsl:attribute-set><xsl:variable name="table-border_">
+		
+	</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			
 		
@@ -2839,6 +2501,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-style">
 		
 		
@@ -3059,14 +2722,15 @@
 		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>			
 		
 		<!-- Normative references  -->
-		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" mode="contents"/>	
+		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] |   /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]" mode="contents"/>	
 		<!-- Terms and definitions -->
 		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] |                        /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] |                       /*/*[local-name()='sections']/*[local-name()='definitions'] |                        /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]" mode="contents"/>		
 		<!-- Another main sections -->
 		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and                                                local-name() != 'definitions' and                                                not(@type='scope') and                                               not(local-name() = 'clause' and .//*[local-name()='terms']) and                                               not(local-name() = 'clause' and .//*[local-name()='definitions'])]" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>		
 		<!-- Bibliography -->
-		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]" mode="contents"/>
+		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] |       /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
+		
 	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
@@ -3109,6 +2773,8 @@
 				<fo:block>&#xA0;</fo:block>
 			</xsl:if> -->
 			
+			
+			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
 			
 					
@@ -3187,6 +2853,12 @@
 				
 				
 				
+				
+				
+				
+				<!-- display table's name before table for PAS inside block-container (2-columnn layout) -->
+				
+				
 				<xsl:variable name="table_width">
 					<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
 					100%
@@ -3207,6 +2879,7 @@
 						</xsl:if>
 					
 					
+					
 						<xsl:if test="ancestor::*[local-name() = 'table']">
 							<!-- for internal table in table cell -->
 							<attribute name="border">0.5pt solid black</attribute>
@@ -3656,6 +3329,8 @@
 					</xsl:choose>
 				</xsl:for-each>
 				
+				
+				
 				<xsl:choose>
 					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
 						<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
@@ -3680,6 +3355,7 @@
 					<fo:table-row>
 						<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
 							
+							
 								<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
 							
 							
@@ -3692,6 +3368,11 @@
 							
 							
 							
+							
+							
+							<!-- for BSI (not PAS) display Notes before footnotes -->
+							
+							
 							<!-- except gb  -->
 							
 								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
@@ -3717,6 +3398,10 @@
 							<!-- fn processing -->
 							<xsl:call-template name="fn_display"/>
 							
+							
+							<!-- for PAS display Notes after footnotes -->
+							
+							
 						</fo:table-cell>
 					</fo:table-row>
 				</fo:table-body>
@@ -3761,12 +3446,17 @@
 		
 		<fo:table-body>
 							
-				<xsl:variable name="title_continued">
+				<xsl:variable name="title_continued_">
 					<xsl:call-template name="getTitle">
 						<xsl:with-param name="name" select="'title-continued'"/>
 					</xsl:call-template>
 				</xsl:variable>
 				
+				<xsl:variable name="title_continued">
+					<xsl:value-of select="$title_continued_"/>
+					
+				</xsl:variable>
+				
 				<xsl:variable name="title_start" select="ancestor::*[local-name()='table'][1]/*[local-name()='name']/node()[1][self::text()]"/>
 				<xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
 				
@@ -3822,9 +3512,12 @@
 					
 					
 					
+					
+					
 				</xsl:if>
 				<xsl:if test="$parent-name = 'tfoot'">
 					
+					
 						<xsl:attribute name="font-size">9pt</xsl:attribute>
 						<xsl:attribute name="border-left">solid black 1pt</xsl:attribute>
 						<xsl:attribute name="border-right">solid black 1pt</xsl:attribute>
@@ -3839,6 +3532,8 @@
 				
 				
 				
+				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -3920,6 +3615,7 @@
 			
 			
 			
+			
 				<xsl:if test="ancestor::*[local-name() = 'tfoot']">
 					<xsl:attribute name="border">solid black 0</xsl:attribute>
 				</xsl:if>
@@ -3959,6 +3655,7 @@
 		
 			<fo:block font-size="10pt" margin-bottom="12pt">
 				
+				
 					<xsl:attribute name="font-size">9pt</xsl:attribute>
 					<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 				
@@ -3967,8 +3664,13 @@
 				
 				
 				
+				
+				<!-- Table's note name (NOTE, for example) -->
+
 				<fo:inline padding-right="2mm">
 					
+				
+					
 					
 					
 					
@@ -3976,6 +3678,8 @@
 						
 				</fo:inline>
 				
+				
+				
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
 		
@@ -3995,6 +3699,8 @@
 			<xsl:variable name="reference" select="@reference"/>
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
 				<fo:block margin-bottom="12pt">
+				
+					
 					
 						<xsl:attribute name="font-size">9pt</xsl:attribute>
 						<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -4013,9 +3719,11 @@
 						
 						
 						
+						
 						<xsl:value-of select="@reference"/>
 						
 						
+						
 					</fo:inline>
 					<fo:inline>
 						
@@ -4151,6 +3859,8 @@
 		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
 		<fo:inline font-size="80%" keep-with-previous.within-line="always">
 			
+			
+			
 				<xsl:if test="ancestor::*[local-name()='td']">
 					<xsl:attribute name="font-weight">normal</xsl:attribute>
 					<!-- <xsl:attribute name="alignment-baseline">hanging</xsl:attribute> -->
@@ -4163,11 +3873,13 @@
 			
 			
 			
+			
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				
 				
 				<xsl:value-of select="@reference"/>
 				
+				
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
@@ -5085,6 +4797,7 @@
 		<fo:inline xsl:use-attribute-sets="link-style">
 			
 			
+			
 			<xsl:choose>
 				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
@@ -5193,6 +4906,7 @@
 			
 			
 			
+			
 			<fo:block-container margin-left="0mm">
 				
 				
@@ -5367,7 +5081,24 @@
 							</fo:instream-foreign-object>
 						</xsl:when>
 						<xsl:otherwise>
-							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
+							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
+								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
+										
+									<xsl:variable name="img_src">
+										<xsl:choose>
+											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+										</xsl:choose>
+									</xsl:variable>
+									
+									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $width_effective, $height_effective)"/>
+									<xsl:if test="number($scale) &lt; 100">
+										<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+									</xsl:if>
+								
+								</xsl:if>
+							
+							</fo:external-graphic>
 						</xsl:otherwise>
 					</xsl:choose>
 					
@@ -5435,6 +5166,253 @@
 		<xsl:param name="height"/>
 		<line xmlns="http://www.w3.org/2000/svg" x1="0" y1="0" x2="{$width}" y2="{$height}" style="stroke: rgb(255, 0, 0); stroke-width:4px; "/>
 		<line xmlns="http://www.w3.org/2000/svg" x1="0" y1="{$height}" x2="{$width}" y2="0" style="stroke: rgb(255, 0, 0); stroke-width:4px; "/>
+	</xsl:template><xsl:variable name="figure_name_height">14</xsl:variable><xsl:variable name="width_effective" select="$pageWidth - $marginLeftRight1 - $marginLeftRight2"/><xsl:variable name="height_effective" select="$pageHeight - $marginTop - $marginBottom - $figure_name_height"/><xsl:variable name="image_dpi" select="96"/><xsl:variable name="width_effective_px" select="$width_effective div 25.4 * $image_dpi"/><xsl:variable name="height_effective_px" select="$height_effective div 25.4 * $image_dpi"/><xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image']) and *[local-name() = 'svg']]/*[local-name() = 'name']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image'])]/*[local-name() = 'svg']" priority="2" name="image_svg">
+		<xsl:param name="name"/>
+		
+		<xsl:variable name="svg_content">
+			<xsl:apply-templates select="." mode="svg_update"/>
+		</xsl:variable>
+		
+		<xsl:variable name="alt-text">
+			<xsl:choose>
+				<xsl:when test="normalize-space(../*[local-name() = 'name']) != ''">
+					<xsl:value-of select="../*[local-name() = 'name']"/>
+				</xsl:when>
+				<xsl:when test="normalize-space($name) != ''">
+					<xsl:value-of select="$name"/>
+				</xsl:when>
+				<xsl:otherwise>Figure</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		
+		<xsl:choose>
+			<xsl:when test=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]">
+				<fo:block>
+					<xsl:variable name="width" select="@width"/>
+					<xsl:variable name="height" select="@height"/>
+					
+					<xsl:variable name="scale_x">
+						<xsl:choose>
+							<xsl:when test="$width &gt; $width_effective_px">
+								<xsl:value-of select="$width_effective_px div $width"/>
+							</xsl:when>
+							<xsl:otherwise>1</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					
+					<xsl:variable name="scale_y">
+						<xsl:choose>
+							<xsl:when test="$height * $scale_x &gt; $height_effective_px">
+								<xsl:value-of select="$height_effective_px div ($height * $scale_x)"/>
+							</xsl:when>
+							<xsl:otherwise>1</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					
+					<xsl:variable name="scale">
+						<xsl:choose>
+							<xsl:when test="$scale_y != 1">
+								<xsl:value-of select="$scale_x * $scale_y"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:value-of select="$scale_x"/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					 
+					<xsl:variable name="width_scale" select="round($width * $scale)"/>
+					<xsl:variable name="height_scale" select="round($height * $scale)"/>
+					
+					<fo:table table-layout="fixed" width="100%">
+						<fo:table-column column-width="proportional-column-width(1)"/>
+						<fo:table-column column-width="{$width_scale}px"/>
+						<fo:table-column column-width="proportional-column-width(1)"/>
+						<fo:table-body>
+							<fo:table-row>
+								<fo:table-cell column-number="2">
+									<fo:block>
+										<fo:block-container width="{$width_scale}px" height="{$height_scale}px">
+											<xsl:if test="../*[local-name() = 'name']/*[local-name() = 'bookmark']">
+												<fo:block line-height="0" font-size="0">
+													<xsl:for-each select="../*[local-name() = 'name']/*[local-name() = 'bookmark']">
+														<xsl:call-template name="bookmark"/>
+													</xsl:for-each>
+												</fo:block>
+											</xsl:if>
+											<fo:block text-depth="0" line-height="0" font-size="0">
+
+												<fo:instream-foreign-object fox:alt-text="{$alt-text}">
+													<xsl:attribute name="width">100%</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:apply-templates select="xalan:nodeset($svg_content)" mode="svg_remove_a"/>
+												</fo:instream-foreign-object>
+											</fo:block>
+											
+											<xsl:apply-templates select=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]" mode="svg_imagemap_links">
+												<xsl:with-param name="scale" select="$scale"/>
+											</xsl:apply-templates>
+										</fo:block-container>
+									</fo:block>
+								</fo:table-cell>
+							</fo:table-row>
+						</fo:table-body>
+					</fo:table>
+				</fo:block>
+				
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="image-style">
+					<fo:instream-foreign-object fox:alt-text="{$alt-text}">
+						<xsl:attribute name="width">100%</xsl:attribute>
+						<xsl:attribute name="content-height">100%</xsl:attribute>
+						<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+						<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
+						<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
+						<!-- effective height 297 - 27.4 - 13 =  256.6 -->
+						<!-- effective width 210 - 12.5 - 25 = 172.5 -->
+						<!-- effective height / width = 1.48, 1.4 - with title -->
+						<xsl:if test="$svg_height &gt; ($svg_width * 1.4)"> <!-- for images with big height -->
+							<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
+							<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
+						</xsl:if>
+						<xsl:attribute name="scaling">uniform</xsl:attribute>
+						<xsl:copy-of select="$svg_content"/>
+					</fo:instream-foreign-object>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="@*|node()" mode="svg_update">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="svg_update"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'image']/@href" mode="svg_update">
+		<xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink">
+			<xsl:value-of select="."/>
+		</xsl:attribute>
+	</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:call-template name="split">
+					<xsl:with-param name="pText" select="@viewBox"/>
+					<xsl:with-param name="sep" select="' '"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:attribute name="width">
+				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[3])"/>
+			</xsl:attribute>
+			<xsl:attribute name="height">
+				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[4])"/>
+			</xsl:attribute>
+			<xsl:apply-templates mode="svg_update"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
+		<xsl:variable name="svg_content" select="document(@src)"/>
+		<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
+		<xsl:for-each select="xalan:nodeset($svg_content)/node()">
+			<xsl:call-template name="image_svg">
+				<xsl:with-param name="name" select="$name"/>
+			</xsl:call-template>
+		</xsl:for-each>
+	</xsl:template><xsl:template match="@*|node()" mode="svg_remove_a">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="svg_remove_a"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'a']" mode="svg_remove_a">
+		<xsl:apply-templates mode="svg_remove_a"/>
+	</xsl:template><xsl:template match="*[local-name() = 'a']" mode="svg_imagemap_links">
+		<xsl:param name="scale"/>
+		<xsl:variable name="dest">
+			<xsl:choose>
+				<xsl:when test="starts-with(@href, '#')">
+					<xsl:value-of select="substring-after(@href, '#')"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="@href"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:for-each select="./*[local-name() = 'rect']">
+			<xsl:call-template name="insertSVGMapLink">
+				<xsl:with-param name="left" select="floor(@x * $scale)"/>
+				<xsl:with-param name="top" select="floor(@y * $scale)"/>
+				<xsl:with-param name="width" select="floor(@width * $scale)"/>
+				<xsl:with-param name="height" select="floor(@height * $scale)"/>
+				<xsl:with-param name="dest" select="$dest"/>
+			</xsl:call-template>
+		</xsl:for-each>
+		
+		<xsl:for-each select="./*[local-name() = 'polygon']">
+			<xsl:variable name="points">
+				<xsl:call-template name="split">
+					<xsl:with-param name="pText" select="@points"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:variable name="x_coords">
+				<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
+					<xsl:sort select="." data-type="number"/>
+					<x><xsl:value-of select="."/></x>
+				</xsl:for-each>
+			</xsl:variable>
+			<xsl:variable name="y_coords">
+				<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
+					<xsl:sort select="." data-type="number"/>
+					<y><xsl:value-of select="."/></y>
+				</xsl:for-each>
+			</xsl:variable>
+			<xsl:variable name="x" select="xalan:nodeset($x_coords)//x[1]"/>
+			<xsl:variable name="y" select="xalan:nodeset($y_coords)//y[1]"/>
+			<xsl:variable name="width" select="xalan:nodeset($x_coords)//x[last()] - $x"/>
+			<xsl:variable name="height" select="xalan:nodeset($y_coords)//y[last()] - $y"/>
+			<xsl:call-template name="insertSVGMapLink">
+				<xsl:with-param name="left" select="floor($x * $scale)"/>
+				<xsl:with-param name="top" select="floor($y * $scale)"/>
+				<xsl:with-param name="width" select="floor($width * $scale)"/>
+				<xsl:with-param name="height" select="floor($height * $scale)"/>
+				<xsl:with-param name="dest" select="$dest"/>
+			</xsl:call-template>
+		</xsl:for-each>
+		
+		<xsl:for-each select="./*[local-name() = 'circle']">
+			<xsl:call-template name="insertSVGMapLink">
+				<xsl:with-param name="left" select="floor((@cx - @r) * $scale)"/>
+				<xsl:with-param name="top" select="floor((@cy - @r) * $scale)"/>
+				<xsl:with-param name="width" select="floor(@r * 2 * $scale)"/>
+				<xsl:with-param name="height" select="floor(@r * 2 * $scale)"/>
+				<xsl:with-param name="dest" select="$dest"/>
+			</xsl:call-template>
+		</xsl:for-each>
+		<xsl:for-each select="./*[local-name() = 'ellipse']">
+			<xsl:call-template name="insertSVGMapLink">
+				<xsl:with-param name="left" select="floor((@cx - @rx) * $scale)"/>
+				<xsl:with-param name="top" select="floor((@cy - @ry) * $scale)"/>
+				<xsl:with-param name="width" select="floor(@rx * 2 * $scale)"/>
+				<xsl:with-param name="height" select="floor(@ry * 2 * $scale)"/>
+				<xsl:with-param name="dest" select="$dest"/>
+			</xsl:call-template>
+		</xsl:for-each>
+	</xsl:template><xsl:template name="insertSVGMapLink">
+		<xsl:param name="left"/>
+		<xsl:param name="top"/>
+		<xsl:param name="width"/>
+		<xsl:param name="height"/>
+		<xsl:param name="dest"/>
+		<fo:block-container position="absolute" left="{$left}px" top="{$top}px" width="{$width}px" height="{$height}px">
+		 <fo:block font-size="1pt">
+			<fo:basic-link internal-destination="{$dest}" fox:alt-text="svg link">
+				<fo:inline-container inline-progression-dimension="100%">
+					<fo:block-container height="{$height - 1}px" width="100%">
+						<!-- DEBUG <xsl:if test="local-name()='polygon'">
+							<xsl:attribute name="background-color">magenta</xsl:attribute>
+						</xsl:if> -->
+					<fo:block> </fo:block></fo:block-container>
+				</fo:inline-container>
+			</fo:basic-link>
+		 </fo:block>
+	  </fo:block-container>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">		
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
@@ -5463,28 +5441,39 @@
 							<xsl:when test="count(xalan:nodeset($contents)/doc) &gt; 1">
 								<xsl:for-each select="xalan:nodeset($contents)/doc">
 									<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
+										<xsl:if test="@bundle = 'true'">
+											<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
+										</xsl:if>
 										<fo:bookmark-title>
-											<xsl:variable name="bookmark-title_">
-												<xsl:call-template name="getLangVersion">
-													<xsl:with-param name="lang" select="@lang"/>
-													<xsl:with-param name="doctype" select="@doctype"/>
-													<xsl:with-param name="title" select="@title-part"/>
-												</xsl:call-template>
-											</xsl:variable>
 											<xsl:choose>
-												<xsl:when test="normalize-space($bookmark-title_) != ''">
-													<xsl:value-of select="normalize-space($bookmark-title_)"/>
-												</xsl:when>
-												<xsl:otherwise>
+												<xsl:when test="not(normalize-space(@bundle) = 'true')"> <!-- 'bundle' means several different documents (not language versions) in one xml -->
+													<xsl:variable name="bookmark-title_">
+														<xsl:call-template name="getLangVersion">
+															<xsl:with-param name="lang" select="@lang"/>
+															<xsl:with-param name="doctype" select="@doctype"/>
+															<xsl:with-param name="title" select="@title-part"/>
+														</xsl:call-template>
+													</xsl:variable>
 													<xsl:choose>
-														<xsl:when test="@lang = 'en'">English</xsl:when>
-														<xsl:when test="@lang = 'fr'">Français</xsl:when>
-														<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
-														<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
+														<xsl:when test="normalize-space($bookmark-title_) != ''">
+															<xsl:value-of select="normalize-space($bookmark-title_)"/>
+														</xsl:when>
+														<xsl:otherwise>
+															<xsl:choose>
+																<xsl:when test="@lang = 'en'">English</xsl:when>
+																<xsl:when test="@lang = 'fr'">Français</xsl:when>
+																<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
+																<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
+															</xsl:choose>
+														</xsl:otherwise>
 													</xsl:choose>
+												</xsl:when>
+												<xsl:otherwise>
+													<xsl:value-of select="@title-part"/>
 												</xsl:otherwise>
 											</xsl:choose>
 										</fo:bookmark-title>
+										
 										<xsl:apply-templates select="contents/item" mode="bookmark"/>
 										
 										<xsl:call-template name="insertFigureBookmarks">
@@ -5583,16 +5572,23 @@
 			<xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template match="item" mode="bookmark">
-		<fo:bookmark internal-destination="{@id}" starting-state="hide">
-				<fo:bookmark-title>
-					<xsl:if test="@section != ''">
-						<xsl:value-of select="@section"/> 
-						<xsl:text> </xsl:text>
-					</xsl:if>
-					<xsl:value-of select="normalize-space(title)"/>
-				</fo:bookmark-title>
-				<xsl:apply-templates mode="bookmark"/>				
-		</fo:bookmark>
+		<xsl:choose>
+			<xsl:when test="@id != ''">
+				<fo:bookmark internal-destination="{@id}" starting-state="hide">
+					<fo:bookmark-title>
+						<xsl:if test="@section != ''">
+							<xsl:value-of select="@section"/> 
+							<xsl:text> </xsl:text>
+						</xsl:if>
+						<xsl:value-of select="normalize-space(title)"/>
+					</fo:bookmark-title>
+					<xsl:apply-templates mode="bookmark"/>
+				</fo:bookmark>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates mode="bookmark"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |         *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
 		<xsl:if test="normalize-space() != ''">			
 			<fo:block xsl:use-attribute-sets="figure-name-style">
@@ -6154,7 +6150,9 @@
 											
 						
 					</xsl:if>	
-											
+					
+					
+            
 					<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
 						<xsl:if test="normalize-space(@citeas) = ''">
 							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -6163,6 +6161,7 @@
 							
 							
 							
+							
 						</xsl:if>
 
 						<xsl:apply-templates/>
@@ -7032,20 +7031,40 @@
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getLocalizedString">
-		<xsl:param name="key"/>	
+		<xsl:param name="key"/>
+		<xsl:param name="formatted">false</xsl:param>
 		
 		<xsl:variable name="curr_lang">
 			<xsl:call-template name="getLang"/>
 		</xsl:variable>
 		
-		<xsl:variable name="data_value" select="normalize-space(xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang])"/>
+		<xsl:variable name="data_value">
+			<xsl:choose>
+				<xsl:when test="$formatted = 'true'">
+					<xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang])"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		
 		<xsl:choose>
-			<xsl:when test="$data_value != ''">
-				<xsl:value-of select="$data_value"/>
+			<xsl:when test="normalize-space($data_value) != ''">
+				<xsl:choose>
+					<xsl:when test="$formatted = 'true'"><xsl:copy-of select="$data_value"/></xsl:when>
+					<xsl:otherwise><xsl:value-of select="$data_value"/></xsl:otherwise>
+				</xsl:choose>
 			</xsl:when>
 			<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
-				<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+				<xsl:choose>
+					<xsl:when test="$formatted = 'true'">
+						<xsl:apply-templates select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:variable name="key_">
@@ -7056,7 +7075,7 @@
 				<xsl:value-of select="$key_"/>
 			</xsl:otherwise>
 		</xsl:choose>
-		
+			
 	</xsl:template><xsl:template name="setTrackChangesStyles">
 		<xsl:param name="isAdded"/>
 		<xsl:param name="isDeleted"/>
@@ -7107,4 +7126,100 @@
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+	</xsl:template><xsl:template name="number-to-words">
+		<xsl:param name="number"/>
+		<xsl:param name="first"/>
+		<xsl:if test="$number != ''">
+			<xsl:variable name="words">
+								<words>
+					<word cardinal="1">One-</word>
+					<word ordinal="1">First </word>
+					<word cardinal="2">Two-</word>
+					<word ordinal="2">Second </word>
+					<word cardinal="3">Three-</word>
+					<word ordinal="3">Third </word>
+					<word cardinal="4">Four-</word>
+					<word ordinal="4">Fourth </word>
+					<word cardinal="5">Five-</word>
+					<word ordinal="5">Fifth </word>
+					<word cardinal="6">Six-</word>
+					<word ordinal="6">Sixth </word>
+					<word cardinal="7">Seven-</word>
+					<word ordinal="7">Seventh </word>
+					<word cardinal="8">Eight-</word>
+					<word ordinal="8">Eighth </word>
+					<word cardinal="9">Nine-</word>
+					<word ordinal="9">Ninth </word>
+					<word ordinal="10">Tenth </word>
+					<word ordinal="11">Eleventh </word>
+					<word ordinal="12">Twelfth </word>
+					<word ordinal="13">Thirteenth </word>
+					<word ordinal="14">Fourteenth </word>
+					<word ordinal="15">Fifteenth </word>
+					<word ordinal="16">Sixteenth </word>
+					<word ordinal="17">Seventeenth </word>
+					<word ordinal="18">Eighteenth </word>
+					<word ordinal="19">Nineteenth </word>
+					<word cardinal="20">Twenty-</word>
+					<word ordinal="20">Twentieth </word>
+					<word cardinal="30">Thirty-</word>
+					<word ordinal="30">Thirtieth </word>
+					<word cardinal="40">Forty-</word>
+					<word ordinal="40">Fortieth </word>
+					<word cardinal="50">Fifty-</word>
+					<word ordinal="50">Fiftieth </word>
+					<word cardinal="60">Sixty-</word>
+					<word ordinal="60">Sixtieth </word>
+					<word cardinal="70">Seventy-</word>
+					<word ordinal="70">Seventieth </word>
+					<word cardinal="80">Eighty-</word>
+					<word ordinal="80">Eightieth </word>
+					<word cardinal="90">Ninety-</word>
+					<word ordinal="90">Ninetieth </word>
+					<word cardinal="100">Hundred-</word>
+					<word ordinal="100">Hundredth </word>
+				</words>
+			</xsl:variable>
+
+			<xsl:variable name="ordinal" select="xalan:nodeset($words)//word[@ordinal = $number]/text()"/>
+			
+			<xsl:variable name="value">
+				<xsl:choose>
+					<xsl:when test="$ordinal != ''">
+						<xsl:value-of select="$ordinal"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:choose>
+							<xsl:when test="$number &lt; 100">
+								<xsl:variable name="decade" select="concat(substring($number,1,1), '0')"/>
+								<xsl:variable name="digit" select="substring($number,2)"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $decade]/text()"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@ordinal = $digit]/text()"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<!-- more 100 -->
+								<xsl:variable name="hundred" select="substring($number,1,1)"/>
+								<xsl:variable name="digits" select="number(substring($number,2))"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $hundred]/text()"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = '100']/text()"/>
+								<xsl:call-template name="number-to-words">
+									<xsl:with-param name="number" select="$digits"/>
+								</xsl:call-template>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:choose>
+				<xsl:when test="$first = 'true'">
+					<xsl:variable name="value_lc" select="java:toLowerCase(java:java.lang.String.new($value))"/>
+					<xsl:call-template name="capitalize">
+						<xsl:with-param name="str" select="$value_lc"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="$value"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:if>
 	</xsl:template></xsl:stylesheet>