metanorma-bipm 2.1.1 → 2.1.4

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -164,11 +164,7 @@ module IsoDoc
         end
         elem.children = l10n("[#{@i18n.source} #{elem.children.to_xml.strip}]")
       end
-
-      def bibliography_bibitem_number_skip(bibitem)
-        super || @xrefs.klass.standard?(bibitem)
-      end
-
+=begin
       def expand_citeas(text)
         ret = super
         if @lang == "fr" && /^(CGPM|CIPM) /.match?(ret)
@@ -184,7 +180,9 @@ module IsoDoc
         Decision: "Décision",
         Recommendation: "Recommandation",
         Declaration: "Déclaration",
+        Meeting: "Réunion",
       }.freeze
+=end
 
       include Init
     end

data/lib/isodoc/bipm/xref.rb

@@ -22,9 +22,7 @@ module IsoDoc
       end
 
       def wrap_brackets(txt)
-        return txt if /^\[.*\]$/.match?(txt)
-
-        "[#{txt}]"
+        /^\[.*\]$/.match?(txt) ? txt : "[#{txt}]"
       end
 
       def reference_names(ref)
@@ -34,10 +32,8 @@ module IsoDoc
       end
 
       def clause_names(docxml, sect_num)
-        if @jcgm
-          clause_names_jcgm(docxml, sect_num)
-        else
-          clause_names_bipm(docxml, sect_num)
+        if @jcgm then clause_names_jcgm(docxml, sect_num)
+        else clause_names_bipm(docxml, sect_num)
         end
       end
 
@@ -48,29 +44,29 @@ module IsoDoc
         end
       end
 
+      UNNUM = "@unnumbered = 'true'".freeze
+
       def clause_names_bipm(docxml, _sect_num)
         n = Counter.new
-        docxml.xpath(ns("//sections/clause[not(@unnumbered = 'true')] | "\
-                        "//sections/terms[not(@unnumbered = 'true')] | "\
-                        "//sections/definitions[not(@unnumbered = 'true')]"))
+        docxml.xpath(ns("//sections/clause[not(#{UNNUM})] | "\
+                        "//sections/terms[not(#{UNNUM})] | "\
+                        "//sections/definitions[not(#{UNNUM})]"))
           .each { |c| section_names(c, n, 1) }
-        docxml.xpath(ns("//sections/clause[@unnumbered = 'true'] | "\
-                        "//sections/terms[@unnumbered = 'true'] | "\
-                        "//sections/definitions[@unnumbered = 'true']"))
+        docxml.xpath(ns("//sections/clause[#{UNNUM}] | "\
+                        "//sections/terms[#{UNNUM}] | "\
+                        "//sections/definitions[#{UNNUM}]"))
           .each { |c| unnumbered_section_names(c, 1) }
       end
 
-      NUMBERED_SUBCLAUSES = "./clause[not(@unnumbered = 'true')] | "\
-                            "./references[not(@unnumbered = 'true')] | "\
-                            "./term[not(@unnumbered = 'true')] | "\
-                            "./terms[not(@unnumbered = 'true')] | "\
-                            "./definitions[not(@unnumbered = 'true')]".freeze
+      NUMBERED_SUBCLAUSES =
+        "./clause[not(#{UNNUM})] | ./references[not(#{UNNUM})] | "\
+        "./term[not(#{UNNUM})] | ./terms[not(#{UNNUM})] | "\
+        "./definitions[not(#{UNNUM})]".freeze
 
-      UNNUMBERED_SUBCLAUSES = "./clause[@unnumbered = 'true'] | "\
-                              "./references[@unnumbered = 'true'] | "\
-                              "./term[@unnumbered = 'true'] | "\
-                              "./terms[@unnumbered = 'true'] | "\
-                              "./definitions[@unnumbered = 'true']".freeze
+      UNNUMBERED_SUBCLAUSES =
+        "./clause[#{UNNUM}] | ./references[#{UNNUM}] | "\
+        "./term[#{UNNUM}] | ./terms[#{UNNUM}] | "\
+        "./definitions[#{UNNUM}]".freeze
 
       def section_name_anchors(clause, num, lvl)
         lbl = @jcgm ? "clause_jcgm" : "clause"
@@ -137,11 +133,11 @@ module IsoDoc
       def back_anchor_names(docxml)
         super
         i = @jcgm ? Counter.new("@", skip_i: true) : Counter.new(0)
-        docxml.xpath(ns("//annex[not(@unnumbered = 'true')]")).each do |c|
+        docxml.xpath(ns("//annex[not(#{UNNUM})]")).each do |c|
           i.increment(c)
           annex_names(c, i.print)
         end
-        docxml.xpath(ns("//annex[@unnumbered = 'true']"))
+        docxml.xpath(ns("//annex[#{UNNUM}]"))
           .each { |c| unnumbered_annex_names(c) }
         docxml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
       end
@@ -231,12 +227,10 @@ module IsoDoc
 
       def initial_anchor_names(doc)
         super
-        if @parse_settings.empty? || @parse_settings[:clauses]
-        if @jcgm
+        if (@parse_settings.empty? || @parse_settings[:clauses]) && @jcgm
           @iso.introduction_names(doc.at(ns("//introduction")))
           @anchors.merge!(@iso.get)
         end
-        end
       end
 
       def sequential_figure_names(clause)

data/lib/metanorma/bipm/biblio.rng

@@ -614,12 +614,103 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="bsource"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="docidentifier"/>
+    </oneOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bdate"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="edition"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="version"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="biblionote"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="language"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="script"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bibabstract"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="status"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="copyright"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="docrelation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="series"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="medium"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bplace"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bprice"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="extent"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="accesslocation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="license"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bclassification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bkeyword"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="validity"/>
+    </optional>
+  </define>
+  <define name="ReducedBibliographicItem">
+    <optional>
+      <attribute name="type">
+        <ref name="BibItemType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <ref name="fetched"/>
+    </optional>
+    <optional>
+      <ref name="formattedref"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="btitle"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -638,9 +729,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="version"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
@@ -833,6 +924,12 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -986,36 +1083,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">
@@ -1174,7 +1269,7 @@
         </element>
       </optional>
       <element name="bibitem">
-        <ref name="BibliographicItem"/>
+        <ref name="ReducedBibliographicItem"/>
       </element>
       <choice>
         <zeroOrMore>
@@ -1199,9 +1294,9 @@
       <optional>
         <ref name="revision-date"/>
       </optional>
-      <zeroOrMore>
+      <optional>
         <ref name="draft"/>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="vedition">

data/lib/metanorma/bipm/bipm.rng

@@ -198,6 +198,9 @@
         <optional>
           <attribute name="start"/>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>

data/lib/metanorma/bipm/converter.rb

@@ -50,13 +50,15 @@ module Metanorma
         ret
       end
 
+=begin
       def reference_names(xmldoc)
         xmldoc.xpath("//bibitem[not(ancestor::bibitem)]").each do |ref|
           docid = ref.at("./docidentifier[@type = 'metanorma']") ||
             ref.at("./docidentifier[not(@type = 'DOI')]") or next
-          date = ref.at("./date[@type = 'published']")
-          reference = format_ref(reference_names1(docid, date, docid["type"]),
-                                 docid["type"])
+          #date = ref.at("./date[@type = 'published']")
+          #reference = format_ref(reference_names1(docid, date, docid["type"]),
+                                 #docid["type"])
+          reference = format_ref(docid.children.to_xml, docid["type"])
           @anchors[ref["id"]] = { xref: reference }
         end
       end
@@ -69,6 +71,7 @@ module Metanorma
         end
         ret
       end
+=end
 
       def date_range(date)
         from = date.at(("./from"))

data/lib/metanorma/bipm/isodoc.rng

@@ -116,6 +116,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="suppress_identifier">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <ref name="BibliographicItem"/>
       </element>
     </define>
@@ -282,6 +287,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -324,6 +332,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -360,6 +371,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -694,6 +708,9 @@
       <optional>
         <attribute name="tag"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="multilingual-rendering">
           <ref name="MultilingualRenderingType"/>
@@ -729,6 +746,9 @@
         <optional>
           <attribute name="tag"/>
         </optional>
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <optional>
           <attribute name="multilingual-rendering">
             <ref name="MultilingualRenderingType"/>
@@ -2050,6 +2070,7 @@
       <value>compare</value>
       <value>contrast</value>
       <value>see</value>
+      <value>seealso</value>
     </choice>
   </define>
   <define name="deprecates">

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.1.1".freeze
+    VERSION = "2.1.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: metanorma-bipm lets you write BIPM standards in Metanorma.