metanorma-bipm 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b55e6b85ef1f9cae4b1438df9d28fec022df67c5629e63b4a9439df340a3d27
-  data.tar.gz: ea4b6c2f2866b8053b90762eff2f3e1025db86188381ff098be659557e91b024
+  metadata.gz: d974105c9bfacaa99b3e88208ce15c2f6d88b5dc9b6bb8c68ed37278172ef2f0
+  data.tar.gz: ba1d26792f3c15da831fc94bf505ed1747e19a8f8390d912bdf112130493cd35
 SHA512:
-  metadata.gz: 75ba651aad86b1bfd223dfd10e89827c7d283e99ea8c7f268e9b9d223e4b61695d35663788b1502e2ad18333dae7fbf31bd950d1ad4dd1786d5249b904f164db
-  data.tar.gz: 555657db61c387a6b88553b057b0675f358b527d5df75366fde52a22fc5ae6ef5dd3827c5a6705fa42ad638a5ff6d93dfe4238d741b5832b20e9328a6ec83ccf
+  metadata.gz: d5afec8786d1aa673c3a7a4a8015b3283fd9b82df7c3d1ea51c42709fce7c1cc72f3d2272f4b9a8d58717ad8860e76a3008df8c18fd31b5aa926d412ce8d4b90
+  data.tar.gz: da690ae876f6e53684077c41dc16cfd06dc50cbd5c68b88c9ce46cef50c53048db0a3ff37a111d8c485b6043f992a3129bf73c75b88ba1d5ec75df5fbb900510

data/lib/asciidoctor/bipm/isodoc.rng

@@ -1973,7 +1973,11 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
@@ -1987,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammar-info">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>

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

@@ -962,8 +962,11 @@
 	<xsl:template name="setListItemLabel">
 		<xsl:attribute name="label">
 			<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'">•</xsl:when> <!-- &#x2014; dash -->
+				<xsl:when test="local-name(..) = 'ul'">
+					<xsl:call-template name="setULLabel"/>
+				</xsl:when>
+				<!-- <xsl:when test="local-name(..) = 'ul' and ../ancestor::bipm:ul">&#x2212;</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">
 						<xsl:choose>
@@ -2418,7 +2421,7 @@
 	<!-- ====== -->
 	
 	
-	<xsl:template match="bipm:title" name="clause_title">
+	<xsl:template match="bipm:title" name="title">
 		
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
@@ -6966,6 +6969,7 @@
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
+		<xsl:apply-templates select="@language"/>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
 		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -9225,6 +9229,53 @@
 	</xsl:template><xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
+	</xsl:template><xsl:variable name="ul_labels_">
+		
+			<label level="1" font-size="15pt">•</label>
+			<label level="2">−</label><!-- &#x2212; - minus sign.  &#x2014; - en dash -->
+			<label level="3" font-size="75%">o</label> <!-- white circle -->
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
+		<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		<xsl:variable name="list_level">
+			<xsl:choose>
+				<xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
+				<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 3 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 2 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="label" mode="ul_labels">
+		<xsl:copy-of select="@*[not(local-name() = 'level')]"/>
+		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -9709,6 +9760,10 @@
 					</svg>
 				</fo:instream-foreign-object>	
 		</fo:inline>
+	</xsl:template><xsl:template match="@language">
+		<xsl:copy-of select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
+		<xsl:call-template name="title"/>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>

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

@@ -962,8 +962,11 @@
 	<xsl:template name="setListItemLabel">
 		<xsl:attribute name="label">
 			<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'">•</xsl:when> <!-- &#x2014; dash -->
+				<xsl:when test="local-name(..) = 'ul'">
+					<xsl:call-template name="setULLabel"/>
+				</xsl:when>
+				<!-- <xsl:when test="local-name(..) = 'ul' and ../ancestor::bipm:ul">&#x2212;</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">
 						<xsl:choose>
@@ -2418,7 +2421,7 @@
 	<!-- ====== -->
 	
 	
-	<xsl:template match="bipm:title" name="clause_title">
+	<xsl:template match="bipm:title" name="title">
 		
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
@@ -6966,6 +6969,7 @@
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
+		<xsl:apply-templates select="@language"/>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
 		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -9225,6 +9229,53 @@
 	</xsl:template><xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
+	</xsl:template><xsl:variable name="ul_labels_">
+		
+			<label level="1" font-size="15pt">•</label>
+			<label level="2">−</label><!-- &#x2212; - minus sign.  &#x2014; - en dash -->
+			<label level="3" font-size="75%">o</label> <!-- white circle -->
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
+		<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		<xsl:variable name="list_level">
+			<xsl:choose>
+				<xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
+				<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 3 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 2 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="label" mode="ul_labels">
+		<xsl:copy-of select="@*[not(local-name() = 'level')]"/>
+		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -9709,6 +9760,10 @@
 					</svg>
 				</fo:instream-foreign-object>	
 		</fo:inline>
+	</xsl:template><xsl:template match="@language">
+		<xsl:copy-of select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
+		<xsl:call-template name="title"/>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>

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

@@ -962,8 +962,11 @@
 	<xsl:template name="setListItemLabel">
 		<xsl:attribute name="label">
 			<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'">•</xsl:when> <!-- &#x2014; dash -->
+				<xsl:when test="local-name(..) = 'ul'">
+					<xsl:call-template name="setULLabel"/>
+				</xsl:when>
+				<!-- <xsl:when test="local-name(..) = 'ul' and ../ancestor::bipm:ul">&#x2212;</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">
 						<xsl:choose>
@@ -2418,7 +2421,7 @@
 	<!-- ====== -->
 	
 	
-	<xsl:template match="bipm:title" name="clause_title">
+	<xsl:template match="bipm:title" name="title">
 		
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
@@ -6966,6 +6969,7 @@
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
+		<xsl:apply-templates select="@language"/>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
 		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -9225,6 +9229,53 @@
 	</xsl:template><xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
+	</xsl:template><xsl:variable name="ul_labels_">
+		
+			<label level="1" font-size="15pt">•</label>
+			<label level="2">−</label><!-- &#x2212; - minus sign.  &#x2014; - en dash -->
+			<label level="3" font-size="75%">o</label> <!-- white circle -->
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
+		<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		<xsl:variable name="list_level">
+			<xsl:choose>
+				<xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
+				<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 3 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 2 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="label" mode="ul_labels">
+		<xsl:copy-of select="@*[not(local-name() = 'level')]"/>
+		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -9709,6 +9760,10 @@
 					</svg>
 				</fo:instream-foreign-object>	
 		</fo:inline>
+	</xsl:template><xsl:template match="@language">
+		<xsl:copy-of select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
+		<xsl:call-template name="title"/>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>

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

@@ -962,8 +962,11 @@
 	<xsl:template name="setListItemLabel">
 		<xsl:attribute name="label">
 			<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'">•</xsl:when> <!-- &#x2014; dash -->
+				<xsl:when test="local-name(..) = 'ul'">
+					<xsl:call-template name="setULLabel"/>
+				</xsl:when>
+				<!-- <xsl:when test="local-name(..) = 'ul' and ../ancestor::bipm:ul">&#x2212;</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">
 						<xsl:choose>
@@ -2418,7 +2421,7 @@
 	<!-- ====== -->
 	
 	
-	<xsl:template match="bipm:title" name="clause_title">
+	<xsl:template match="bipm:title" name="title">
 		
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
@@ -6966,6 +6969,7 @@
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
+		<xsl:apply-templates select="@language"/>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
 		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -9225,6 +9229,53 @@
 	</xsl:template><xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
+	</xsl:template><xsl:variable name="ul_labels_">
+		
+			<label level="1" font-size="15pt">•</label>
+			<label level="2">−</label><!-- &#x2212; - minus sign.  &#x2014; - en dash -->
+			<label level="3" font-size="75%">o</label> <!-- white circle -->
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
+		<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		<xsl:variable name="list_level">
+			<xsl:choose>
+				<xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
+				<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 3 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 2 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="label" mode="ul_labels">
+		<xsl:copy-of select="@*[not(local-name() = 'level')]"/>
+		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -9709,6 +9760,10 @@
 					</svg>
 				</fo:instream-foreign-object>	
 		</fo:inline>
+	</xsl:template><xsl:template match="@language">
+		<xsl:copy-of select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
+		<xsl:call-template name="title"/>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>

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

@@ -76,6 +76,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -87,6 +93,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -470,27 +479,27 @@ p.document-stage {
 /*
     3.1 Titles
 */
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: {{headerfont}};
   color: #6C734A;
   font-weight: 300;
   margin-top: 1.6em;
   margin-bottom: 0.3em; }
 
-h1 {
+h1, .h1 {
   font-size: 1.6em;
   text-transform: uppercase;
   margin-top: 2em; }
 
-h1#content {
+h1#content, #content.h1 {
   margin-top: 2em; }
 
-h2 {
+h2, .h2 {
   margin-top: 1.3em;
   font-size: 1.3em;
   font-weight: 400; }
 
-h3 {
+h3, .h3 {
   margin-top: 1.1em;
   font-size: 1.1em;
   font-weight: 100; }
@@ -802,7 +811,7 @@ p {
   margin-top: 1em;
   margin-bottom: 1em; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 /*
@@ -954,7 +963,7 @@ To top button
 @media print {
   .document-info, nav, .copyright {
     page-break-before: always; }
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em; }
   .note, .figure, pre, .pseudocode, table {
@@ -974,15 +983,15 @@ To top button
     display: none; }
   .container {
     padding-left: 0; }
-  h1.content {
+  h1.content, .h1.content {
     margin-top: 2em;
     line-height: 2.5em; }
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5; }
-  h2 {
+  h2, .h2 {
     font-size: 1.2em; }
-  h3 {
+  h3, .h3 {
     font-size: 1em; }
   .Note {
     background-color: #fff495;

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

@@ -159,7 +159,7 @@ p.document-stage {
     3.1 Titles
 */
 
-  h1,h2,h3,h4,h5,h6 {
+  h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6 {
     font-family: $headerfont;
     color: #6C734A;
     font-weight: 300;
@@ -167,23 +167,23 @@ p.document-stage {
     margin-bottom: 0.3em;
   }
 
-  h1 {
+  h1,.h1 {
     font-size: 1.6em;
     text-transform: uppercase;
     margin-top: 2em;
   }
 
-  h1#content {
+  h1#content,.h1#content {
       margin-top: 2em;
   }
 
-  h2 {
+  h2,.h2 {
     margin-top: 1.3em;
     font-size: 1.3em;
     font-weight: 400;
   }
 
-  h3 {
+  h3,.h3 {
     margin-top: 1.1em;
     font-size: 1.1em;
     font-weight: 100;
@@ -485,7 +485,7 @@ p {
   margin-bottom: 1em;
 }
 
-h2 p {
+h2 p, .h2 p {
   display: inline;
 }
 
@@ -658,7 +658,7 @@ To top button
       page-break-before: always;
   }
 
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em;
   }
@@ -695,21 +695,21 @@ To top button
       padding-left: 0;
   }
 
-  h1.content {
+  h1.content,.h1.content {
     margin-top: 2em;
     line-height: 2.5em;
   }
 
-  h1 {
+  h1,.h1 {
     font-size: 1.5em;
     line-height: 1.5;
   }
 
-  h2 {
+  h2,.h2 {
     font-size: 1.2em
   }
 
-  h3 {
+  h3,.h3 {
     font-size: 1em;
   }
 

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

@@ -629,8 +629,9 @@
 
 	<xsl:template name="getListItemFormat">
 		<xsl:choose>
-			<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:when test="local-name(..) = 'ul'">
+				<xsl:call-template name="setULLabel"/>
+			</xsl:when>
 			<xsl:otherwise> <!-- for ordered lists -->
 				<xsl:variable name="start_value">
 					<xsl:choose>
@@ -1284,7 +1285,7 @@
 		</xsl:if>
 	</xsl:template>
 	
-	<xsl:template match="jcgm:title">
+	<xsl:template match="jcgm:title" name="title">
 	
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
@@ -4363,6 +4364,7 @@
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
+		<xsl:apply-templates select="@language"/>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
 		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -6575,6 +6577,53 @@
 	</xsl:template><xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
+	</xsl:template><xsl:variable name="ul_labels_">
+		
+		
+		
+		
+		
+		
+		
+		
+			<label level="1">—</label> <!-- em dash -->
+			<label level="2">−</label><!-- minus sign -->
+			<label level="3" font-size="75%">o</label> <!-- white circle -->
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
+		<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		<xsl:variable name="list_level">
+			<xsl:choose>
+				<xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
+				<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 3 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 2 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="label" mode="ul_labels">
+		<xsl:copy-of select="@*[not(local-name() = 'level')]"/>
+		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -7028,6 +7077,10 @@
 					</svg>
 				</fo:instream-foreign-object>	
 		</fo:inline>
+	</xsl:template><xsl:template match="@language">
+		<xsl:copy-of select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
+		<xsl:call-template name="title"/>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "1.2.4".freeze
+    VERSION = "1.2.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic