metanorma-bipm 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be68aaa802943c019afdfd6279a33269e9de8e9c2a9ece29a311e08e6c465355
-  data.tar.gz: 96b2dc9464927ae543c7a4ce10a705b14647ca79db313ff503e6856c1ce788b4
+  metadata.gz: c0b4698a24ef97618afbec45c35c528cadb9552b49d1dcd89bd15ad7c8a6876a
+  data.tar.gz: 96c9a111515b7df05186ffae09bcf19c5409929ea13809499ec583a3e97da0cd
 SHA512:
-  metadata.gz: de26de8eb2254291733038b0598e7dade4f27378ff1285a42d5957c95d14d02202df44ebfcb7a0072eb2760985a6d1c4c0d3feb860aa218f6eb34a0737a4dbf7
-  data.tar.gz: 447a238c927f5a14a655acbc0c52a4f33c3db5513eddf208ac6c564a6429786e62c53308e4adf0de5e15a0c26dfda28d29c9f855355dbe9bc1f6f7b98403787e
+  metadata.gz: 7d76e1b157bbe5c6fbff33ac87424c239965e9c1fa6ea6649a2dd5098b72460c988b92235ed0149400996c6d4a339409cdda396f271a7f08a0d8a00b9b689395
+  data.tar.gz: 995c9cb871a5b5ca91d00f370d1d6bc0ff0c7040c8362300bfd77c52978e9a479edf5deb242b837d21f2755be6cf6980110fd5c87b39c0d161dbe1c7b70a6c6e

data/lib/asciidoctor/bipm/bipm.rng

@@ -340,6 +340,9 @@
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -355,6 +358,9 @@
       <optional>
         <ref name="bibliography"/>
       </optional>
+      <zeroOrMore>
+        <ref name="indexsect"/>
+      </zeroOrMore>
     </element>
   </define>
 </grammar>

data/lib/asciidoctor/bipm/isodoc.rng

@@ -919,6 +919,9 @@
         </choice>
       </attribute>
       <ref name="bibdata"/>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -929,11 +932,21 @@
       <zeroOrMore>
         <ref name="annex"/>
       </zeroOrMore>
+      <optional>
+        <ref name="bibliography"/>
+      </optional>
       <zeroOrMore>
-        <ref name="references"/>
+        <ref name="indexsect"/>
       </zeroOrMore>
     </element>
   </define>
+  <define name="misccontainer">
+    <element name="misc-container">
+      <oneOrMore>
+        <ref name="AnyElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="preface">
     <element name="preface">
       <oneOrMore>
@@ -957,6 +970,11 @@
       <ref name="Content-Section"/>
     </element>
   </define>
+  <define name="indexsect">
+    <element name="indexsect">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="boilerplate">
     <element name="boilerplate">
       <optional>

data/lib/isodoc/bipm/bipm.brochure.xsl

@@ -114,7 +114,8 @@
 
 						<!-- add id to xref and split xref with @to into two xref -->
 						<xsl:variable name="current_document_index_id">
-							<xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/>
+							<!-- <xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/> -->
+							<xsl:apply-templates select=".//bipm:indexsect" mode="index_add_id"/>
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index">
@@ -145,7 +146,8 @@
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index_id">
-							<xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/>
+							<!-- <xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/> -->
+							<xsl:apply-templates select=".//bipm:indexsect" mode="index_add_id"/>
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index">
@@ -200,7 +202,8 @@
 			<xsl:apply-templates select="/*/bipm:bibliography/bipm:references[not(@normative='true')]" mode="contents"/> 
 			
 			<!-- Index -->
-			<xsl:apply-templates select="//bipm:clause[@type = 'index']" mode="contents"/>
+			<!-- <xsl:apply-templates select="//bipm:clause[@type = 'index']" mode="contents"/> -->
+			<xsl:apply-templates select="//bipm:indexsect" mode="contents"/>
 			
 		</contents>
 	</xsl:template>
@@ -836,7 +839,8 @@
 		</xsl:choose>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']" mode="flatxml"/>
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="flatxml"/> -->
+	<xsl:template match="bipm:indexsect" mode="flatxml"/>
 	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="flatxml">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="flatxml_index"/>
@@ -1089,7 +1093,8 @@
 				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				
 				<!-- 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:clause[@type = 'index']" mode="index" /> -->
+				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"/>
 				
 				<!-- End Document Pages -->
 				
@@ -1253,7 +1258,8 @@
 				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				
 				<!-- 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:clause[@type = 'index']" mode="index" /> -->
+				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"/>
 				
 			</xsl:otherwise>
 		</xsl:choose>
@@ -1920,6 +1926,7 @@
 			<xsl:variable name="type">
 				<xsl:choose>
 					<xsl:when test="@type = 'index'">index</xsl:when>
+					<xsl:when test="local-name() = 'indexsect'">index</xsl:when>
 					<xsl:otherwise><xsl:value-of select="local-name()"/></xsl:otherwise>
 				</xsl:choose>
 			</xsl:variable>
@@ -3545,14 +3552,16 @@
 		</xsl:copy>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li" mode="index_update">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li" mode="index_update"> -->
+	<xsl:template match="bipm:indexsect//bipm:li" mode="index_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="index_update"/>
 		<xsl:apply-templates select="node()[1]" mode="process_li_element"/>
 		</xsl:copy>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li/node()" mode="process_li_element" priority="2">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li/node()" mode="process_li_element" priority="2"> -->
+	<xsl:template match="bipm:indexsect//bipm:li/node()" mode="process_li_element" priority="2">
 		<xsl:param name="element"/>
 		<xsl:param name="remove" select="'false'"/>
 		<xsl:param name="target"/>
@@ -3644,14 +3653,17 @@
 			<xsl:call-template name="getDocumentId"/>
 		</xsl:variable>
 		<xsl:variable name="item_number">
-			<xsl:number count="bipm:li[ancestor::bipm:clause[@type = 'index']]" level="any"/>
+			<!-- <xsl:number count="bipm:li[ancestor::bipm:clause[@type = 'index']]" level="any" /> -->
+			<xsl:number count="bipm:li[ancestor::bipm:indexsect]" level="any"/>
 		</xsl:variable>
 		<xsl:variable name="xref_number"><xsl:number count="bipm:xref"/></xsl:variable>
 		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']"/>
-	<xsl:template match="bipm:clause[@type = 'index']" mode="index">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" /> -->
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="index"> -->
+	<xsl:template match="bipm:indexsect"/>
+	<xsl:template match="bipm:indexsect" mode="index">
 	
 		<fo:page-sequence master-reference="index" force-page-count="no-force">
 			<xsl:variable name="header-title">
@@ -3696,14 +3708,16 @@
 		</fo:page-sequence>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:title" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:title" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:title" priority="4">
 		<fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt" margin-left="-18mm">
 			<!-- Index -->
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:clause" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:clause" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:clause" priority="4">
 		<xsl:apply-templates/>
 		<fo:block>
 		<xsl:if test="following-sibling::bipm:clause">
@@ -3712,18 +3726,21 @@
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:clause/bipm:title" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:clause/bipm:title" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:clause/bipm:title" priority="4">
 		<!-- Letter A, B, C, ... -->
 		<fo:block font-size="10pt" font-weight="bold" margin-bottom="3pt" keep-with-next="always">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:ul" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:ul" priority="4"> -->
+	<xsl:template match="bipm:indexsect//bipm:ul" priority="4">
 		<xsl:apply-templates/>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li" priority="4"> -->
+	<xsl:template match="bipm:indexsect//bipm:li" priority="4">
 		<xsl:variable name="level" select="count(ancestor::bipm:ul)"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
 			<xsl:apply-templates/>

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

@@ -114,7 +114,8 @@
 
 						<!-- add id to xref and split xref with @to into two xref -->
 						<xsl:variable name="current_document_index_id">
-							<xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/>
+							<!-- <xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/> -->
+							<xsl:apply-templates select=".//bipm:indexsect" mode="index_add_id"/>
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index">
@@ -145,7 +146,8 @@
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index_id">
-							<xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/>
+							<!-- <xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/> -->
+							<xsl:apply-templates select=".//bipm:indexsect" mode="index_add_id"/>
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index">
@@ -200,7 +202,8 @@
 			<xsl:apply-templates select="/*/bipm:bibliography/bipm:references[not(@normative='true')]" mode="contents"/> 
 			
 			<!-- Index -->
-			<xsl:apply-templates select="//bipm:clause[@type = 'index']" mode="contents"/>
+			<!-- <xsl:apply-templates select="//bipm:clause[@type = 'index']" mode="contents"/> -->
+			<xsl:apply-templates select="//bipm:indexsect" mode="contents"/>
 			
 		</contents>
 	</xsl:template>
@@ -836,7 +839,8 @@
 		</xsl:choose>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']" mode="flatxml"/>
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="flatxml"/> -->
+	<xsl:template match="bipm:indexsect" mode="flatxml"/>
 	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="flatxml">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="flatxml_index"/>
@@ -1089,7 +1093,8 @@
 				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				
 				<!-- 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:clause[@type = 'index']" mode="index" /> -->
+				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"/>
 				
 				<!-- End Document Pages -->
 				
@@ -1253,7 +1258,8 @@
 				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				
 				<!-- 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:clause[@type = 'index']" mode="index" /> -->
+				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"/>
 				
 			</xsl:otherwise>
 		</xsl:choose>
@@ -1920,6 +1926,7 @@
 			<xsl:variable name="type">
 				<xsl:choose>
 					<xsl:when test="@type = 'index'">index</xsl:when>
+					<xsl:when test="local-name() = 'indexsect'">index</xsl:when>
 					<xsl:otherwise><xsl:value-of select="local-name()"/></xsl:otherwise>
 				</xsl:choose>
 			</xsl:variable>
@@ -3545,14 +3552,16 @@
 		</xsl:copy>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li" mode="index_update">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li" mode="index_update"> -->
+	<xsl:template match="bipm:indexsect//bipm:li" mode="index_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="index_update"/>
 		<xsl:apply-templates select="node()[1]" mode="process_li_element"/>
 		</xsl:copy>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li/node()" mode="process_li_element" priority="2">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li/node()" mode="process_li_element" priority="2"> -->
+	<xsl:template match="bipm:indexsect//bipm:li/node()" mode="process_li_element" priority="2">
 		<xsl:param name="element"/>
 		<xsl:param name="remove" select="'false'"/>
 		<xsl:param name="target"/>
@@ -3644,14 +3653,17 @@
 			<xsl:call-template name="getDocumentId"/>
 		</xsl:variable>
 		<xsl:variable name="item_number">
-			<xsl:number count="bipm:li[ancestor::bipm:clause[@type = 'index']]" level="any"/>
+			<!-- <xsl:number count="bipm:li[ancestor::bipm:clause[@type = 'index']]" level="any" /> -->
+			<xsl:number count="bipm:li[ancestor::bipm:indexsect]" level="any"/>
 		</xsl:variable>
 		<xsl:variable name="xref_number"><xsl:number count="bipm:xref"/></xsl:variable>
 		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']"/>
-	<xsl:template match="bipm:clause[@type = 'index']" mode="index">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" /> -->
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="index"> -->
+	<xsl:template match="bipm:indexsect"/>
+	<xsl:template match="bipm:indexsect" mode="index">
 	
 		<fo:page-sequence master-reference="index" force-page-count="no-force">
 			<xsl:variable name="header-title">
@@ -3696,14 +3708,16 @@
 		</fo:page-sequence>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:title" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:title" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:title" priority="4">
 		<fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt" margin-left="-18mm">
 			<!-- Index -->
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:clause" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:clause" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:clause" priority="4">
 		<xsl:apply-templates/>
 		<fo:block>
 		<xsl:if test="following-sibling::bipm:clause">
@@ -3712,18 +3726,21 @@
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:clause/bipm:title" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:clause/bipm:title" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:clause/bipm:title" priority="4">
 		<!-- Letter A, B, C, ... -->
 		<fo:block font-size="10pt" font-weight="bold" margin-bottom="3pt" keep-with-next="always">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:ul" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:ul" priority="4"> -->
+	<xsl:template match="bipm:indexsect//bipm:ul" priority="4">
 		<xsl:apply-templates/>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li" priority="4"> -->
+	<xsl:template match="bipm:indexsect//bipm:li" priority="4">
 		<xsl:variable name="level" select="count(ancestor::bipm:ul)"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
 			<xsl:apply-templates/>

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

@@ -114,7 +114,8 @@
 
 						<!-- add id to xref and split xref with @to into two xref -->
 						<xsl:variable name="current_document_index_id">
-							<xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/>
+							<!-- <xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/> -->
+							<xsl:apply-templates select=".//bipm:indexsect" mode="index_add_id"/>
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index">
@@ -145,7 +146,8 @@
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index_id">
-							<xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/>
+							<!-- <xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/> -->
+							<xsl:apply-templates select=".//bipm:indexsect" mode="index_add_id"/>
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index">
@@ -200,7 +202,8 @@
 			<xsl:apply-templates select="/*/bipm:bibliography/bipm:references[not(@normative='true')]" mode="contents"/> 
 			
 			<!-- Index -->
-			<xsl:apply-templates select="//bipm:clause[@type = 'index']" mode="contents"/>
+			<!-- <xsl:apply-templates select="//bipm:clause[@type = 'index']" mode="contents"/> -->
+			<xsl:apply-templates select="//bipm:indexsect" mode="contents"/>
 			
 		</contents>
 	</xsl:template>
@@ -836,7 +839,8 @@
 		</xsl:choose>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']" mode="flatxml"/>
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="flatxml"/> -->
+	<xsl:template match="bipm:indexsect" mode="flatxml"/>
 	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="flatxml">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="flatxml_index"/>
@@ -1089,7 +1093,8 @@
 				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				
 				<!-- 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:clause[@type = 'index']" mode="index" /> -->
+				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"/>
 				
 				<!-- End Document Pages -->
 				
@@ -1253,7 +1258,8 @@
 				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				
 				<!-- 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:clause[@type = 'index']" mode="index" /> -->
+				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"/>
 				
 			</xsl:otherwise>
 		</xsl:choose>
@@ -1920,6 +1926,7 @@
 			<xsl:variable name="type">
 				<xsl:choose>
 					<xsl:when test="@type = 'index'">index</xsl:when>
+					<xsl:when test="local-name() = 'indexsect'">index</xsl:when>
 					<xsl:otherwise><xsl:value-of select="local-name()"/></xsl:otherwise>
 				</xsl:choose>
 			</xsl:variable>
@@ -3545,14 +3552,16 @@
 		</xsl:copy>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li" mode="index_update">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li" mode="index_update"> -->
+	<xsl:template match="bipm:indexsect//bipm:li" mode="index_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="index_update"/>
 		<xsl:apply-templates select="node()[1]" mode="process_li_element"/>
 		</xsl:copy>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li/node()" mode="process_li_element" priority="2">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li/node()" mode="process_li_element" priority="2"> -->
+	<xsl:template match="bipm:indexsect//bipm:li/node()" mode="process_li_element" priority="2">
 		<xsl:param name="element"/>
 		<xsl:param name="remove" select="'false'"/>
 		<xsl:param name="target"/>
@@ -3644,14 +3653,17 @@
 			<xsl:call-template name="getDocumentId"/>
 		</xsl:variable>
 		<xsl:variable name="item_number">
-			<xsl:number count="bipm:li[ancestor::bipm:clause[@type = 'index']]" level="any"/>
+			<!-- <xsl:number count="bipm:li[ancestor::bipm:clause[@type = 'index']]" level="any" /> -->
+			<xsl:number count="bipm:li[ancestor::bipm:indexsect]" level="any"/>
 		</xsl:variable>
 		<xsl:variable name="xref_number"><xsl:number count="bipm:xref"/></xsl:variable>
 		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']"/>
-	<xsl:template match="bipm:clause[@type = 'index']" mode="index">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" /> -->
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="index"> -->
+	<xsl:template match="bipm:indexsect"/>
+	<xsl:template match="bipm:indexsect" mode="index">
 	
 		<fo:page-sequence master-reference="index" force-page-count="no-force">
 			<xsl:variable name="header-title">
@@ -3696,14 +3708,16 @@
 		</fo:page-sequence>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:title" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:title" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:title" priority="4">
 		<fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt" margin-left="-18mm">
 			<!-- Index -->
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:clause" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:clause" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:clause" priority="4">
 		<xsl:apply-templates/>
 		<fo:block>
 		<xsl:if test="following-sibling::bipm:clause">
@@ -3712,18 +3726,21 @@
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:clause/bipm:title" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:clause/bipm:title" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:clause/bipm:title" priority="4">
 		<!-- Letter A, B, C, ... -->
 		<fo:block font-size="10pt" font-weight="bold" margin-bottom="3pt" keep-with-next="always">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:ul" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:ul" priority="4"> -->
+	<xsl:template match="bipm:indexsect//bipm:ul" priority="4">
 		<xsl:apply-templates/>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li" priority="4"> -->
+	<xsl:template match="bipm:indexsect//bipm:li" priority="4">
 		<xsl:variable name="level" select="count(ancestor::bipm:ul)"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
 			<xsl:apply-templates/>

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

@@ -114,7 +114,8 @@
 
 						<!-- add id to xref and split xref with @to into two xref -->
 						<xsl:variable name="current_document_index_id">
-							<xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/>
+							<!-- <xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/> -->
+							<xsl:apply-templates select=".//bipm:indexsect" mode="index_add_id"/>
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index">
@@ -145,7 +146,8 @@
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index_id">
-							<xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/>
+							<!-- <xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/> -->
+							<xsl:apply-templates select=".//bipm:indexsect" mode="index_add_id"/>
 						</xsl:variable>
 						
 						<xsl:variable name="current_document_index">
@@ -200,7 +202,8 @@
 			<xsl:apply-templates select="/*/bipm:bibliography/bipm:references[not(@normative='true')]" mode="contents"/> 
 			
 			<!-- Index -->
-			<xsl:apply-templates select="//bipm:clause[@type = 'index']" mode="contents"/>
+			<!-- <xsl:apply-templates select="//bipm:clause[@type = 'index']" mode="contents"/> -->
+			<xsl:apply-templates select="//bipm:indexsect" mode="contents"/>
 			
 		</contents>
 	</xsl:template>
@@ -836,7 +839,8 @@
 		</xsl:choose>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']" mode="flatxml"/>
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="flatxml"/> -->
+	<xsl:template match="bipm:indexsect" mode="flatxml"/>
 	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="flatxml">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="flatxml_index"/>
@@ -1089,7 +1093,8 @@
 				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				
 				<!-- 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:clause[@type = 'index']" mode="index" /> -->
+				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"/>
 				
 				<!-- End Document Pages -->
 				
@@ -1253,7 +1258,8 @@
 				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				
 				<!-- 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:clause[@type = 'index']" mode="index" /> -->
+				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"/>
 				
 			</xsl:otherwise>
 		</xsl:choose>
@@ -1920,6 +1926,7 @@
 			<xsl:variable name="type">
 				<xsl:choose>
 					<xsl:when test="@type = 'index'">index</xsl:when>
+					<xsl:when test="local-name() = 'indexsect'">index</xsl:when>
 					<xsl:otherwise><xsl:value-of select="local-name()"/></xsl:otherwise>
 				</xsl:choose>
 			</xsl:variable>
@@ -3545,14 +3552,16 @@
 		</xsl:copy>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li" mode="index_update">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li" mode="index_update"> -->
+	<xsl:template match="bipm:indexsect//bipm:li" mode="index_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="index_update"/>
 		<xsl:apply-templates select="node()[1]" mode="process_li_element"/>
 		</xsl:copy>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li/node()" mode="process_li_element" priority="2">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li/node()" mode="process_li_element" priority="2"> -->
+	<xsl:template match="bipm:indexsect//bipm:li/node()" mode="process_li_element" priority="2">
 		<xsl:param name="element"/>
 		<xsl:param name="remove" select="'false'"/>
 		<xsl:param name="target"/>
@@ -3644,14 +3653,17 @@
 			<xsl:call-template name="getDocumentId"/>
 		</xsl:variable>
 		<xsl:variable name="item_number">
-			<xsl:number count="bipm:li[ancestor::bipm:clause[@type = 'index']]" level="any"/>
+			<!-- <xsl:number count="bipm:li[ancestor::bipm:clause[@type = 'index']]" level="any" /> -->
+			<xsl:number count="bipm:li[ancestor::bipm:indexsect]" level="any"/>
 		</xsl:variable>
 		<xsl:variable name="xref_number"><xsl:number count="bipm:xref"/></xsl:variable>
 		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']"/>
-	<xsl:template match="bipm:clause[@type = 'index']" mode="index">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" /> -->
+	<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="index"> -->
+	<xsl:template match="bipm:indexsect"/>
+	<xsl:template match="bipm:indexsect" mode="index">
 	
 		<fo:page-sequence master-reference="index" force-page-count="no-force">
 			<xsl:variable name="header-title">
@@ -3696,14 +3708,16 @@
 		</fo:page-sequence>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:title" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:title" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:title" priority="4">
 		<fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt" margin-left="-18mm">
 			<!-- Index -->
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:clause" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:clause" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:clause" priority="4">
 		<xsl:apply-templates/>
 		<fo:block>
 		<xsl:if test="following-sibling::bipm:clause">
@@ -3712,18 +3726,21 @@
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']/bipm:clause/bipm:title" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:clause/bipm:title" priority="4"> -->
+	<xsl:template match="bipm:indexsect/bipm:clause/bipm:title" priority="4">
 		<!-- Letter A, B, C, ... -->
 		<fo:block font-size="10pt" font-weight="bold" margin-bottom="3pt" keep-with-next="always">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:ul" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:ul" priority="4"> -->
+	<xsl:template match="bipm:indexsect//bipm:ul" priority="4">
 		<xsl:apply-templates/>
 	</xsl:template>
 	
-	<xsl:template match="bipm:clause[@type = 'index']//bipm:li" priority="4">
+	<!-- <xsl:template match="bipm:clause[@type = 'index']//bipm:li" priority="4"> -->
+	<xsl:template match="bipm:indexsect//bipm:li" priority="4">
 		<xsl:variable name="level" select="count(ancestor::bipm:ul)"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
 			<xsl:apply-templates/>

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

@@ -3,7 +3,7 @@
 </div>
 
 <div class="document-type-band" id="{{ doctype | downcase | replace: ' ', '-' }}-band">
-    <p class="document-type">BIPM {{ doctype_display }}</p>
+  <p class="document-type">{{org_abbrev}} {{ doctype_display }}</p>
 </div>
 
 
@@ -82,7 +82,7 @@
 
   <div class="WordSection11">
   <div class="coverpage-stage-block" >
-    <span class="coverpage-stage" id="{{ doctype | replace: ' ', '-' | downcase }}">BIPM {{ doctype_display }}</span>
+    <span class="coverpage-stage" id="{{ doctype | replace: ' ', '-' | downcase }}">{{org_abbrev}} {{ doctype_display }}</span>
   </div>
 
   <div class="coverpage-stage-block" >

data/lib/isodoc/bipm/index.rb

@@ -9,8 +9,12 @@ module IsoDoc
       end
 
       def index(docxml)
-        return unless docxml.at(ns("//index"))
-        i = docxml.root.add_child "<clause type='index' #{add_id}><title>#{@i18n.index}</title></clause>"
+        unless docxml.at(ns("//index"))
+          docxml.xpath(ns("//indexsect")).each { |i| i.remove }
+          return
+        end
+        i = docxml.at(ns("//indexsect")) ||
+          docxml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}</title></indexsect>").first
         index = sort_indexterms(docxml.xpath(ns("//index")), docxml.xpath(ns("//index-xref[@also = 'false']")),
                                 docxml.xpath(ns("//index-xref[@also = 'true']")))
         index1(docxml, i, index)
@@ -18,7 +22,7 @@ module IsoDoc
 
       def index1(docxml, i, index)
         index.keys.sort.each do |k|
-          c = i.first.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
+          c = i.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
           words = index[k].keys.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
           words.keys.localize(@lang.to_sym).sort.to_a.each do |w|
             c.first.at(ns("./ul")).add_child index_entries(words, index[k], w)

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

@@ -1137,6 +1137,7 @@
 						<!-- skip 0 section without subsections -->
 						<xsl:when test="@level = 2"><xsl:value-of select="$margin-left * 1.6"/>mm</xsl:when>
 						<xsl:when test="@level &gt;= 3"><xsl:value-of select="$margin-left * 1.8"/>mm</xsl:when>
+						<xsl:when test="@level = 1 and @type = 'annex' and @section != ''"><xsl:value-of select="$margin-left + string-length(@section) * 1.7"/>mm</xsl:when>
 						<xsl:when test="@section != ''"><xsl:value-of select="$margin-left"/>mm</xsl:when>
 						<xsl:otherwise>0mm</xsl:otherwise>
 					</xsl:choose>

data/lib/isodoc/bipm/metadata.rb

@@ -59,6 +59,8 @@ module IsoDoc
         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}"))
+        set(:org_abbrev, 
+            isoxml.at(ns("//bibdata/ext/editorialgroup/committee[@acronym = 'JCGM']")) ? "JCGM" : "BIPM")
       end
 
       def extract_person_names_affiliations(authors)

data/lib/isodoc/bipm/xref.rb

@@ -9,19 +9,30 @@ module IsoDoc
       end
 
       def clause_names(docxml, sect_num)
+        if docxml&.at(ns("//bibdata/ext/editorialgroup/committee/@acronym"))&.value == "JCGM"
+          clause_names_jcgm(docxml, sect_num)
+        else
+          clause_names_bipm(docxml, sect_num)
+        end
+      end
+
+      def clause_names_jcgm(docxml, sect_num)
+        docxml.xpath(ns("//clause[parent::sections][not(@type = 'scope')][not(descendant::terms)]")).
+          each_with_index do |c, i|
+          section_names(c, sect_num, 1)
+        end
+      end
+
+      def clause_names_bipm(docxml, sect_num)
         n = Counter.new
         docxml.xpath(ns("//sections/clause[not(@unnumbered = 'true')] | "\
                         "//sections/terms[not(@unnumbered = 'true')] | "\
                         "//sections/definitions[not(@unnumbered = 'true')]")).
-        each do |c|
-          section_names(c, n, 1)
-        end
+        each { |c| section_names(c, n, 1) }
         docxml.xpath(ns("//sections/clause[@unnumbered = 'true'] | "\
                         "//sections/terms[@unnumbered = 'true'] | "\
                         "//sections/definitions[@unnumbered = 'true']")).
-        each do |c|
-          unnumbered_section_names(c, 1)
-        end
+        each { |c| unnumbered_section_names(c, 1) }
       end
 
       NUMBERED_SUBCLAUSES = "./clause[not(@unnumbered = 'true')] | "\
@@ -39,9 +50,8 @@ module IsoDoc
       def section_names(clause, num, lvl)
         return num if clause.nil?
         num.increment(clause)
-        @anchors[clause["id"]] =
-          { label: num.print, xref: l10n("#{@labels["clause"]} #{num.print}"),
-            level: lvl, type: "clause" }
+        @anchors[clause["id"]] = { label: num.print, xref: l10n("#{@labels["clause"]} #{num.print}"),
+                                   level: lvl, type: "clause" }
         i = Counter.new
         clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
           i.increment(c)
@@ -56,8 +66,7 @@ module IsoDoc
       def unnumbered_section_names(clause, lvl)
         return if clause.nil?
         lbl = clause&.at(ns("./title"))&.text || "[#{clause["id"]}]"
-        @anchors[clause["id"]] =
-          { label: lbl, xref: l10n(%{"#{lbl}"}), level: lvl, type: "clause" }
+        @anchors[clause["id"]] = { label: lbl, xref: l10n(%{"#{lbl}"}), level: lvl, type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           unnumbered_section_names1(c, lvl + 1)
         end
@@ -90,16 +99,14 @@ module IsoDoc
         super
         @annexlbl = docxml.at(ns("//bibdata/ext/structuredidentifier/appendix")) ?
           @labels["appendix"] : @labels["annex"]
-        docxml.xpath(ns("//annex[not(@unnumbered = 'true')]")).
-          each_with_index { |c, i| annex_names(c, (i+1).to_s) }
-        docxml.xpath(ns("//annex[@unnumbered = 'true']")).
-          each { |c| unnumbered_annex_names(c) }
+        docxml.xpath(ns("//annex[not(@unnumbered = 'true')]")).each_with_index { |c, i| annex_names(c, (i+1).to_s) }
+        docxml.xpath(ns("//annex[@unnumbered = 'true']")).each { |c| unnumbered_annex_names(c) }
+        docxml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
       end
 
       def annex_names(clause, num)
-        @anchors[clause["id"]] =
-          { label: annex_name_lbl(clause, num), type: "clause", value: num.to_s,
-            xref: l10n("#{@annexlbl} #{num}"), level: 1 }
+        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), type: "clause", value: num.to_s,
+                                   xref: l10n("#{@annexlbl} #{num}"), level: 1 }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
@@ -108,50 +115,38 @@ module IsoDoc
             i.increment(c)
             annex_names1(c, "#{num}.#{i.print}", 2)
           end
-          clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
-            unnumbered_annex_names1(c, 2)
-          end
+          clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each { |c| unnumbered_annex_names1(c, 2) }
         end
         hierarchical_asset_names(clause, num)
       end
 
       def unnumbered_annex_names(clause)
         lbl = clause&.at(ns("./title"))&.text || "[#{clause["id"]}]"
-        @anchors[clause["id"]] =
-          { label: lbl, type: "clause", value: "",
-            xref: l10n(%{"#{lbl}"}), level: 1 }
+        @anchors[clause["id"]] = { label: lbl, type: "clause", value: "", xref: l10n(%{"#{lbl}"}), level: 1 }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
-          clause.xpath(ns(SUBCLAUSES)).each do |c|
-            unnumbered_annex_names1(c, 2)
-          end
+          clause.xpath(ns(SUBCLAUSES)).each { |c| unnumbered_annex_names1(c, 2) }
         end
         hierarchical_asset_names(clause, lbl)
       end
 
       def annex_names1(clause, num, level)
-        @anchors[clause["id"]] =
-          { label: num, xref: l10n("#{@annexlbl} #{num}"),
-            level: level, type: "clause" }
+        @anchors[clause["id"]] = { label: num, xref: l10n("#{@annexlbl} #{num}"),
+                                   level: level, type: "clause" }
         i = Counter.new
         clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
           i.increment(c)
           annex_names1(c, "#{num}.#{i.print}", level + 1)
         end
-        clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
-          unnumbered_annex_names1(c, level + 1)
-        end
+        clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each { |c| unnumbered_annex_names1(c, level + 1) }
       end
 
       def unnumbered_annex_names1(clause, level)
         lbl = clause&.at(ns("./title"))&.text || "[#{clause["id"]}]"
-        @anchors[clause["id"]] =
-          { label: lbl, xref: l10n(%{"#{lbl}"}),
-            level: level, type: "clause" }
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
-          unnumbered_annex_names1(c, level + 1)
-        end
+        @anchors[clause["id"]] = { label: lbl, xref: l10n(%{"#{lbl}"}),
+                                   level: level, type: "clause" }
+        clause.xpath(ns(SUBCLAUSES)).each { |c| unnumbered_annex_names1(c, level + 1) }
       end
 
       def annex_name_lbl(clause, num)

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

data/metanorma.yml

@@ -5,6 +5,7 @@ organization_name_long:
   en: Bureau International des Poids et Mesures
 document_namespace: https://www.metanorma.org/ns/bipm
 xml_root_tag: 'bipm-standard'
+docid_template: "{{ org_abbrev }} {{ docnumeric }}"
 html_bodyfont: Times New Roman
 html_headerfont: Times New Roman
 html_normalfontsize: "15px"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic