metanorma-nist 1.2.7 → 1.2.12

data/lib/isodoc/nist/nist.cswp.xsl

@@ -31,7 +31,17 @@
 		</xsl:choose>
 	</xsl:variable>
 	<xsl:variable name="color">rgb(36, 64, 97)</xsl:variable>
-	<xsl:variable name="seriestitle" select="/nist:nist-standard/nist:bibdata/nist:series[@type = 'main']/nist:title"/>
+	<xsl:variable name="seriestitle">
+		<xsl:choose>
+			<xsl:when test="normalize-space(/nist:nist-standard/nist:bibdata/nist:series[@type = 'main']/nist:abbreviation) = 'NIST CSTS'">
+				<xsl:value-of select="/nist:nist-standard/nist:bibdata/nist:series[@type = 'secondary']/nist:title"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="/nist:nist-standard/nist:bibdata/nist:series[@type = 'main']/nist:title"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+	
 	<!-- Example:
 		<item level="1" id="Foreword" display="true">Foreword</item>
 		<item id="term-script" display="false">3.2</item>
@@ -151,19 +161,35 @@
 							<xsl:for-each select="/nist:nist-standard/nist:bibdata/nist:contributor[nist:role/@type = 'author']">
 								<xsl:value-of select="nist:person/nist:name/nist:completename"/>
 								<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:for-each select="xalan:tokenize($org-name, ',')">
+								<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)">
+									<!-- <xsl:for-each select="xalan:tokenize($org-name, ',')">
 										<fo:block>
 											<fo:inline font-style="italic">
 												<xsl:value-of select="."/>
-												<!-- <xsl:if test="normalize-space($org-address) != ''">
-													<fo:inline>, <xsl:value-of select="$org-address"/></fo:inline>
-												</xsl:if> -->
 											</fo:inline>
 										</fo:block>
-									</xsl:for-each>
+									</xsl:for-each> -->
+									<fo:block font-style="italic">
+										<xsl:value-of select="$org-name"/>
+									</fo:block>
+									<xsl:if test="normalize-space($subdivision) != ''">
+										<fo:block font-style="italic">
+											<xsl:value-of select="$subdivision"/>
+										</fo:block>
+									</xsl:if>
 									
 									<xsl:if test="normalize-space($org-address) != ''">
 										<fo:block>
@@ -558,30 +584,23 @@
 	<!-- 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:list-block margin-bottom="12pt" provisional-distance-between-starts="12mm">
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
 					<fo:block>
 						<fo:inline id="{@id}">
 							<!-- <xsl:number format="[1]"/> -->
-							<xsl:value-of select="nist:docidentifier"/>
+							<xsl:value-of select="nist:docidentifier[@display = 'true']"/>
 						</fo:inline>
 					</fo:block>
 				</fo:list-item-label>
 				<fo:list-item-body start-indent="body-start()">
 					<fo:block>
-						<xsl:choose>
-							<xsl:when test="nist:title[@type = 'main' and @language = 'en']">
-								<xsl:apply-templates select="nist:title[@type = 'main' and @language = 'en']"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates select="nist:title"/>
-							</xsl:otherwise>
-						</xsl:choose>
 						<xsl:apply-templates select="nist:formattedref"/>
 					</fo:block>
 				</fo:list-item-body>
@@ -589,6 +608,9 @@
 		</fo:list-block>
 	</xsl:template>
 
+	<xsl:template match="nist:formattedref">
+		<xsl:apply-templates/>
+	</xsl:template>
 	<!-- ============================= -->
 	<!-- ============================= -->
 
@@ -618,6 +640,11 @@
 		</fo:block>
 	</xsl:template>
 	
+	<xsl:template match="nist:references">
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
 	<xsl:template match="nist:references/nist:title">
 		<fo:block-container color="white" background-color="{$color}" margin-bottom="12pt" keep-with-next="always" height="5mm" margin-left="-0.5mm" margin-right="-0.5mm">
 			<fo:block font-family="Arial" font-size="12pt" font-weight="bold" margin-left="1mm" padding-top="0.3mm">
@@ -685,14 +712,14 @@
 			</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="$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-container margin-left="3mm">
 					<fo:block font-size="9pt" font-family="Times New Roman" font-style="normal" font-weight="normal" margin-left="-3mm" margin-top="6pt" margin-bottom="12pt" start-indent="0mm" text-indent="-2mm" line-height="10pt" page-break-inside="avoid">
 						<fo:inline id="footnote_{@reference}_{$number}" font-size="75%" keep-with-next.within-line="always" vertical-align="super" padding-right="1mm"> <!-- 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/>
@@ -725,78 +752,6 @@
 	</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:value-of select="nist:organization/nist:name"/>
-						<xsl:if test="position() != last()">, </xsl:if>
-					</xsl:for-each>
-					<xsl:text> (</xsl:text>
-
-					<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: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">
 		<fo:list-block>
 			<xsl:apply-templates/>
@@ -849,7 +804,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)"/>
@@ -857,7 +812,7 @@
 								<xsl:when test="ancestor::*[nist:annex]">
 									<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)"/>
@@ -1142,13 +1097,22 @@
 		<title-part lang="en">
 			
 			
+			
 		</title-part>
 		<title-part lang="fr">
 			
 			
+			
 		</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>
 		
@@ -1448,6 +1412,7 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
 				
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
 		
 		
@@ -1455,6 +1420,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-source-style">		
 		
 				
@@ -1472,6 +1438,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 		
@@ -1580,7 +1547,7 @@
 	</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"/>			
@@ -1590,7 +1557,9 @@
 		
 		
 		
-		
+		<!-- <xsl:if test="$namespace = 'bipm'">
+			<fo:block>&#xA0;</fo:block>				
+		</xsl:if> -->
 		
 		<!-- $namespace = 'iso' or  -->
 		
@@ -1622,10 +1591,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"/> -->
 		
@@ -1676,7 +1647,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>
 				
@@ -1705,16 +1681,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']">
@@ -1727,10 +1712,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>
 			
@@ -1763,6 +1750,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
 				
+				
 				<xsl:apply-templates/>				
 			</fo:block>
 		</xsl:if>
@@ -1983,12 +1971,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">
@@ -2006,16 +2004,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>
@@ -2119,6 +2126,7 @@
 				
 				
 				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -2212,7 +2220,8 @@
 				</xsl:attribute>
 			</xsl:if>
 			<xsl:call-template name="display-align"/>
-			<fo:block>								
+			<fo:block>
+								
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
@@ -2433,7 +2442,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>
@@ -2443,8 +2458,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">
@@ -2458,9 +2477,12 @@
 							<fo:block margin-bottom="12pt" text-align="left">
 								
 								<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="getTitle">
+											<xsl:with-param name="name" select="'title-where'"/>
+										</xsl:call-template>
+									
 								</xsl:variable>
 								<xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
 								<xsl:apply-templates select="*[local-name()='dt']/*"/>
@@ -2476,9 +2498,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="getTitle">
+										<xsl:with-param name="name" select="'title-where'"/>
+									</xsl:call-template>
+																
 							</xsl:variable>
 							<xsl:value-of select="$title-where"/>
 						</fo:block>
@@ -2489,9 +2514,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="getTitle">
+										<xsl:with-param name="name" select="'title-key'"/>
+									</xsl:call-template>
+								
 							</xsl:variable>
 							<xsl:value-of select="$title-key"/>
 						</fo:block>
@@ -2625,12 +2653,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"/>
 		
@@ -2758,6 +2806,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']">
@@ -2784,6 +2833,7 @@
 				
 				
 				
+				
 						
 			</xsl:variable>
 			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>		
@@ -2797,6 +2847,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/>
@@ -3086,7 +3140,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>
@@ -3121,6 +3186,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>
@@ -3150,6 +3216,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -3203,10 +3270,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="getTitle">
+					<xsl:with-param name="name" select="'title-modified'"/>
+				</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>
@@ -3360,8 +3431,9 @@
 				</xsl:if> -->
 			</fo:inline>
 		</xsl:if>
-	</xsl:template><xsl:template match="*[local-name() = 'figure']">
-		<fo:block-container id="{@id}">
+	</xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
+		<fo:block-container id="{@id}">			
+			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -3412,7 +3484,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"/>
@@ -3428,6 +3500,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>
@@ -3445,13 +3519,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>
@@ -3470,8 +3565,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'">
 				
@@ -3511,6 +3642,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']">
@@ -3563,6 +3700,10 @@
 		<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() = 'br']" mode="contents_item">
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
@@ -3588,6 +3729,7 @@
 						
 						
 						
+						
 								
 						
 						10
@@ -3963,7 +4105,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">
@@ -4089,9 +4232,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="getTitle">
+					<xsl:with-param name="name" select="'title-deprecated'"/>
+				</xsl:call-template>
+			
 		</xsl:variable>
 		<fo:block xsl:use-attribute-sets="deprecates-style">
 			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
@@ -4113,6 +4259,7 @@
 			
 			
 			
+			
 						
 			
 						
@@ -4128,7 +4275,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"/>
@@ -4136,7 +4283,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>
@@ -4144,7 +4292,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 break-after="page"/>
 		
@@ -4203,7 +4351,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>
@@ -4221,6 +4372,10 @@
 			<fo:block><xsl:apply-templates/></fo:block>
 		</fo:table-cell>
 	</xsl:template><xsl:template name="processBibitem">
+		
+		
+		<!-- end BIPM bibitem processing-->
+		
 		 
 		
 		
@@ -4279,6 +4434,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'"/>
@@ -4303,6 +4460,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>
@@ -4463,13 +4671,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">		
@@ -4493,6 +4710,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>
@@ -4535,4 +4753,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>