metanorma-bipm 1.0.7 → 1.1.0

data/lib/isodoc/bipm/bipm.guide.xsl

@@ -4,6 +4,7 @@
 	
 	<xsl:param name="svg_images"/>
 	<xsl:variable name="images" select="document($svg_images)"/>
+	<xsl:param name="basepath"/>
 	
 	<xsl:param name="initial_page_number"/>
 	<xsl:param name="doc_split_by_language"/>
@@ -4630,12 +4631,18 @@
 				
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
 		
-	
+		
 	</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="definition-style">
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="add-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="del-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
 	</xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -6101,8 +6108,12 @@
 		<fo:inline text-decoration="underline">
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='add']">
+		<fo:inline xsl:use-attribute-sets="add-style">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
-		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
+		<fo:inline xsl:use-attribute-sets="del-style">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='hi']">
@@ -6740,22 +6751,37 @@
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'image']">
-		<fo:block xsl:use-attribute-sets="image-style">
-			
-			
-			<xsl:variable name="src">
-				<xsl:choose>
-					<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
-						<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="@src"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			
-			<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
-		</fo:block>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'title']">
+				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="image-style">
+					
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="image_src">
+		<xsl:choose>
+			<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
+				<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
+			</xsl:when>
+			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="@src"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><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>

data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl

@@ -4,6 +4,7 @@
 	
 	<xsl:param name="svg_images"/>
 	<xsl:variable name="images" select="document($svg_images)"/>
+	<xsl:param name="basepath"/>
 	
 	<xsl:param name="initial_page_number"/>
 	<xsl:param name="doc_split_by_language"/>
@@ -4630,12 +4631,18 @@
 				
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
 		
-	
+		
 	</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="definition-style">
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="add-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="del-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
 	</xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -6101,8 +6108,12 @@
 		<fo:inline text-decoration="underline">
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='add']">
+		<fo:inline xsl:use-attribute-sets="add-style">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
-		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
+		<fo:inline xsl:use-attribute-sets="del-style">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='hi']">
@@ -6740,22 +6751,37 @@
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'image']">
-		<fo:block xsl:use-attribute-sets="image-style">
-			
-			
-			<xsl:variable name="src">
-				<xsl:choose>
-					<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
-						<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="@src"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			
-			<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
-		</fo:block>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'title']">
+				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="image-style">
+					
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="image_src">
+		<xsl:choose>
+			<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
+				<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
+			</xsl:when>
+			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="@src"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><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>

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

@@ -4,6 +4,7 @@
 	
 	<xsl:param name="svg_images"/>
 	<xsl:variable name="images" select="document($svg_images)"/>
+	<xsl:param name="basepath"/>
 	
 	<xsl:param name="initial_page_number"/>
 	<xsl:param name="doc_split_by_language"/>
@@ -4630,12 +4631,18 @@
 				
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
 		
-	
+		
 	</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="definition-style">
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="add-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="del-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
 	</xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -6101,8 +6108,12 @@
 		<fo:inline text-decoration="underline">
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='add']">
+		<fo:inline xsl:use-attribute-sets="add-style">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
-		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
+		<fo:inline xsl:use-attribute-sets="del-style">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='hi']">
@@ -6740,22 +6751,37 @@
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'image']">
-		<fo:block xsl:use-attribute-sets="image-style">
-			
-			
-			<xsl:variable name="src">
-				<xsl:choose>
-					<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
-						<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="@src"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			
-			<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
-		</fo:block>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'title']">
+				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="image-style">
+					
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="image_src">
+		<xsl:choose>
+			<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
+				<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
+			</xsl:when>
+			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="@src"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><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>

data/lib/isodoc/bipm/html/html_bipm_titlepage.html

@@ -35,6 +35,8 @@
       {% if partid_alt %}<span class="title-second">{{ partid_alt}}: {{ partsubtitle }}</span>{% endif %}       
       {% if subparttitle %}<span class="title-first">{{ subparttitle }}</span><br/>{% endif %}
       {% if subpartsubtitle %}<span class="title-second">{{ subpartsubtitle }}</span><br/>{% endif %}
+      {% if provenancetitle %}<span class="title-first">{{ provenancetitle }}</span><br/>{% endif %}
+      {% if provenancesubtitle %}<span class="title-second">{{ provenancesubtitle }}</span><br/>{% endif %}
       {% if appendixid %}<span class="title-first">{{ appendixid}}: {{ appendixtitle }}</span><br/>{% endif %} 
       {% if appendixid_alt %}<span class="title-second">{{ appendixid_alt}}: {{ appendixsubtitle }}</span>{% endif %}
       {% if annexid %}<span class="title-first">{{ annexid}}: {{ annextitle }}</span><br/>{% endif %} 

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

@@ -116,6 +116,13 @@ a.FootnoteRef + a.FootnoteRef:before {
   content: ", ";
   vertical-align: super; }
 
+.addition {
+  color: blue; }
+
+.deletion {
+  color: red;
+  text-decoration: line-through; }
+
 #brochure-band {
   background-color: #0AC442; }
 

data/lib/isodoc/bipm/i18n-en.yaml

@@ -4,7 +4,16 @@ see: see
 see_also: see also
 clause: Chapter
 subclause: Section
+clause_jcgm: Clause
+subclause_jcgm: Clause
 formula: Equation
 inequality: Inequality
 bibliography: References
 index: Index
+norm_with_refs_pref:
+      The following referenced documents are indispensable for the application of this document. 
+      For dated references, only the edition cited applies.
+      For undated references, the latest edition of the referenced
+      document (including any amendments) applies.
+all_rights_reserved: All rights reserved
+table_of_contents: Contents

data/lib/isodoc/bipm/i18n-fr.yaml

@@ -4,6 +4,8 @@ see: voir
 see_also: voir aussi
 clause: chapître
 subclause: section
+clause_jcgm: Article
+subclause_jcgm: Article
 formula: équation
 inequality: inégalité
 bibliography: Références
@@ -34,3 +36,7 @@ stage_dict:
   draft-development: projet-de-développement
   in-force: en-vigeur
   retired: retiré
+norm_with_refs_pref:
+     Les documents suivants cités dans le texte sont indispensables pour l'application de ce document. Pour les références datées, seule l’édition citée s’applique. Pour les références non datées, la dernière édition du document de référence s’applique (y compris les éventuels amendements).
+all_rights_reserved: Tous droits réservés
+table_of_contents: Table des matières

data/lib/isodoc/bipm/jcgm.standard.xsl

@@ -4,6 +4,7 @@
 	
 	<xsl:param name="svg_images"/>
 	<xsl:variable name="images" select="document($svg_images)"/>
+	<xsl:param name="basepath"/>
 
 	<!-- <item id="#">N_page</item> -->
 	<!-- param for second pass -->
@@ -213,7 +214,7 @@
 						<xsl:call-template name="printEdition"/>
 						<xsl:text>  </xsl:text>
 						<xsl:call-template name="convertDate">
-							<xsl:with-param name="date" select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:version/jcgm:revision-date"/>
+							<xsl:with-param name="date" select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:date[@type = 'published']/jcgm:on"/>
 						</xsl:call-template>
 					</fo:block>
 					<!-- Example © JCGM 2009 -->
@@ -227,13 +228,16 @@
 				<fo:flow flow-name="xsl-region-body">
 					<xsl:call-template name="insert_Logo-BIPM-Metro"/>
 					<fo:block-container font-weight="bold">
-						<fo:block font-size="16.5pt" space-after="24.5mm">
+						<fo:block font-size="16.5pt">
 							<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:ext/jcgm:editorialgroup/jcgm:committee/@acronym"/>
 							<xsl:text> </xsl:text>
 							<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:docnumber"/>
 							<fo:inline font-weight="normal">:</fo:inline>
 							<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:copyright/jcgm:from"/>
 						</fo:block>
+						<fo:block font-size="13pt" font-weight="normal" space-after="19.5mm">
+							<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@type = 'provenance']"/>
+						</fo:block>
 						<fo:block border-bottom="1pt solid black"> </fo:block>
 						<fo:block font-size="16.5pt" margin-left="-0.5mm" padding-top="3.5mm" space-after="7mm" margin-right="7mm" line-height="105%">
 							<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'main']" mode="title"/>
@@ -597,7 +601,7 @@
 
 	<xsl:template name="getListItemFormat">
 		<xsl:choose>
-			<xsl:when test="local-name(..) = 'ul' and ../ancestor::bipm:ul">−</xsl:when> <!-- &#x2212; - minus sign.  &#x2014; - dash -->
+			<xsl:when test="local-name(..) = 'ul' and ../ancestor::jcgm:ul">−</xsl:when> <!-- &#x2212; - minus sign.  &#x2014; - dash -->
 			<xsl:when test="local-name(..) = 'ul'">—</xsl:when> <!-- &#x2014; dash -->
 			<xsl:otherwise> <!-- for ordered lists -->
 				<xsl:variable name="start_value">
@@ -807,6 +811,42 @@
 		</fo:footnote>
 	</xsl:template>
 	
+  
+  <!--
+	<fn reference="1">
+			<p id="_8e5cf917-f75a-4a49-b0aa-1714cb6cf954">Formerly denoted as 15 % (m/m).</p>
+		</fn>
+	-->
+	<xsl:template match="jcgm:title//jcgm:fn |                  jcgm:name//jcgm:fn |                  jcgm:p/jcgm:fn[not(ancestor::jcgm:table)] |                  jcgm:p/*/jcgm:fn[not(ancestor::jcgm:table)] |                 jcgm:sourcecode/jcgm:fn[not(ancestor::jcgm:table)]" priority="2" name="fn">
+		<fo:footnote keep-with-previous.within-line="always">
+			<xsl:variable name="number">
+				<xsl:number count="jcgm:fn[not(ancestor::jcgm:table)]" level="any"/>
+			</xsl:variable>
+			<xsl:variable name="gen_id" select="generate-id()"/>
+			<xsl:variable name="lang" select="ancestor::jcgm:bipm-standard/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
+			<fo:inline font-size="65%" keep-with-previous.within-line="always" vertical-align="super">
+				<fo:basic-link internal-destination="{$lang}_footnote_{@reference}_{$number}_{$gen_id}" fox:alt-text="footnote {@reference}">
+					<xsl:value-of select="$number"/>
+				</fo:basic-link>
+			</fo:inline>
+			<fo:footnote-body>
+				<fo:block font-size="9pt" margin-bottom="12pt" font-weight="normal" text-indent="0" start-indent="0" line-height="124%" text-align="justify">
+					<fo:inline id="{$lang}_footnote_{@reference}_{$number}_{$gen_id}" keep-with-next.within-line="always" font-size="60%" vertical-align="super" padding-right="1mm"> <!-- baseline-shift="30%" padding-right="3mm" font-size="60%"  alignment-baseline="hanging" -->
+						<xsl:value-of select="$number "/>
+					</fo:inline>
+					<xsl:for-each select="jcgm:p">
+							<xsl:apply-templates/>
+					</xsl:for-each>
+				</fo:block>
+			</fo:footnote-body>
+		</fo:footnote>
+	</xsl:template>
+
+	<xsl:template match="jcgm:fn/jcgm:p">
+		<fo:block>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
 	
 	
 	<xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="ul_ol">
@@ -982,6 +1022,12 @@
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
 			<fo:instream-foreign-object fox:alt-text="Math">
+				<xsl:if test="local-name(../..) = 'formula'">
+					<xsl:attribute name="width">95%</xsl:attribute>
+					<xsl:attribute name="content-height">100%</xsl:attribute>
+					<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+					<xsl:attribute name="scaling">uniform</xsl:attribute>
+				</xsl:if>
 				<!-- <xsl:copy-of select="."/> -->
 				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>
@@ -1082,6 +1128,17 @@
 	</xsl:template>
 	
 
+	<xsl:template match="*[local-name()='td' or local-name()='th']/*[local-name()='formula']/*[local-name()='stem']" priority="2">
+		<fo:block>
+			<xsl:if test="ancestor::*[local-name()='td' or local-name()='th'][1][@align]">
+				<xsl:attribute name="text-align">
+					<xsl:value-of select="ancestor::*[local-name()='td' or local-name()='th'][1]/@align"/>
+				</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+  
 	<xsl:template match="*[local-name()='formula']/*[local-name()='stem']">
 		<fo:block margin-top="6pt" margin-bottom="12pt">
 			<fo:table table-layout="fixed" width="100%">
@@ -1320,6 +1377,7 @@
 		<xsl:variable name="font-size">
 			<xsl:choose>
 				<xsl:when test="ancestor::jcgm:preface">15pt</xsl:when>
+				<xsl:when test="parent::jcgm:annex">15pt</xsl:when>
 				<xsl:when test="../@inline-header = 'true'  or @inline-header = 'true'">10.5pt</xsl:when>
 				<xsl:when test="$level = 2">11.5pt</xsl:when>
 				<xsl:when test="$level &gt;= 3">10.5pt</xsl:when>
@@ -1351,6 +1409,8 @@
 				<xsl:attribute name="space-after">
 					<xsl:choose>
 						<xsl:when test="ancestor::jcgm:preface">12pt</xsl:when>
+						<xsl:when test="parent::jcgm:annex">30pt</xsl:when>
+						<xsl:when test="following-sibling::*[1][local-name() = 'admitted']">0pt</xsl:when>
 						<!-- <xsl:otherwise>12pt</xsl:otherwise> -->
 						<xsl:otherwise>12pt</xsl:otherwise>
 					</xsl:choose>
@@ -1364,6 +1424,10 @@
 						</xsl:choose>
 					</xsl:attribute>
 				</xsl:if>
+				<xsl:if test="parent::jcgm:annex">
+					<xsl:attribute name="text-align">center</xsl:attribute>
+					<xsl:attribute name="line-height">130%</xsl:attribute>
+				</xsl:if>
 				<xsl:apply-templates/>
 			</xsl:element>
 			
@@ -1380,41 +1444,43 @@
 		<xsl:param name="font-size" select="'65%'"/>
 		<xsl:param name="baseline-shift" select="'30%'"/>
 		<xsl:param name="curr_lang" select="'fr'"/>
-		<fo:inline>
-			<xsl:variable name="title-edition">
-				<xsl:call-template name="getTitle">
-					<xsl:with-param name="name" select="'title-edition'"/>
-					<xsl:with-param name="lang" select="$curr_lang"/>
-				</xsl:call-template>
-			</xsl:variable>
-			<xsl:value-of select="."/>
-			<fo:inline font-size="{$font-size}" baseline-shift="{$baseline-shift}">
-				<xsl:if test="$curr_lang = 'en'">
-					<xsl:attribute name="baseline-shift">0%</xsl:attribute>
-					<xsl:attribute name="font-size">100%</xsl:attribute>
-				</xsl:if>
-				<xsl:choose>
-					<xsl:when test="$curr_lang = 'fr'">
-						<xsl:choose>					
-							<xsl:when test=". = '1'">re</xsl:when>
-							<xsl:otherwise>e</xsl:otherwise>
-						</xsl:choose>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:choose>					
-							<xsl:when test=". = '1'">st</xsl:when>
-							<xsl:when test=". = '2'">nd</xsl:when>
-							<xsl:when test=". = '3'">rd</xsl:when>
-							<xsl:otherwise>th</xsl:otherwise>
-						</xsl:choose>
-					</xsl:otherwise>
-				</xsl:choose>
-				
+		<xsl:if test="normalize-space (.) != '1'">
+			<fo:inline>
+				<xsl:variable name="title-edition">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-edition'"/>
+						<xsl:with-param name="lang" select="$curr_lang"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="."/>
+				<fo:inline font-size="{$font-size}" baseline-shift="{$baseline-shift}">
+					<xsl:if test="$curr_lang = 'en'">
+						<xsl:attribute name="baseline-shift">0%</xsl:attribute>
+						<xsl:attribute name="font-size">100%</xsl:attribute>
+					</xsl:if>
+					<xsl:choose>
+						<xsl:when test="$curr_lang = 'fr'">
+							<xsl:choose>					
+								<xsl:when test=". = '1'">re</xsl:when>
+								<xsl:otherwise>e</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:choose>					
+								<xsl:when test=". = '1'">st</xsl:when>
+								<xsl:when test=". = '2'">nd</xsl:when>
+								<xsl:when test=". = '3'">rd</xsl:when>
+								<xsl:otherwise>th</xsl:otherwise>
+							</xsl:choose>
+						</xsl:otherwise>
+					</xsl:choose>
+					
+				</fo:inline>
+				<xsl:text> </xsl:text>			
+				<xsl:value-of select="java:toLowerCase(java:java.lang.String.new($title-edition))"/>
+				<xsl:text/>
 			</fo:inline>
-			<xsl:text> </xsl:text>			
-			<xsl:value-of select="java:toLowerCase(java:java.lang.String.new($title-edition))"/>
-			<xsl:text/>
-		</fo:inline>
+		</xsl:if>
 	</xsl:template>
 
 
@@ -1443,7 +1509,7 @@
 			
 			<fo:flow flow-name="xsl-region-body">
 				<fo:block id="{@id}" span="all">
-					<xsl:apply-templates select="bipm:title"/>
+					<xsl:apply-templates select="jcgm:title"/>
 				</fo:block>
 				<fo:block>
 					<xsl:apply-templates select="*[not(local-name() = 'title')]"/>
@@ -2511,7 +2577,9 @@
 				
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
 		
-	
+		
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+		
 	</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="definition-style">
@@ -2519,6 +2587,12 @@
 		
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		
+	</xsl:attribute-set><xsl:attribute-set name="add-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="del-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
 	</xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -3970,8 +4044,12 @@
 		<fo:inline text-decoration="underline">
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='add']">
+		<fo:inline xsl:use-attribute-sets="add-style">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
-		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
+		<fo:inline xsl:use-attribute-sets="del-style">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='hi']">
@@ -4585,22 +4663,37 @@
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'image']">
-		<fo:block xsl:use-attribute-sets="image-style">
-			
-			
-			<xsl:variable name="src">
-				<xsl:choose>
-					<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
-						<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="@src"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			
-			<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
-		</fo:block>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'title']">
+				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="image-style">
+					
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="image_src">
+		<xsl:choose>
+			<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
+				<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
+			</xsl:when>
+			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="@src"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><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>
@@ -5119,8 +5212,8 @@
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 			
 			<xsl:variable name="element">
-				block				
-				
+								
+				inline
 				<xsl:if test=".//*[local-name() = 'table']">block</xsl:if> 
 			</xsl:variable>
 			
@@ -5165,7 +5258,12 @@
 	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:variable name="element">
-			block
+			
+			
+				<xsl:choose>
+					<xsl:when test="$num = 1">inline</xsl:when>
+					<xsl:otherwise>block</xsl:otherwise>
+				</xsl:choose>
 			
 			
 		</xsl:variable>