metanorma-bipm 2.1.1 → 2.1.4

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

@@ -167,7 +167,7 @@
 	<xsl:template name="generateContents">
 		<contents>
 
-			<xsl:apply-templates select="/*/bipm:preface/*[position() &gt; 1]" mode="contents"/>
+			<xsl:apply-templates select="/*/bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')][position() &gt; 1]" mode="contents"/>
 			
 			<xsl:apply-templates select="/*/bipm:sections/*" mode="contents"/>
 			<xsl:apply-templates select="/*/bipm:bibliography/bipm:references[@normative='true']" mode="contents"/>
@@ -631,7 +631,7 @@
 	</xsl:template>
 		
 	
-	<xsl:template match="bipm:note" name="change_note_kind" mode="flatxml">
+	<xsl:template match="bipm:note[not(parent::bipm:preface)]" name="change_note_kind" mode="flatxml">
 		<xsl:variable name="element">
 			<xsl:choose>
 				<xsl:when test="ancestor::bipm:quote">note</xsl:when>
@@ -949,7 +949,9 @@
 					
 					<xsl:call-template name="insertFootnoteSeparator"/>
 					
-					<xsl:call-template name="insertHeaderDraftWatermark"/>
+					<xsl:call-template name="insertHeaderDraftWatermark">
+						<xsl:with-param name="lang" select="$curr_lang"/>
+					</xsl:call-template>
 					
 					<fo:flow flow-name="xsl-region-body" font-family="Arial">
 						
@@ -1020,17 +1022,17 @@
 				</fo:page-sequence>
 				
 				
-				<xsl:if test="bipm:preface/*">
+				<xsl:if test="bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 					<fo:page-sequence master-reference="document" force-page-count="no-force">
 						<xsl:call-template name="insertFootnoteSeparator"/>
 						
 						<xsl:variable name="header-title">
 							<xsl:choose>
-								<xsl:when test="bipm:preface/*[1]/bipm:title[1]/*[local-name() = 'tab']">
-									<xsl:apply-templates select="bipm:preface/*[1]/bipm:title[1]/*[local-name() = 'tab'][1]/following-sibling::node()" mode="header"/>
+								<xsl:when test="bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')][1]/bipm:title[1]/*[local-name() = 'tab']">
+									<xsl:apply-templates select="bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')][1]/bipm:title[1]/*[local-name() = 'tab'][1]/following-sibling::node()" mode="header"/>
 								</xsl:when>
 								<xsl:otherwise>
-									<xsl:apply-templates select="bipm:preface/*[1]/bipm:title[1]" mode="header"/>
+									<xsl:apply-templates select="bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')][1]/bipm:title[1]" mode="header"/>
 								</xsl:otherwise>
 							</xsl:choose>
 						</xsl:variable>
@@ -1040,7 +1042,7 @@
 						
 						<fo:flow flow-name="xsl-region-body">
 							<fo:block line-height="135%">
-								<xsl:apply-templates select="bipm:preface/*[1]"/>
+								<xsl:apply-templates select="bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')][1]"/>
 							</fo:block>
 						</fo:flow>
 					</fo:page-sequence>
@@ -1139,7 +1141,7 @@
 				</fo:page-sequence>
 				
 				
-				<xsl:apply-templates select="bipm:preface/*[position() &gt; 1]" mode="sections"/> <!-- bipm:clause -->
+				<xsl:apply-templates select="bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')][position() &gt; 1]" mode="sections"/> <!-- bipm:clause -->
 				
 				
 				
@@ -1164,6 +1166,7 @@
 				<!-- Index -->
 				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index">
 					<xsl:with-param name="isDraft" select="normalize-space(//bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:draft or       contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'draft') or       contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'projet'))"/>
+					<xsl:with-param name="lang" select="$curr_lang"/>
 				</xsl:apply-templates>
 				
 				<!-- End Document Pages -->
@@ -1304,7 +1307,7 @@
 				</fo:page-sequence>
 				
 				
-				<xsl:apply-templates select="bipm:preface/*" mode="sections"/>
+				<xsl:apply-templates select="bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')]" mode="sections"/>
 				
 				<!-- Document Pages -->
 				<xsl:apply-templates select="bipm:sections/*" mode="sections"/>
@@ -1324,6 +1327,7 @@
 				<!-- Index -->
 				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index">
 					<xsl:with-param name="isDraft" select="normalize-space(//bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:draft or       contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'draft') or       contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'projet'))"/>
+					<xsl:with-param name="lang" select="$curr_lang"/>
 				</xsl:apply-templates>
 				
 			</xsl:otherwise>
@@ -1640,7 +1644,9 @@
 			</fo:block>
 		</fo:block-container>
 	
-		<xsl:call-template name="insertDraftWatermark"/>
+		<xsl:call-template name="insertDraftWatermark">
+			<xsl:with-param name="lang" select="$doc_split_by_language"/>
+		</xsl:call-template>
 		
 		<!-- BIPM logo -->
 		<fo:block-container absolute-position="fixed" left="12.8mm" top="12.2mm">
@@ -2280,7 +2286,7 @@
 	<!-- ====== -->
 
 
-	<xsl:template match="bipm:preface/*[1]" priority="3">
+	<xsl:template match="bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')][1]" priority="3">
 		<fo:table table-layout="fixed" width="173.5mm">
 			<xsl:call-template name="setId"/>
 			<fo:table-column column-width="137mm"/>
@@ -2371,7 +2377,7 @@
 	</xsl:template>
 	
 
-	<xsl:template match="bipm:preface/*[1]/*" mode="clause_table">
+	<xsl:template match="bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')][1]/*" mode="clause_table">
 		<xsl:param name="rows"/>
 		
 		<xsl:variable name="current_row"><xsl:number count="*"/></xsl:variable>
@@ -2403,7 +2409,7 @@
 					<xsl:variable name="end_row" select="$current_row + $number-rows-spanned"/>
 					<fo:block>
 						
-						<xsl:for-each select="ancestor::bipm:preface/*[1]/*[position() &gt;= $start_row and position() &lt; $end_row]//bipm:note_side">
+						<xsl:for-each select="ancestor::bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')][1]/*[position() &gt;= $start_row and position() &lt; $end_row]//bipm:note_side">
 							<xsl:apply-templates select="." mode="note_side"/>
 						</xsl:for-each>
 					</fo:block>
@@ -2663,7 +2669,7 @@
 
 
 	<!-- skip, because it process in note_side template -->
-	<xsl:template match="bipm:preface/*[1]//bipm:note_side" priority="3"/>
+	<xsl:template match="bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition')][1]//bipm:note_side" priority="3"/>
 	
 	
 	<xsl:template match="bipm:sections//bipm:note_side | bipm:annex//bipm:note_side" priority="3">
@@ -3273,9 +3279,11 @@
 		<xsl:param name="header-title"/>
 		<xsl:param name="orientation"/>
 		<xsl:param name="isDraft"/>
+		<xsl:param name="lang"/>
 		<fo:static-content flow-name="header-odd" role="artifact">
 			<xsl:call-template name="insertDraftWatermark">
 				<xsl:with-param name="isDraft" select="$isDraft"/>
+				<xsl:with-param name="lang" select="$lang"/>
 			</xsl:call-template>
 			<fo:block-container font-family="Arial" font-size="8pt" padding-top="12.5mm">
 				<fo:block text-align="right">
@@ -3296,6 +3304,7 @@
 		<fo:static-content flow-name="header-even" role="artifact">
 			<xsl:call-template name="insertDraftWatermark">
 				<xsl:with-param name="isDraft" select="$isDraft"/>
+				<xsl:with-param name="lang" select="$lang"/>
 			</xsl:call-template>
 			<fo:block-container font-family="Arial" font-size="8pt" padding-top="12.5mm">
 				<fo:block>
@@ -3313,6 +3322,7 @@
 		<fo:static-content flow-name="header-blank" role="artifact">
 			<xsl:call-template name="insertDraftWatermark">
 				<xsl:with-param name="isDraft" select="$isDraft"/>
+				<xsl:with-param name="lang" select="$lang"/>
 			</xsl:call-template>
 			<fo:block/>
 		</fo:static-content>
@@ -3320,12 +3330,23 @@
 
 	<xsl:template name="insertDraftWatermark">
 		<xsl:param name="isDraft"/>
+		<xsl:param name="lang"/>
 		<xsl:if test="$isDraft = 'true' or normalize-space(//bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:draft or   contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'draft') or   contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'projet')) = 'true'">
 			<!-- DRAFT -->
 			<xsl:variable name="draft_label">
-				<xsl:call-template name="getLocalizedString">
-					<xsl:with-param name="key">draft_label</xsl:with-param>
-				</xsl:call-template>
+				<xsl:choose>
+					<xsl:when test="normalize-space($lang) != ''">
+						<xsl:call-template name="getLocalizedString">
+							<xsl:with-param name="key">draft_label</xsl:with-param>
+							<xsl:with-param name="lang" select="$lang"/>
+						</xsl:call-template>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="getLocalizedString">
+							<xsl:with-param name="key">draft_label</xsl:with-param>
+						</xsl:call-template>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:variable>
 			<fo:block-container absolute-position="fixed" left="0mm" top="30mm">
 				<fo:block line-height="0">
@@ -3355,25 +3376,30 @@
 
 	<xsl:template name="insertHeaderDraftWatermark">
 		<xsl:variable name="isDraft" select="normalize-space(//bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:draft or   contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'draft') or   contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'projet'))"/>
+		<xsl:variable name="curr_lang" select="$doc_split_by_language"/>
 		<xsl:if test="$isDraft = 'true'">
 			<fo:static-content flow-name="header-blank" role="artifact">
 				<xsl:call-template name="insertDraftWatermark">
 					<xsl:with-param name="isDraft" select="$isDraft"/>
+					<xsl:with-param name="lang" select="$curr_lang"/>
 				</xsl:call-template>
 			</fo:static-content>
 			<fo:static-content flow-name="header" role="artifact">
 				<xsl:call-template name="insertDraftWatermark">
 					<xsl:with-param name="isDraft" select="$isDraft"/>
+					<xsl:with-param name="lang" select="$curr_lang"/>
 				</xsl:call-template>
 			</fo:static-content>
 			<fo:static-content flow-name="header-odd" role="artifact">
 				<xsl:call-template name="insertDraftWatermark">
 					<xsl:with-param name="isDraft" select="$isDraft"/>
+					<xsl:with-param name="lang" select="$curr_lang"/>
 				</xsl:call-template>
 			</fo:static-content>
 			<fo:static-content flow-name="header-even" role="artifact">
 				<xsl:call-template name="insertDraftWatermark">
 					<xsl:with-param name="isDraft" select="$isDraft"/>
+					<xsl:with-param name="lang" select="$curr_lang"/>
 				</xsl:call-template>
 			</fo:static-content>
 		</xsl:if>
@@ -3426,6 +3452,7 @@
 	<xsl:template match="bipm:indexsect"/>
 	<xsl:template match="bipm:indexsect" mode="index">
 		<xsl:param name="isDraft"/>
+		<xsl:param name="lang"/>
 	
 		<fo:page-sequence master-reference="index" force-page-count="no-force">
 			<xsl:variable name="header-title">
@@ -3441,6 +3468,7 @@
 			<xsl:call-template name="insertHeaderFooter">
 				<xsl:with-param name="header-title" select="$header-title"/>
 				<xsl:with-param name="isDraft" select="$isDraft"/>
+				<xsl:with-param name="lang" select="$lang"/>
 			</xsl:call-template>
 			
 			<fo:flow flow-name="xsl-region-body">
@@ -3813,14 +3841,41 @@
 	</xsl:template>
 
 	
-<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:param name="table_if">false</xsl:param><xsl:param name="table_widths"/><xsl:variable name="table_widths_from_if" select="xalan:nodeset($table_widths)"/><xsl:param name="table_if_debug">false</xsl:param><xsl:variable name="isGenerateTableIF_">
+<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:param name="table_if">false</xsl:param><xsl:param name="table_widths"/><xsl:variable name="table_widths_from_if" select="xalan:nodeset($table_widths)"/><xsl:variable name="table_widths_from_if_calculated_">
+		<xsl:for-each select="$table_widths_from_if//table">
+			<xsl:copy>
+				<xsl:copy-of select="@*"/>
+				<xsl:call-template name="calculate-column-widths-autolayout-algorithm"/>
+			</xsl:copy>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="table_widths_from_if_calculated" select="xalan:nodeset($table_widths_from_if_calculated_)"/><xsl:param name="table_if_debug">false</xsl:param><xsl:variable name="isGenerateTableIF_">
 		false
 	</xsl:variable><xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/><xsl:variable name="lang">
 		<xsl:call-template name="getLang"/>
-	</xsl:variable><xsl:variable name="pageWidth_">
-		210
+	</xsl:variable><xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/><xsl:variable name="papersize_width_">
+		<xsl:choose>
+			<xsl:when test="$papersize = 'letter'">215.9</xsl:when>
+			<xsl:when test="$papersize = 'a4'">210</xsl:when>
+		</xsl:choose>
+	</xsl:variable><xsl:variable name="papersize_width" select="normalize-space($papersize_width_)"/><xsl:variable name="papersize_height_">
+		<xsl:choose>
+			<xsl:when test="$papersize = 'letter'">279.4</xsl:when>
+			<xsl:when test="$papersize = 'a4'">297</xsl:when>
+		</xsl:choose>
+	</xsl:variable><xsl:variable name="papersize_height" select="normalize-space($papersize_height_)"/><xsl:variable name="pageWidth_">
+		<xsl:choose>
+			<xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
+			<xsl:otherwise>
+				210
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
-		297
+		<xsl:choose>
+			<xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
+			<xsl:otherwise>
+				297
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="marginLeftRight1_">
 		31.7
 	</xsl:variable><xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/><xsl:variable name="marginLeftRight2_">
@@ -3936,9 +3991,10 @@
 				<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:attribute-set name="root-style">
+	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable><xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable><xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable><xsl:attribute-set name="root-style">
 		
-			<xsl:attribute name="font-family">Times New Roman, STIX Two Math, Source Han Sans</xsl:attribute>
+			<xsl:attribute name="font-family">Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_serif"/></xsl:attribute>
+			<xsl:attribute name="font-family-generic">Serif</xsl:attribute>
 			<xsl:attribute name="font-size">10.5pt</xsl:attribute>
 		
 		
@@ -3956,6 +4012,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:template name="insertRootStyle">
 		<xsl:param name="root-style"/>
 		<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
@@ -3967,17 +4024,60 @@
 		</xsl:variable>
 		<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
 		
+		<xsl:variable name="font_family_generic" select="$root-style_/root-style/@font-family-generic"/>
+		
 		<xsl:for-each select="$root-style_/root-style/@*">
+		
 			<xsl:choose>
-				<xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
+				<xsl:when test="local-name() = 'font-family-generic'"><!-- skip, it's using for determine 'sans' or 'serif' --></xsl:when>
+				<xsl:when test="local-name() = 'font-family'">
+				
+					<xsl:variable name="font_regional_prefix">
+						<xsl:choose>
+							<xsl:when test="$font_family_generic = 'Sans'">Noto Sans</xsl:when>
+							<xsl:otherwise>Noto Serif</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+				
 					<xsl:attribute name="{local-name()}">
-						<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
+					
+						<xsl:variable name="font_extended">
+							<xsl:choose>
+								<xsl:when test="$lang = 'zh'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
+								<xsl:when test="$lang = 'hk'"><xsl:value-of select="$font_regional_prefix"/> HK</xsl:when>
+								<xsl:when test="$lang = 'jp'"><xsl:value-of select="$font_regional_prefix"/> JP</xsl:when>
+								<xsl:when test="$lang = 'kr'"><xsl:value-of select="$font_regional_prefix"/> KR</xsl:when>
+								<xsl:when test="$lang = 'sc'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
+								<xsl:when test="$lang = 'tc'"><xsl:value-of select="$font_regional_prefix"/> TC</xsl:when>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:if test="normalize-space($font_extended) != ''">
+							<xsl:value-of select="$font_regional_prefix"/><xsl:text>, </xsl:text>
+							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
+						</xsl:if>
+					
+						<xsl:value-of select="."/>
+						
+						<xsl:if test="$additional_fonts != ''">
+							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+						</xsl:if>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:copy-of select="."/>
 				</xsl:otherwise>
 			</xsl:choose>
+		
+			<!-- <xsl:choose>
+				<xsl:when test="local-name() = 'font-family'">
+					<xsl:attribute name="{local-name()}">
+						<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
+					</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose> -->
 		</xsl:for-each>
 	</xsl:template><xsl:attribute-set name="copyright-statement-style">
 		
@@ -4063,6 +4163,7 @@
 		
 		
 		
+		
 				
 		
 		
@@ -4077,7 +4178,10 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-style">
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
 		
@@ -4103,6 +4207,7 @@
 		
 		
 		
+		
 
 	</xsl:attribute-set><xsl:attribute-set name="example-style">
 		
@@ -4117,6 +4222,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		
@@ -4140,6 +4246,7 @@
 		
 		
 		
+		
 				
 				
 		
@@ -4168,10 +4275,12 @@
 		
 		
 		
+		
 				
 				
 	</xsl:attribute-set><xsl:variable name="table-border_">
 		
+		
 	</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -4196,6 +4305,7 @@
 		
 		
 		
+		
 					
 		
 		
@@ -4224,6 +4334,7 @@
 		
 		
 		
+		
 		
 		
 	</xsl:attribute-set><xsl:attribute-set name="table-name-style">
@@ -4232,6 +4343,7 @@
 		
 		
 		
+				
 		
 				
 		
@@ -4317,6 +4429,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
 		<xsl:attribute name="border">solid black 1pt</xsl:attribute>
 		<xsl:attribute name="padding-left">1mm</xsl:attribute>
@@ -4331,7 +4444,7 @@
 		
 		
 		
-
+		
 		
 		
 		
@@ -4349,6 +4462,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="table-fn-style">
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		
@@ -4362,6 +4476,8 @@
 		
 		
 		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -4380,6 +4496,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
 		<xsl:attribute name="text-indent">0</xsl:attribute>
 		<xsl:attribute name="start-indent">0</xsl:attribute>
@@ -4415,6 +4532,27 @@
 		
 		
 		
+		
+	</xsl:attribute-set><xsl:attribute-set name="dl-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			
+		
+		
+		
+		
+		
+				
+		
+		
+		
+				
+		
+		
+		
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
@@ -4444,6 +4582,7 @@
 		
 		
 				
+				
 		
 		
 		
@@ -4483,7 +4622,8 @@
 		
 		
 		
-				
+		
+		
 		
 		
 		
@@ -4498,6 +4638,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="termnote-style">
 		
 		
+				
 		
 		
 		
@@ -4510,6 +4651,8 @@
 			<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">
 		<xsl:attribute name="margin-left">12mm</xsl:attribute>
 		<xsl:attribute name="margin-right">12mm</xsl:attribute>
@@ -4554,6 +4697,7 @@
 			<xsl:attribute name="text-align">left</xsl:attribute>			
 			<xsl:attribute name="margin-left">19mm</xsl:attribute>
 			<xsl:attribute name="text-indent">-19mm</xsl:attribute>
+		
 		
 		
 				
@@ -4598,6 +4742,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
 		
@@ -4616,16 +4761,16 @@
 	</xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
+		<xsl:attribute name="width">100%</xsl:attribute>
+		<xsl:attribute name="content-height">100%</xsl:attribute>
+		<xsl:attribute name="scaling">uniform</xsl:attribute>			
 		
 		
-			<xsl:attribute name="width">100%</xsl:attribute>
 			<xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
-			<xsl:attribute name="scaling">uniform</xsl:attribute>
 		
 		
 		
-				
-
+		
 	</xsl:attribute-set><xsl:attribute-set name="tt-style">
 		
 		
@@ -4704,6 +4849,25 @@
 		
 		
 		
+		
+	</xsl:attribute-set><xsl:attribute-set name="list-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			
+		
+		
+		
+		
+				
+		
+		
+		
+				
+		
+		
+		
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="list-item-style">
 		
 		
@@ -4755,6 +4919,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="fn-body-style">
 		<xsl:attribute name="font-weight">normal</xsl:attribute>
 		<xsl:attribute name="font-style">normal</xsl:attribute>
@@ -4783,6 +4948,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
 		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
 		
@@ -4806,6 +4972,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="admonition-style">
 		
 		
@@ -4826,11 +4993,12 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
 		
 		
-			<xsl:attribute name="margin-left">0mm</xsl:attribute>
-			<xsl:attribute name="margin-right">0mm</xsl:attribute>
 			<xsl:attribute name="padding">2mm</xsl:attribute>
 			<xsl:attribute name="padding-top">3mm</xsl:attribute>
 		
@@ -4842,6 +5010,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="admonition-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		
@@ -4877,6 +5046,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style">
 		
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -4910,6 +5080,10 @@
 		
 		
 		
+		<!-- <xsl:if test="$namespace = 'ieee'">
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
+		</xsl:if> -->
 		
 		
 		
@@ -4938,6 +5112,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
 		
 		
@@ -4966,6 +5141,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
 		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
 		
@@ -4987,6 +5163,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-body-style">
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -5002,6 +5179,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
 		
 			<xsl:attribute name="line-height">120%</xsl:attribute>
@@ -5124,13 +5302,13 @@
 		
 	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/*[local-name()='preface']/*">
+			<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 				<node id="{@id}"/>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
 		
-		<xsl:for-each select="/*/*[local-name()='preface']/*">
+		<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			
 			<!-- process Section's title -->
@@ -5196,7 +5374,7 @@
 			</xsl:for-each>
 		</figures>
 	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
-		<xsl:for-each select="/*/*[local-name()='preface']/*">
+		<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
@@ -5459,6 +5637,8 @@
 				
 				
 				
+				
+				
 			
 				
 				
@@ -5505,6 +5685,8 @@
 						
 						
 						
+						
+						
 					</xsl:element>
 				</xsl:variable>
 				
@@ -5647,30 +5829,36 @@
 	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
-			<fo:block xsl:use-attribute-sets="table-name-style">
-
-				
-					<xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
-						<xsl:attribute name="margin-top">0pt</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
-						<xsl:attribute name="margin-top">0pt</xsl:attribute>
-					</xsl:if>
-				
-				
-				
+		
+			
 				
-				<xsl:choose>
-					<xsl:when test="$continued = 'true'"> 
+					<fo:block xsl:use-attribute-sets="table-name-style">
+
 						
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:apply-templates/>
-					</xsl:otherwise>
-				</xsl:choose>
-				
+							<xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
+								<xsl:attribute name="margin-top">0pt</xsl:attribute>
+							</xsl:if>
+							<xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
+								<xsl:attribute name="margin-top">0pt</xsl:attribute>
+							</xsl:if>
+						
+						
+						
+						
+						<xsl:choose>
+							<xsl:when test="$continued = 'true'"> 
+								
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates/>
+							</xsl:otherwise>
+						</xsl:choose>
+						
+						
+					</fo:block>
+			
 				
-			</fo:block>
+			
 		</xsl:if>
 	</xsl:template><xsl:template name="calculate-columns-numbers">
 		<xsl:param name="table-row"/>
@@ -5833,8 +6021,9 @@
 			<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
 		</xsl:if>
 	</xsl:template><xsl:template name="calculate-column-widths-autolayout-algorithm">
-		<xsl:param name="table"/>
-		<xsl:param name="if">false</xsl:param> <!-- via intermediate format -->
+		<xsl:param name="parent_table_page-width"/> <!-- for nested tables, in re-calculate step -->
+		
+		<!-- via intermediate format -->
 
 		<!-- The algorithm uses two passes through the table data and scales linearly with the size of the table -->
 	 
@@ -5845,9 +6034,8 @@
 		<!-- get current table id -->
 		<xsl:variable name="table_id" select="@id"/>
 		<!-- find table by id in the file 'table_widths' -->
-		<xsl:variable name="table-if_" select="$table_widths_from_if//table[@id = $table_id]"/>
-		<xsl:variable name="table-if" select="xalan:nodeset($table-if_)"/>
-		
+	<!-- 	<xsl:variable name="table-if_" select="$table_widths_from_if//table[@id = $table_id]"/>
+		<xsl:variable name="table-if" select="xalan:nodeset($table-if_)"/> -->
 		
 		<!-- table='<xsl:copy-of select="$table"/>' -->
 		<!-- table_id='<xsl:value-of select="$table_id"/>\ -->
@@ -5855,24 +6043,13 @@
 		<!-- table_widths_from_if='<xsl:copy-of select="$table_widths_from_if"/>' -->
 		
 		<xsl:variable name="table_with_cell_widths_">
-			<xsl:choose>
-				<xsl:when test="$if = 'true' and normalize-space($table-if) != ''"> <!-- if we read column's width from IF and there is table in IF -->
-				
-					<!-- Example: <column>10</column>
-							<column>11</column> 
-					-->
-					<xsl:apply-templates select="$table-if" mode="determine_cell_widths-if"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="xalan:nodeset($table)" mode="determine_cell_widths"/>
-				</xsl:otherwise>
-			</xsl:choose>
+			<xsl:apply-templates select="." mode="determine_cell_widths-if"/> <!-- read column's width from IF -->
 		</xsl:variable>
 		<xsl:variable name="table_with_cell_widths" select="xalan:nodeset($table_with_cell_widths_)"/>
 		
-		<xsl:if test="$table_if_debug = 'true'">
+		<!-- <xsl:if test="$table_if_debug = 'true'">
 			<xsl:copy-of select="$table_with_cell_widths"/>
-		</xsl:if>
+		</xsl:if> -->
 		
 		
 		<!-- The minimum and maximum cell widths are then used to determine the corresponding minimum and maximum widths for the columns. -->
@@ -5918,8 +6095,12 @@
 		
 		<xsl:variable name="page_width">
 			<xsl:choose>
-				<xsl:when test="$if = 'true'"><xsl:value-of select="$table-if/@page-width"/></xsl:when>
-				<xsl:otherwise>75</xsl:otherwise>
+				<xsl:when test="$parent_table_page-width != ''">
+					<xsl:value-of select="$parent_table_page-width"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="@page-width"/>
+				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
 		
@@ -5927,9 +6108,6 @@
 			<table_width>
 				<xsl:copy-of select="$table_widths"/>
 			</table_width>
-			<!-- <debug>$table_widths/@width_min=<xsl:value-of select="$table_widths/table/@width_min"/></debug>
-			<debug>$table_widths/@width_max=<xsl:value-of select="$table_widths/table/@width_max"/></debug>
-			 -->
 			<debug>$page_width=<xsl:value-of select="$page_width"/></debug>
 		</xsl:if>
 		
@@ -5940,11 +6118,11 @@
 			<xsl:when test="$table_widths/table/@width_min &gt;= $page_width and 1 = 2"> <!-- this condition isn't working see case 3 below -->
 				<!-- call old algorithm -->
 				<case1/>
-				<xsl:variable name="cols-count" select="count(xalan:nodeset($table)/*/tr[1]/td)"/>
+				<!-- <xsl:variable name="cols-count" select="count(xalan:nodeset($table)/*/tr[1]/td)"/>
 				<xsl:call-template name="calculate-column-widths-proportional">
 					<xsl:with-param name="cols-count" select="$cols-count"/>
 					<xsl:with-param name="table" select="$table"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
 			</xsl:when>
 			<!-- 2. The maximum table width fits within the available space. In this case, set the columns to their maximum widths. -->
 			<xsl:when test="$table_widths/table/@width_max &lt;= $page_width">
@@ -5988,95 +6166,49 @@
 			<xsl:otherwise><unknown_case/></xsl:otherwise>
 		</xsl:choose>
 		
+	</xsl:template><xsl:template name="get-calculated-column-widths-autolayout-algorithm">
 		
-	</xsl:template><xsl:template match="@*|node()" mode="determine_cell_widths">
-		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="determine_cell_widths"/>
-		</xsl:copy>
-	</xsl:template><xsl:template match="td | th" mode="determine_cell_widths">
-		<xsl:copy>
-			<xsl:copy-of select="@*"/>
+		<!-- if nested 'dl' or 'table' -->
+		<xsl:variable name="parent_table_id" select="normalize-space(ancestor::*[local-name() = 'table' or local-name() = 'dl'][1]/@id)"/>
+		<parent_table_id><xsl:value-of select="$parent_table_id"/></parent_table_id>
 			
-			 <!-- The maximum width is given by the widest line.  -->
-			<xsl:variable name="widths_max">
-				<xsl:for-each select=".//*[local-name() = 'p']">
-					<xsl:call-template name="add_width"/>
-				</xsl:for-each>
-				<xsl:if test="not(*[local-name() = 'p'])">
-					<xsl:call-template name="add_width"/>
-				</xsl:if>
-			</xsl:variable>
-			<xsl:variable name="width_max">
-				<xsl:for-each select="xalan:nodeset($widths_max)//width">
-					<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:attribute name="width_max">
-				<xsl:value-of select="$width_max"/>
-			</xsl:attribute>
+		<parent_element><xsl:value-of select="local-name(..)"/></parent_element>
 			
-			<!-- The minimum width is given by the widest text element (word, image, etc.) -->
-			<!-- To do: image width -->
-			<xsl:variable name="td_text">
-				<xsl:apply-templates select="." mode="td_text"/>
-			</xsl:variable>
-			<xsl:variable name="words">
-				<xsl:variable name="string_with_added_zerospaces">
-					<xsl:call-template name="add-zero-spaces-java">
-						<xsl:with-param name="text" select="$td_text"/>
-					</xsl:call-template>
+		<xsl:variable name="parent_table_page-width_">
+			<xsl:if test="$parent_table_id != ''">
+				<!-- determine column number in the parent table -->
+				<xsl:variable name="parent_table_column_number">
+					<xsl:choose>
+						<xsl:when test="parent::*[local-name() = 'dd']">2</xsl:when>
+						<xsl:otherwise> <!-- parent is table -->
+							<xsl:value-of select="count(ancestor::*[local-name() = 'td'][1]/preceding-sibling::*[local-name() = 'td']) + 1"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:variable>
-				<xsl:call-template name="tokenize">
-					<xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​­', '  '))"/> <!-- replace zero-width-space and soft-hyphen to space -->
-				</xsl:call-template>
-			</xsl:variable>
-			
-			<xsl:variable name="max_word_length">
-				<xsl:call-template name="max_length">
-					<xsl:with-param name="words" select="xalan:nodeset($words)"/>
-				</xsl:call-template>
-			</xsl:variable>
-			<xsl:variable name="width_min">
-				<xsl:value-of select="$max_word_length"/>
-			</xsl:variable>
-			<xsl:attribute name="width_min">
-				<xsl:value-of select="$width_min"/>
-			</xsl:attribute>
-			<!-- width_max="1" width_min="1.5"> --> <!-- see 'tokenize' template, multiply 1.5 for all latin capitals -->
-			<xsl:if test="$width_min &gt; $width_max">
-				<xsl:attribute name="width_max">
-					<xsl:value-of select="$width_min"/>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="$width_min = 0">
-				<xsl:attribute name="width_min">1</xsl:attribute>
+				<!-- find table by id in the file 'table_widths' and get all Nth `<column>...</column> -->
+				<xsl:value-of select="$table_widths_from_if_calculated//table[@id = $parent_table_id]/column[number($parent_table_column_number)]"/>
 			</xsl:if>
-			
-			<xsl:apply-templates select="node()" mode="determine_cell_widths"/>
-			
-		</xsl:copy>
-	</xsl:template><xsl:template name="add_width">
-		<xsl:variable name="p_text"><xsl:apply-templates select="." mode="td_text"/></xsl:variable>
-		<xsl:variable name="p_text_len_" select="string-length(normalize-space($p_text))"/>
-		
-		<xsl:variable name="p_text_len">
-			<xsl:choose>
-				<xsl:when test="normalize-space(translate($p_text, concat($upper,'0123456789'), '')) = ''"> <!-- english word in CAPITAL letters -->
-					<xsl:value-of select="$p_text_len_ * 1.5"/>
-				</xsl:when>
-				<xsl:otherwise><xsl:value-of select="$p_text_len_"/></xsl:otherwise>
-			</xsl:choose>
 		</xsl:variable>
+		<xsl:variable name="parent_table_page-width" select="normalize-space($parent_table_page-width_)"/>
 		
-		<xsl:variable name="math_addon_text">
-			<xsl:for-each select=".//*[local-name() = 'math']">
-				<xsl:apply-templates mode="td_text"/>
-			</xsl:for-each>
-		</xsl:variable>
-		<xsl:variable name="math_addon_length" select="string-length(normalize-space($math_addon_text)) * 0.2"/> <!-- plus 20% -->
+		<!-- get current table id -->
+		<xsl:variable name="table_id" select="@id"/>
+		
+		<xsl:choose>
+			<xsl:when test="$parent_table_id = '' or $parent_table_page-width = ''">
+				<!-- find table by id in the file 'table_widths' and get all `<column>...</column> -->
+				<xsl:copy-of select="$table_widths_from_if_calculated//table[@id = $table_id]/node()"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<!-- recalculate columns width based on parent table width -->
+				<xsl:for-each select="$table_widths_from_if//table[@id = $table_id]">
+					<xsl:call-template name="calculate-column-widths-autolayout-algorithm">
+						<xsl:with-param name="parent_table_page-width" select="$parent_table_page-width"/> <!-- padding-left = 2mm  = 50000-->
+					</xsl:call-template>
+				</xsl:for-each>
+			</xsl:otherwise>
+		</xsl:choose>
 		
-		<width><xsl:value-of select="$p_text_len + $math_addon_length"/></width>
 	</xsl:template><xsl:template match="@*|node()" mode="determine_cell_widths-if">
 		<xsl:copy>
 				<xsl:apply-templates select="@*|node()" mode="determine_cell_widths-if"/>
@@ -6124,12 +6256,18 @@
 		<fo:table-row>
 			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
 				
-				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
-					<xsl:with-param name="continued">true</xsl:with-param>
-				</xsl:apply-templates>
 				
 				
 				
+						<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
+							<xsl:with-param name="continued">true</xsl:with-param>
+						</xsl:apply-templates>
+						
+						
+				
+					
+				
+				
 			</fo:table-cell>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">		
@@ -6169,87 +6307,101 @@
 				</xsl:choose>
 			</xsl:variable>
 			
-			<fo:table keep-with-previous="always">
-				<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
-					<xsl:variable name="name" select="local-name()"/>
+			
+			<xsl:variable name="tableWithNotesAndFootnotes">
+			
+				<fo:table keep-with-previous="always">
+					<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
+						<xsl:variable name="name" select="local-name()"/>
+						<xsl:choose>
+							<xsl:when test="$name = 'border-top'">
+								<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:when test="$name = 'border'">
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+								<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
+					
+					
+					
 					<xsl:choose>
-						<xsl:when test="$name = 'border-top'">
-							<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
-						</xsl:when>
-						<xsl:when test="$name = 'border'">
-							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
-							<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+						<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:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
+							<xsl:call-template name="insertTableColumnWidth">
+								<xsl:with-param name="colwidths" select="$colwidths"/>
+							</xsl:call-template>
 						</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>
-						<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
-						<xsl:call-template name="insertTableColumnWidth">
-							<xsl:with-param name="colwidths" select="$colwidths"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-				
-				<fo:table-body>
-					<fo:table-row>
-						<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
-							
-							
+					
+					<fo:table-body>
+						<fo:table-row>
+							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
+								
+								
 
-							
-							
-							<!-- fn will be processed inside 'note' processing -->
-							
-							
-							
-								<xsl:if test="count(ancestor::bipm:table//*[local-name()='note']) &gt; 1">
-									<fo:block font-weight="bold">
-										<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language"/>
-										<xsl:choose>
-											<xsl:when test="$curr_lang = 'fr'">Remarques</xsl:when>
-											<xsl:otherwise>Notes</xsl:otherwise>
-										</xsl:choose>
-									</fo:block>
-								</xsl:if>
-							
-							
-							
-							
-							<!-- for BSI (not PAS) display Notes before footnotes -->
-							
-							
-							<!-- except gb and bsi  -->
-							
-									<xsl:apply-templates select="../*[local-name()='note']"/>
 								
-							
-							
-							<!-- horizontal row separator -->
-							
-							
-							<!-- fn processing -->
-							<xsl:call-template name="table_fn_display"/>
-							
-							<!-- for PAS display Notes after footnotes -->
-							
-							
-						</fo:table-cell>
-					</fo:table-row>
-				</fo:table-body>
-				
-			</fo:table>
+								
+								<!-- fn will be processed inside 'note' processing -->
+								
+								
+								
+									<xsl:if test="count(ancestor::bipm:table//*[local-name()='note']) &gt; 1">
+										<fo:block font-weight="bold">
+											<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language"/>
+											<xsl:choose>
+												<xsl:when test="$curr_lang = 'fr'">Remarques</xsl:when>
+												<xsl:otherwise>Notes</xsl:otherwise>
+											</xsl:choose>
+										</fo:block>
+									</xsl:if>
+								
+								
+								
+								
+								<!-- for BSI (not PAS) display Notes before footnotes -->
+								
+								
+								<!-- except gb and bsi  -->
+								
+										<xsl:apply-templates select="../*[local-name()='note']"/>
+									
+								
+								
+								<!-- horizontal row separator -->
+								
+								
+								<!-- fn processing -->
+								
+										<xsl:call-template name="table_fn_display"/>
+									
+								
+								
+								<!-- for PAS display Notes after footnotes -->
+								
+								
+							</fo:table-cell>
+						</fo:table-row>
+					</fo:table-body>
+					
+				</fo:table>
+			</xsl:variable>
+			
+			<xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
+				<xsl:copy-of select="$tableWithNotesAndFootnotes"/>
+			</xsl:if>
+			
+			
+			
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='tbody']">
 		
@@ -6338,6 +6490,9 @@
 			
 			
 
+
+			
+
 			
 			
 			<xsl:call-template name="setTableRowAttributes"/>
@@ -6357,6 +6512,8 @@
 		
 			
 		
+			
+		
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -6467,6 +6624,8 @@
 			
 			
 			
+			
+			
 
 			
 			
@@ -6560,7 +6719,11 @@
 		
 		<xsl:variable name="gen_id" select="generate-id(.)"/>
 		<xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
-		<xsl:variable name="reference" select="@reference"/>
+		<xsl:variable name="reference_">
+			<xsl:value-of select="@reference"/>
+			<xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
+		</xsl:variable>
+		<xsl:variable name="reference" select="normalize-space($reference_)"/>
 		<!-- fn sequence number in document -->
 		<xsl:variable name="current_fn_number">
 			<xsl:choose>
@@ -6580,6 +6743,7 @@
 		<xsl:variable name="footnote_inline">
 			<fo:inline xsl:use-attribute-sets="fn-num-style">
 				
+				
 				<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
 					<xsl:value-of select="$current_fn_number_text"/>
 				</fo:basic-link>
@@ -6601,8 +6765,12 @@
 							<fo:block xsl:use-attribute-sets="fn-body-style">
 								
 								
+								
 								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
 									
+									
+									
+									
 									<xsl:value-of select="$current_fn_number_text"/>
 								</fo:inline>
 								<xsl:apply-templates/>
@@ -6635,7 +6803,7 @@
 						<xsl:copy-of select="node()"/>
 					</fn>
 				</xsl:for-each>
-				<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
+				<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='boilerplate']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
 					<xsl:sort select="@displayorder" data-type="number"/>
 					<xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] |      .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
 						<!-- copy unique fn -->
@@ -6924,11 +7092,19 @@
 						
 						
 						
+						
+						<xsl:if test="ancestor::*[local-name() = 'dd' or local-name() = 'td']">
+							<xsl:attribute name="margin-top">0</xsl:attribute>
+						</xsl:if>
+						
 						<fo:block>
 							
 							
 							
 							
+							<xsl:apply-templates select="*[local-name() = 'name']">
+								<xsl:with-param name="process">true</xsl:with-param>
+							</xsl:apply-templates>
 							
 							<xsl:if test="$isGenerateTableIF = 'true'">
 								<!-- to determine start of table -->
@@ -6951,6 +7127,7 @@
 								</xsl:choose>
 								
 								
+								
 								<xsl:choose>
 									<xsl:when test="$isGenerateTableIF = 'true'">
 										<!-- generate IF for table widths -->
@@ -7079,6 +7256,18 @@
 				</xsl:if> <!-- END: a few components -->
 			</fo:block-container>
 		</fo:block-container>
+		
+		<xsl:if test="$isGenerateTableIF = 'true'"> <!-- process nested 'dl' -->
+			<xsl:apply-templates select="*[local-name() = 'dd']/*[local-name() = 'dl']"/>
+		</xsl:if>
+		
+	</xsl:template><xsl:template match="*[local-name() = 'dl']/*[local-name() = 'name']">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:block xsl:use-attribute-sets="dl-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
 	</xsl:template><xsl:template name="setColumnWidth_dl">
 		<xsl:param name="colwidths"/>		
 		<xsl:param name="maxlength_dt"/>
@@ -7087,6 +7276,11 @@
 		<!-- <colwidths><xsl:copy-of select="$colwidths"/></colwidths> -->
 		
 		<xsl:choose>
+			<xsl:when test="xalan:nodeset($colwidths)/autolayout">
+				<xsl:call-template name="insertTableColumnWidth">
+					<xsl:with-param name="colwidths" select="$colwidths"/>
+				</xsl:call-template>
+			</xsl:when>
 			<xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
 				<fo:table-column column-width="50%"/>
 				<fo:table-column column-width="50%"/>
@@ -7339,12 +7533,24 @@
 			</td>
 			<td>
 				
-						<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()"/>
+						<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/>
+						
+						<!-- get paragraphs from nested 'dl' -->
+						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/>
+						
 					
 			</td>
 		</tr>
 		
-	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if"/><xsl:template match="*[local-name()='em']">
+	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if"/><xsl:template match="*[local-name()='dl']" mode="dl_if_nested">
+		<xsl:for-each select="*[local-name() = 'dt']">
+			<p>
+				<xsl:copy-of select="node()"/>
+				<xsl:text> </xsl:text>
+				<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'p']/node()"/>
+			</p>
+		</xsl:for-each>
+	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if_nested"/><xsl:template match="*[local-name()='em']">
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
 		</fo:inline>
@@ -7375,7 +7581,7 @@
 				
 				
 				
-				
+				 <!-- 10 -->
 				
 				
 				
@@ -8282,6 +8488,13 @@
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
 			
+			<xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
+				<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
+			</xsl:if>
+			
+			
+			
+			
 			
 			
 			
@@ -8507,6 +8720,7 @@
 				
 
 				
+				
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
 				<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -8528,6 +8742,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 						<xsl:text>:</xsl:text>
 					
 					
@@ -8547,6 +8762,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 						<xsl:text>:</xsl:text>
 					
 					
@@ -8558,7 +8774,19 @@
 			<xsl:value-of select="$suffix"/>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<xsl:variable name="num"><xsl:number/></xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
+				<fo:inline xsl:use-attribute-sets="termnote-p-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="termnote-p-style">						
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'terms']">
 		<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
 		<fo:block id="{@id}">
@@ -9331,6 +9559,9 @@
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 				
 				
+				
+				
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -9391,9 +9622,9 @@
 					<xsl:apply-templates/>
 				</xsl:otherwise>
 			</xsl:choose>
-	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
+	</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
 		<xsl:copy>
@@ -9464,9 +9695,12 @@
 						
 						
 						
+						<!-- 9 -->
 						
 						
-						
+						<!-- <xsl:if test="$namespace = 'ieee'">							
+							<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
+						</xsl:if> -->
 						
 								
 						
@@ -9548,7 +9782,7 @@
 		<xsl:for-each select="xalan:nodeset($text_step4)/node()">
 			<xsl:choose>
 				<xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
-					<xsl:call-template name="interspers">
+					<xsl:call-template name="interspers-java">
 						<xsl:with-param name="str" select="."/>
 					</xsl:call-template>
 				</xsl:when>
@@ -9598,6 +9832,10 @@
 				<xsl:with-param name="char" select="$char"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template name="interspers-java">
+		<xsl:param name="str"/>
+		<xsl:param name="char" select="$zero_width_space"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($str),'([^ -.:=_—])',concat('$1', $char))"/> <!-- insert $char after each char excep space, - . : = _ etc. -->
 	</xsl:template><xsl:template match="*" mode="syntax_highlight">
 		<xsl:apply-templates mode="syntax_highlight"/>
 	</xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -9907,10 +10145,14 @@
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
 		<xsl:variable name="element">inline
 			
+			
 		</xsl:variable>		
 		<xsl:choose>			
 			<xsl:when test="contains($element, 'block')">
 				<fo:block xsl:use-attribute-sets="example-p-style">
+				
+					
+						
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -10018,6 +10260,7 @@
 					</xsl:if>
 					<fo:block xsl:use-attribute-sets="example-p-style">
 						
+						
 						<xsl:apply-templates/>
 					</fo:block>
 				</fo:block-container>
@@ -10174,6 +10417,8 @@
 					
 					
 					
+					
+					
 					<fo:basic-link fox:alt-text="{@citeas}">
 						<xsl:if test="normalize-space(@citeas) = ''">
 							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -10248,6 +10493,7 @@
 			
 			
 			
+			
 				<xsl:choose>
 					<xsl:when test="ancestor::bipm:annex">2</xsl:when>
 					<xsl:otherwise>8</xsl:otherwise>
@@ -10556,6 +10802,11 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
+	
+		<xsl:apply-templates select="*[local-name() = 'name']">
+			<xsl:with-param name="process">true</xsl:with-param>
+		</xsl:apply-templates>
+	
 		<fo:list-block xsl:use-attribute-sets="list-style">
 		
 			
@@ -10566,12 +10817,23 @@
 
 			
 			
+			<xsl:if test="*[local-name() = 'name']">
+				<xsl:attribute name="margin-top">0pt</xsl:attribute>
+			</xsl:if>
+			
 			<xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
 		</fo:list-block>
 		<!-- <xsl:for-each select="./iho:note">
 			<xsl:call-template name="note"/>
 		</xsl:for-each> -->
 		<xsl:apply-templates select="./*[local-name() = 'note']"/>
+	</xsl:template><xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:block xsl:use-attribute-sets="list-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='li']">
 		<fo:list-item xsl:use-attribute-sets="list-item-style">
 			<xsl:copy-of select="@id"/>
@@ -10583,6 +10845,8 @@
 				
 					
 				
+					
+				
 					<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 					<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
 						<xsl:call-template name="append_add-style"/>
@@ -10840,9 +11104,10 @@
 				</fo:block>
 			
 
-	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
 		
 		
+				<!-- start BIPM bibitem processing -->
 				<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
 					<fo:list-item>
 						<fo:list-item-label end-indent="label-end()">
@@ -10855,7 +11120,7 @@
 												<xsl:value-of select="bipm:docidentifier[@type='metanorma']"/>
 											</xsl:when>
 											<xsl:otherwise>
-												<xsl:number format="[1]"/>
+												<xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
 											</xsl:otherwise>
 										</xsl:choose>
 									</xsl:if>
@@ -10869,6 +11134,7 @@
 						</fo:list-item-body>
 					</fo:list-item>
 				</fo:list-block>
+				<!-- END BIPM bibitem processing -->
 			
 		
 	</xsl:template><xsl:template name="processBibitem">
@@ -10878,32 +11144,19 @@
 				<xsl:if test=".//bipm:fn">
 					<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
 				</xsl:if>			
-				<xsl:choose>
-					<xsl:when test="*[local-name() = 'formattedref']">
-						<xsl:apply-templates select="*[local-name() = 'formattedref']"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:variable name="docidentifier" select="*[local-name() = 'docidentifier'][not(@type = 'URN' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'BIPM' or @type = 'ISBN' or @type = 'ISSN')]"/>
-						
-						<xsl:value-of select="$docidentifier"/>
-						<xsl:if test="$docidentifier != '' and *[local-name() = 'title']">, </xsl:if>
-						
-						<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language"/>
-						
-						<xsl:choose>
-							<xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = $curr_lang]">
-								<xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = $curr_lang]"/>
-							</xsl:when>
-							<xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = 'en']">
-								<xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = 'en']"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates select="*[local-name() = 'title']"/>
-							</xsl:otherwise>
-						</xsl:choose>
-						
-					</xsl:otherwise>
-				</xsl:choose>
+				
+				<xsl:variable name="docidentifier_" select="*[local-name() = 'docidentifier'][not(@type = 'URN' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'BIPM' or @type = 'ISBN' or @type = 'ISSN')]"/>
+				<xsl:variable name="docidentifier_main" select="*[local-name() = 'docidentifier'][not(@type)]"/>
+				<xsl:variable name="docidentifier">
+					<xsl:choose>
+						<xsl:when test="$docidentifier_ = $docidentifier_main and @suppress_identifier = 'true'"><!-- suppress indentifier --></xsl:when>
+						<xsl:otherwise><xsl:value-of select="$docidentifier_"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:value-of select="normalize-space($docidentifier)"/>
+				
+				<xsl:if test="normalize-space($docidentifier) != '' and *[local-name() = 'formattedref']">, </xsl:if>
+				<xsl:apply-templates select="*[local-name() = 'formattedref']"/>
 				<!-- end BIPM bibitem processing-->
 			
 	</xsl:template><xsl:template name="processBibitemDocId">
@@ -11213,12 +11466,16 @@
 				<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
 					
 					
+					
+					
 				
 					
 					
 							<fo:block-container xsl:use-attribute-sets="admonition-container-style">
 							
 								
+							
+								
 										<fo:block xsl:use-attribute-sets="admonition-name-style">
 											<xsl:call-template name="displayAdmonitionName"/>
 										</fo:block>
@@ -11231,25 +11488,32 @@
 				</fo:block-container>
 			
 	</xsl:template><xsl:template name="displayAdmonitionName">
-		
+		<xsl:param name="sep"/> <!-- Example: ' - ' -->
+		<!-- <xsl:choose>
+			<xsl:when test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
+				<xsl:choose>
+					<xsl:when test="@type='important'"><xsl:apply-templates select="@type"/></xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise>
 				<xsl:apply-templates select="*[local-name() = 'name']"/>
 				<xsl:if test="not(*[local-name() = 'name'])">
 					<xsl:apply-templates select="@type"/>
 				</xsl:if>
-			
-	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
-		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'admonition']/@type">
-		<xsl:variable name="admonition_type_">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">admonition.<xsl:value-of select="."/></xsl:with-param>
-			</xsl:call-template>
+			</xsl:otherwise>
+		</xsl:choose> -->
+		<xsl:variable name="name">
+			<xsl:apply-templates select="*[local-name() = 'name']"/>
 		</xsl:variable>
-		<xsl:variable name="admonition_type" select="normalize-space(java:toUpperCase(java:java.lang.String.new($admonition_type_)))"/>
-		<xsl:value-of select="$admonition_type"/>
-		<xsl:if test="$admonition_type = ''">
-			<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
+		<xsl:copy-of select="$name"/>
+		<xsl:if test="normalize-space($name) != ''">
+			<xsl:value-of select="$sep"/>
 		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
+		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
 		
 				<fo:block xsl:use-attribute-sets="admonition-p-style">
@@ -11420,6 +11684,8 @@
 			</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name() = 'lang_none']">
+		<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
 	</xsl:template><xsl:template name="printEdition">
 		<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
 		<xsl:text> </xsl:text>
@@ -11526,6 +11792,27 @@
 			</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="getMonthLocalizedByNum">
+		<xsl:param name="num"/>
+		<xsl:variable name="monthStr">
+			<xsl:choose>
+				<xsl:when test="$num = '01'">january</xsl:when>
+				<xsl:when test="$num = '02'">february</xsl:when>
+				<xsl:when test="$num = '03'">march</xsl:when>
+				<xsl:when test="$num = '04'">april</xsl:when>
+				<xsl:when test="$num = '05'">may</xsl:when>
+				<xsl:when test="$num = '06'">june</xsl:when>
+				<xsl:when test="$num = '07'">july</xsl:when>
+				<xsl:when test="$num = '08'">august</xsl:when>
+				<xsl:when test="$num = '09'">september</xsl:when>
+				<xsl:when test="$num = '10'">october</xsl:when>
+				<xsl:when test="$num = '11'">november</xsl:when>
+				<xsl:when test="$num = '12'">december</xsl:when>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:call-template name="getLocalizedString">
+			<xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param>
+		</xsl:call-template>
 	</xsl:template><xsl:template name="insertKeywords">
 		<xsl:param name="sorting" select="'true'"/>
 		<xsl:param name="charAtEnd" select="'.'"/>
@@ -11597,7 +11884,7 @@
 					<dc:description>
 						<xsl:variable name="abstract">
 							
-									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
+									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>									
 								
 						</xsl:variable>
 						<xsl:value-of select="normalize-space($abstract)"/>
@@ -11725,6 +12012,7 @@
 			
 			
 			
+