metanorma-bipm 1.1.11 → 1.2.3

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

@@ -247,33 +247,68 @@
 	<xsl:template match="/">
 		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
 			<fo:layout-master-set>
+			
+				<!-- blank page -->
+				<fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<fo:region-before region-name="header-blank" extent="{$marginTop}mm"/> 
+					<fo:region-after region-name="footer-blank" extent="{$marginBottom}mm"/>
+					<fo:region-start region-name="left-region" extent="17mm"/>
+					<fo:region-end region-name="right-region" extent="26.5mm"/>
+				</fo:simple-page-master>
+				
 				<!-- Cover page -->
-				<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+				<fo:simple-page-master master-name="simple-cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 					<fo:region-body margin-top="36mm" margin-bottom="43mm" margin-left="49mm" margin-right="48mm"/>
-					<fo:region-before extent="36mm"/>
+					<fo:region-before region-name="header" extent="36mm"/>
 					<fo:region-after extent="43mm"/>
 					<fo:region-start extent="49mm"/>
 					<fo:region-end extent="48mm"/>
 				</fo:simple-page-master>
 				
+				<fo:page-sequence-master master-name="cover-page">
+					<fo:repeatable-page-master-alternatives>
+						<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
+						<fo:conditional-page-master-reference master-reference="simple-cover-page" odd-or-even="odd"/>
+						<fo:conditional-page-master-reference master-reference="simple-cover-page" odd-or-even="even"/>
+					</fo:repeatable-page-master-alternatives>
+				</fo:page-sequence-master>
+				
 				<!-- Cover page -->
-				<fo:simple-page-master master-name="cover-page-appendix" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+				<fo:simple-page-master master-name="simple-cover-page-appendix" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 					<fo:region-body margin-top="90mm" margin-bottom="40mm" margin-left="12.5mm" margin-right="53mm"/>
-					<fo:region-before extent="60mm"/>
+					<fo:region-before region-name="header" extent="60mm"/>
 					<fo:region-after extent="40mm"/>
 					<fo:region-start extent="12.5mm"/>
 					<fo:region-end extent="53mm"/>
 				</fo:simple-page-master>
 				
+				<fo:page-sequence-master master-name="cover-page-appendix">
+					<fo:repeatable-page-master-alternatives>
+						<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
+						<fo:conditional-page-master-reference master-reference="simple-cover-page-appendix" odd-or-even="odd"/>
+						<fo:conditional-page-master-reference master-reference="simple-cover-page-appendix" odd-or-even="even"/>
+					</fo:repeatable-page-master-alternatives>
+				</fo:page-sequence-master>
+				
+				
 				<!-- Title page  -->
-				<fo:simple-page-master master-name="title-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+				<fo:simple-page-master master-name="simple-title-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 					<fo:region-body margin-top="38mm" margin-bottom="25mm" margin-left="95mm" margin-right="12mm"/>
-					<fo:region-before extent="38mm"/>
+					<fo:region-before region-name="header" extent="38mm"/>
 					<fo:region-after extent="25mm"/>
 					<fo:region-start extent="95mm"/>
 					<fo:region-end extent="12mm"/>
 				</fo:simple-page-master>
 				
+				<fo:page-sequence-master master-name="title-page">
+					<fo:repeatable-page-master-alternatives>
+						<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
+						<fo:conditional-page-master-reference master-reference="simple-title-page" odd-or-even="odd"/>
+						<fo:conditional-page-master-reference master-reference="simple-title-page" odd-or-even="even"/>
+					</fo:repeatable-page-master-alternatives>
+				</fo:page-sequence-master>
+				
 				<!-- Document pages -->
 				<fo:simple-page-master master-name="document-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
@@ -291,6 +326,7 @@
 				</fo:simple-page-master>
 				<fo:page-sequence-master master-name="document">
 					<fo:repeatable-page-master-alternatives>						
+						<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
 						<fo:conditional-page-master-reference odd-or-even="even" master-reference="document-even"/>
 						<fo:conditional-page-master-reference odd-or-even="odd" master-reference="document-odd"/>
 					</fo:repeatable-page-master-alternatives>
@@ -312,7 +348,8 @@
 					<fo:region-end region-name="right-region" extent="26.5mm"/>
 				</fo:simple-page-master>
 				<fo:page-sequence-master master-name="document-landscape">
-					<fo:repeatable-page-master-alternatives>						
+					<fo:repeatable-page-master-alternatives>
+						<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
 						<fo:conditional-page-master-reference odd-or-even="even" master-reference="document-landscape-even"/>
 						<fo:conditional-page-master-reference odd-or-even="odd" master-reference="document-landscape-odd"/>
 					</fo:repeatable-page-master-alternatives>
@@ -334,7 +371,8 @@
 					<fo:region-end region-name="right-region" extent="26.5mm"/>
 				</fo:simple-page-master>
 				<fo:page-sequence-master master-name="index">
-					<fo:repeatable-page-master-alternatives>						
+					<fo:repeatable-page-master-alternatives>
+						<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
 						<fo:conditional-page-master-reference odd-or-even="even" master-reference="index-even"/>
 						<fo:conditional-page-master-reference odd-or-even="odd" master-reference="index-odd"/>
 					</fo:repeatable-page-master-alternatives>
@@ -1106,6 +1144,9 @@
 					</xsl:if>
 					
 					<xsl:call-template name="insertFootnoteSeparator"/>
+					
+					<xsl:call-template name="insertHeaderDraftWatermark"/>
+					
 					<fo:flow flow-name="xsl-region-body" font-family="Arial">
 						
 						<fo:block-container font-size="12pt" font-weight="bold" border-top="1pt solid black" width="82mm" margin-top="2mm" padding-top="2mm">						
@@ -1303,7 +1344,9 @@
 				
 				<!-- Index -->
 				<!-- <xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:clause[@type = 'index']" mode="index" /> -->
-				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="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:apply-templates>
 				
 				<!-- End Document Pages -->
 				
@@ -1322,6 +1365,8 @@
 				
 				<fo:page-sequence master-reference="document" force-page-count="no-force">
 					
+					<xsl:call-template name="insertHeaderDraftWatermark"/>
+					
 					<fo:flow flow-name="xsl-region-body" font-family="Arial">
 						
 						<fo:block-container font-size="12pt" font-weight="bold" border-top="1pt solid black" width="82mm" margin-top="2mm" padding-top="2mm">						
@@ -1471,7 +1516,9 @@
 				
 				<!-- Index -->
 				<!-- <xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:clause[@type = 'index']" mode="index" /> -->
-				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="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:apply-templates>
 				
 			</xsl:otherwise>
 		</xsl:choose>
@@ -1485,6 +1532,8 @@
 	
 		<fo:page-sequence master-reference="cover-page" force-page-count="even">
 			
+			<xsl:call-template name="insertHeaderDraftWatermark"/>
+			
 			<fo:flow flow-name="xsl-region-body">
 			
 				<xsl:call-template name="insertCoverPageCommon"/>
@@ -1820,6 +1869,8 @@
 			</fo:block>
 		</fo:block-container>
 	
+		<xsl:call-template name="insertDraftWatermark"/>
+		
 		<!-- BIPM logo -->
 		<fo:block-container absolute-position="fixed" left="12.8mm" top="12.2mm">
 			<fo:block>
@@ -1844,6 +1895,8 @@
 	
 			<fo:page-sequence master-reference="title-page" format="1" initial-page-number="1" force-page-count="even">
 				
+				<xsl:call-template name="insertHeaderDraftWatermark"/>
+				
 				<fo:flow flow-name="xsl-region-body" font-family="Arial">
 				
 					<xsl:variable name="languages">
@@ -3326,13 +3379,14 @@
 
 	<xsl:template match="bipm:preferred">		
 		<fo:block font-weight="bold" keep-with-next="always" space-before="8pt" margin-bottom="6pt">
-			<xsl:if test="ancestor::bipm:term/bipm:name">
+			<xsl:call-template name="setStyle_preferred"/>
+			<xsl:if test="ancestor::bipm:term[1]/bipm:name">
 				<xsl:variable name="level">
 					<xsl:call-template name="getLevelTermName"/>
 				</xsl:variable>
-				<fo:inline role="H{$level}">
+				<fo:inline role="H{$level}" font-weight="bold">
 					<xsl:attribute name="padding-right">2mm</xsl:attribute>
-					<xsl:apply-templates select="ancestor::bipm:term/bipm:name" mode="presentation"/>				
+					<xsl:apply-templates select="ancestor::bipm:term[1]/bipm:name" mode="presentation"/>				
 				</fo:inline>
 			</xsl:if>
 			<xsl:apply-templates/>
@@ -3908,7 +3962,11 @@
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="header-title"/>
 		<xsl:param name="orientation"/>
+		<xsl:param name="isDraft"/>
 		<fo:static-content flow-name="header-odd" role="artifact">
+			<xsl:call-template name="insertDraftWatermark">
+				<xsl:with-param name="isDraft" select="$isDraft"/>
+			</xsl:call-template>
 			<fo:block-container font-family="Arial" font-size="8pt" padding-top="12.5mm">
 				<fo:block text-align="right">
 					<xsl:copy-of select="$header-title"/>
@@ -3929,6 +3987,9 @@
 			</fo:block-container>
 		</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:call-template>
 			<fo:block-container font-family="Arial" font-size="8pt" padding-top="12.5mm">
 				<fo:block>
 					<fo:inline font-weight="bold"><fo:page-number/></fo:inline>
@@ -3944,7 +4005,74 @@
 					<fo:block> </fo:block>
 				</fo:block-container>
 			</fo:block-container>
-		</fo:static-content>		
+		</fo:static-content>
+		<fo:static-content flow-name="header-blank" role="artifact">
+			<xsl:call-template name="insertDraftWatermark">
+				<xsl:with-param name="isDraft" select="$isDraft"/>
+			</xsl:call-template>
+			<fo:block/>
+		</fo:static-content>
+	</xsl:template>
+
+	<xsl:template name="insertDraftWatermark">
+		<xsl:param name="isDraft"/>
+		<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:variable>
+			<fo:block-container absolute-position="fixed" left="0mm" top="30mm">
+				<fo:block line-height="0">
+					<fo:instream-foreign-object fox:alt-text="DRAFT">
+							<svg:svg xmlns:svg="http://www.w3.org/2000/svg" width="200mm" height="250mm">
+								<svg:g transform="rotate(-45) scale(0.6, 1)">
+									<xsl:variable name="font-size">
+										<xsl:choose>
+											<xsl:when test="string-length($draft_label) &gt; 5">150</xsl:when>
+											<xsl:otherwise>260</xsl:otherwise>
+										</xsl:choose>
+									</xsl:variable>
+										<svg:text x="-175mm" y="205mm" style="font-family:Arial;font-size:{$font-size}pt;font-weight:normal;fill:rgb(223, 223, 223);">
+											<xsl:if test="string-length($draft_label) &gt; 5">
+												<xsl:attribute name="x">-175mm</xsl:attribute>
+												<xsl:attribute name="y">180mm</xsl:attribute>
+											</xsl:if>
+											<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($draft_label))"/>
+										</svg:text>
+								</svg:g>
+							</svg:svg>
+					</fo:instream-foreign-object>
+				</fo:block>
+			</fo:block-container>
+		</xsl:if>
+	</xsl:template>
+
+	<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: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: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: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: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:call-template>
+			</fo:static-content>
+		</xsl:if>
 	</xsl:template>
 
 	<!-- <xsl:template name="insertHeaderFooterAppendix">		
@@ -4089,6 +4217,7 @@
 	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="index"> -->
 	<xsl:template match="bipm:indexsect"/>
 	<xsl:template match="bipm:indexsect" mode="index">
+		<xsl:param name="isDraft"/>
 	
 		<fo:page-sequence master-reference="index" force-page-count="no-force">
 			<xsl:variable name="header-title">
@@ -4103,6 +4232,7 @@
 			</xsl:variable>
 			<xsl:call-template name="insertHeaderFooter">
 				<xsl:with-param name="header-title" select="$header-title"/>
+				<xsl:with-param name="isDraft" select="$isDraft"/>
 			</xsl:call-template>
 			
 			<fo:flow flow-name="xsl-region-body">
@@ -4648,6 +4778,8 @@
 		
 		<title-list-figures lang="en">List of Figures</title-list-figures>
 		
+		<title-table-figures lang="en">Table of Figures</title-table-figures>
+		
 		<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
 		
 		<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -5102,7 +5234,8 @@
 		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] |       /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
 		
 	</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
-		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+	
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] |    /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
@@ -5112,7 +5245,7 @@
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
 		
-		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
@@ -6627,6 +6760,7 @@
 			<fo:table-cell>
 				
 				<fo:block margin-top="6pt">
+					<xsl:copy-of select="@id"/>
 					
 					
 					<xsl:if test="normalize-space($key_iso) = 'true'">
@@ -7509,14 +7643,18 @@
 	</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'terms']">
+		<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']">
+		<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
 		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
 			
 			
-			
+			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
+				
+			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -7582,6 +7720,7 @@
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="image-style">
 					
+					
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -7943,12 +8082,12 @@
 	</xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">		
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
-	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">		
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name'] |               *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">		
 		<xsl:apply-templates mode="bookmarks"/>
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="node()" mode="contents">
 		<xsl:apply-templates mode="contents"/>
@@ -8046,6 +8185,8 @@
 				
 				
 				
+				
+				
 			</fo:bookmark-tree>
 		</xsl:if>
 	</xsl:template><xsl:template name="insertFigureBookmarks">
@@ -8230,6 +8371,8 @@
 		
 				
 				
+				
+				
 				<fo:block xsl:use-attribute-sets="sourcecode-style">
 					<xsl:variable name="_font-size">
 						
@@ -8263,13 +8406,17 @@
 				
 				
 				
+				
+				
 				<xsl:apply-templates/>			
 			</fo:block>
-				
+			
 			
 				<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 				
 				
+			
+				
 			</fo:block-container>
 		</fo:block-container>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -8505,7 +8652,8 @@
 			</fo:block>			
 		</fo:table-cell>
 	</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
-		<fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center"  -->
+		<fo:block font-size="11pt">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -8610,6 +8758,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>
@@ -8620,13 +8769,15 @@
 					<!-- <xsl:apply-templates /> -->
 					<xsl:copy-of select="$termsource_text"/>
 				</xsl:when>
-				<xsl:otherwise>					
+				<xsl:otherwise>
+					
 					
 						<xsl:text>[</xsl:text>
 					
 					<!-- <xsl:apply-templates />					 -->
 					<xsl:copy-of select="$termsource_text"/>
 					
+					
 						<xsl:text>]</xsl:text>
 					
 				</xsl:otherwise>
@@ -8708,12 +8859,20 @@
 	</xsl:template><xsl:template match="*[local-name() = 'author']">
 		<xsl:text>— </xsl:text>
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'eref']">
+	</xsl:template><xsl:variable name="bibitem_hidden_">
+		<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+		<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
 	
 		<xsl:variable name="bibitemid">
 			<xsl:choose>
-				<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
-				<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
+				<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
+				<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
+				<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
 				<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -8811,10 +8970,10 @@
 			</xsl:choose>
 		</xsl:variable>
 		
-		<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+		<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
 		
 		<xsl:choose>
-			<xsl:when test="$language = 'zh'">
+			<xsl:when test="$lang = 'zh'">
 				<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
 			</xsl:when>
 			<xsl:when test="../../@inline-header = 'true'">
@@ -8848,24 +9007,29 @@
 	</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
 		<xsl:variable name="title-deprecated">
 			
-			
-				<xsl:call-template name="getTitle">
-					<xsl:with-param name="name" select="'title-deprecated'"/>
+				<xsl:call-template name="getLocalizedString">
+					<xsl:with-param name="key">deprecated</xsl:with-param>
 				</xsl:call-template>
 			
+			
 		</xsl:variable>
 		<fo:block xsl:use-attribute-sets="deprecates-style">
 			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
 		</fo:block>
+	</xsl:template><xsl:template name="setStyle_preferred">
+		<xsl:if test="*[local-name() = 'strong']">
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'definition']">
 		<fo:block xsl:use-attribute-sets="definition-style">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
+	</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
 		<fo:inline> <xsl:apply-templates/></fo:inline>
-		<fo:block> </fo:block>
+		<!-- <fo:block>&#xA0;</fo:block> -->
+		<fo:block/>
 	</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
 		
 		<fo:block>
@@ -9827,12 +9991,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

data/lib/isodoc/bipm/html/htmlstyle.css

@@ -495,10 +495,12 @@ h3 {
   font-size: 1.1em;
   font-weight: 100; }
 
-.TermNum, .Terms, .AltTerms {
-  color: #6C734A;
+.TermNum {
   font-weight: 100; }
 
+.TermNum, .Terms, .AltTerms {
+  color: #6C734A; }
+
 h2.TermNum {
   margin-bottom: 0; }
 

data/lib/isodoc/bipm/html/htmlstyle.scss

@@ -189,9 +189,12 @@ p.document-stage {
     font-weight: 100;
   }
 
+  .TermNum {
+    font-weight: 100;
+  }
+
   .TermNum, .Terms, .AltTerms {
     color: #6C734A;
-    font-weight: 100;
   }
 
   h2.TermNum {