metanorma-bipm 2.1.8.1 → 2.1.10

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

@@ -1065,16 +1065,18 @@
 											<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and not(@type = 'annex') and not(@type = 'index') and not(@parent = 'annex')]">
 												<xsl:call-template name="insertContentItem"/>
 											</xsl:for-each>
-											<xsl:if test="$doctype ='brochure'">
-												<!-- insert page break between main sections and appendixes in ToC -->
+											<!-- insert page break between main sections and appendixes in ToC -->
+											<!-- <xsl:if test="$doctype ='brochure'">
 												<fo:table-row>
 													<fo:table-cell number-columns-spanned="2">
 														<fo:block break-after="page"/>
 													</fo:table-cell>
 												</fo:table-row>
-											</xsl:if>
+											</xsl:if> -->
 											<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and (@type = 'annex')]"> <!--  or (@level = 2 and @parent = 'annex') -->
-												<xsl:call-template name="insertContentItem"/>
+												<xsl:call-template name="insertContentItem">
+													<xsl:with-param name="keep-with-next">true</xsl:with-param>
+												</xsl:call-template>
 											</xsl:for-each>
 											<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and (@type = 'index')]">
 												<xsl:call-template name="insertContentItem"/>
@@ -1191,10 +1193,10 @@
 
 							</fo:block>
 
-							<xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/>
-							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']">
+							<!-- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/> -->
+							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']">
 								<fo:block role="H2">
-									<xsl:if test="$part_num != ''">
+									<!-- <xsl:if test="$part_num != ''">
 										<xsl:call-template name="getLocalizedString">
 											<xsl:with-param name="key">Part.sg</xsl:with-param>
 											<xsl:with-param name="lang" select="$curr_lang"/>
@@ -1202,18 +1204,18 @@
 										<xsl:text> </xsl:text>
 										<xsl:value-of select="$part_num"/>
 									</xsl:if>
-									<xsl:text>: </xsl:text>
-									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']" mode="title"/>
+									<xsl:text>: </xsl:text> -->
+									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']" mode="title"/>
 								</fo:block>
 							</xsl:if>
-							<xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/>
-							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']">
+							<!-- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/> -->
+							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']">
 								<fo:block role="H3">
-									<xsl:if test="$subpart_num != ''">
+									<!-- <xsl:if test="$subpart_num != ''">
 										<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang=$curr_lang]),'#',$subpart_num)"/>
 									</xsl:if>
-									<xsl:text>: </xsl:text>
-									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']" mode="title"/>
+									<xsl:text>: </xsl:text> -->
+									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']" mode="title"/>
 								</fo:block>
 							</xsl:if>
 
@@ -1733,7 +1735,11 @@
 	</xsl:template>
 
 	<xsl:template name="insertContentItem">
+		<xsl:param name="keep-with-next"/>
 		<fo:table-row>
+			<xsl:if test="$keep-with-next = 'true'">
+				<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			</xsl:if>
 			<xsl:variable name="space-before">
 				<xsl:if test="@level = 1">
 					<xsl:if test="@type = 'annex'">14pt</xsl:if>
@@ -2224,6 +2230,14 @@
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="header">
+		<xsl:apply-templates select="."/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="header">
+		<xsl:apply-templates select="."/>
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -2747,6 +2761,10 @@
 				<xsl:attribute name="role">BlockQuote</xsl:attribute>
 			</xsl:if>
 
+			<xsl:if test="ancestor::bipm:preface">
+				<xsl:attribute name="space-after">6pt</xsl:attribute>
+			</xsl:if>
+
 			<!-- last item -->
 			<xsl:if test="not(following-sibling::*[1][local-name() = 'li'])">
 				<xsl:attribute name="space-after">6pt</xsl:attribute>
@@ -2909,16 +2927,18 @@
 	<xsl:template match="bipm:note[not(ancestor::bipm:preface)]/bipm:name" priority="2">
 		<xsl:choose>
 			<xsl:when test="not(../preceding-sibling::bipm:note) and not((../following-sibling::bipm:note))">
-				<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+				<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
 				<xsl:choose>
 					<xsl:when test="$curr_lang = 'fr'">
 						<xsl:choose>
-							<xsl:when test="ancestor::bipm:li">Remarque: </xsl:when>
-							<xsl:otherwise>Note: </xsl:otherwise>
+							<xsl:when test="ancestor::bipm:li">Remarque&#xa0;: </xsl:when>
+							<xsl:otherwise>Note&#xa0;: </xsl:otherwise>
 						</xsl:choose>
 					</xsl:when>
 					<xsl:otherwise>Note: </xsl:otherwise>
-				</xsl:choose>
+				</xsl:choose> -->
+				<xsl:apply-templates/>
+				<xsl:text> </xsl:text>
 			</xsl:when>
 			<xsl:when test="ancestor::bipm:table and count(ancestor::bipm:table//bipm:note) &gt; 0">
 				<xsl:variable name="table_id" select="ancestor::bipm:table/@id"/>
@@ -2928,11 +2948,30 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']" priority="3">
-		<fo:inline xsl:use-attribute-sets="note-p-style">
-			<xsl:apply-templates/>
-		</fo:inline>
-		<fo:inline><xsl:value-of select="$linebreak"/></fo:inline>
+		<xsl:variable name="num"><xsl:number/></xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
+				<fo:inline xsl:use-attribute-sets="note-p-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:when test="ancestor::*[local-name() = 'preface']">
+				<fo:block xsl:use-attribute-sets="note-p-style">
+					<xsl:attribute name="space-before">6pt</xsl:attribute>
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline xsl:use-attribute-sets="note-p-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+				<fo:inline><xsl:value-of select="$linebreak"/></fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'name']/text()" priority="2">
+		<xsl:value-of select="."/>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'sup_fn']">
@@ -4297,8 +4336,8 @@
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="text-align">left</xsl:attribute>
 			<xsl:attribute name="margin-top">24pt</xsl:attribute>
-			<xsl:attribute name="margin-left">25mm</xsl:attribute>
-			<xsl:attribute name="text-indent">-25mm</xsl:attribute>
+			<!-- <xsl:attribute name="margin-left">25mm</xsl:attribute>
+			<xsl:attribute name="text-indent">-25mm</xsl:attribute> -->
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-name-style -->
@@ -4462,6 +4501,7 @@
 	<xsl:attribute-set name="note-style">
 
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<xsl:attribute name="text-align">justify</xsl:attribute>
 
 	</xsl:attribute-set>
 
@@ -5571,25 +5611,38 @@
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
 
-					<fo:block xsl:use-attribute-sets="table-name-style">
+					<fo:list-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: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:attribute name="provisional-distance-between-starts">25mm</xsl:attribute>
 
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates/>
-							</xsl:otherwise>
-						</xsl:choose>
-
-					</fo:block>
+						<fo:list-item>
+							<fo:list-item-label end-indent="label-end()">
+								<fo:block>
+									<xsl:apply-templates select="./*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+								</fo:block>
+							</fo:list-item-label>
+							<fo:list-item-body start-indent="body-start()">
+								<fo:block>
+									<xsl:choose>
+										<xsl:when test="./*[local-name() = 'tab']">
+											<xsl:apply-templates select="./*[local-name() = 'tab'][1]/following-sibling::node()"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:apply-templates/>
+										</xsl:otherwise>
+									</xsl:choose>
+								</fo:block>
+							</fo:list-item-body>
+						</fo:list-item>
+					</fo:list-block>
+					<!-- bipm -->
 
 		</xsl:if>
 	</xsl:template> <!-- table/name -->
@@ -8680,7 +8733,12 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:text>:</xsl:text>
+						<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+						<xsl:choose>
+							<xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
+							<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
+						</xsl:choose> -->
+						<xsl:text> </xsl:text>
 
 				</xsl:otherwise>
 			</xsl:choose>
@@ -8700,7 +8758,12 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:text>:</xsl:text>
+						<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+						<xsl:choose>
+							<xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
+							<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
+						</xsl:choose> -->
+						<xsl:text> </xsl:text>
 
 				</xsl:otherwise>
 			</xsl:choose>
@@ -9709,6 +9772,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="contents_item">
 		<xsl:copy-of select="."/>
 	</xsl:template>
@@ -10653,7 +10728,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -11157,21 +11232,29 @@
 	</xsl:variable>
 
 	<xsl:template match="@*|node()" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="index_add_id"/>
+			<xsl:apply-templates select="@*|node()" mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:variable name="id">
-			<xsl:call-template name="generateIndexXrefId"/>
+			<xsl:call-template name="generateIndexXrefId">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:call-template>
 		</xsl:variable>
 		<xsl:copy> <!-- add id to xref -->
 			<xsl:apply-templates select="@*" mode="index_add_id"/>
 			<xsl:attribute name="id">
 				<xsl:value-of select="$id"/>
 			</xsl:attribute>
-			<xsl:apply-templates mode="index_add_id"/>
+			<xsl:apply-templates mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 		<!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
 		<xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
@@ -11183,7 +11266,9 @@
 				<xsl:attribute name="id">
 					<xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
 				</xsl:attribute>
-				<xsl:apply-templates mode="index_add_id"/>
+				<xsl:apply-templates mode="index_add_id">
+					<xsl:with-param name="docid" select="$docid"/>
+				</xsl:apply-templates>
 			</xsl:copy>
 		</xsl:if>
 	</xsl:template>
@@ -11220,12 +11305,33 @@
 			</xsl:when>
 			<xsl:when test="self::* and local-name(.) = 'xref'">
 				<xsl:variable name="id" select="@id"/>
-				<xsl:variable name="page" select="$index//item[@id = $id]"/>
-				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
 
+				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
 				<xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
+
+				<xsl:variable name="pages_">
+					<xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
+						<xsl:choose>
+							<xsl:when test="@id = $id">
+								<page><xsl:value-of select="."/></page>
+							</xsl:when>
+							<xsl:when test="@id = $id_next">
+								<page_next><xsl:value-of select="."/></page_next>
+							</xsl:when>
+							<xsl:when test="@id = $id_prev">
+								<page_prev><xsl:value-of select="."/></page_prev>
+							</xsl:when>
+						</xsl:choose>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="pages" select="xalan:nodeset($pages_)"/>
+
+				<!-- <xsl:variable name="page" select="$index/index/item[@id = $id]"/> -->
+				<xsl:variable name="page" select="$pages/page"/>
+				<!-- <xsl:variable name="page_next" select="$index/index/item[@id = $id_next]"/> -->
+				<xsl:variable name="page_next" select="$pages/page_next"/>
+				<!-- <xsl:variable name="page_prev" select="$index/index/item[@id = $id_prev]"/> -->
+				<xsl:variable name="page_prev" select="$pages/page_prev"/>
 
 				<xsl:choose>
 					<!-- 2nd pass -->
@@ -11285,16 +11391,20 @@
 	</xsl:template>
 
 	<xsl:template name="generateIndexXrefId">
+		<xsl:param name="docid"/>
+
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 
-		<xsl:variable name="docid">
-			<xsl:call-template name="getDocumentId"/>
+		<xsl:variable name="docid_curr">
+			<xsl:value-of select="$docid"/>
+			<xsl:if test="normalize-space($docid) = ''"><xsl:call-template name="getDocumentId"/></xsl:if>
 		</xsl:variable>
+
 		<xsl:variable name="item_number">
 			<xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
 		</xsl:variable>
 		<xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
-		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
+		<xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">

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

@@ -19,3 +19,7 @@ norm_with_refs_pref:
 all_rights_reserved: All rights reserved
 table_of_contents: Contents
 source: Adapted from
+note: "Note:"
+prefacenote: "NOTE:"
+listnote: "Note:"
+termnote: "Note % to entry"

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

@@ -42,3 +42,7 @@ norm_with_refs_pref:
 all_rights_reserved: Tous droits réservés
 table_of_contents: Table des matières
 source: Adapté de
+note: "Note:"
+prefacenote: "NOTE:"
+listnote: "Remarque:"
+termnote: "Note % à l’article:"

data/lib/isodoc/bipm/init.rb

@@ -6,8 +6,8 @@ require_relative "i18n"
 module IsoDoc
   module BIPM
     module Init
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
+      def metadata_init(lang, script, locale, labels)
+        @meta = Metadata.new(lang, script, locale, labels)
       end
 
       def xref_init(lang, script, _klass, labels, options)
@@ -15,8 +15,9 @@ module IsoDoc
         @xrefs = Xref.new(lang, script, html, labels, options)
       end
 
-      def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
+      def i18n_init(lang, script, locale, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, locale: locale,
+                                       i18nyaml: i18nyaml || @i18nyaml)
       end
 
       def omit_docid_prefix(prefix)

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

@@ -7602,6 +7602,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="contents_item">
 		<xsl:copy-of select="."/>
 	</xsl:template>
@@ -8562,7 +8574,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -9062,21 +9074,29 @@
 	</xsl:variable>
 
 	<xsl:template match="@*|node()" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="index_add_id"/>
+			<xsl:apply-templates select="@*|node()" mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:variable name="id">
-			<xsl:call-template name="generateIndexXrefId"/>
+			<xsl:call-template name="generateIndexXrefId">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:call-template>
 		</xsl:variable>
 		<xsl:copy> <!-- add id to xref -->
 			<xsl:apply-templates select="@*" mode="index_add_id"/>
 			<xsl:attribute name="id">
 				<xsl:value-of select="$id"/>
 			</xsl:attribute>
-			<xsl:apply-templates mode="index_add_id"/>
+			<xsl:apply-templates mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 		<!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
 		<xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
@@ -9088,7 +9108,9 @@
 				<xsl:attribute name="id">
 					<xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
 				</xsl:attribute>
-				<xsl:apply-templates mode="index_add_id"/>
+				<xsl:apply-templates mode="index_add_id">
+					<xsl:with-param name="docid" select="$docid"/>
+				</xsl:apply-templates>
 			</xsl:copy>
 		</xsl:if>
 	</xsl:template>
@@ -9125,12 +9147,33 @@
 			</xsl:when>
 			<xsl:when test="self::* and local-name(.) = 'xref'">
 				<xsl:variable name="id" select="@id"/>
-				<xsl:variable name="page" select="$index//item[@id = $id]"/>
-				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
 
+				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
 				<xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
+
+				<xsl:variable name="pages_">
+					<xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
+						<xsl:choose>
+							<xsl:when test="@id = $id">
+								<page><xsl:value-of select="."/></page>
+							</xsl:when>
+							<xsl:when test="@id = $id_next">
+								<page_next><xsl:value-of select="."/></page_next>
+							</xsl:when>
+							<xsl:when test="@id = $id_prev">
+								<page_prev><xsl:value-of select="."/></page_prev>
+							</xsl:when>
+						</xsl:choose>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="pages" select="xalan:nodeset($pages_)"/>
+
+				<!-- <xsl:variable name="page" select="$index/index/item[@id = $id]"/> -->
+				<xsl:variable name="page" select="$pages/page"/>
+				<!-- <xsl:variable name="page_next" select="$index/index/item[@id = $id_next]"/> -->
+				<xsl:variable name="page_next" select="$pages/page_next"/>
+				<!-- <xsl:variable name="page_prev" select="$index/index/item[@id = $id_prev]"/> -->
+				<xsl:variable name="page_prev" select="$pages/page_prev"/>
 
 				<xsl:choose>
 					<!-- 2nd pass -->
@@ -9190,16 +9233,20 @@
 	</xsl:template>
 
 	<xsl:template name="generateIndexXrefId">
+		<xsl:param name="docid"/>
+
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 
-		<xsl:variable name="docid">
-			<xsl:call-template name="getDocumentId"/>
+		<xsl:variable name="docid_curr">
+			<xsl:value-of select="$docid"/>
+			<xsl:if test="normalize-space($docid) = ''"><xsl:call-template name="getDocumentId"/></xsl:if>
 		</xsl:variable>
+
 		<xsl:variable name="item_number">
 			<xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
 		</xsl:variable>
 		<xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
-		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
+		<xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">

data/lib/isodoc/bipm/metadata.rb

@@ -11,7 +11,7 @@ module IsoDoc
                      K_k kg_h_c_deltanu kg_h m_c_deltanu m_c mol_NA
                      s_deltanu).freeze
 
-      def initialize(lang, script, labels)
+      def initialize(lang, script, locale, labels)
         super
         here = File.join(File.dirname(__FILE__), "html", "si-aspect")
         si_paths = []
@@ -26,14 +26,14 @@ module IsoDoc
 
       def title(isoxml, _out)
         lang1, lang2 = @lang == "fr" ? %w(fr en) : %w(en fr)
-        set(:doctitle, @c.encode(isoxml&.at(
+        set(:doctitle, @c.encode(isoxml.at(
           ns("#{TITLE}[@type='main'][@language='#{lang1}']"))&.text || ""))
-        set(:docsubtitle, @c.encode(isoxml&.at(
+        set(:docsubtitle, @c.encode(isoxml.at(
           ns("#{TITLE}[@type='main'][@language='#{lang2}']"))&.text || ""))
         %w(appendix annex part subtitle provenance).each do |e|
-          set("#{e}title".to_sym, @c.encode(isoxml&.at(
+          set("#{e}title".to_sym, @c.encode(isoxml.at(
             ns("#{TITLE}[@type='#{e}'][@language='#{lang1}']"))&.text || ""))
-          set("#{e}subtitle".to_sym, @c.encode(isoxml&.at(
+          set("#{e}subtitle".to_sym, @c.encode(isoxml.at(
             ns("#{TITLE}[@type='#{e}'][@language='#{lang2}']"))&.text || ""))
         end
       end
@@ -51,16 +51,16 @@ module IsoDoc
         super
         label1, label2 = @lang == "fr" ? %w(Annexe Appendix) : %w(Appendix Annexe)
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/appendix"))
-        dn and set(:appendixid, @i18n.l10n("#{label1} #{dn&.text}"))
-        dn and set(:appendixid_alt, @i18n.l10n("#{label2} #{dn&.text}"))
+        dn and set(:appendixid, @i18n.l10n("#{label1} #{dn.text}"))
+        dn and set(:appendixid_alt, @i18n.l10n("#{label2} #{dn.text}"))
         label1, label2 = @lang == "fr" ? %w(Appendice Annex) : %w(Annex Appendice)
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
-        dn and set(:annexid, @i18n.l10n("#{label1} #{dn&.text}"))
-        dn and set(:annexid_alt, @i18n.l10n("#{label2} #{dn&.text}"))
+        dn and set(:annexid, @i18n.l10n("#{label1} #{dn.text}"))
+        dn and set(:annexid_alt, @i18n.l10n("#{label2} #{dn.text}"))
         label1, label2  = @lang == "fr" ? %w(Partie Part) : %w(Part Partie)
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/part"))
-        dn and set(:partid, @i18n.l10n("#{label1} #{dn&.text}"))
-        dn and set(:partid_alt, @i18n.l10n("#{label2} #{dn&.text}"))
+        dn and set(:partid, @i18n.l10n("#{label1} #{dn.text}"))
+        dn and set(:partid_alt, @i18n.l10n("#{label2} #{dn.text}"))
         set(:org_abbrev,
             isoxml.at(ns("//bibdata/ext/editorialgroup/committee"\
                          "[@acronym = 'JCGM']")) ? "JCGM" : "BIPM")