metanorma-nist 1.2.8 → 1.2.13

data/lib/isodoc/nist/nist.sp.xsl

@@ -808,10 +808,25 @@
 								<fo:block>
 									<fo:block><xsl:value-of select="nist:person/nist:name/nist:completename"/></fo:block>
 									<xsl:variable name="org-name" select="nist:person/nist:affiliation/nist:organization/nist:name"/>
+									<xsl:variable name="subdivision">
+										<xsl:for-each select="nist:person/nist:affiliation/nist:organization/nist:subdivision">
+											<xsl:value-of select="."/>
+											<xsl:if test="position() != last()">, </xsl:if>
+										</xsl:for-each>
+									</xsl:variable>
+									<xsl:variable name="following_subdivision">
+										<xsl:for-each select="following-sibling::nist:contributor[nist:role/@type = 'author'][1]/nist:person/nist:affiliation/nist:organization/nist:subdivision">
+											<xsl:value-of select="."/>
+											<xsl:if test="position() != last()">, </xsl:if>
+										</xsl:for-each>
+									</xsl:variable>
 									<xsl:variable name="org-address" select="nist:person/nist:affiliation/nist:organization/nist:address/nist:formattedAddress"/>
-									<xsl:if test="concat(following-sibling::nist:contributor[nist:role/@type = 'author'][1]/nist:person/nist:affiliation/nist:organization/nist:name,                                         following-sibling::nist:contributor[nist:role/@type = 'author'][1]/nist:person/nist:affiliation/nist:organization/nist:address/nist:formattedAddress) !=                   concat($org-name, $org-address)">
+									<xsl:if test="concat(following-sibling::nist:contributor[nist:role/@type = 'author'][1]/nist:person/nist:affiliation/nist:organization/nist:name,                         $following_subdivision,                                         following-sibling::nist:contributor[nist:role/@type = 'author'][1]/nist:person/nist:affiliation/nist:organization/nist:address/nist:formattedAddress) !=                   concat($org-name, $subdivision, $org-address)">
 										<fo:block font-style="italic" margin-bottom="12pt">
 											<xsl:value-of select="$org-name"/>
+											<xsl:if test="normalize-space($subdivision) != ''">
+												<fo:inline>, <xsl:value-of select="$subdivision"/></fo:inline>
+											</xsl:if>
 											<xsl:if test="normalize-space($org-address) != ''">
 												<fo:inline>, <xsl:value-of select="$org-address"/></fo:inline>
 											</xsl:if>
@@ -915,7 +930,7 @@
 								<fo:block font-size="12pt" font-weight="bold" text-align="center" margin-bottom="12pt"><xsl:value-of select="$title-list-figures"/></fo:block>
 								<xsl:for-each select="//nist:figure[@id and nist:name]">
 									<fo:block text-align-last="justify" margin-top="6pt" margin-bottom="6pt">
-										<fo:basic-link internal-destination="{@id}" fox:alt-text="{@section}">
+										<fo:basic-link internal-destination="{@id}" fox:alt-text="{nist:name}">
 											<xsl:apply-templates select="nist:name" mode="contents"/>
 											<fo:inline keep-together.within-line="always">
 												<fo:leader leader-pattern="dots"/>
@@ -941,7 +956,7 @@
 								<fo:block font-size="12pt" font-weight="bold" text-align="center" margin-bottom="12pt"><xsl:value-of select="$title-list-tables"/></fo:block>
 								<xsl:for-each select="//nist:table[@id and nist:name]">
 									<fo:block text-align-last="justify" margin-top="6pt" margin-bottom="6pt">
-										<fo:basic-link internal-destination="{@id}" fox:alt-text="{@section}">
+										<fo:basic-link internal-destination="{@id}" fox:alt-text="{nist:name}">
 											<xsl:apply-templates select="nist:name" mode="contents"/>
 											<fo:inline keep-together.within-line="always">
 												<fo:leader leader-pattern="dots"/>
@@ -1340,35 +1355,24 @@
 	<!-- Bibliography -->
 	<!-- ============================= -->
 
-	<!-- Example: [ITU-T A.23]	ITU-T A.23, Recommendation ITU-T A.23, Annex A (2014), Guide for ITU-T and ISO/IEC JTC 1 cooperation. -->
+	<!-- Examples:
+	[b-ASM]	b-ASM, http://www.eecs.umich.edu/gasm/ (accessed 20 March 2018).
+	[b-Börger & Stärk]	b-Börger & Stärk, Börger, E., and Stärk, R. S. (2003), Abstract State Machines: A Method for High-Level System Design and Analysis, Springer-Verlag.
+	-->
 	<xsl:template match="nist:bibitem">
-		<fo:block id="{@id}" margin-top="6pt" margin-left="14mm" text-indent="-14mm">
-			<fo:inline padding-right="5mm">[<xsl:value-of select="nist:docidentifier"/>]</fo:inline><xsl:value-of select="nist:docidentifier"/>
-				<xsl:if test="nist:title">
-				<fo:inline font-style="italic">
-						<xsl:text>, </xsl:text>
-						<xsl:choose>
-							<xsl:when test="nist:title[@type = 'main' and @language = 'en']">
-								<xsl:value-of select="nist:title[@type = 'main' and @language = 'en']"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:value-of select="nist:title"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</fo:inline>
-				</xsl:if>
-				<xsl:apply-templates select="nist:formattedref"/>
-			</fo:block>
+		<fo:block id="{@id}" margin-top="6pt" margin-left="12mm" text-indent="-12mm">
+			<xsl:variable name="docidentifier" select="normalize-space(nist:docidentifier[@display = 'true'])"/>
+			<xsl:if test="$docidentifier != ''">
+				<fo:inline padding-right="5mm"><xsl:value-of select="$docidentifier"/></fo:inline>
+			</xsl:if>
+			<xsl:apply-templates select="nist:formattedref"/>
+		</fo:block>
 	</xsl:template>
-	<xsl:template match="nist:bibitem/nist:docidentifier"/>
-
-	<xsl:template match="nist:bibitem/nist:title"/>
 
 	<xsl:template match="nist:formattedref">
-		<xsl:text>, </xsl:text><xsl:apply-templates/>
+		<xsl:apply-templates/>
 	</xsl:template>
 
-
 	<!-- ============================= -->
 	<!-- ============================= -->
 
@@ -1488,21 +1492,21 @@
 	<!-- ====== -->	
 	
 
-	<xsl:template match="nist:p/nist:fn[not(ancestor::nist:table)] | nist:title/nist:fn | nist:table/nist:name/nist:fn" priority="2">
+	<xsl:template match="nist:p//nist:fn[not(ancestor::nist:table)] | nist:title/nist:fn | nist:table/nist:name/nist:fn" priority="2">
 		<fo:footnote>
 			<xsl:variable name="number">
-				<xsl:number level="any" count="nist:p/nist:fn[not(ancestor::nist:table)] | nist:title/nist:fn | nist:table/nist:name/nist:fn"/>
+				<xsl:number level="any" count="nist:p//nist:fn[not(ancestor::nist:table)] | nist:title/nist:fn | nist:table/nist:name/nist:fn"/>
 			</xsl:variable>
 			<fo:inline font-size="60%" keep-with-previous.within-line="always" vertical-align="super">
 				<fo:basic-link internal-destination="footnote_{@reference}_{$number}" fox:alt-text="footnote {@reference} {$number}">
 					<!-- <xsl:value-of select="@reference"/> -->
-					<xsl:value-of select="$number + count(//nist:bibitem/nist:note)"/>
+					<xsl:value-of select="$number + count(//nist:bibitem//nist:note)"/>
 				</fo:basic-link>
 			</fo:inline>
 			<fo:footnote-body>
 				<fo:block font-size="10pt" font-family="Times New Roman" font-style="normal" font-weight="normal" text-align="justify" margin-bottom="12pt" start-indent="0">
 					<fo:inline id="footnote_{@reference}_{$number}" font-size="75%" keep-with-next.within-line="always" vertical-align="super"> <!-- alignment-baseline="hanging" -->
-						<xsl:value-of select="$number + count(//nist:bibitem/nist:note)"/>
+						<xsl:value-of select="$number + count(//nist:bibitem//nist:note)"/>
 					</fo:inline>
 					<xsl:for-each select="nist:p">
 						<xsl:apply-templates/>
@@ -1536,104 +1540,6 @@
 		</xsl:element>
 	</xsl:template>
 
-
-
-	<!-- Examples:
-	[b-ASM]	b-ASM, http://www.eecs.umich.edu/gasm/ (accessed 20 March 2018).
-	[b-Börger & Stärk]	b-Börger & Stärk, Börger, E., and Stärk, R. S. (2003), Abstract State Machines: A Method for High-Level System Design and Analysis, Springer-Verlag.
-	-->
-	<xsl:template match="nist:annex//nist:bibitem">
-		<fo:block id="{@id}" margin-top="6pt" margin-left="12mm" text-indent="-12mm">
-				<xsl:if test="nist:formattedref">
-					<xsl:choose>
-						<xsl:when test="nist:docidentifier[@type = 'metanorma']">
-							<xsl:attribute name="margin-left">0</xsl:attribute>
-							<xsl:attribute name="text-indent">0</xsl:attribute>
-							<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-							<!-- create list -->
-							<fo:list-block>
-								<fo:list-item>
-									<fo:list-item-label end-indent="label-end()">
-										<fo:block>
-											<xsl:apply-templates select="nist:docidentifier[@type = 'metanorma']" mode="process"/>
-										</fo:block>
-									</fo:list-item-label>
-									<fo:list-item-body start-indent="body-start()">
-										<fo:block margin-left="3mm">
-											<xsl:apply-templates select="nist:formattedref"/>
-										</fo:block>
-									</fo:list-item-body>
-								</fo:list-item>
-							</fo:list-block>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:apply-templates select="nist:formattedref"/>
-							<xsl:apply-templates select="nist:docidentifier[@type != 'metanorma' or not(@type)]" mode="process"/>
-						</xsl:otherwise>
-					</xsl:choose>
-
-
-				</xsl:if>
-				<xsl:if test="nist:title">
-					<xsl:for-each select="nist:contributor">
-						<xsl:choose>
-							<xsl:when test="nist:person/nist:name/nist:completename">
-								<xsl:apply-templates select="nist:person/nist:name/nist:completename"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates select="nist:organization/nist:name"/>
-							</xsl:otherwise>
-						</xsl:choose>
-						<xsl:if test="position() != last()">, </xsl:if>
-					</xsl:for-each>
-					<xsl:text> (</xsl:text>
-					<xsl:variable name="date">
-						<xsl:choose>
-							<xsl:when test="nist:date[@type='issued']">
-								<xsl:call-template name="formatDate">
-									<xsl:with-param name="date" select="nist:date[@type='issued']/nist:on"/>
-								</xsl:call-template>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:call-template name="formatDate">
-									<xsl:with-param name="date" select="nist:date/nist:on"/>
-								</xsl:call-template>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:variable>
-					<xsl:value-of select="$date"/>
-					<xsl:text>) </xsl:text>
-					<fo:inline font-style="italic"><xsl:value-of select="nist:title"/></fo:inline>
-					<xsl:if test="nist:contributor[nist:role/@type='publisher']/nist:organization/nist:name">
-						<xsl:text> (</xsl:text><xsl:value-of select="nist:contributor[nist:role/@type='publisher']/nist:organization/nist:name"/><xsl:text>)</xsl:text>
-					</xsl:if>
-					<xsl:if test="nist:place">
-						<xsl:text> (</xsl:text><xsl:value-of select="nist:place"/><xsl:text>)</xsl:text>
-					</xsl:if>
-					<xsl:text>, </xsl:text>
-					<xsl:value-of select="$date"/>
-					<xsl:text>. </xsl:text>
-					<xsl:value-of select="nist:docidentifier"/>
-					<xsl:value-of select="$linebreak"/>
-					<xsl:value-of select="nist:uri"/>
-				</xsl:if>
-		</fo:block>
-	</xsl:template>
-
-	<xsl:template match="nist:annex//nist:bibitem//nist:formattedref">
-		<xsl:apply-templates/>
-	</xsl:template>
-
-	<xsl:template match="nist:docidentifier[@type = 'metanorma']" mode="process">
-		<xsl:apply-templates/>
-	</xsl:template>
-	<xsl:template match="nist:docidentifier[@type != 'metanorma' or not(@type)]" mode="process">
-		<xsl:text> [</xsl:text><xsl:apply-templates/><xsl:text>]</xsl:text>
-	</xsl:template>
-	<xsl:template match="nist:docidentifier"/>
-
-
-
 	<xsl:template match="nist:ul | nist:ol" mode="ul_ol">
 		<xsl:param name="margin"/>
 		<fo:list-block>
@@ -1693,7 +1599,7 @@
 									<xsl:number format="1."/>
 								</xsl:when>
 								<xsl:when test="../@type = 'arabic'">
-									<xsl:number format="a)"/>
+									<xsl:number format="a)" lang="en"/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet'">
 									<xsl:number format="1)"/>
@@ -1702,7 +1608,7 @@
 									<xsl:number format="i)"/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet_upper'">
-									<xsl:number format="A)"/>
+									<xsl:number format="A)" lang="en"/>
 								</xsl:when>
 								<xsl:when test="ancestor::*[nist:annex]">
 									<!-- <xsl:variable name="level">
@@ -1710,7 +1616,7 @@
 									</xsl:variable> -->
 									<xsl:choose>
 										<xsl:when test="$level = 1">
-											<xsl:number format="a)"/>
+											<xsl:number format="a)" lang="en"/>
 										</xsl:when>
 										<xsl:when test="$level = 2">
 											<xsl:number format="i)"/>
@@ -2543,6 +2449,7 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
 				
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
 		
 		
@@ -2550,6 +2457,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-source-style">		
 		
 				
@@ -2677,187 +2585,239 @@
 	</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:template><xsl:template match="*[local-name()='table']">
+	</xsl:template><xsl:template match="*[local-name()='table']" name="table">
 	
-		<xsl:variable name="simple-table">	
-			<xsl:call-template name="getSimpleTable"/>			
-		</xsl:variable>
+		<xsl:variable name="table">
 	
-		
-		
-		
-		
-		<!-- <xsl:if test="$namespace = 'bipm'">
-			<fo:block>&#xA0;</fo:block>				
-		</xsl:if> -->
-		
-		<!-- $namespace = 'iso' or  -->
-		
-			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
-		
-				
+			<xsl:variable name="simple-table">	
+				<xsl:call-template name="getSimpleTable"/>			
+			</xsl:variable>
 		
 			
-		
-		<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
-		
-		<!-- <xsl:variable name="cols-count">
-			<xsl:choose>
-				<xsl:when test="*[local-name()='thead']">
-					<xsl:call-template name="calculate-columns-numbers">
-						<xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
-					</xsl:call-template>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:call-template name="calculate-columns-numbers">
-						<xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
-					</xsl:call-template>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable> -->
-		<!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
-		<!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
-		
-		
-		
-		<xsl:variable name="colwidths">
-			<xsl:call-template name="calculate-column-widths">
-				<xsl:with-param name="cols-count" select="$cols-count"/>
-				<xsl:with-param name="table" select="$simple-table"/>
-			</xsl:call-template>
-		</xsl:variable>
-		<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
-		
-		<!-- <xsl:variable name="colwidths2">
-			<xsl:call-template name="calculate-column-widths">
-				<xsl:with-param name="cols-count" select="$cols-count"/>
-			</xsl:call-template>
-		</xsl:variable> -->
-		
-		<!-- cols-count=<xsl:copy-of select="$cols-count"/>
-		colwidthsNew=<xsl:copy-of select="$colwidths"/>
-		colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
-		
-		<xsl:variable name="margin-left">
-			<xsl:choose>
-				<xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
-				<xsl:otherwise>0</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		
-		<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">			
 			
 			
-				<xsl:attribute name="space-after">6pt</xsl:attribute>
 			
-						
-						
-						
+			<!-- <xsl:if test="$namespace = 'bipm'">
+				<fo:block>&#xA0;</fo:block>				
+			</xsl:if> -->
 			
+			<!-- $namespace = 'iso' or  -->
 			
-				<xsl:if test="ancestor::*[local-name()='annex'] or ancestor::*[local-name()='preface']">
-					<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
-					<xsl:attribute name="font-size">10pt</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="not(ancestor::*[local-name()='annex'] or ancestor::*[local-name()='preface'])">
-					<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
-					<xsl:attribute name="font-size">12pt</xsl:attribute>
-				</xsl:if>
-				<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+				<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 			
-									
+					
+			
+				
+			
+			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
+			
+			<!-- <xsl:variable name="cols-count">
+				<xsl:choose>
+					<xsl:when test="*[local-name()='thead']">
+						<xsl:call-template name="calculate-columns-numbers">
+							<xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
+						</xsl:call-template>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="calculate-columns-numbers">
+							<xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
+						</xsl:call-template>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable> -->
+			<!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
+			<!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
 			
 			
 			
+			<xsl:variable name="colwidths">
+				<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
+					<xsl:call-template name="calculate-column-widths">
+						<xsl:with-param name="cols-count" select="$cols-count"/>
+						<xsl:with-param name="table" select="$simple-table"/>
+					</xsl:call-template>
+				</xsl:if>
+			</xsl:variable>
+			<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
 			
+			<!-- <xsl:variable name="colwidths2">
+				<xsl:call-template name="calculate-column-widths">
+					<xsl:with-param name="cols-count" select="$cols-count"/>
+				</xsl:call-template>
+			</xsl:variable> -->
 			
+			<!-- cols-count=<xsl:copy-of select="$cols-count"/>
+			colwidthsNew=<xsl:copy-of select="$colwidths"/>
+			colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
 			
+			<xsl:variable name="margin-left">
+				<xsl:choose>
+					<xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
+					<xsl:otherwise>0</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
 			
-			<xsl:variable name="table_attributes">
-				<attribute name="table-layout">fixed</attribute>
-				<attribute name="width">100%</attribute>
-				<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
-				<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
+			<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">			
 				
 				
+					<xsl:attribute name="space-after">6pt</xsl:attribute>
 				
+							
+							
+							
 				
-								
-								
-								
 				
-								
+					<xsl:if test="ancestor::*[local-name()='annex'] or ancestor::*[local-name()='preface']">
+						<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+						<xsl:attribute name="font-size">10pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="not(ancestor::*[local-name()='annex'] or ancestor::*[local-name()='preface'])">
+						<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+						<xsl:attribute name="font-size">12pt</xsl:attribute>
+					</xsl:if>
+					<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 				
-			</xsl:variable>
-			
-			
-			<fo:table id="{@id}" table-omit-footer-at-break="true">
+										
 				
-				<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">					
-					<xsl:attribute name="{@name}">
-						<xsl:value-of select="."/>
-					</xsl:attribute>
-				</xsl:for-each>
 				
-				<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>				
-				<xsl:if test="$isNoteOrFnExist = 'true'">
-					<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
-				</xsl:if>
 				
-				<xsl:for-each select="xalan:nodeset($colwidths)//column">
+				
+				
+				
+				<xsl:variable name="table_width">
+					<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
+					100%
+							
+					
+				</xsl:variable>
+				
+				<xsl:variable name="table_attributes">
+					<attribute name="table-layout">fixed</attribute>
+					<attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></attribute>
+					<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
+					<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
+					
+					
+					
+					
+									
+									
+									
+					
+									
+					
+				</xsl:variable>
+				
+				
+				<fo:table id="{@id}" table-omit-footer-at-break="true">
+					
+					<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">					
+						<xsl:attribute name="{@name}">
+							<xsl:value-of select="."/>
+						</xsl:attribute>
+					</xsl:for-each>
+					
+					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>				
+					<xsl:if test="$isNoteOrFnExist = 'true'">
+						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
+					</xsl:if>
+					
 					<xsl:choose>
-						<xsl:when test=". = 1 or . = 0">
-							<fo:table-column column-width="proportional-column-width(2)"/>
+						<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>
-							<fo:table-column column-width="proportional-column-width({.})"/>
+							<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:for-each>
-				
-				<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/>
-					</xsl:otherwise>
-				</xsl:choose>
-				
-			</fo:table>
-			
-			<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
-				<xsl:call-template name="insertTableFooterInSeparateTable">
-					<xsl:with-param name="table_attributes" select="$table_attributes"/>
-					<xsl:with-param name="colwidths" select="$colwidths"/>				
-				</xsl:call-template>
-			</xsl:for-each>
-			
-			<!-- insert footer as table -->
-			<!-- <fo:table>
-				<xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
-					<xsl:attribute name="{@name}">
-						<xsl:value-of select="."/>
-					</xsl:attribute>
-				</xsl:for-each>
-				
-				<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 test="not(*[local-name()='tbody']) and *[local-name()='thead']">
+							<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<fo:table-column column-width="proportional-column-width({.})"/>
+							<xsl:apply-templates/>
 						</xsl:otherwise>
 					</xsl:choose>
+					
+				</fo:table>
+				
+				<xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>				
+				<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
+					<xsl:call-template name="insertTableFooterInSeparateTable">
+						<xsl:with-param name="table_attributes" select="$table_attributes"/>
+						<xsl:with-param name="colwidths" select="$colwidths"/>				
+						<xsl:with-param name="colgroup" select="$colgroup"/>				
+					</xsl:call-template>
 				</xsl:for-each>
-			</fo:table>-->
-			
-			
-			
-			
-			
-		</fo:block-container>
+				
+				<!-- insert footer as table -->
+				<!-- <fo:table>
+					<xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
+						<xsl:attribute name="{@name}">
+							<xsl:value-of select="."/>
+						</xsl:attribute>
+					</xsl:for-each>
+					
+					<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>
+				</fo:table>-->
+				
+				
+				
+				
+				
+			</fo:block-container>
+		</xsl:variable>
+		
+		
+		
+		<xsl:choose>
+			<xsl:when test="@width">
+	
+				<!-- centered table when table name is centered (see table-name-style) -->
+				
+					<fo:table table-layout="fixed" width="100%">
+						<fo:table-column column-width="proportional-column-width(1)"/>
+						<fo:table-column column-width="{@width}"/>
+						<fo:table-column column-width="proportional-column-width(1)"/>
+						<fo:table-body>
+							<fo:table-row>
+								<fo:table-cell column-number="2">
+									<fo:block><xsl:copy-of select="$table"/></fo:block>
+								</fo:table-cell>
+							</fo:table-row>
+						</fo:table-body>
+					</fo:table>
+				
+				
+				
+				
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy-of select="$table"/>
+			</xsl:otherwise>
+		</xsl:choose>
+		
 	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
@@ -3083,12 +3043,22 @@
 	</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:if test="$isNoteOrFnExist = 'true'">
 		
-			<xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
+			<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>
+						<xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
 			
 			<fo:table keep-with-previous="always">
 				<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -3106,16 +3076,25 @@
 					</xsl:choose>
 				</xsl:for-each>
 				
-				<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:choose>
+					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
+						<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
+							<fo:table-column column-width="{@width}"/>
+						</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>
+					</xsl:otherwise>
+				</xsl:choose>
 				
 				<fo:table-body>
 					<fo:table-row>
@@ -3537,7 +3516,9 @@
 	</xsl:template><xsl:template match="*[local-name()='dl']">
 		<fo:block-container>
 			
-				<xsl:attribute name="margin-left">0mm</xsl:attribute>
+				<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
+					<xsl:attribute name="margin-left">0mm</xsl:attribute>
+				</xsl:if>
 			
 			
 			<xsl:if test="parent::*[local-name() = 'note']">
@@ -3552,6 +3533,7 @@
 			<fo:block-container>
 				
 					<xsl:attribute name="margin-left">0mm</xsl:attribute>
+					<xsl:attribute name="margin-right">0mm</xsl:attribute>
 				
 				
 				<xsl:variable name="parent" select="local-name(..)"/>
@@ -3676,7 +3658,7 @@
 										<xsl:with-param name="table" select="$html-table"/>
 									</xsl:call-template>
 								</xsl:variable>
-								<!-- colwidths=<xsl:value-of select="$colwidths"/> -->
+								<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
 								<xsl:variable name="maxlength_dt">							
 									<xsl:call-template name="getMaxLength_dt"/>							
 								</xsl:variable>
@@ -3705,13 +3687,22 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:choose>
+					<!-- 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="5%"/>
-						<fo:table-column column-width="95%"/>
+						<fo:table-column column-width="7%"/>
+						<fo:table-column column-width="93%"/>
+					</xsl:when>
+					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 5"> <!-- if dt contains short text like ABC, etc -->
+						<fo:table-column column-width="15%"/>
+						<fo:table-column column-width="85%"/>
+					</xsl:when>
+					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 7"> <!-- if dt contains short text like ABCDEF, etc -->
+						<fo:table-column column-width="20%"/>
+						<fo:table-column column-width="80%"/>
 					</xsl:when>
-					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 5"> <!-- if dt contains short text like t90, a, etc -->
-						<fo:table-column column-width="10%"/>
-						<fo:table-column column-width="90%"/>
+					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 10"> <!-- if dt contains short text like ABCDEFEF, etc -->
+						<fo:table-column column-width="25%"/>
+						<fo:table-column column-width="75%"/>
 					</xsl:when>
 					<!-- <xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 1.7">
 						<fo:table-column column-width="60%"/>
@@ -3743,12 +3734,32 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template name="getMaxLength_dt">
-		<xsl:for-each select="*[local-name()='dt']">
-			<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
-			<xsl:if test="position() = 1">
-				<xsl:value-of select="string-length(normalize-space(.))"/>
-			</xsl:if>
-		</xsl:for-each>
+		<xsl:variable name="lengths">
+			<xsl:for-each select="*[local-name()='dt']">
+				<xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
+				<xsl:variable name="attributes">
+					<xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
+					<xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
+				</xsl:variable>
+				<length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="maxLength">
+			<!-- <xsl:for-each select="*[local-name()='dt']">
+				<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
+				<xsl:if test="position() = 1">
+					<xsl:value-of select="string-length(normalize-space(.))"/>
+				</xsl:if>
+			</xsl:for-each> -->
+			<xsl:for-each select="xalan:nodeset($lengths)/length">
+				<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:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
+		<xsl:value-of select="$maxLength"/>
 	</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
 		<xsl:param name="key_iso"/>
 		
@@ -3903,6 +3914,7 @@
 				
 				
 				
+				
 						
 			</xsl:variable>
 			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>		
@@ -3916,6 +3928,10 @@
 			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='underline']">
+		<fo:inline text-decoration="underline">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
 		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
 			<xsl:apply-templates/>
@@ -4009,6 +4025,10 @@
 		<xsl:param name="text" select="."/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| )','$1​')"/>
+	</xsl:template><xsl:template name="add-zero-spaces-link-java">
+		<xsl:param name="text" select="."/>
+		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
 	</xsl:template><xsl:template name="add-zero-spaces">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-chars">-</xsl:variable>
@@ -4269,6 +4289,11 @@
 			<!-- 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:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="mathml"/>
+		</xsl:copy>
+		<mathml:mspace width="0.5ex"/>
 	</xsl:template><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
@@ -4290,7 +4315,10 @@
 					<fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
 						<xsl:choose>
 							<xsl:when test="normalize-space(.) = ''">
-								<xsl:value-of select="$target"/>
+								<!-- <xsl:value-of select="$target"/> -->
+								<xsl:call-template name="add-zero-spaces-link-java">
+									<xsl:with-param name="text" select="$target"/>
+								</xsl:call-template>
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:apply-templates/>
@@ -4496,7 +4524,7 @@
 				</xsl:if> -->
 			</fo:inline>
 		</xsl:if>
-	</xsl:template><xsl:template match="*[local-name() = 'figure']">
+	</xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
 		<fo:block-container id="{@id}">			
 			
 			<fo:block>
@@ -4565,6 +4593,8 @@
 											<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>
@@ -4582,13 +4612,34 @@
 											</xsl:choose>
 										</fo:bookmark-title>
 										<xsl:apply-templates select="contents/item" mode="bookmark"/>
+										
+										<xsl:call-template name="insertFigureBookmarks">
+											<xsl:with-param name="contents" select="contents"/>
+										</xsl:call-template>
+										
+										<xsl:call-template name="insertTableBookmarks">
+											<xsl:with-param name="contents" select="contents"/>
+											<xsl:with-param name="lang" select="@lang"/>
+										</xsl:call-template>
+										
 									</fo:bookmark>
 									
 								</xsl:for-each>
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:for-each select="xalan:nodeset($contents)/doc">
+								
 									<xsl:apply-templates select="contents/item" mode="bookmark"/>
+									
+									<xsl:call-template name="insertFigureBookmarks">
+										<xsl:with-param name="contents" select="contents"/>
+									</xsl:call-template>
+										
+									<xsl:call-template name="insertTableBookmarks">
+										<xsl:with-param name="contents" select="contents"/>
+										<xsl:with-param name="lang" select="@lang"/>
+									</xsl:call-template>
+									
 								</xsl:for-each>
 							</xsl:otherwise>
 						</xsl:choose>
@@ -4634,8 +4685,44 @@
 				
 			</fo:bookmark-tree>
 		</xsl:if>
+	</xsl:template><xsl:template name="insertFigureBookmarks">
+		<xsl:param name="contents"/>
+		<xsl:if test="xalan:nodeset($contents)/figure">
+			<fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
+				<fo:bookmark-title>Figures</fo:bookmark-title>
+				<xsl:for-each select="xalan:nodeset($contents)/figure">
+					<fo:bookmark internal-destination="{@id}">
+						<fo:bookmark-title>
+							<xsl:value-of select="normalize-space(title)"/>
+						</fo:bookmark-title>
+					</fo:bookmark>
+				</xsl:for-each>
+			</fo:bookmark>	
+		</xsl:if>
+	</xsl:template><xsl:template name="insertTableBookmarks">
+		<xsl:param name="contents"/>
+		<xsl:param name="lang"/>
+		<xsl:if test="xalan:nodeset($contents)/table">
+			<fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
+				<fo:bookmark-title>
+					<xsl:choose>
+						<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
+						<xsl:otherwise>Tables</xsl:otherwise>
+					</xsl:choose>
+				</fo:bookmark-title>
+				<xsl:for-each select="xalan:nodeset($contents)/table">
+					<fo:bookmark internal-destination="{@id}">
+						<fo:bookmark-title>
+							<xsl:value-of select="normalize-space(title)"/>
+						</fo:bookmark-title>
+					</fo:bookmark>
+				</xsl:for-each>
+			</fo:bookmark>	
+		</xsl:if>
 	</xsl:template><xsl:template name="getLangVersion">
 		<xsl:param name="lang"/>
+		<xsl:param name="doctype" select="''"/>
+		<xsl:param name="title" select="''"/>
 		<xsl:choose>
 			<xsl:when test="$lang = 'en'">
 				
@@ -4675,6 +4762,12 @@
 		<!-- <xsl:text> </xsl:text> -->
 	</xsl:template><xsl:template name="getSection">
 		<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+		<!-- 
+		<xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
+			<xsl:value-of select="."/>
+		</xsl:for-each>
+		-->
+		
 	</xsl:template><xsl:template name="getName">
 		<xsl:choose>
 			<xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
@@ -4727,6 +4820,12 @@
 		<xsl:copy>
 			<xsl:apply-templates mode="contents_item"/>
 		</xsl:copy>		
+	</xsl:template><xsl:template match="*[local-name() = 'em']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>		
+	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents_item">
+		<xsl:copy-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
@@ -4752,6 +4851,7 @@
 						
 						
 						
+						
 								
 						
 						10
@@ -5121,10 +5221,13 @@
 				</xsl:if>
 			</xsl:if>
 			
+			
 			<fo:block-container margin-left="0mm">
 		
 				<fo:block xsl:use-attribute-sets="quote-style">
-					<xsl:apply-templates select=".//*[local-name() = 'p']"/>
+					<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
+					
+					<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
 				</fo:block>
 				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
 					<fo:block xsl:use-attribute-sets="quote-source-style">
@@ -5278,6 +5381,7 @@
 			
 			
 			
+			
 						
 			
 						
@@ -5293,7 +5397,7 @@
 				</xsl:if>
 		
 		
-	</xsl:template><xsl:template match="/*/*[local-name() = 'preface']/*" priority="2">
+	</xsl:template><xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
 		<fo:block break-after="page"/>
 		<fo:block>
 			<xsl:call-template name="setId"/>
@@ -5301,7 +5405,8 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'clause']">
 		<fo:block>
-			<xsl:call-template name="setId"/>			
+			<xsl:call-template name="setId"/>
+			
 			
 			<xsl:apply-templates/>
 		</fo:block>
@@ -5368,7 +5473,10 @@
 			<fo:table-column column-width="107mm"/>
 			<fo:table-column column-width="15mm"/>
 			<fo:table-body>
-				<fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
+				<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
+					
+						<xsl:attribute name="font-family">Arial</xsl:attribute>
+					
 					<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
 					<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
 					<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -5386,6 +5494,10 @@
 			<fo:block><xsl:apply-templates/></fo:block>
 		</fo:table-cell>
 	</xsl:template><xsl:template name="processBibitem">
+		
+		
+		<!-- end BIPM bibitem processing-->
+		
 		 
 		
 		
@@ -5444,6 +5556,8 @@
 		<xsl:value-of select="translate(.,'. ','')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
 		<xsl:value-of select="substring(.,1,1)"/>
+	</xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
+		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -5468,6 +5582,57 @@
 		</xsl:variable>
 		<xsl:variable name="result">
 			<xsl:choose>
+				<xsl:when test="$format = 'ddMMyyyy'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text>
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
+				</xsl:when>
+				<xsl:when test="$format = 'ddMM'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
+				</xsl:when>
+				<xsl:when test="$format = 'short' or $day = ''">
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:value-of select="$result"/>
+	</xsl:template><xsl:template name="convertDateLocalized">
+		<xsl:param name="date"/>
+		<xsl:param name="format" select="'short'"/>
+		<xsl:variable name="year" select="substring($date, 1, 4)"/>
+		<xsl:variable name="month" select="substring($date, 6, 2)"/>
+		<xsl:variable name="day" select="substring($date, 9, 2)"/>
+		<xsl:variable name="monthStr">
+			<xsl:choose>
+				<xsl:when test="$month = '01'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_january</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '02'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_february</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '03'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_march</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '04'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_april</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '05'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_may</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '06'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_june</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '07'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_july</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '08'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_august</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '09'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_september</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '10'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_october</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '11'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_november</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '12'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_december</xsl:with-param></xsl:call-template></xsl:when>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="result">
+			<xsl:choose>
+				<xsl:when test="$format = 'ddMMyyyy'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text>
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
+				</xsl:when>
+				<xsl:when test="$format = 'ddMM'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
+				</xsl:when>
 				<xsl:when test="$format = 'short' or $day = ''">
 					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
 				</xsl:when>
@@ -5483,7 +5648,7 @@
 		<xsl:param name="charDelim" select="', '"/>
 		<xsl:choose>
 			<xsl:when test="$sorting = 'true' or $sorting = 'yes'">
-				<xsl:for-each select="/*/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
+				<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
 					<xsl:sort data-type="text" order="ascending"/>
 					<xsl:call-template name="insertKeyword">
 						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
@@ -5492,7 +5657,7 @@
 				</xsl:for-each>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:for-each select="/*/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
+				<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
 					<xsl:call-template name="insertKeyword">
 						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
 						<xsl:with-param name="charDelim" select="$charDelim"/>
@@ -5509,6 +5674,9 @@
 			<xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template name="addPDFUAmeta">
+		<xsl:variable name="lang">
+			<xsl:call-template name="getLang"/>
+		</xsl:variable>
 		<fo:declarations>
 			<pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
 					<pdf:dictionary type="normal" key="ViewerPreferences">
@@ -5521,13 +5689,16 @@
 					<!-- Dublin Core properties go here -->
 						<dc:title>
 							<xsl:variable name="title">
-								
-									<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = 'en' and @type = 'main']"/>
-								
-								
-								
-								
-																
+								<xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
+									
+										<xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
+									
+									
+									
+									
+									
+																	
+								</xsl:for-each>
 							</xsl:variable>
 							<xsl:choose>
 								<xsl:when test="normalize-space($title) != ''">
@@ -5539,22 +5710,21 @@
 							</xsl:choose>							
 						</dc:title>
 						<dc:creator>
-							
-							
-							
-								<xsl:for-each select="/*/*[local-name() = 'bibdata']/*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
-									<xsl:value-of select="*[local-name() = 'person']/*[local-name() = 'name']/*[local-name() = 'completename']"/>
-									<xsl:if test="position() != last()">; </xsl:if>
-								</xsl:for-each>
-							
-						</dc:creator>
-						<dc:description>
-							<xsl:variable name="abstract">
+							<xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
+								
 								
 								
+									<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
+										<xsl:value-of select="*[local-name() = 'person']/*[local-name() = 'name']/*[local-name() = 'completename']"/>
+										<xsl:if test="position() != last()">; </xsl:if>
+									</xsl:for-each>
 								
-									<xsl:copy-of select="/*/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
+							</xsl:for-each>
+						</dc:creator>
+						<dc:description>
+							<xsl:variable name="abstract">
 								
+									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
 								
 								
 							</xsl:variable>
@@ -5667,6 +5837,7 @@
 			
 			
 			
+			
 		</xsl:variable>
 		<xsl:if test="$documentNS != $XSLNS">
 			<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
@@ -5726,6 +5897,11 @@
 			<xsl:call-template name="getLang"/>
 		</xsl:variable>
 		
-		<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+		<xsl:choose>
+			<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:when>
+			<xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
+		</xsl:choose>
 		
 	</xsl:template></xsl:stylesheet>