metanorma-bipm 2.5.11 → 2.6.0

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -99,15 +99,16 @@ module IsoDoc
 
       def eref(docxml)
         super
-        jcgm_eref(docxml, "//eref")
+        jcgm_eref(docxml, "//fmt-eref")
       end
 
       def origin(docxml)
         super
-        jcgm_eref(docxml, "//origin[not(termref)]")
+        jcgm_eref(docxml, "//fmt-origin[not(.//termref)]")
       end
 
-      def quotesource(docxml)
+      # KILL
+      def quotesourcex(docxml)
         super
         jcgm_eref(docxml, "//quote//source")
       end
@@ -118,9 +119,9 @@ module IsoDoc
         # merge adjacent text nodes
         docxml.root.replace(Nokogiri::XML(docxml.root.to_xml).root)
         docxml.xpath(ns(xpath)).each do |x| # rubocop: disable Style/CombinableLoops
-          if x.next&.text? && /^\],\s+\[$/.match?(x.next.text) &&
-              %w(eref origin source).include?(x.next.next&.name)
-            x.next.replace(", ")
+          if x.parent.next&.text? && /^\],\s+\[$/.match?(x.parent.next.text) &&
+              %w(eref origin fmt-eref fmt-origin).include?(x.parent.next.next&.name)
+            x.parent.next.replace(", ")
           end
         end
       end

data/lib/metanorma/bipm/biblio.rng

@@ -947,6 +947,8 @@ May be electronic (e.g. Twitter direct message, email) or voice (e.g. a remark m
 typically cited as "personal communication")</a:documentation>
       <value>conversation</value>
       <a:documentation>An exchange of messages between two or more persons. May be electronic (e.g. web chat) or voice (e.g. phone call)</a:documentation>
+      <value>collection</value>
+      <a:documentation>A compound resource consisting of other resources, which are themselves presupposed to have their type specified..</a:documentation>
       <value>misc</value>
       <a:documentation>Bibliographic type not adequately described in the foregoing</a:documentation>
     </choice>

data/lib/metanorma/bipm/bipm.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns='https://www.metanorma.org/ns/bipm' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns='https://www.metanorma.org/ns/standoc' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!--
     VERSION v1.2.1
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
@@ -8,9 +8,6 @@
   -->
   <include href="relaton-bipm.rng"/>
   <include href="isodoc.rng">
-    <start>
-      <ref name="bipm-standard"/>
-    </start>
     <define name="XrefAttributes" combine="interleave">
       <optional>
         <attribute name="pagenumber">
@@ -93,35 +90,35 @@
         <attribute name="start"/>
       </optional>
     </define>
+    <define name="standard-document">
+      <element name="metanorma">
+        <ref name="Root-Attributes"/>
+        <ref name="bibdata"/>
+        <zeroOrMore>
+          <ref name="termdocsource"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="misccontainer"/>
+        </optional>
+        <optional>
+          <ref name="boilerplate"/>
+        </optional>
+        <optional>
+          <ref name="preface"/>
+        </optional>
+        <oneOrMore>
+          <ref name="sections"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="annex"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="bibliography"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="indexsect"/>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
-  <define name="bipm-standard">
-    <element name="bipm-standard">
-      <ref name="Root-Attributes"/>
-      <ref name="bibdata"/>
-      <zeroOrMore>
-        <ref name="termdocsource"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="misccontainer"/>
-      </optional>
-      <optional>
-        <ref name="boilerplate"/>
-      </optional>
-      <optional>
-        <ref name="preface"/>
-      </optional>
-      <oneOrMore>
-        <ref name="sections"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="annex"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="bibliography"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="indexsect"/>
-      </zeroOrMore>
-    </element>
-  </define>
 </grammar>

data/lib/metanorma/bipm/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.4.1 -->
+<!-- VERSION v2.0.0 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -459,11 +459,14 @@ gives an explicit page orientation</a:documentation>
           <a:documentation>Description of location in a reference, which can be combined with other locations in a single citation</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="PureTextElement">
+      <optional>
+        <element name="display-text">
           <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-        </ref>
-      </zeroOrMore>
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
     </define>
   </include>
   <!-- end overrides -->
@@ -1205,10 +1208,13 @@ numbers</a:documentation>
         <value>presentation</value>
       </choice>
     </attribute>
+    <attribute name="flavor">
+      <a:documentation>Metanorma flavor, indicating SDO whose requiremnts the realisation aligns to</a:documentation>
+    </attribute>
   </define>
   <define name="standard-document">
     <a:documentation>Representation of a standardisation document</a:documentation>
-    <element name="standard-document">
+    <element name="metanorma">
       <ref name="Root-Attributes"/>
       <ref name="bibdata">
         <a:documentation>Bibliographic description of the document itself, expressed in the Relaton model</a:documentation>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Bipm
-    VERSION = "2.5.11".freeze
+    VERSION = "2.6.0".freeze
   end
 end

data/metanorma-bipm.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.7.4"
-  spec.add_dependency "metanorma-iso", "~> 2.9.2"
+  spec.add_dependency "metanorma-generic", "~> 3.0.0"
+  spec.add_dependency "metanorma-iso", "~> 3.0.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.5.11
+  version: 2.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement