metanorma-bipm 2.5.6 → 2.5.8

data/lib/isodoc/bipm/presentation_biblio.rb

@@ -74,8 +74,8 @@ _bib)
 
       def reference_name(ref)
         super
-        @jcgm and
-          @xrefs.get[ref["id"]][:xref] = wrap_brackets(@xrefs.get[ref["id"]][:xref])
+        @jcgm and @xrefs.get[ref["id"]][:xref] =
+                    wrap_brackets(@xrefs.get[ref["id"]][:xref])
       end
     end
   end

data/lib/isodoc/bipm/presentation_blocks.rb

@@ -6,7 +6,8 @@ module IsoDoc
         @iso.middle_title(docxml)
       end
 
-      def table1(elem)
+      # KILL
+      def table1x(elem)
         table_fn(elem)
         labelled_ancestor(elem) || elem["unnumbered"] and return
         n = @xrefs.anchor(elem["id"], :label, false)
@@ -14,6 +15,10 @@ module IsoDoc
                     l10n("#{@i18n.table.capitalize} #{n}"), "name")
       end
 
+      def table_delim
+        l10n("x.<tab/>").sub("x", "") # force French " .</tab>"
+      end
+
       def figure1(elem)
         if @jcgm
           @iso.xrefs = @xrefs
@@ -22,11 +27,15 @@ module IsoDoc
         end
       end
 
+      def note_delim(_elem)
+        l10n("x:<tab/>").sub("x", "") # force French " :</tab>"
+      end
+
       # notes and remarques (list notes) are not numbered
       def note1(elem)
         elem.parent.name == "bibitem" || elem["notag"] == "true" and return
         lbl = l10n(note_label(elem))
-        prefix_name(elem, "", lbl, "name")
+        prefix_name(elem, { label: note_delim(elem) }, lbl, "name")
       end
 
       def note_label(elem)

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -33,7 +33,8 @@ module IsoDoc
         super
       end
 
-      def annex1(elem)
+      # KILL
+      def annex1x(elem)
         @jcgm and return super
         elem["unnumbered"] == "true" and return
         lbl = @xrefs.anchor(elem["id"], :label)
@@ -42,6 +43,11 @@ module IsoDoc
         prefix_name(elem, ".<tab/>", lbl, "title")
       end
 
+      def annex_delim(elem)
+        @jcgm and return super
+        ".<tab/>"
+      end
+
       def clause(docxml)
         quotedtitles(docxml)
         super
@@ -57,7 +63,8 @@ module IsoDoc
         super
       end
 
-      def prefix_name(node, delim, number, elem)
+      # KILL
+      def prefix_namex(node, delims, number, elem)
         number.nil? || number.empty? and return
         unless name = node.at(ns("./#{elem}[not(@type = 'quoted')]"))
           node.at(ns("./#{elem}[@type = 'quoted']")) and return
@@ -69,6 +76,17 @@ module IsoDoc
         end
       end
 
+      def prefix_name(node, delims, number, elem)
+        if n = node.at(ns("./#{elem}[@type = 'quoted']"))
+          n1 = n.dup
+          n1.name = "fmt-#{elem}"
+          n.next = n1
+          prefix_name_postprocess(node, elem)
+        else
+          super
+        end
+      end
+
       def conversions(docxml)
         doccontrol docxml
         super

data/lib/isodoc/bipm/xref.rb

@@ -59,6 +59,7 @@ module IsoDoc
         "./term[#{UNNUM}] | ./terms[#{UNNUM}] | " \
         "./definitions[#{UNNUM}]".freeze
 
+      # KILL
       def section_name_anchors(clause, num, lvl)
         lbl = @jcgm ? "clause_jcgm" : "clause"
         @anchors[clause["id"]] =
@@ -66,6 +67,17 @@ module IsoDoc
             level: lvl, type: "clause", elem: @labels[lbl] }
       end
 
+      def section_name_anchors(clause, num, level)
+        lbl = @jcgm ? "clause_jcgm" : "clause"
+        xref = labelled_autonum(@labels[lbl], num)
+        label = num
+        c = clause_title(clause) and title = semx(clause, c, "title")
+        @anchors[clause["id"]] =
+          { label:, xref:, title:, level:, type: "clause",
+            elem: @labels[lbl] }
+      end
+
+      # KILL
       def section_names(clause, num, lvl)
         clause.nil? and return num
         num.increment(clause)
@@ -80,9 +92,25 @@ module IsoDoc
         num
       end
 
+      def section_names(clause, num, lvl)
+        unnumbered_section_name?(clause) and return num
+        num.increment(clause)
+        lbl = semx(clause, num.print)
+        section_name_anchors(clause, lbl, lvl)
+        clause.xpath(ns(NUMBERED_SUBCLAUSES))
+          .each_with_object(clause_counter(0)) do |c, i|
+          section_names1(c, lbl, i.increment(c).print, lvl + 1)
+        end
+        clause.xpath(ns(UNNUMBERED_SUBCLAUSES))
+          .each_with_object(clause_counter(0)) do |c, i|
+          unnumbered_section_names1(c, lvl + 1)
+        end
+        num
+      end
+
       def unnumbered_section_names(clause, lvl)
-        clause.nil? and return num
         lbl = clause.at(ns("./title"))&.text || "[#{clause['id']}]"
+        lbl = semx(clause, lbl, "title")
         @anchors[clause["id"]] = { label: lbl, xref: l10n(%{"#{lbl}"}),
                                    level: lvl, type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each do |c|
@@ -91,17 +119,20 @@ module IsoDoc
       end
 
       def section_name1_anchors(clause, num, level)
-        lbl = @jcgm ? "" : "#{@labels['subclause']} "
+        lbl = @jcgm ? "" : @labels['subclause']
+        xref = labelled_autonum(@labels[lbl], num)
+        label = num
         @anchors[clause["id"]] =
-          { label: num, level: level, xref: l10n("#{lbl}#{num}"),
+          { label: num, level: level, xref: labelled_autonum(lbl, num), # l10n("#{lbl}#{num}"),
             type: "clause", elem: lbl }
       end
 
-      def section_names1(clause, num, level)
-        @anchors[clause["id"]] = section_name1_anchors(clause, num, level)
-        i = Counter.new(0, prefix: num)
+      def section_names1(clause, parentnum, num, level)
+        lbl = clause_number_semx(parentnum, clause, num)
+        @anchors[clause["id"]] = section_name1_anchors(clause, lbl, level)
+        i = Counter.new(0)
         clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
-          section_names1(c, i.increment(c).print, level + 1)
+          section_names1(c, lbl, i.increment(c).print, level + 1)
         end
         clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
           unnumbered_section_names1(c, lvl + 1)
@@ -110,8 +141,9 @@ module IsoDoc
 
       def unnumbered_section_names1(clause, level)
         lbl = clause.at(ns("./title"))&.text || "[#{clause['id']}]"
+        lbl = semx(clause, lbl, "title")
         @anchors[clause["id"]] =
-          { label: lbl, xref: l10n(%{"#{lbl}"}), level: level, type: "clause" }
+          { label: lbl, xref: %{"#{lbl}"}, level: level, type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           unnumbered_section_names1(c, level + 1)
         end
@@ -137,33 +169,37 @@ 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, elem: @annexlbl }
+          xref: labelled_autonum(@annexlbl, num), # #l10n("#{@annexlbl} #{num}"),
+          level: 1, elem: @annexlbl }
       end
 
       def annex_names(clause, num)
-        @anchors[clause["id"]] = annex_name_anchors(clause, num)
+        lbl = semx(clause, num)
+        prefix = @jcgm ? "" : "A"
+        lbl1 = semx(clause, "#{prefix}#{num}")
+        @anchors[clause["id"]] = annex_name_anchors(clause, lbl)
         if @klass.single_term_clause?(clause)
           annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
-                       num.to_s, 1)
+                       lbl, 1)
         else
-          prefix = @jcgm ? "" : "A"
-          i = Counter.new(0, prefix: "#{prefix}#{num}")
+          i = Counter.new(0)
           clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
-            annex_names1(c, i.increment(c).print, 2)
+            annex_names1(c, lbl1, i.increment(c).print, 2)
           end
           clause.xpath(ns(UNNUMBERED_SUBCLAUSES))
             .each { |c| unnumbered_annex_names1(c, 2) }
         end
-        hierarchical_asset_names(clause, num)
+        hierarchical_asset_names(clause, "#{prefix}#{num}")
       end
 
       def unnumbered_annex_anchors(lbl)
         { label: lbl, type: "clause", value: "",
-          xref: l10n(%{"#{lbl}"}), level: 1 }
+          xref: (%{"#{lbl}"}), level: 1 }
       end
 
       def unnumbered_annex_names(clause)
         lbl = clause.at(ns("./title"))&.text || "[#{clause['id']}]"
+        lbl = semx(clause, lbl, "title")
         @anchors[clause["id"]] = unnumbered_annex_anchors(lbl)
         if @klass.single_term_clause?(clause)
           annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
@@ -175,17 +211,19 @@ module IsoDoc
         hierarchical_asset_names(clause, lbl)
       end
 
-      def annex_names1_anchors(num, level)
-        lbl = @jcgm ? "" : "#{@annexlbl} "
-        { label: num, xref: l10n("#{lbl}#{num}"),
+      def annex_name_anchors1(clause, num, level)
+        lbl = @jcgm ? "" : @annexlbl
+        @anchors[clause["id"]] = 
+        { label: num, xref: labelled_autonum(lbl, num), #l10n("#{lbl}#{num}"),
           level: level, type: "clause", elem: lbl }
       end
 
-      def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = annex_names1_anchors(num, level)
-        i = Counter.new(0, prefix: num)
+      def annex_names1(clause, parentnum, num, level)
+        lbl = clause_number_semx(parentnum, clause, num)
+        annex_name_anchors1(clause, lbl, level)
+        i = Counter.new(0)
         clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
-          annex_names1(c, i.increment(c).print, level + 1)
+          annex_names1(c, lbl, i.increment(c).print, level + 1)
         end
         clause.xpath(ns(UNNUMBERED_SUBCLAUSES))
           .each { |c| unnumbered_annex_names1(c, level + 1) }
@@ -193,6 +231,7 @@ module IsoDoc
 
       def unnumbered_annex_names1(clause, level)
         lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
+        lbl = semx(clause, lbl, "title")
         @anchors[clause["id"]] = { label: lbl, xref: l10n(%{"#{lbl}"}),
                                    level: level, type: "clause" }
         clause.xpath(ns(SUBCLAUSES))
@@ -200,16 +239,16 @@ module IsoDoc
       end
 
       def annex_name_lbl(_clause, num)
-        l10n("<strong>#{@annexlbl} #{num}</strong>")
+        l10n("<strong>#{labelled_autonum(@annexlbl, num)}</strong>")
       end
 
       def sequential_formula_names(clause, container: false)
         c = Counter.new
         clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
-            c.increment(t).print, container ? t : nil,
+            semx(t, c.increment(t).print), t,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
-            "formula", t["unnumbered"]
+            "formula", { unnumb: t["unnumbered"], container: }
           )
         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.4.0 -->
+<!-- VERSION v1.4.1 -->
 <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">

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Bipm
-    VERSION = "2.5.6".freeze
+    VERSION = "2.5.8".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -25,7 +25,7 @@ template:
     # TODO: omitted: author ids, additional info for component part, subsidiary titles of host resource, rights metadata, distributor, relationships
   journal: "<em>{{ title}}</em> [{{medium}}] . ({% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}:_{{publisher}}). ({{date}}). {{size}}. {{extent}}. {{ authoritative_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
     # TODO subsidiary titles, rights metadata, item attributes, relationships
-  article: "{{ creatornames }} ({{role | capitalize}}) ({{date}} ({{ labels['updated'] }}_{{date_updated}}) {% if date %}){% endif %} {{ series }}. [{{medium}}] {{draft}} . {{size}}. {{ extent }}. {{ authoritative_identifier | join: '. ' }}. {{ authoritative_identifier | join: '. ' }}.  {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  article: "{{ creatornames }} ({{role | capitalize}}) ({{date}} ({{ labels['updated'] }}_{{date_updated}}) {% if date %}){% endif %} {{ series }}. [{{medium}}] {{draft}} . {{size}}. {{ extent }}. {{ authoritative_identifier | join: '. ' }}.  {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
     # TODO: omitted: author ids, subsidiary titles, rights metadata, distributor, item attributes, relationships; newspapers
   software: "{{ creatornames }} ({{ role | capitalize}}) ({{date}} ({{ labels['updated'] }}_{{date_updated}}) {% if date %}){% endif %} <em>{{ title }}</em> . {{ labels['version'] | capitalize }}_{{ edition_raw }} {{draft}} . [{{medium | capitalize}}]. ({% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}:_{{publisher}}). {{ authoritative_identifier | join: '. ' }}. {{ uri }}. {{size}}. {{ extent}}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
     # TODO: omitted: author ids, subsidiary titles, subsidiary creators, copyright, license, distributor, system requirements, relationships

data/lib/relaton/render/general.rb

@@ -1,4 +1,5 @@
 require "relaton-render"
+require_relative "parse"
 
 module Relaton
   module Render
@@ -16,7 +17,7 @@ module Relaton
           @sizetemplateklass = Relaton::Render::Template::Size
           @generaltemplateklass = Relaton::Render::Template::General
           @fieldsklass = Relaton::Render::Fields
-          @parseklass = Relaton::Render::Parse
+          @parseklass = Relaton::Render::Bipm::Parse
         end
       end
     end

data/lib/relaton/render/parse.rb

@@ -14,6 +14,14 @@ module Relaton
               .include?(r[:nonpersonal])
           end
         end
+
+        def authoritative_identifier(doc)
+          if %w(article journal book).include?(doc.type)
+            [] # we don't want BIPM identifiers for these!
+          else
+            super
+          end
+        end
       end
     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.2"
-  spec.add_dependency "metanorma-iso", "~> 2.9.0"
+  spec.add_dependency "metanorma-generic", "~> 2.7.4"
+  spec.add_dependency "metanorma-iso", "~> 2.9.2"
 
   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.6
+  version: 2.5.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-12-10 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.2
+        version: 2.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: 2.7.4
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.9.2
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement