metanorma-bipm 2.0.2 → 2.0.5

data/lib/isodoc/bipm/pdf_convert.rb

@@ -31,12 +31,12 @@ module IsoDoc
         if docxml.root.name == "metanorma-collection" &&
             docxml.at("#{q}[. = 'fr']", "m" => n) &&
             docxml.at("#{q}[. = 'en']", "m" => n)
-          "#{super} --split-by-language"
-        else
-          super
+          return super.tap do |h|
+            h["--split-by-language"] = nil
+          end
         end
+        super
       end
     end
   end
 end
-

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -17,9 +17,9 @@ module IsoDoc
         super
       end
 
-      def eref_localities1(target, type, from, to, delim, n, lang = "en")
-        @jcgm and
-          return @iso.eref_localities1(target, type, from, to, delim, n, lang)
+      def eref_localities1(target, type, from, upto, node, lang = "en")
+        @jcgm and return @iso.eref_localities1(target, type, from, upto,
+                                               node, lang)
         super
       end
 
@@ -142,7 +142,7 @@ module IsoDoc
         ret = list_people(
           xml, "//bibdata/contributor[xmlns:role/@type = 'author']/person"
         )
-        @i18n.multiple_and(ret, @i18n.get["and"])
+        @i18n.boolean_conj(ret, "and")
       end
 
       COCHAIR = "xmlns:role[contains(text(),'co-chair')]".freeze
@@ -154,7 +154,7 @@ module IsoDoc
         ret.empty? and return ""
         role = xml&.at(ns("//bibdata/contributor[#{COCHAIR}]/role"))&.text
         label = ret.size > 1 && role ? "#{role}s" : role
-        "#{label}: #{@i18n.multiple_and(ret, @i18n.get['and'])}"
+        "#{label}: #{@i18n.boolean_conj(ret, 'and')}"
       end
 
       def list_chairs(xml)
@@ -162,7 +162,7 @@ module IsoDoc
         ret.empty? and return ""
         role = xml&.at(ns("//bibdata/contributor#{CHAIR}/role"))&.text
         label = ret.size > 1 && role ? "#{role}s" : role
-        "#{label}: #{@i18n.multiple_and(ret, @i18n.get['and'])}"
+        "#{label}: #{@i18n.boolean_conj(ret, 'and')}"
       end
 
       def list_people(xml, xpath)

data/lib/isodoc/bipm/xref.rb

@@ -76,7 +76,7 @@ module IsoDoc
         lbl = @jcgm ? "clause_jcgm" : "clause"
         @anchors[clause["id"]] =
           { label: num.print, xref: l10n("#{@labels[lbl]} #{num.print}"),
-            level: lvl, type: "clause" }
+            level: lvl, type: "clause", elem: @labels[lbl] }
       end
 
       def section_names(clause, num, lvl)
@@ -110,7 +110,7 @@ module IsoDoc
         lbl = @jcgm ? "" : "#{@labels['subclause']} "
         @anchors[clause["id"]] =
           { label: num, level: level, xref: l10n("#{lbl}#{num}"),
-            type: "clause" }
+            type: "clause", elem: lbl }
       end
 
       def section_names1(clause, num, level)
@@ -148,7 +148,7 @@ module IsoDoc
 
       def annex_name_anchors(clause, num)
         { label: annex_name_lbl(clause, num), type: "clause", value: num.to_s,
-          xref: l10n("#{@annexlbl} #{num}"), level: 1 }
+          xref: l10n("#{@annexlbl} #{num}"), level: 1, elem: @annexlbl }
       end
 
       def annex_names(clause, num)
@@ -188,7 +188,7 @@ module IsoDoc
       def annex_names1_anchors(num, level)
         lbl = @jcgm ? "" : "#{@annexlbl} "
         { label: num, xref: l10n("#{lbl}#{num}"),
-          level: level, type: "clause" }
+          level: level, type: "clause", elem: lbl }
       end
 
       def annex_names1(clause, num, level)

data/lib/metanorma/bipm/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>

data/lib/metanorma/bipm/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/bipm/bipm.rng

@@ -59,7 +59,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <text/>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="Clause-Section">

data/lib/metanorma/bipm/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <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">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.5".freeze
   end
 end

data/metanorma-bipm.gemspec

@@ -39,4 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
+  spec.add_development_dependency "vcr", "~> 5.0.0"
+  spec.add_development_dependency "webmock"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -178,6 +178,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   metanorma-vg lets you write Bureau International de Poids et Mesures (BIPM) standards in Metanorma syntax.