metanorma-bipm 2.1.10 → 2.1.12

data/lib/metanorma/bipm/isodoc.rng

@@ -19,19 +19,7 @@
 -->
 <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 "biblio.rnc" { } -->
   <include href="basicdoc.rng">
-    <start>
-      <ref name="standard-document"/>
-    </start>
-    <define name="doctype">
-      <element name="doctype">
-        <optional>
-          <attribute name="abbreviation"/>
-        </optional>
-        <ref name="DocumentType"/>
-      </element>
-    </define>
     <define name="admonition">
       <element name="admonition">
         <attribute name="type">
@@ -117,24 +105,6 @@
         </optional>
       </element>
     </define>
-    <define name="bibitem">
-      <element name="bibitem">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="hidden">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="suppress_identifier">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <ref name="BibliographicItem"/>
-      </element>
-    </define>
     <define name="section-title">
       <element name="title">
         <zeroOrMore>
@@ -207,11 +177,7 @@
         </optional>
         <optional>
           <attribute name="style">
-            <choice>
-              <value>basic</value>
-              <value>full</value>
-              <value>short</value>
-            </choice>
+            <ref name="XrefStyleType"/>
           </attribute>
         </optional>
         <ref name="XrefBody"/>
@@ -248,42 +214,6 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
-    <define name="localityStack">
-      <element name="localityStack">
-        <optional>
-          <attribute name="connective">
-            <choice>
-              <value>and</value>
-              <value>or</value>
-              <value>from</value>
-              <value>to</value>
-              <value/>
-            </choice>
-          </attribute>
-        </optional>
-        <zeroOrMore>
-          <ref name="locality"/>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="sourceLocalityStack">
-      <element name="sourceLocalityStack">
-        <optional>
-          <attribute name="connective">
-            <choice>
-              <value>and</value>
-              <value>or</value>
-              <value>from</value>
-              <value>to</value>
-              <value/>
-            </choice>
-          </attribute>
-        </optional>
-        <zeroOrMore>
-          <ref name="sourceLocality"/>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -827,21 +757,6 @@
         </zeroOrMore>
       </element>
     </define>
-    <define name="BibDataExtensionType">
-      <ref name="doctype"/>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <optional>
-        <ref name="editorialgroup"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="structuredidentifier"/>
-      </zeroOrMore>
-    </define>
     <!-- TitleType = text -->
     <define name="sections">
       <element name="sections">
@@ -881,7 +796,7 @@
           <ref name="BasicBlock"/>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="bibitem"/>
+          <ref name="doc_bibitem"/>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
@@ -1112,6 +1027,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1126,6 +1042,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1139,6 +1056,7 @@
             <ref name="PureTextElement"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1219,6 +1137,24 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="doc_bibitem">
+    <element name="bibitem">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <optional>
+        <attribute name="hidden">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="suppress_identifier">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <ref name="BibliographicItem"/>
+    </element>
+  </define>
   <define name="image" combine="choice">
     <element name="svg">
       <oneOrMore>
@@ -1237,14 +1173,6 @@
       <value>tag</value>
     </choice>
   </define>
-  <define name="docsubtype">
-    <element name="subdoctype">
-      <ref name="DocumentSubtype"/>
-    </element>
-  </define>
-  <define name="DocumentSubtype">
-    <text/>
-  </define>
   <define name="colgroup">
     <element name="colgroup">
       <oneOrMore>
@@ -1266,6 +1194,7 @@
       <ref name="add"/>
       <ref name="del"/>
       <ref name="span"/>
+      <ref name="erefstack"/>
     </choice>
   </define>
   <define name="add">
@@ -1273,6 +1202,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1285,6 +1215,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1349,6 +1280,7 @@
       </optional>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -1606,45 +1538,6 @@
       </choice>
     </element>
   </define>
-  <define name="editorialgroup">
-    <element name="editorialgroup">
-      <oneOrMore>
-        <ref name="technical-committee"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="technical-committee">
-    <element name="technical-committee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="IsoWorkgroup">
-    <optional>
-      <attribute name="number"/>
-    </optional>
-    <optional>
-      <attribute name="type"/>
-    </optional>
-    <optional>
-      <attribute name="identifier"/>
-    </optional>
-    <optional>
-      <attribute name="prefix"/>
-    </optional>
-    <text/>
-  </define>
-  <define name="ics">
-    <element name="ics">
-      <element name="code">
-        <text/>
-      </element>
-      <optional>
-        <element name="text">
-          <text/>
-        </element>
-      </optional>
-    </element>
-  </define>
   <define name="standard-document">
     <element name="standard-document">
       <attribute name="version"/>
@@ -2080,6 +1973,7 @@
       </element>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -2475,71 +2369,6 @@
       </optional>
     </element>
   </define>
-  <define name="structuredidentifier">
-    <element name="structuredidentifier">
-      <optional>
-        <attribute name="type"/>
-      </optional>
-      <oneOrMore>
-        <element name="agency">
-          <text/>
-        </element>
-      </oneOrMore>
-      <optional>
-        <element name="class">
-          <text/>
-        </element>
-      </optional>
-      <element name="docnumber">
-        <text/>
-      </element>
-      <optional>
-        <element name="partnumber">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="edition">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="version">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="supplementtype">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="supplementnumber">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="amendment">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="corrigendum">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="language">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="year">
-          <text/>
-        </element>
-      </optional>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>
@@ -2700,6 +2529,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
           <oneOrMore>
             <element name="coords">
@@ -2747,6 +2577,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
         </element>
       </zeroOrMore>
@@ -2795,6 +2626,15 @@
       <ref name="PureTextElement"/>
     </oneOrMore>
   </define>
+  <define name="XrefConnectiveType">
+    <choice>
+      <value>and</value>
+      <value>or</value>
+      <value>from</value>
+      <value>to</value>
+      <value/>
+    </choice>
+  </define>
   <define name="XrefTarget">
     <element name="location">
       <attribute name="target">
@@ -2803,14 +2643,36 @@
         </data>
       </attribute>
       <attribute name="connective">
-        <choice>
-          <value>and</value>
-          <value>or</value>
-          <value>from</value>
-          <value>to</value>
-          <value/>
-        </choice>
+        <ref name="XrefConnectiveType"/>
       </attribute>
     </element>
   </define>
+  <define name="XrefStyleType">
+    <choice>
+      <value>basic</value>
+      <value>full</value>
+      <value>short</value>
+      <value>id</value>
+    </choice>
+  </define>
+  <define name="erefTypeWithConnective">
+    <optional>
+      <attribute name="connective">
+        <ref name="XrefConnectiveType"/>
+      </attribute>
+    </optional>
+    <ref name="erefType"/>
+  </define>
+  <define name="erefstack">
+    <element name="erefstack">
+      <oneOrMore>
+        <element name="eref">
+          <ref name="erefTypeWithConnective"/>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
+  <start>
+    <ref name="standard-document"/>
+  </start>
 </grammar>

data/lib/metanorma/bipm/relaton-bipm.rng

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <include href="biblio-standoc.rng">
+    <define name="DocumentType">
+      <choice>
+        <value>brochure</value>
+        <value>mise-en-pratique</value>
+        <value>rapport</value>
+        <value>monographie</value>
+        <value>guide</value>
+        <value>meeting-report</value>
+        <value>technical-report</value>
+        <value>working-party-note</value>
+        <value>strategy</value>
+        <value>cipm-mra</value>
+        <value>resolution</value>
+      </choice>
+    </define>
+    <define name="editorialgroup">
+      <element name="editorialgroup">
+        <oneOrMore>
+          <ref name="committee"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="workgroup"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="structuredidentifier">
+      <element name="structuredidentifier">
+        <element name="docnumber">
+          <text/>
+        </element>
+        <optional>
+          <element name="part">
+            <text/>
+          </element>
+        </optional>
+        <optional>
+          <element name="appendix">
+            <text/>
+          </element>
+        </optional>
+      </element>
+    </define>
+    <define name="BibDataExtensionType">
+      <optional>
+        <attribute name="schema-version"/>
+      </optional>
+      <optional>
+        <ref name="doctype"/>
+      </optional>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
+      <ref name="editorialgroup"/>
+      <optional>
+        <ref name="comment-period"/>
+      </optional>
+      <optional>
+        <ref name="si-aspect"/>
+      </optional>
+      <optional>
+        <ref name="meeting-note"/>
+      </optional>
+      <ref name="structuredidentifier"/>
+    </define>
+  </include>
+  <define name="comment-period">
+    <element name="comment-period">
+      <element name="from">
+        <ref name="ISO8601Date"/>
+      </element>
+      <element name="to">
+        <ref name="ISO8601Date"/>
+      </element>
+    </element>
+  </define>
+  <define name="si-aspect">
+    <element name="si-aspect">
+      <choice>
+        <value>A_e_deltanu</value>
+        <value>A_e</value>
+        <value>cd_Kcd_h_deltanu</value>
+        <value>cd_Kcd</value>
+        <value>full</value>
+        <value>K_k_deltanu</value>
+        <value>K_k</value>
+        <value>kg_h_c_deltanu</value>
+        <value>kg_h</value>
+        <value>m_c_deltanu</value>
+        <value>m_c</value>
+        <value>mol_NA</value>
+        <value>s_deltanu</value>
+      </choice>
+    </element>
+  </define>
+  <define name="committee">
+    <element name="committee">
+      <attribute name="acronym">
+        <choice>
+          <value>CGPM</value>
+          <value>CIPM</value>
+          <value>BIPM</value>
+          <value>CCAUV</value>
+          <value>CCEM</value>
+          <value>CCL</value>
+          <value>CCM</value>
+          <value>CCPR</value>
+          <value>CCQM</value>
+          <value>CCRI</value>
+          <value>CCT</value>
+          <value>CCTF</value>
+          <value>CCU</value>
+          <value>CCL-CCTF-WGFS</value>
+          <value>JCGM</value>
+          <value>JCRB</value>
+          <value>JCTLM</value>
+          <value>INetQI</value>
+        </choice>
+      </attribute>
+      <ref name="LocalizedString"/>
+    </element>
+  </define>
+  <define name="workgroup">
+    <element name="workgroup">
+      <optional>
+        <attribute name="acronym"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
+  <define name="meeting-note">
+    <element name="meeting-note">
+      <text/>
+    </element>
+  </define>
+</grammar>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.1.10".freeze
+    VERSION = "2.1.12".freeze
   end
 end

data/metanorma-bipm.gemspec

@@ -19,12 +19,13 @@ Gem::Specification.new do |spec|
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "metanorma-generic", "~> 2.2.2"
   spec.add_dependency "metanorma-iso", "~> 2.2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.1.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -216,8 +216,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -225,10 +223,6 @@ files:
 - Gemfile
 - LICENSE
 - README.adoc
-- Rakefile
-- bin/console
-- bin/rspec
-- bin/setup
 - lib/isodoc/bipm.rb
 - lib/isodoc/bipm/base_convert.rb
 - lib/isodoc/bipm/bipm.brochure.xsl
@@ -269,6 +263,7 @@ files:
 - lib/metanorma-bipm.rb
 - lib/metanorma/bipm.rb
 - lib/metanorma/bipm/basicdoc.rng
+- lib/metanorma/bipm/biblio-standoc.rng
 - lib/metanorma/bipm/biblio.rng
 - lib/metanorma/bipm/bipm.rng
 - lib/metanorma/bipm/boilerplate-en.xml
@@ -278,6 +273,7 @@ files:
 - lib/metanorma/bipm/front.rb
 - lib/metanorma/bipm/isodoc.rng
 - lib/metanorma/bipm/processor.rb
+- lib/metanorma/bipm/relaton-bipm.rng
 - lib/metanorma/bipm/reqt.rng
 - lib/metanorma/bipm/version.rb
 - metanorma-bipm.gemspec
@@ -294,14 +290,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: metanorma-bipm lets you write BIPM standards in Metanorma.

data/.github/workflows/rake.yml

@@ -1,15 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: rake
-
-on:
-  push:
-    branches: [ master, main ]
-    tags: [ v* ]
-  pull_request:
-
-jobs:
-  notify:
-    uses: metanorma/ci/.github/workflows/mn-processor-rake.yml@main
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -1,24 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: release
-
-on:
-  workflow_dispatch:
-    inputs:
-      next_version:
-        description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
-        required: true
-        default: 'skip'
-  push:
-    tags: [ v* ]
-
-jobs:
-  release:
-    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
-    with:
-      next_version: ${{ github.event.inputs.next_version }}
-    secrets:
-      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-