metanorma-bipm 2.2.14 → 2.3.1

data/lib/isodoc/bipm/xref.rb

@@ -4,14 +4,16 @@ module IsoDoc
     end
 
     class Xref < IsoDoc::Xref
+      attr_accessor :jcgm
+
       def initialize(lang, script, klass, i18n, options = {})
         @iso = IsoDoc::Iso::Xref.new(lang, script, klass, i18n, options)
         super
       end
 
       def parse(docxml)
-        @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/"\
-                              "@acronym"))&.value == "JCGM"
+        @jcgm = docxml.at(ns("//bibdata/ext/editorialgroup/committee/" \
+                             "@acronym"))&.value == "JCGM"
         @annexlbl =
           if @jcgm then @labels["iso_annex"]
           elsif docxml.at(ns("//bibdata/ext/structuredidentifier/appendix"))
@@ -31,41 +33,40 @@ module IsoDoc
           @anchors[ref["id"]][:xref] = wrap_brackets(@anchors[ref["id"]][:xref])
       end
 
-      def clause_names(docxml, sect_num)
-        if @jcgm then clause_names_jcgm(docxml, sect_num)
-        else clause_names_bipm(docxml, sect_num)
-        end
-      end
-
-      def clause_names_jcgm(docxml, sect_num)
-        docxml.xpath(ns("//clause[parent::sections][not(@type = 'scope')]"\
-                        "[not(descendant::terms)]")).each do |c|
-          section_names(c, sect_num, 1)
-        end
-      end
-
       UNNUM = "@unnumbered = 'true'".freeze
 
-      def clause_names_bipm(docxml, _sect_num)
+      def clause_order_main(docxml)
+        @jcgm and return @iso.clause_order_main(docxml)
+        [{ path: "//sections/clause[not(#{UNNUM})] | " \
+                 "//sections/terms[not(#{UNNUM})] | " \
+                 "//sections/definitions[not(#{UNNUM})] | " \
+                 "//sections/references[not(#{UNNUM})]", multi: true },
+         { path: "//sections/clause[#{UNNUM}] | " \
+                 "//sections/terms[#{UNNUM}] | " \
+                 "//sections/definitions[#{UNNUM}] | " \
+                 "//sections/references[#{UNNUM}]", multi: true }]
+      end
+
+      def main_anchor_names(xml)
+        @jcgm and return super
+        t = clause_order_main(xml)
         n = Counter.new
-        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[#{UNNUM}] | "\
-                        "//sections/terms[#{UNNUM}] | "\
-                        "//sections/definitions[#{UNNUM}]"))
-          .each { |c| unnumbered_section_names(c, 1) }
+        t.each_with_index do |a, i|
+          xml.xpath(ns(a[:path])).each do |c|
+            i.zero? ? section_names(c, n, 1) : unnumbered_section_names(c, 1)
+            a[:multi] or break
+          end
+        end
       end
 
       NUMBERED_SUBCLAUSES =
-        "./clause[not(#{UNNUM})] | ./references[not(#{UNNUM})] | "\
-        "./term[not(#{UNNUM})] | ./terms[not(#{UNNUM})] | "\
+        "./clause[not(#{UNNUM})] | ./references[not(#{UNNUM})] | " \
+        "./term[not(#{UNNUM})] | ./terms[not(#{UNNUM})] | " \
         "./definitions[not(#{UNNUM})]".freeze
 
       UNNUMBERED_SUBCLAUSES =
-        "./clause[#{UNNUM}] | ./references[#{UNNUM}] | "\
-        "./term[#{UNNUM}] | ./terms[#{UNNUM}] | "\
+        "./clause[#{UNNUM}] | ./references[#{UNNUM}] | " \
+        "./term[#{UNNUM}] | ./terms[#{UNNUM}] | " \
         "./definitions[#{UNNUM}]".freeze
 
       def section_name_anchors(clause, num, lvl)
@@ -76,8 +77,7 @@ module IsoDoc
       end
 
       def section_names(clause, num, lvl)
-        return num if clause.nil?
-
+        clause.nil? and return num
         num.increment(clause)
         @anchors[clause["id"]] = section_name_anchors(clause, num, lvl)
         i = Counter.new
@@ -92,9 +92,8 @@ module IsoDoc
       end
 
       def unnumbered_section_names(clause, lvl)
-        return if clause.nil?
-
-        lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
+        clause.nil? and return num
+        lbl = clause.at(ns("./title"))&.text || "[#{clause['id']}]"
         @anchors[clause["id"]] = { label: lbl, xref: l10n(%{"#{lbl}"}),
                                    level: lvl, type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each do |c|
@@ -122,7 +121,7 @@ module IsoDoc
       end
 
       def unnumbered_section_names1(clause, level)
-        lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
+        lbl = clause.at(ns("./title"))&.text || "[#{clause['id']}]"
         @anchors[clause["id"]] =
           { label: lbl, xref: l10n(%{"#{lbl}"}), level: level, type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each do |c|
@@ -130,16 +129,22 @@ module IsoDoc
         end
       end
 
-      def back_anchor_names(docxml)
-        super
-        i = @jcgm ? Counter.new("@", skip_i: true) : Counter.new(0)
-        docxml.xpath(ns("//annex[not(#{UNNUM})]")).each do |c|
-          i.increment(c)
-          annex_names(c, i.print)
+      def clause_order_annex(_docxml)
+        [{ path: "//annex[not(#{UNNUM})]", multi: true },
+         { path: "//annex[#{UNNUM}]", multi: true }]
+      end
+
+      def annex_anchor_names(docxml)
+        n = @jcgm ? Counter.new("@", skip_i: true) : Counter.new(0)
+        clause_order_annex(docxml).each_with_index do |a, i|
+          docxml.xpath(ns(a[:path])).each do |c|
+            if i.zero?
+              n.increment(c)
+              annex_names(c, n.print)
+            else unnumbered_annex_names(c) end
+            a[:multi] or break
+          end
         end
-        docxml.xpath(ns("//annex[#{UNNUM}]"))
-          .each { |c| unnumbered_annex_names(c) }
-        docxml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
       end
 
       def annex_name_anchors(clause, num)
@@ -171,7 +176,7 @@ module IsoDoc
       end
 
       def unnumbered_annex_names(clause)
-        lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
+        lbl = clause.at(ns("./title"))&.text || "[#{clause['id']}]"
         @anchors[clause["id"]] = unnumbered_annex_anchors(lbl)
         if @klass.single_term_clause?(clause)
           annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
@@ -214,9 +219,7 @@ module IsoDoc
 
       def sequential_formula_names(clause)
         c = Counter.new
-        clause.xpath(ns(".//formula")).each do |t|
-          next if t["id"].nil? || t["id"].empty?
-
+        clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
             c.increment(t).print, nil,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
@@ -234,19 +237,15 @@ module IsoDoc
       end
 
       def sequential_figure_names(clause)
-        if @jcgm
-          @iso.sequential_figure_names(clause)
-          @anchors.merge!(@iso.get)
-        else super
-        end
+        @jcgm or return super
+        @iso.sequential_figure_names(clause)
+        @anchors.merge!(@iso.get)
       end
 
       def hierarchical_figure_names(clause, num)
-        if @jcgm
-          @iso.hierarchical_figure_names(clause, num)
-          @anchors.merge!(@iso.get)
-        else super
-        end
+        @jcgm or return super
+        @iso.hierarchical_figure_names(clause, num)
+        @anchors.merge!(@iso.get)
       end
     end
   end

data/lib/metanorma/bipm/front.rb

@@ -91,7 +91,7 @@ module Metanorma
       def title(node, xml)
         ["en", "fr"].each do |lang|
           at = { language: lang, format: "text/plain" }
-          xml.title **attr_code(at.merge(type: "main")) do |t1|
+          xml.title **attr_code(at.merge(type: "title-main")) do |t1|
             t1 << Metanorma::Utils::asciidoc_sub(node.attr("title-#{lang}"))
           end
           %w(cover appendix annex part subpart provenance).each do |w|
@@ -104,7 +104,7 @@ module Metanorma
         at = { language: lang, format: "text/plain" }
         return unless title = node.attr("title-#{type}-#{lang}")
 
-        xml.title **attr_code(at.merge(type: type)) do |t1|
+        xml.title **attr_code(at.merge(type: "title-#{type}")) do |t1|
           t1 << Metanorma::Utils::asciidoc_sub(title)
         end
       end

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.2.2 -->
+<!-- VERSION v1.2.4 -->
 <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">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -836,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>
@@ -2046,6 +2068,9 @@
   </define>
   <define name="termdefinition">
     <element name="definition">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <choice>
         <ref name="verbaldefinition"/>
         <ref name="nonverbalrep"/>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.2.14".freeze
+    VERSION = "2.3.1".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(">= 2.7.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.4.1"
-  spec.add_dependency "metanorma-iso", "~> 2.4.2"
+  spec.add_dependency "metanorma-generic", "~> 2.5.1"
+  spec.add_dependency "metanorma-iso", "~> 2.5.1"
 
   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.2.14
+  version: 2.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-28 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.4.1
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -258,6 +258,7 @@ files:
 - lib/isodoc/bipm/jcgm.standard.xsl
 - lib/isodoc/bipm/metadata.rb
 - lib/isodoc/bipm/pdf_convert.rb
+- lib/isodoc/bipm/presentation_blocks.rb
 - lib/isodoc/bipm/presentation_xml_convert.rb
 - lib/isodoc/bipm/xref.rb
 - lib/metanorma-bipm.rb