metanorma-bipm 2.7.8 → 2.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d997599d8da05112dc7b8e8309928195f2aba2057ff6a16771c7358ca2ac8a
-  data.tar.gz: 64dead4c86d89d8d783c6b820c78dac2d4c7ef76aaf416455fd4f15eccfa717c
+  metadata.gz: 4391b8e761aaee7f40ab6fc3fe9465f7c251c2d7aa8873abb01df8f63d5e9cae
+  data.tar.gz: 71fb81970289cd893c44ec4beab4b24d9ec8c80b1387c9d66cb85e5ca4181ae9
 SHA512:
-  metadata.gz: c4fb8a351c4798f8cdcceadcef5575ace3a44f9fe23564e39e7ba53a555fa522900081471a157fb2046ff69b188a82284daf1198123f88f5c862a29d56262969
-  data.tar.gz: 5da1f94800940c6f2c905c523a028e2f500874100aa93e93d50dc7c09b67b9a5fec6a7fe70cc8f44dd16ae064c81671371e2baf3115b279266c7450eaa977c86
+  metadata.gz: 164b0452a5341a0156336f53df049032d36ac55e2c7c6586a73daa6a003b4120f9fc82bad477dc4c066c5a99f67dc00d108fcb79518a2adb48e1dae968ccb260
+  data.tar.gz: e90b2f2c7f8b54f9c62277a59fb1972e6132a1501b4406f4af83326bb9a02924f9684a9e456199180c02ad88347e327c4b37839c0b85988cc6e08350aa63c767

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

@@ -14072,10 +14072,10 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -16188,6 +16188,7 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">

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

@@ -14072,10 +14072,10 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -16188,6 +16188,7 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">

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

@@ -14072,10 +14072,10 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -16188,6 +16188,7 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">

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

@@ -14072,10 +14072,10 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -16188,6 +16188,7 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">

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

@@ -11975,10 +11975,10 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -14042,6 +14042,13 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="font-size">15pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0pt</xsl:attribute>
+		<xsl:attribute name="space-after">30pt</xsl:attribute>
+		<xsl:attribute name="line-height">130%</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
@@ -14088,11 +14095,6 @@
 			<xsl:call-template name="getLevel"/>
 		</xsl:variable>
 
-		<xsl:if test="$level = 1">
-			<xsl:if test="parent::mn:annex">
-				<xsl:attribute name="space-before">0pt</xsl:attribute>
-			</xsl:if>
-		</xsl:if>
 		<xsl:if test="$level = 2">
 			<xsl:attribute name="font-size">11.5pt</xsl:attribute>
 			<xsl:attribute name="space-before">18pt</xsl:attribute>
@@ -14111,10 +14113,7 @@
 			<xsl:attribute name="font-size">15pt</xsl:attribute>
 			<xsl:attribute name="space-after">12pt</xsl:attribute>
 		</xsl:if>
-		<xsl:if test="parent::mn:annex">
-			<xsl:attribute name="font-size">15pt</xsl:attribute>
-			<xsl:attribute name="space-after">30pt</xsl:attribute>
-		</xsl:if>
+
 		<xsl:if test="$element-name = 'fo:inline'">
 			<xsl:attribute name="padding-right">
 				<xsl:choose>
@@ -14123,11 +14122,18 @@
 				</xsl:choose>
 			</xsl:attribute>
 		</xsl:if>
-		<xsl:if test="parent::mn:annex">
-			<xsl:attribute name="text-align">center</xsl:attribute>
-			<xsl:attribute name="line-height">130%</xsl:attribute>
+		<xsl:if test="parent::mn:annex"><!-- Annex title -->
+			<xsl:variable name="annex_title_styles">
+				<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
+		</xsl:if>
+		<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
+			<xsl:variable name="bibliography_title_styles">
+				<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
 		</xsl:if>
-
 		<!-- $namespace = 'jcgm' -->
 		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 	</xsl:template> <!-- refine_title-style -->

data/lib/metanorma/bipm/biblio.rng

@@ -690,7 +690,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -1296,17 +1296,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/bipm/cleanup.rb

@@ -72,6 +72,19 @@ module Metanorma
         p = parts["annexid"] and ret += ".#{p}"
         id.children = "#{id.text}#{ret}"
       end
+
+      def sections_variant_title_cleanup(xml)
+        path = section_containers.map { |x| "./ancestor::#{x}" }.join(" | ")
+        xml.xpath("//p[@variant_title]").each do |p|
+          p.name = "variant-title"
+          p.delete("variant_title")
+          p.xpath("(#{path})[last()]").each do |sect|
+            p.remove
+            (ins = sect.at("./title") and ins.next = p) or
+              sect.add_first_child(p)
+          end
+        end
+      end
     end
   end
 end

data/lib/metanorma/bipm/front.rb

@@ -1,17 +1,15 @@
 module Metanorma
   module Bipm
     class Converter < Metanorma::Generic::Converter
-      def contrib_committee_subdiv(xml, committee)
-        contributors_committees_filter_empty?(committee) and return
-        xml.subdivision **attr_code(type: committee[:subdivtype],
-                                    subtype: committee[:type]) do |o|
-          committee[:name] and o.name committee[:name]
-          committee[:name_en] and o.name committee[:name_en],
-                                         language: "en"
-          committee[:name_fr] and o.name committee[:name_fr],
-                                         language: "fr"
-          committee[:abbr] and o.abbreviation committee[:abbr]
-          committee[:ident] and o.identifier committee[:ident]
+      def contrib_committee_subdiv(xml, comm)
+        contributors_committees_filter_empty?(comm) and return
+        xml.subdivision **attr_code(type: comm[:subdivtype],
+                                    subtype: comm[:type]) do |o|
+          add_noko_elem(o, "name", comm[:name])
+          add_noko_elem(o, "name", comm[:name_en], language: "en")
+          add_noko_elem(o, "name", comm[:name_fr], language: "fr")
+          add_noko_elem(o, "abbreviation", comm[:abbr])
+          add_noko_elem(o, "identifier", comm[:ident])
         end
       end
 
@@ -68,11 +66,11 @@ module Metanorma
       def relation_supersedes_self1(xml, date, edition, draft)
         xml.relation type: "supersedes" do |r|
           r.bibitem do |b|
-            date and b.date(date,
-                            type: edition ? "published" : "circulated")
-            edition and b.edition edition
+            add_noko_elem(b, "date", date,
+                          type: edition ? "published" : "circulated")
+            add_noko_elem(b, "edition", edition)
             draft and b.version do |v|
-              v.draft draft
+              add_noko_elem(v, "draft", draft)
             end
           end
         end
@@ -85,7 +83,7 @@ module Metanorma
           role = "editor"
         end
         xml.role type: role.downcase do |d|
-          d << desc
+          d << desc # can be empty
         end
       end
 

data/lib/metanorma/bipm/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.1.3 -->
+<!-- VERSION v2.1.4 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -905,15 +905,32 @@ titlecase, or lowercase</a:documentation>
     </element>
   </define>
   <define name="image" combine="choice">
-    <element name="svg">
-      <a:documentation>Add svg mark up to image</a:documentation>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
+    <choice>
+      <element name="image">
+        <ref name="RequiredId"/>
+        <ref name="ImageAttributes"/>
+        <optional>
+          <element name="svg">
+            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
+            <oneOrMore>
+              <choice>
+                <text/>
+                <ref name="AnyElement"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+      <element name="svg">
+        <a:documentation>Add svg mark up to image</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </choice>
   </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Bipm
-    VERSION = "2.7.8".freeze
+    VERSION = "2.7.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.7.8
+  version: 2.7.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic