metanorma-iso 1.5.11 → 1.6.1

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -17,7 +17,12 @@
 
 	<xsl:variable name="docidentifierISO" select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso'] | /iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'ISO']"/>
 
-	<xsl:variable name="copyrightText" select="concat('© ISO ', iso:iso-standard/iso:bibdata/iso:copyright/iso:from ,' – All rights reserved')"/>
+	<xsl:variable name="all_rights_reserved">
+		<xsl:call-template name="getLocalizedString">
+			<xsl:with-param name="key">all_rights_reserved</xsl:with-param>
+		</xsl:call-template>
+	</xsl:variable>	
+	<xsl:variable name="copyrightText" select="concat('© ISO ', /iso:iso-standard/iso:bibdata/iso:copyright/iso:from ,' – ', $all_rights_reserved)"/>
   
 	<xsl:variable name="lang-1st-letter_tmp" select="substring-before(substring-after(/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-with-lang'], '('), ')')"/>
 	<xsl:variable name="lang-1st-letter" select="concat('(', $lang-1st-letter_tmp , ')')"/>
@@ -161,7 +166,10 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="Cambria, Times New Roman, Cambria Math, HanSans" font-size="11pt" xml:lang="{$lang}"> <!--   -->
+		<fo:root font-family="Cambria, Times New Roman, Cambria Math, Source Han Sans" font-size="11pt" xml:lang="{$lang}"> <!--   -->
+			<xsl:if test="$lang = 'zh'">
+				<xsl:attribute name="font-family">Source Han Sans, Times New Roman, Cambria Math</xsl:attribute>
+			</xsl:if>
 			<fo:layout-master-set>
 				
 				<!-- cover page -->
@@ -376,8 +384,13 @@
 																</fo:block>
 															</fo:table-cell>
 															<fo:table-cell display-align="center">
-																<fo:block text-align="right">
-																	<fo:block>Reference number</fo:block>
+																<fo:block text-align="right">																	
+																	<!-- Reference number -->
+																	<fo:block>
+																		<xsl:call-template name="getLocalizedString">
+																			<xsl:with-param name="key">reference_number</xsl:with-param>																			
+																		</xsl:call-template>
+																	</fo:block>
 																	<fo:block>
 																		<xsl:value-of select="$ISOname"/>																		
 																	</fo:block>
@@ -756,8 +769,12 @@
 											</fo:block>
 										</fo:table-cell>
 										<fo:table-cell display-align="center">
-											<fo:block text-align="right">
-												<fo:block>Reference number</fo:block>
+											<fo:block text-align="right">												
+												<fo:block>
+													<xsl:call-template name="getLocalizedString">
+														<xsl:with-param name="key">reference_number</xsl:with-param>																			
+													</xsl:call-template>
+												</fo:block>
 												<fo:block><xsl:value-of select="$ISOname"/></fo:block>
 												<fo:block> </fo:block>
 												<fo:block> </fo:block>
@@ -984,10 +1001,10 @@
 					<xsl:if test="/iso:iso-standard/iso:boilerplate/iso:copyright-statement">
 					
 						<fo:block-container height="252mm" display-align="after">
-							<fo:block margin-bottom="3mm">
-								<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
-								<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold">COPYRIGHT PROTECTED DOCUMENT</fo:inline>
-							</fo:block>
+							<!-- <fo:block margin-bottom="3mm">
+								<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>								
+								<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold"></fo:inline>
+							</fo:block> -->
 							<fo:block line-height="90%">
 								<fo:block font-size="9pt" text-align="justify">
 									<xsl:apply-templates select="/iso:iso-standard/iso:boilerplate/iso:copyright-statement"/>
@@ -1106,20 +1123,26 @@
 						</fo:block>
 						 -->
 						<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1">
-							<xsl:variable name="part-en" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-part']"/>
+						
+							<xsl:variable name="title-part-doc-lang" select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']"/>
+							
+							<xsl:variable name="title-intro-doc-lang" select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
+							
 							<fo:block>
-								<xsl:if test="normalize-space($title-intro) != ''">
-									<xsl:value-of select="$title-intro"/>
+								<xsl:if test="normalize-space($title-intro-doc-lang) != ''">
+									<xsl:value-of select="$title-intro-doc-lang"/>
 									<xsl:text> — </xsl:text>
 								</xsl:if>
 								
-								<xsl:value-of select="$title-main"/>
+								<xsl:variable name="title-main-doc-lang" select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']"/>
+								
+								<xsl:value-of select="$title-main-doc-lang"/>
 								
-								<xsl:if test="normalize-space($part-en) != ''">
+								<xsl:if test="normalize-space($title-part-doc-lang) != ''">
 									<xsl:if test="$part != ''">
 										<xsl:text> — </xsl:text>
-										<fo:block font-weight="normal" margin-top="12pt" line-height="1.1">
-											<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='en']),'#',$part)"/>
+										<fo:block font-weight="normal" margin-top="12pt" line-height="1.1">											
+											<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$lang]),'#',$part)"/>											
 											<!-- <xsl:value-of select="$title-part-en"/>
 											<xsl:value-of select="$part"/>
 											<xsl:text>:</xsl:text> -->
@@ -1128,10 +1151,10 @@
 								</xsl:if>
 							</fo:block>
 							<fo:block>
-								<xsl:value-of select="$part-en"/>
+								<xsl:value-of select="$title-part-doc-lang"/>
 							</fo:block>
 							
-							<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-amd']"/>
+							<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-amd']"/>
 							<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
 								<fo:block margin-top="12pt">
 									<xsl:call-template name="printAmendmentTitle"/>
@@ -1215,7 +1238,28 @@
 										</xsl:call-template>
 									</fo:block>
 								</xsl:if>
-								<fo:block font-size="9pt">Price based on <fo:page-number-citation ref-id="lastBlock"/> pages</fo:block>
+								<xsl:variable name="countPages"/>
+								<xsl:variable name="price_based_on">
+									<xsl:call-template name="getLocalizedString">
+										<xsl:with-param name="key">price_based_on</xsl:with-param>
+									</xsl:call-template>
+								</xsl:variable>
+								<xsl:variable name="price_based_on_items">
+									<xsl:call-template name="split">
+										<xsl:with-param name="pText" select="$price_based_on"/>
+										<xsl:with-param name="sep" select="'%'"/>
+										<xsl:with-param name="normalize-space">false</xsl:with-param>
+									</xsl:call-template>
+								</xsl:variable>
+								<!-- Price based on ... pages -->
+								<fo:block font-size="9pt">
+									<xsl:for-each select="xalan:nodeset($price_based_on_items)/item">
+										<xsl:value-of select="."/>
+										<xsl:if test="position() != last()">
+											<fo:page-number-citation ref-id="lastBlock"/>
+										</xsl:if>										
+									</xsl:for-each>
+								</fo:block>
 							</fo:block-container>
 						</fo:block-container>
 					</fo:flow>
@@ -1319,13 +1363,22 @@
 			<xsl:otherwise> <!-- for ordered lists -->
 				<xsl:choose>
 					<xsl:when test="../@type = 'arabic'">
-						<xsl:number format="a)"/>
+						<xsl:number format="1." lang="en"/>
 					</xsl:when>
 					<xsl:when test="../@type = 'alphabet'">
-						<xsl:number format="a)"/>
+						<xsl:number format="a)" lang="en"/>
+					</xsl:when>
+					<xsl:when test="../@type = 'alphabet_upper'">
+						<xsl:number format="A." lang="en"/>
+					</xsl:when>
+					<xsl:when test="../@type = 'roman'">
+						<xsl:number format="i)"/>
+					</xsl:when>
+					<xsl:when test="../@type = 'roman_upper'">
+						<xsl:number format="I."/>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:number format="1."/>
+						<xsl:number format="a)"/>
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:otherwise>
@@ -1365,6 +1418,14 @@
 				<fo:block>www.iso.org</fo:block>
 			</fo:block> -->
 	
+	<xsl:template match="iso:copyright-statement/iso:clause[1]/iso:title">
+		<fo:block margin-bottom="3mm">
+				<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
+				<!-- <fo:inline padding-left="6mm" font-size="12pt" font-weight="bold">COPYRIGHT PROTECTED DOCUMENT</fo:inline> -->
+				<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold"><xsl:apply-templates/></fo:inline>
+			</fo:block>
+	</xsl:template>
+	
 	<xsl:template match="iso:copyright-statement//iso:p">
 		<fo:block>
 			<xsl:if test="preceding-sibling::iso:p">
@@ -1629,6 +1690,9 @@
 			<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
 			<fo:inline font-style="italic">
 				<xsl:choose>
+					<xsl:when test="iso:title[@type = 'main' and @language = $lang]">
+						<xsl:value-of select="iso:title[@type = 'main' and @language = $lang]"/>
+					</xsl:when>
 					<xsl:when test="iso:title[@type = 'main' and @language = 'en']">
 						<xsl:value-of select="iso:title[@type = 'main' and @language = 'en']"/>
 					</xsl:when>
@@ -1748,6 +1812,9 @@
 						<xsl:apply-templates select="iso:note"/>
 						<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
 						<xsl:choose>
+							<xsl:when test="iso:title[@type = 'main' and @language = $lang]">
+								<xsl:apply-templates select="iso:title[@type = 'main' and @language = $lang]"/>
+							</xsl:when>
 							<xsl:when test="iso:title[@type = 'main' and @language = 'en']">
 								<xsl:apply-templates select="iso:title[@type = 'main' and @language = 'en']"/>
 							</xsl:when>
@@ -1789,7 +1856,12 @@
 	
 	<xsl:template match="iso:admonition">
 		<fo:block margin-bottom="12pt" font-weight="bold"> <!-- text-align="center"  -->			
-			<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@type))"/>
+			<xsl:variable name="type">
+				<xsl:call-template name="getLocalizedString">
+					<xsl:with-param name="key">admonition.<xsl:value-of select="@type"/></xsl:with-param>
+				</xsl:call-template>
+			</xsl:variable>			
+			<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($type))"/>
 			<xsl:text> — </xsl:text>
 			<xsl:apply-templates/>
 		</fo:block>
@@ -2111,15 +2183,24 @@
 				<xsl:text>Part #:</xsl:text>
 			
 			
+			
 		</title-part>
 		<title-part lang="fr">
 			
 				<xsl:text>Partie #:</xsl:text>
 			
 			
+			
 		</title-part>		
 		<title-part lang="zh">第 # 部分:</title-part>
 		
+		<title-subpart lang="en">			
+			
+		</title-subpart>
+		<title-subpart lang="fr">		
+			
+		</title-subpart>
+		
 		<title-modified lang="en">modified</title-modified>
 		<title-modified lang="fr">modifiée</title-modified>
 		
@@ -2441,6 +2522,7 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
 				
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
 		
 		
@@ -2475,6 +2557,7 @@
 			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 		
@@ -2597,7 +2680,9 @@
 		
 		
 		
-		
+		<!-- <xsl:if test="$namespace = 'bipm'">
+			<fo:block>&#xA0;</fo:block>				
+		</xsl:if> -->
 		
 		<!-- $namespace = 'iso' or  -->
 		
@@ -2627,10 +2712,12 @@
 		
 		
 		<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: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"/> -->
 		
@@ -2676,7 +2763,12 @@
 			
 			<xsl:variable name="table_attributes">
 				<attribute name="table-layout">fixed</attribute>
-				<attribute name="width">100%</attribute>
+				<attribute name="width">
+					<xsl:choose>
+						<xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
+						<xsl:otherwise>100%</xsl:otherwise>
+					</xsl:choose>
+				</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>
 				
@@ -2713,16 +2805,25 @@
 					<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: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="*[local-name()='colgroup']/*[local-name()='col']">
+						<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
+							<fo:table-column column-width="{@width}"/>
+						</xsl:for-each>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:for-each select="xalan:nodeset($colwidths)//column">
+							<xsl:choose>
+								<xsl:when test=". = 1 or . = 0">
+									<fo:table-column column-width="proportional-column-width(2)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<fo:table-column column-width="proportional-column-width({.})"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:for-each>
+					</xsl:otherwise>
+				</xsl:choose>
 				
 				<xsl:choose>
 					<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -2735,10 +2836,12 @@
 				
 			</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>
 			
@@ -2773,6 +2876,7 @@
 				
 					<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 				
+				
 				<xsl:apply-templates/>				
 			</fo:block>
 		</xsl:if>
@@ -2999,12 +3103,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">
@@ -3022,16 +3136,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>
@@ -3184,6 +3307,7 @@
 				
 				
 				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -3277,7 +3401,8 @@
 				</xsl:attribute>
 			</xsl:if>
 			<xsl:call-template name="display-align"/>
-			<fo:block>								
+			<fo:block>
+								
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
@@ -3501,7 +3626,13 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='dl']">
-		<fo:block-container margin-left="0mm">
+		<fo:block-container>
+			
+				<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']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -3511,8 +3642,12 @@
 				</xsl:attribute>
 				
 			</xsl:if>
-			<fo:block-container margin-left="0mm">
-	
+			<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(..)"/>
 				
 				<xsl:variable name="key_iso">
@@ -3530,9 +3665,12 @@
 									<xsl:attribute name="margin-bottom">0</xsl:attribute>
 								
 								<xsl:variable name="title-where">
-									<xsl:call-template name="getTitle">
-										<xsl:with-param name="name" select="'title-where'"/>
-									</xsl:call-template>
+									
+										<xsl:call-template name="getLocalizedString">
+											<xsl:with-param name="key">where</xsl:with-param>
+										</xsl:call-template>
+									
+									
 								</xsl:variable>
 								<xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
 								<xsl:apply-templates select="*[local-name()='dt']/*"/>
@@ -3550,9 +3688,12 @@
 							
 							
 							<xsl:variable name="title-where">
-								<xsl:call-template name="getTitle">
-									<xsl:with-param name="name" select="'title-where'"/>
-								</xsl:call-template>
+								
+									<xsl:call-template name="getLocalizedString">
+										<xsl:with-param name="key">where</xsl:with-param>
+									</xsl:call-template>
+								
+																
 							</xsl:variable>
 							<xsl:value-of select="$title-where"/>
 						</fo:block>
@@ -3566,9 +3707,12 @@
 							
 							
 							<xsl:variable name="title-key">
-								<xsl:call-template name="getTitle">
-									<xsl:with-param name="name" select="'title-key'"/>
-								</xsl:call-template>
+								
+									<xsl:call-template name="getLocalizedString">
+										<xsl:with-param name="key">key</xsl:with-param>
+									</xsl:call-template>
+								
+								
 							</xsl:variable>
 							<xsl:value-of select="$title-key"/>
 						</fo:block>
@@ -3699,12 +3843,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"/>
 		
@@ -3818,6 +3982,7 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<fo:inline font-weight="bold">
+			
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='sup']">
@@ -3857,6 +4022,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/>
@@ -4146,7 +4315,18 @@
 				<xsl:with-param name="previousRow" select="$newRow"/>
 		</xsl:apply-templates>
 	</xsl:template><xsl:template name="getLang">
-		<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+		<xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
+		<xsl:variable name="language">
+			<xsl:choose>
+				<xsl:when test="$language_current != ''">
+					<xsl:value-of select="$language_current"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		
 		<xsl:choose>
 			<xsl:when test="$language = 'English'">en</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
@@ -4181,6 +4361,7 @@
 		<xsl:value-of select="substring($str, 2)"/>		
 	</xsl:template><xsl:template match="mathml:math">
 		<fo:inline font-family="STIX Two Math"> <!--  -->
+			
 			<xsl:variable name="mathml">
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
@@ -4210,6 +4391,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -4263,10 +4445,14 @@
 		</fo:inline>		
 	</xsl:template><xsl:template match="*[local-name() = 'modification']">
 		<xsl:variable name="title-modified">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-modified'"/>
-			</xsl:call-template>
+			
+				<xsl:call-template name="getLocalizedString">
+					<xsl:with-param name="key">modified</xsl:with-param>
+				</xsl:call-template>
+			
+			
 		</xsl:variable>
+		
 		<xsl:choose>
 			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
 			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
@@ -4419,7 +4605,8 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']">
-		<fo:block-container id="{@id}">
+		<fo:block-container id="{@id}">			
+			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -4470,7 +4657,7 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -4486,6 +4673,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>
@@ -4503,13 +4692,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>
@@ -4528,8 +4738,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'">
 				
@@ -4993,9 +5239,14 @@
 			
 				<fo:inline>
 					
-					<xsl:call-template name="getTitle">
-						<xsl:with-param name="name" select="'title-source'"/>
-					</xsl:call-template>
+					
+					
+						<xsl:call-template name="getLocalizedString">
+							<xsl:with-param name="key">source</xsl:with-param>
+						</xsl:call-template>
+					
+					
+					
 					<xsl:text>: </xsl:text>
 				</fo:inline>
 			
@@ -5020,7 +5271,8 @@
 			<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="./*[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">
@@ -5144,9 +5396,12 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
 		<xsl:variable name="title-deprecated">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-deprecated'"/>
-			</xsl:call-template>
+			
+				<xsl:call-template name="getLocalizedString">
+					<xsl:with-param name="key">deprecated</xsl:with-param>
+				</xsl:call-template>
+			
+			
 		</xsl:variable>
 		<fo:block xsl:use-attribute-sets="deprecates-style">
 			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
@@ -5200,7 +5455,7 @@
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
 		
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
@@ -5257,7 +5512,8 @@
 			<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">
+					
 					<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>
@@ -5275,6 +5531,10 @@
 			<fo:block><xsl:apply-templates/></fo:block>
 		</fo:table-cell>
 	</xsl:template><xsl:template name="processBibitem">
+		
+		
+		<!-- end BIPM bibitem processing-->
+		
 		 
 		
 		
@@ -5333,6 +5593,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'"/>
@@ -5514,13 +5776,22 @@
 	</xsl:template><xsl:template name="split">
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>
+		<xsl:param name="normalize-space" select="'true'"/>
 		<xsl:if test="string-length($pText) &gt;0">
 		<item>
-			<xsl:value-of select="normalize-space(substring-before(concat($pText, ','), $sep))"/>
+			<xsl:choose>
+				<xsl:when test="$normalize-space = 'true'">
+					<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
+				</xsl:otherwise>
+			</xsl:choose>
 		</item>
 		<xsl:call-template name="split">
 			<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
 			<xsl:with-param name="sep" select="$sep"/>
+			<xsl:with-param name="normalize-space" select="$normalize-space"/>
 		</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getDocumentId">		
@@ -5586,4 +5857,28 @@
 				<xsl:with-param name="letter-spacing" select="$letter-spacing"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template name="repeat">
+		<xsl:param name="char" select="'*'"/>
+		<xsl:param name="count"/>
+		<xsl:if test="$count &gt; 0">
+			<xsl:value-of select="$char"/>
+			<xsl:call-template name="repeat">
+				<xsl:with-param name="char" select="$char"/>
+				<xsl:with-param name="count" select="$count - 1"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template><xsl:template name="getLocalizedString">
+		<xsl:param name="key"/>		
+		
+		<xsl:variable name="curr_lang">
+			<xsl:call-template name="getLang"/>
+		</xsl:variable>
+		
+		<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>