metanorma-bipm 2.1.2 → 2.1.5

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

@@ -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">
 						
@@ -1154,7 +1156,7 @@
 				<xsl:apply-templates select="bipm:annex" mode="sections"/>
 				
 				<!-- Bibliography -->
-				<xsl:if test="bipm:bibliography/bipm:references[not(@normative='true')]/bipm:bibitem[not(contains(bipm:docidentifier, 'si-brochure-'))]">
+				<xsl:if test="bipm:bibliography/bipm:references[not(@normative='true')][not(@hidden='true')]/bipm:bibitem[not(contains(bipm:docidentifier, 'si-brochure-'))]">
 					<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				</xsl:if>
 				
@@ -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 -->
@@ -1314,7 +1317,7 @@
 
 				<xsl:apply-templates select="bipm:annex" mode="sections"/>
 				
-				<xsl:if test="bipm:bibliography/bipm:references[not(@normative='true')]/bipm:bibitem[not(contains(bipm:docidentifier, 'si-brochure-'))]">
+				<xsl:if test="bipm:bibliography/bipm:references[not(@normative='true')][not(@hidden='true')]/bipm:bibitem[not(contains(bipm:docidentifier, 'si-brochure-'))]">
 					<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				</xsl:if>
 				
@@ -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">
@@ -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">
@@ -3963,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>
 		
 		
@@ -3983,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)"/>
@@ -3994,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">
 		
@@ -4090,6 +4163,7 @@
 		
 		
 		
+		
 				
 		
 		
@@ -4104,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">
 		
@@ -4130,6 +4207,7 @@
 		
 		
 		
+		
 
 	</xsl:attribute-set><xsl:attribute-set name="example-style">
 		
@@ -4144,6 +4222,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		
@@ -4167,6 +4246,7 @@
 		
 		
 		
+		
 				
 				
 		
@@ -4195,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>
@@ -4223,6 +4305,7 @@
 		
 		
 		
+		
 					
 		
 		
@@ -4251,6 +4334,7 @@
 		
 		
 		
+		
 		
 		
 	</xsl:attribute-set><xsl:attribute-set name="table-name-style">
@@ -4259,6 +4343,7 @@
 		
 		
 		
+				
 		
 				
 		
@@ -4344,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>
@@ -4358,7 +4444,7 @@
 		
 		
 		
-
+		
 		
 		
 		
@@ -4376,6 +4462,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="table-fn-style">
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		
@@ -4389,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>
@@ -4407,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>
@@ -4442,6 +4532,7 @@
 		
 		
 		
+		
 	</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>
@@ -4450,6 +4541,7 @@
 		
 		
 		
+		
 				
 		
 		
@@ -4490,6 +4582,7 @@
 		
 		
 				
+				
 		
 		
 		
@@ -4529,7 +4622,8 @@
 		
 		
 		
-				
+		
+		
 		
 		
 		
@@ -4544,6 +4638,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="termnote-style">
 		
 		
+				
 		
 		
 		
@@ -4556,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>
@@ -4600,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>
+		
 		
 		
 				
@@ -4644,6 +4742,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
 		
@@ -4662,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">
 		
 		
@@ -4750,6 +4849,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="list-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			
@@ -4819,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>
@@ -4847,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>
 		
@@ -4870,6 +4972,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="admonition-style">
 		
 		
@@ -4890,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>
 		
@@ -4906,6 +5010,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="admonition-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		
@@ -4941,6 +5046,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style">
 		
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -4974,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> -->
 		
 		
 		
@@ -5002,13 +5112,16 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">65%</xsl:attribute>
@@ -5030,6 +5143,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
 		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
 		
@@ -5051,6 +5165,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>
@@ -5066,6 +5181,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
 		
 			<xsl:attribute name="line-height">120%</xsl:attribute>
@@ -5523,6 +5639,8 @@
 				
 				
 				
+				
+				
 			
 				
 				
@@ -5569,6 +5687,8 @@
 						
 						
 						
+						
+						
 					</xsl:element>
 				</xsl:variable>
 				
@@ -5656,6 +5776,14 @@
 				
 				
 				
+				<xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
+					<fo:block keep-with-previous="always" line-height="0.1">
+						<xsl:for-each select="*[local-name()='bookmark']">
+							<xsl:call-template name="bookmark"/>
+						</xsl:for-each>
+					</fo:block>
+				</xsl:if>
+				
 			</fo:block-container>
 		</xsl:variable>
 		
@@ -5711,30 +5839,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"/>
@@ -6132,12 +6266,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">		
@@ -6177,87 +6317,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']">
 		
@@ -6346,6 +6500,9 @@
 			
 			
 
+
+			
+
 			
 			
 			<xsl:call-template name="setTableRowAttributes"/>
@@ -6365,6 +6522,8 @@
 		
 			
 		
+			
+		
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -6475,6 +6634,8 @@
 			
 			
 			
+			
+			
 
 			
 			
@@ -6568,7 +6729,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>
@@ -6588,6 +6753,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>
@@ -6609,8 +6775,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/>
@@ -6643,7 +6813,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 -->
@@ -8328,6 +8498,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>
+			
+			
+			
+			
 			
 			
 			
@@ -8553,6 +8730,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']]">
@@ -8574,6 +8752,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 						<xsl:text>:</xsl:text>
 					
 					
@@ -8593,6 +8772,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 						<xsl:text>:</xsl:text>
 					
 					
@@ -8604,7 +8784,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}">
@@ -9377,6 +9569,9 @@
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 				
 				
+				
+				
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -9437,9 +9632,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>
@@ -9513,6 +9708,9 @@
 						<!-- 9 -->
 						
 						
+						<!-- <xsl:if test="$namespace = 'ieee'">							
+							<xsl:if test="$current_template = 'standard'">8</xsl:if>
+						</xsl:if> -->
 						
 								
 						
@@ -9957,10 +10155,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>
@@ -10068,6 +10270,7 @@
 					</xsl:if>
 					<fo:block xsl:use-attribute-sets="example-p-style">
 						
+						
 						<xsl:apply-templates/>
 					</fo:block>
 				</fo:block-container>
@@ -10224,6 +10427,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>
@@ -10298,6 +10503,7 @@
 			
 			
 			
+			
 				<xsl:choose>
 					<xsl:when test="ancestor::bipm:annex">2</xsl:when>
 					<xsl:otherwise>8</xsl:otherwise>
@@ -10649,6 +10855,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"/>
@@ -10833,7 +11041,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
 		<!-- to split by '_' and other chars -->
 		<xsl:call-template name="add-zero-spaces-java"/>
-	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
+	</xsl:template><xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
 		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
 		<fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
 		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
@@ -10906,7 +11114,7 @@
 				</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 -->
@@ -10922,7 +11130,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>
@@ -10947,10 +11155,17 @@
 					<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
 				</xsl:if>			
 				
-				<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: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="$docidentifier != '' and *[local-name() = 'formattedref']">, </xsl:if>
+				<xsl:if test="normalize-space($docidentifier) != '' and *[local-name() = 'formattedref']">, </xsl:if>
 				<xsl:apply-templates select="*[local-name() = 'formattedref']"/>
 				<!-- end BIPM bibitem processing-->
 			
@@ -11261,12 +11476,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>
@@ -11475,6 +11694,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>
@@ -11581,8 +11802,30 @@
 			</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="meta" select="'false'"/>
 		<xsl:param name="charAtEnd" select="'.'"/>
 		<xsl:param name="charDelim" select="', '"/>
 		<xsl:choose>
@@ -11590,6 +11833,7 @@
 				<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
 					<xsl:sort data-type="text" order="ascending"/>
 					<xsl:call-template name="insertKeyword">
+						<xsl:with-param name="meta" select="$meta"/>
 						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
 						<xsl:with-param name="charDelim" select="$charDelim"/>
 					</xsl:call-template>
@@ -11598,6 +11842,7 @@
 			<xsl:otherwise>
 				<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
 					<xsl:call-template name="insertKeyword">
+						<xsl:with-param name="meta" select="$meta"/>
 						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
 						<xsl:with-param name="charDelim" select="$charDelim"/>
 					</xsl:call-template>
@@ -11607,7 +11852,15 @@
 	</xsl:template><xsl:template name="insertKeyword">
 		<xsl:param name="charAtEnd"/>
 		<xsl:param name="charDelim"/>
-		<xsl:apply-templates/>
+		<xsl:param name="meta"/>
+		<xsl:choose>
+			<xsl:when test="$meta = 'true'">
+				<xsl:value-of select="."/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates/>
+			</xsl:otherwise>
+		</xsl:choose>
 		<xsl:choose>
 			<xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
 			<xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
@@ -11652,13 +11905,15 @@
 					<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)"/>
 					</dc:description>
 					<pdf:Keywords>
-						<xsl:call-template name="insertKeywords"/>
+						<xsl:call-template name="insertKeywords">
+							<xsl:with-param name="meta">true</xsl:with-param>
+						</xsl:call-template>
 					</pdf:Keywords>
 				</rdf:Description>
 				<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
@@ -11780,6 +12035,7 @@
 			
 			
 			
+