metanorma-bipm 1.1.4 → 1.1.5

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

@@ -15,8 +15,12 @@
 	
 	<xsl:variable name="first_pass" select="count($index//item) = 0"/>
 	
-	<xsl:variable name="pageWidth" select="'210mm'"/>
-	<xsl:variable name="pageHeight" select="'297mm'"/>
+	<xsl:variable name="pageWidth" select="210"/>
+	<xsl:variable name="pageHeight" select="297"/>
+	<xsl:variable name="marginLeftRight1" select="31.7"/>
+	<xsl:variable name="marginLeftRight2" select="40"/>
+	<xsl:variable name="marginTop" select="25.4"/>
+	<xsl:variable name="marginBottom" select="22"/>
 
 	
 
@@ -207,7 +211,7 @@
 		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
 			<fo:layout-master-set>
 				<!-- Cover page -->
-				<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
+				<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 					<fo:region-body margin-top="36mm" margin-bottom="43mm" margin-left="49mm" margin-right="48mm"/>
 					<fo:region-before extent="36mm"/>
 					<fo:region-after extent="43mm"/>
@@ -216,7 +220,7 @@
 				</fo:simple-page-master>
 				
 				<!-- Cover page -->
-				<fo:simple-page-master master-name="cover-page-appendix" page-width="{$pageWidth}" page-height="{$pageHeight}">
+				<fo:simple-page-master master-name="cover-page-appendix" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 					<fo:region-body margin-top="90mm" margin-bottom="40mm" margin-left="12.5mm" margin-right="53mm"/>
 					<fo:region-before extent="60mm"/>
 					<fo:region-after extent="40mm"/>
@@ -225,7 +229,7 @@
 				</fo:simple-page-master>
 				
 				<!-- Title page  -->
-				<fo:simple-page-master master-name="title-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
+				<fo:simple-page-master master-name="title-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 					<fo:region-body margin-top="38mm" margin-bottom="25mm" margin-left="95mm" margin-right="12mm"/>
 					<fo:region-before extent="38mm"/>
 					<fo:region-after extent="25mm"/>
@@ -234,17 +238,17 @@
 				</fo:simple-page-master>
 				
 				<!-- Document pages -->
-				<fo:simple-page-master master-name="document-odd" page-width="{$pageWidth}" page-height="{$pageHeight}">
-					<fo:region-body margin-top="25.4mm" margin-bottom="22mm" margin-left="31.7mm" margin-right="40mm"/>
-					<fo:region-before region-name="header-odd" extent="25.4mm"/> 
-					<fo:region-after region-name="footer" extent="22mm"/> <!-- debug:  background-color="green" -->
+				<fo:simple-page-master master-name="document-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> 
+					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug:  background-color="green" -->
 					<fo:region-start region-name="left-region" extent="17mm"/>
 					<fo:region-end region-name="right-region" extent="26.5mm"/>
 				</fo:simple-page-master>
-				<fo:simple-page-master master-name="document-even" page-width="{$pageWidth}" page-height="{$pageHeight}">
-					<fo:region-body margin-top="25.4mm" margin-bottom="22mm" margin-left="31.7mm" margin-right="40mm"/>
-					<fo:region-before region-name="header-even" extent="25.4mm"/> 
-					<fo:region-after region-name="footer" extent="22mm"/> <!-- debug:  background-color="green" -->
+				<fo:simple-page-master master-name="document-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<fo:region-before region-name="header-even" extent="{$marginTop}mm"/> 
+					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug:  background-color="green" -->
 					<fo:region-start region-name="left-region" extent="17mm"/>
 					<fo:region-end region-name="right-region" extent="26.5mm"/>
 				</fo:simple-page-master>
@@ -256,17 +260,17 @@
 				</fo:page-sequence-master>
 				
 				<!-- Document pages (landscape orientation) -->
-				<fo:simple-page-master master-name="document-landscape-odd" page-width="{$pageHeight}" page-height="{$pageWidth}">
-					<fo:region-body margin-top="25.4mm" margin-bottom="22mm" margin-left="31.7mm" margin-right="40mm"/>
-					<fo:region-before region-name="header-odd" extent="25.4mm"/> 
-					<fo:region-after region-name="footer" extent="22mm"/> <!-- debug:  background-color="green" -->
+				<fo:simple-page-master master-name="document-landscape-odd" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> 
+					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug:  background-color="green" -->
 					<fo:region-start region-name="left-region" extent="17mm"/>
 					<fo:region-end region-name="right-region" extent="26.5mm"/>
 				</fo:simple-page-master>
-				<fo:simple-page-master master-name="document-landscape-even" page-width="{$pageHeight}" page-height="{$pageWidth}">
-					<fo:region-body margin-top="25.4mm" margin-bottom="22mm" margin-left="31.7mm" margin-right="40mm"/>
-					<fo:region-before region-name="header-even" extent="25.4mm"/> 
-					<fo:region-after region-name="footer" extent="22mm"/> <!-- debug:  background-color="green" -->
+				<fo:simple-page-master master-name="document-landscape-even" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<fo:region-before region-name="header-even" extent="{$marginTop}mm"/> 
+					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug:  background-color="green" -->
 					<fo:region-start region-name="left-region" extent="17mm"/>
 					<fo:region-end region-name="right-region" extent="26.5mm"/>
 				</fo:simple-page-master>
@@ -278,17 +282,17 @@
 				</fo:page-sequence-master>
 				
 				<!-- Index pages -->
-				<fo:simple-page-master master-name="index-odd" page-width="{$pageWidth}" page-height="{$pageHeight}">
-					<fo:region-body margin-top="25.4mm" margin-bottom="22mm" margin-left="31.7mm" margin-right="41.7mm" column-count="2" column-gap="10mm"/>
-					<fo:region-before region-name="header-odd" extent="25.4mm"/> 
-					<fo:region-after region-name="footer" extent="22mm"/>
+				<fo:simple-page-master master-name="index-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="41.7mm" column-count="2" column-gap="10mm"/>
+					<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> 
+					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
 					<fo:region-start region-name="left-region" extent="17mm"/>
 					<fo:region-end region-name="right-region" extent="26.5mm"/>
 				</fo:simple-page-master>
-				<fo:simple-page-master master-name="index-even" page-width="{$pageWidth}" page-height="{$pageHeight}">
-					<fo:region-body margin-top="25.4mm" margin-bottom="22mm" margin-left="31.7mm" margin-right="41.7mm" column-count="2" column-gap="10mm"/>
-					<fo:region-before region-name="header-even" extent="25.4mm"/> 
-					<fo:region-after region-name="footer" extent="22mm"/>
+				<fo:simple-page-master master-name="index-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="41.7mm" column-count="2" column-gap="10mm"/>
+					<fo:region-before region-name="header-even" extent="{$marginTop}mm"/> 
+					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
 					<fo:region-start region-name="left-region" extent="17mm"/>
 					<fo:region-end region-name="right-region" extent="26.5mm"/>
 				</fo:simple-page-master>
@@ -352,8 +356,12 @@
 									<xsl:apply-templates select="xalan:nodeset($current_document)" mode="flatxml"/>
 								</xsl:variable> -->
 								
+								<xsl:variable name="title_eref">
+									<xsl:apply-templates select="." mode="title_eref"/>
+								</xsl:variable>
+								
 								<xsl:variable name="flatxml_">
-									<xsl:apply-templates select="." mode="flatxml"/>
+									<xsl:apply-templates select="xalan:nodeset($title_eref)" mode="flatxml"/>
 								</xsl:variable>
 								
 								<xsl:variable name="flatxml">
@@ -383,8 +391,12 @@
 									<xsl:apply-templates select="xalan:nodeset($current_document)" mode="flatxml"/>
 								</xsl:variable> -->
 								
+								<xsl:variable name="title_eref">
+									<xsl:apply-templates select="." mode="title_eref"/>
+								</xsl:variable>
+								
 								<xsl:variable name="flatxml_">
-									<xsl:apply-templates select="." mode="flatxml"/>
+									<xsl:apply-templates select="xalan:nodeset($title_eref)" mode="flatxml"/>
 								</xsl:variable>
 								
 								<xsl:variable name="flatxml">
@@ -403,8 +415,12 @@
 				</xsl:when>			
 				<xsl:otherwise>
 				
+					<xsl:variable name="title_eref">
+						<xsl:apply-templates mode="title_eref"/>
+					</xsl:variable>
+					
 					<xsl:variable name="flatxml_">
-						<xsl:apply-templates mode="flatxml"/>
+						<xsl:apply-templates select="xalan:nodeset($title_eref)" mode="flatxml"/>
 					</xsl:variable>
 
 					<xsl:variable name="flatxml">
@@ -426,6 +442,27 @@
 		</fo:root>
 	</xsl:template>
 	
+	<!-- ================================= -->
+	<!-- Move eref inside title -->
+	<!-- ================================= -->	
+	<xsl:template match="@*|node()" mode="title_eref">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="title_eref"/>
+		</xsl:copy>
+	</xsl:template>
+	
+	<xsl:template match="bipm:title[following-sibling::*[1][self::bipm:eref]]" mode="title_eref">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="title_eref"/>
+			<!-- move next eref inside title -->
+			<xsl:copy-of select="following-sibling::*[1][self::bipm:eref]"/>
+		</xsl:copy>
+	</xsl:template>
+	<!-- remove eref immediately after title -->
+	<xsl:template match="bipm:eref[preceding-sibling::*[1][self::bipm:title]]" mode="title_eref"/>
+	<!-- ================================= -->
+	<!-- END Move eref inside title -->
+	<!-- ================================= -->	
 	
 	<!-- ================================= -->
 	<!-- Flattening xml for fit notes at page sides (margins) -->
@@ -1709,9 +1746,9 @@
 		<!-- background color -->
 		<fo:block-container absolute-position="fixed" left="0" top="-1mm">
 			<fo:block>
-				<fo:instream-foreign-object content-height="{$pageHeight}" fox:alt-text="Background color">
-					<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="{$pageWidth}" height="{$pageHeight}">
-						<rect width="{$pageWidth}" height="{$pageHeight}" style="fill:rgb(214,226,239);stroke-width:0"/>
+				<fo:instream-foreign-object content-height="{$pageHeight}mm" fox:alt-text="Background color">
+					<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="{$pageWidth}mm" height="{$pageHeight}mm">
+						<rect width="{$pageWidth}mm" height="{$pageHeight}mm" style="fill:rgb(214,226,239);stroke-width:0"/>
 					</svg>
 				</fo:instream-foreign-object>
 			</fo:block>
@@ -2271,7 +2308,7 @@
 				<xsl:when test="$level = 2 and ancestor::bipm:annex">10.5pt</xsl:when>
 				<xsl:when test="$level = 2">14pt</xsl:when>
 				<xsl:when test="$level = 3 and ancestor::bipm:annex">10pt</xsl:when>
-				<xsl:when test="$level = 4 and ancestor::bipm:annex">9pt</xsl:when>
+				<xsl:when test="$level &gt;= 4 and ancestor::bipm:annex">9pt</xsl:when>
 				<xsl:when test="$level = 3">12pt</xsl:when>
 				<xsl:otherwise>11pt</xsl:otherwise>
 			</xsl:choose>
@@ -2367,8 +2404,10 @@
 							</xsl:if> -->
 							<xsl:choose>
 								<xsl:when test="ancestor::bipm:annex and $level &gt;= 2">
-									<xsl:if test="$level = 3">
+									<xsl:if test="$level &gt;= 3">
 										<xsl:attribute name="margin-left">14mm</xsl:attribute>
+									</xsl:if>
+									<xsl:if test="$level = 3">
 										<fo:inline padding-right="2.5mm" baseline-shift="15%">
 											<fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad">
 													<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 2 2">
@@ -2378,7 +2417,6 @@
 										</fo:inline>
 									</xsl:if>
 									<xsl:if test="$level = 4">
-										<xsl:attribute name="margin-left">14mm</xsl:attribute>
 										<xsl:attribute name="text-align">center</xsl:attribute>
 									</xsl:if>
 									<xsl:call-template name="extractTitle"/>
@@ -2409,17 +2447,8 @@
 
 	</xsl:template>
 	
-	<!-- <xsl:variable name="zero-width-space" select="'&#x200b;'"/> -->
 	<xsl:template match="*" mode="header">
 		<xsl:apply-templates mode="header"/>
-		<!-- <xsl:choose>
-			<xsl:when test="contains(preceding-sibling::node()[1], $zero-width-space)"> -->
-				<!-- stop further processing -->
-			<!-- </xsl:when>
-			<xsl:otherwise>
-				<xsl:apply-templates mode="header"/>
-			</xsl:otherwise>
-		</xsl:choose> -->
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'stem']" mode="header">
@@ -2430,11 +2459,6 @@
 		<xsl:text> </xsl:text>
 	</xsl:template>
 	
-	<!-- zero-width space - separator for full/short titles. Short titles using in headers -->
-	<!-- <xsl:template match="text()[contains(., $zero-width-space)]" mode="header"> 
-		<xsl:value-of select="substring-before(., $zero-width-space)"/>
-	</xsl:template> -->
-	
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -3095,9 +3119,10 @@
 								<fo:inline>
 									<!-- <xsl:if test="@list_type = 'ul'">
 										<xsl:attribute name="font-size">15pt</xsl:attribute> -->
-									<xsl:if test="@font-size">
-										<xsl:attribute name="font-size"><xsl:value-of select="@font-size"/></xsl:attribute>									
-										<!-- <xsl:attribute name="baseline-shift">-10%</xsl:attribute> -->
+									<xsl:copy-of select="@font-size"/>
+									<xsl:copy-of select="@baseline-shift"/>
+									<xsl:if test="@list_type = 'ul' and ancestor::bipm:note_side">
+										<xsl:attribute name="font-size">10pt</xsl:attribute>
 									</xsl:if>
 									<xsl:value-of select="@label"/>
 								</fo:inline>
@@ -3195,7 +3220,7 @@
 	</xsl:template>
 
 	<xsl:template match="bipm:example" priority="2">
-		<fo:block margin-top="6pt" margin-bottom="6pt">
+		<fo:block margin-top="6pt" margin-bottom="6pt" keep-together.within-column="1">
 			<fo:table table-layout="fixed" width="100%">
 				<fo:table-column column-width="27.5mm"/>
 				<fo:table-column column-width="108mm"/>
@@ -3341,6 +3366,11 @@
 
 	<xsl:template match="bipm:xref" priority="2">		
 		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">
+		
+			<xsl:if test="parent::*[local-name() = 'title']">
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+			</xsl:if>
+			
 			<xsl:choose>
 				<xsl:when test="@pagenumber='true'"><!-- ToC in Appendix, and page in references like this: « Le BIPM et la Convention du Mètre » (page 5). -->
 					<fo:inline> <!--  font-weight="bold" -->
@@ -4159,7 +4189,7 @@
 		<!-- grey opacity -->
 		<fo:block-container absolute-position="fixed" left="0" top="0">
 			<fo:block>
-				<fo:instream-foreign-object content-height="{$pageHeight}" fox:alt-text="Background color">
+				<fo:instream-foreign-object content-height="{$pageHeight}mm" fox:alt-text="Background color">
 					<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="215.9mm" height="279.4mm">
 						<rect width="215.9mm" height="279.4mm" style="fill:rgb(255,255,255);stroke-width:0;fill-opacity:0.73"/>
 						</svg>
@@ -4584,6 +4614,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-style">
 		
 		
@@ -4779,14 +4810,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']"/>
@@ -5402,6 +5434,7 @@
 							
 							
 							
+							
 							<!-- fn will be processed inside 'note' processing -->
 							
 							
@@ -5422,6 +5455,10 @@
 							
 							
 							
+							
+							<!-- for BSI (not PAS) display Notes before footnotes -->
+							
+							
 							<!-- except gb  -->
 							
 								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
@@ -5447,6 +5484,10 @@
 							<!-- fn processing -->
 							<xsl:call-template name="fn_display"/>
 							
+							
+							<!-- for PAS display Notes after footnotes -->
+							
+							
 						</fo:table-cell>
 					</fo:table-row>
 				</fo:table-body>
@@ -5504,6 +5545,7 @@
 				<xsl:if test="$parent-name = 'tfoot'">
 					
 					
+					
 				</xsl:if>
 				
 				
@@ -5627,6 +5669,7 @@
 			
 			
 			
+			
 				<xsl:attribute name="border">solid 0pt white</xsl:attribute>
 				<xsl:variable name="rownum"><xsl:number count="*[local-name()='tr']"/></xsl:variable>
 				<xsl:if test="$rownum = 1">
@@ -5678,6 +5721,7 @@
 				
 				
 				
+				
 									
 					<xsl:attribute name="text-align">justify</xsl:attribute>
 					<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
@@ -5685,11 +5729,15 @@
 						<xsl:attribute name="margin-top">18pt</xsl:attribute>
 						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 					</xsl:if>
-					
 				
 				
+				
+				<!-- Table's note name (NOTE, for example) -->
+
 				<fo:inline padding-right="2mm">
 					
+				
+					
 					
 					
 					
@@ -5702,10 +5750,12 @@
 						
 				</fo:inline>
 				
+				
 					<xsl:if test="ancestor::bipm:preface">
 						<fo:block> </fo:block>
 					</xsl:if>
 				
+				
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
 		
@@ -5725,6 +5775,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">
+				
+					
 					
 					
 					
@@ -5743,6 +5795,7 @@
 						
 						
 						
+						
 							<xsl:attribute name="font-style">italic</xsl:attribute>
 							
 							<xsl:attribute name="padding-right">2.5mm</xsl:attribute>
@@ -5753,6 +5806,7 @@
 							<fo:inline font-style="normal">)</fo:inline>
 						
 						
+						
 					</fo:inline>
 					<fo:inline>
 						
@@ -5893,6 +5947,9 @@
 			
 			
 			
+			
+			
+			
 				<xsl:attribute name="font-size">70%</xsl:attribute>
 				<xsl:attribute name="vertical-align">super</xsl:attribute>
 				<xsl:attribute name="font-style">italic</xsl:attribute>
@@ -5907,6 +5964,7 @@
 				
 					<fo:inline font-style="normal">)</fo:inline>
 				
+				
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
@@ -6822,6 +6880,7 @@
 		<fo:inline xsl:use-attribute-sets="link-style">
 			
 			
+			
 			<xsl:choose>
 				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
@@ -6930,6 +6989,12 @@
 			
 			
 			
+			
+				<xsl:if test="parent::*[local-name() = 'li']">
+					<xsl:attribute name="margin-top">4pt</xsl:attribute>
+					<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
+				</xsl:if>
+			
 			<fo:block-container margin-left="0mm">
 				
 				
@@ -7185,6 +7250,234 @@
 		<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>
+						<!-- 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><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>
@@ -7213,28 +7506,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">
@@ -7347,16 +7651,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">
@@ -7913,7 +8224,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>
@@ -7924,6 +8237,13 @@
 								<xsl:attribute name="text-decoration">underline</xsl:attribute>
 							
 							
+								<xsl:if test="parent::*[local-name() = 'title']">
+									<xsl:attribute name="color">inherit</xsl:attribute>
+									<xsl:attribute name="text-decoration">inherit</xsl:attribute>
+									<xsl:attribute name="font-weight">normal</xsl:attribute>
+								</xsl:if>
+							
+							
 							
 						</xsl:if>
 
@@ -8870,4 +9190,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>