metanorma-bipm 2.2.9 → 2.2.11

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -4,6 +4,7 @@ require "metanorma-iso"
 require_relative "init"
 require_relative "index"
 require_relative "doccontrol"
+require_relative "../../relaton/render/general"
 
 module IsoDoc
   module BIPM
@@ -24,8 +25,7 @@ module IsoDoc
       end
 
       def table1(elem)
-        return if labelled_ancestor(elem) || elem["unnumbered"]
-
+        labelled_ancestor(elem) || elem["unnumbered"] and return
         n = @xrefs.anchor(elem["id"], :label, false)
         prefix_name(elem, ".<tab/>",
                     l10n("#{@i18n.table.capitalize} #{n}"), "name")
@@ -40,9 +40,8 @@ module IsoDoc
       end
 
       def annex1(elem)
-        return super if @jcgm
-        return if elem["unnumbered"] == "true"
-
+        @jcgm and return super
+        elem["unnumbered"] == "true" and return
         lbl = @xrefs.anchor(elem["id"], :label)
         t = elem.at(ns("./title")) and
           t.children = "<strong>#{to_xml(t.children)}</strong>"
@@ -59,18 +58,15 @@ module IsoDoc
       end
 
       def clause1(elem)
-        elem.at(("./ancestor::*[@unnumbered = 'true']")) and
+        elem.at("./ancestor::*[@unnumbered = 'true']") and
           elem["unnumbered"] = "true"
-
         super
       end
 
       def prefix_name(node, delim, number, elem)
-        return if number.nil? || number.empty?
-
+        number.nil? || number.empty? and return
         unless name = node.at(ns("./#{elem}[not(@type = 'quoted')]"))
-          return if node.at(ns("./#{elem}[@type = 'quoted']"))
-
+          node.at(ns("./#{elem}[@type = 'quoted']")) and return
           (node.children.empty? and node.add_child("<#{elem}></#{elem}>")) or
             node.children.first.previous = "<#{elem}></#{elem}>"
           name = node.children.first
@@ -117,14 +113,12 @@ module IsoDoc
       end
 
       def bibdata_titles(bibdata)
-        return unless app = bibdata.at(ns("//bibdata/ext/" \
-                                          "structuredidentifier/part"))
-
+        app = bibdata.at(ns("//bibdata/ext/" \
+                            "structuredidentifier/part")) or return
         bibdata.xpath(ns("//bibdata/title[@type = 'part']")).each do |t|
           t.previous = t.dup
           t["type"] = "part-with-numbering"
-          part = t["language"] == "en" ? "Part" : "Partie"
-          # not looking up in YAML
+          part = t["language"] == "en" ? "Part" : "Partie" # not looking up in YAML
           t.children = l10n("#{part} #{app.text}: #{to_xml(t.children)}",
                             t["language"])
         end
@@ -146,8 +140,7 @@ module IsoDoc
       end
 
       def jcgm_eref(docxml, xpath)
-        return unless @jcgm
-
+        @jcgm or return
         docxml.xpath(ns(xpath)).each { |x| extract_brackets(x) }
         # merge adjacent text nodes
         docxml.root.replace(Nokogiri::XML(docxml.root.to_xml).root)
@@ -163,7 +156,6 @@ module IsoDoc
         start = node.at("./text()[1]")
         finish = node.at("./text()[last()]")
         (/^\[/.match?(start.text) && /\]$/.match?(finish.text)) or return
-
         start.replace(start.text[1..-1])
         node.previous = "["
         finish = node.at("./text()[last()]")
@@ -180,12 +172,8 @@ module IsoDoc
 
       # notes and remarques (list notes) are not numbered
       def note1(elem)
-        return if elem.parent.name == "bibitem" || elem["notag"] == "true"
-
-        # n = @xrefs.get[elem["id"]]
+        elem.parent.name == "bibitem" || elem["notag"] == "true" and return
         lbl = l10n(note_label(elem))
-        # (n.nil? || n[:label].nil? || n[:label].empty?) or
-        #  lbl = l10n("#{lbl} #{n[:label]}")
         prefix_name(elem, "", lbl, "name")
       end
 
@@ -193,29 +181,57 @@ module IsoDoc
         if elem.ancestors("preface").empty?
           if elem.ancestors("ul, ol, dl").empty?
             @i18n.note
-          else
-            @i18n.listnote
-          end
-        else
-          @i18n.prefacenote
+          else @i18n.listnote end
+        else @i18n.prefacenote
         end
       end
 
       def termsource1(elem)
+        # elem["status"] == "modified" and return super
         while elem&.next_element&.name == "termsource"
           elem << "; #{to_xml(elem.next_element.remove.children)}"
         end
-        elem.children = l10n("[#{@i18n.source} #{to_xml(elem.children).strip}]")
+        elem.children = l10n("[#{termsource_adapt(elem['status'])}" \
+                             "#{to_xml(elem.children).strip}]")
       end
 
-      def norm_ref_entry_code(_ordinal, identifiers, _ids, _standard, datefn, _bib)
+      def termsource_adapt(status)
+        case status
+        when "adapted" then @i18n.adapted_from
+        when "modified" then @i18n.modified_from
+        else ""
+        end
+      end
+
+      def termsource(docxml)
+        termsource_insert_empty_modification(docxml)
+        super
+      end
+
+      def termsource_insert_empty_modification(docxml)
+        docxml.xpath("//xmlns:termsource[@status = 'modified']" \
+                     "[not(xmlns:modification)]").each do |f|
+          f << "<modification/>"
+        end
+      end
+
+      def termsource_modification(elem)
+        if elem["status"] == "modified"
+          origin = elem.at(ns("./origin"))
+          # s = termsource_status(elem["status"]) and origin.next = l10n(", #{s}")
+        end
+        termsource_add_modification_text(elem.at(ns("./modification")))
+      end
+
+      def norm_ref_entry_code(_ordinal, identifiers, _ids, _standard, datefn,
+_bib)
         ret = (identifiers[0] || identifiers[1])
         ret += " #{identifiers[1]}" if identifiers[0] && identifiers[1]
         "#{ret}#{datefn} "
       end
 
-      def biblio_ref_entry_code(ordinal, ids, _id, standard, datefn, _bib)
-        #standard and id = nil
+      def biblio_ref_entry_code(ordinal, ids, _id, _standard, datefn, _bib)
+        # standard and id = nil
         ret = (ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]")
         if ids[:sdo]
           ret = prefix_bracketed_ref(ret)
@@ -226,6 +242,10 @@ module IsoDoc
         ret
       end
 
+      def bibrenderer
+        ::Relaton::Render::BIPM::General.new(language: @lang)
+      end
+
       include Init
     end
   end

data/lib/metanorma/bipm/converter.rb

@@ -51,9 +51,9 @@ module Metanorma
       end
 
       def date_range(date)
-        from = date.at(("./from"))
-        to = date.at(("./to"))
-        on = date.at(("./on"))
+        from = date.at("./from")
+        to = date.at("./to")
+        on = date.at("./on")
         return date.text unless from || on || to
         return on.text.sub(/-.*$/, "") if on
 
@@ -125,6 +125,14 @@ module Metanorma
           lowergreek: false, lowerroman: true }
       end
 
+      def xref_to_eref(elem, name)
+        if elem.at("//bibitem[@id = '#{elem['target']}']/" \
+                   "docidentifier[@type = 'BIPM-long']")
+          elem["style"] = "BIPM-long"
+        end
+        super
+      end
+
       def document(node)
         @jcgm = node.attr("committee-acronym") == "JCGM"
         super

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.1 -->
+<!-- VERSION v1.2.2 -->
 <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">
@@ -211,6 +211,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -1009,6 +1012,7 @@
       <ref name="del"/>
       <ref name="span"/>
       <ref name="erefstack"/>
+      <ref name="date_inline"/>
     </choice>
   </define>
   <define name="add">
@@ -1050,6 +1054,23 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="date_inline">
+    <element name="date">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="format"/>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>
@@ -2136,6 +2157,7 @@
     <choice>
       <value>identical</value>
       <value>modified</value>
+      <value>adapted</value>
       <value>restyled</value>
       <value>context-added</value>
       <value>generalisation</value>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.2.9".freeze
+    VERSION = "2.2.11".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -0,0 +1,47 @@
+nametemplate:
+  one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} {{initials[0] | join: ' ' | remove: '.' | remove: '_' }}{% endif %}"
+  two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} {{initials[0] | join: ' ' | remove: '.' | remove: '_' }}{% endif %}  {{ labels['and'] }} {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1]}} {{ initials[1] | join: ' ' | remove: '.' | remove: '_' }}{% endif %}"
+  more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} {{initials[0] | join: ' ' | remove: '.' | remove: '_' }} {% endif %} , {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1]}} {{ initials[1] | join: ' ' | remove: '.' | remove: '_' }} {% endif %}  {{ labels['and'] }} {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{{surname[2]}} {{initials[2] | join: ' ' | remove: '.' | remove: '_' }}{% endif %}"
+seriestemplate: "{% if series_formatted %}{{ series_formatted }}{% else %}{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %} ({{series_run}}) {{series_num}}|.{{series_partnumber}}{% endif %}"
+extenttemplate:
+  book: "<strong>{{ volume }}</strong> ({{issue}}) {{ page }}"
+  booklet: book
+  proceedings: book
+  journal: "<strong>{{ volume_raw }}</strong> ({{issue_raw}}) {{ page_raw }}"
+  article: journal
+  standard: book
+  techreport: "<strong>{{ volume }}</strong> ({{issue}}) {{ page }}"
+  inbook: "{{ volume }}: {{ page }}"
+  misc: "<strong>{{ volume }}</strong> ({{issue}}) {{ page }}, {{ duration }}"
+template:
+  book: "{{ creatornames }} ({{role | capitalize}}) ({{date}} ({{ labels['updated'] }}_{{date_updated}}) {% if date %}){% endif %} <em>{{ title }}</em> ,_{{ edition | capitalize_first }}. [{{medium}}] ({% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}:_{{publisher}}) {{draft}} ({{ series }}) {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]. {{size}}. {{extent}}." 
+    # TODO: omitted: author ids, subsidiary titles, subsidiary creators, rights metadata, distributor, item attributes, relationships
+  booklet: book
+  manual: book
+  proceedings: book
+  inbook: "{{ creatornames }} ({{role | capitalize}}) ({{date}} ({{ labels['updated'] }}_{{date_updated}}) {% if date %}){% endif %} {{ title }} . {{ authoritative_identifier | join: '. ' }}. {{ labels['in'] | capitalize }}: {{ host_creatornames}} ({{ host_role | capitalize}}) <em>{{host_title}}</em> [{{medium}}] ({% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}:_{{publisher}}) {{draft}} ({{ series }}) . {{size}}. {{extent}}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  inproceedings: inbook
+  incollection: inbook
+    # 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}}]."
+    # 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
+  electronic resource:  software
+  standard: "{% if home_standard %}<em>{{title}}</em>, _{{extent}}{%else%}{% if creatornames %}{{ creatornames }} ({{ role | capitalize}}){%else%}{{ publisher}}{%endif%} . ({{date}} ({{ labels['updated'] }}_{{date_updated}}) {% if date %}){% endif %} <em>{{ title }}</em> ({{nistpublisher}}), {{draft }} {{ series }} . [{{ medium | capitalize }}]. {{size}}. {{ extent }}. {{ authoritative_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}].{%endif%}"
+    # TODO: omitted: author ids, subsidiary titles, rights metadata, distributor, persistent identifier, item attributes, relationships
+  techreport: "{% if creatornames %}{{ creatornames }} ({{ role | capitalize}}){%else%}{{ publisher}}{%endif%} . ({{date}} ({{ labels['updated'] }}_{{date_updated}}) {% if date %}){% endif %} <em>{{ title }}</em> ({{nistpublisher}}), {{draft }} {{ series }} . [{{ medium | capitalize }}]. {{size}}. {{ extent }}. {{ authoritative_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  dataset: "{{ creatornames }} ({{ role | capitalize }}) ({{date}} ({{ labels['updated'] }}_{{date_updated}}) {% if date %}){% endif %} <em>{{ title }}</em> . {{ labels['version'] | capitalize }}_{{ edition_raw }} [{{medium }}]. {{ labels['in'] | capitalize }}:_{{series}}. {{ authoritative_identifier | join: '. ' }}. {{ uri }}. {{ size }}. {{ extent}}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
+    # TODO: omitted: author ids, system requirements, host archive, copyright, license, data source, distributor, usage instructions, relationships, provenance
+  website: "{{ creatornames }} ({{ role | capitalize }}) ({{date}} ({{ labels['updated'] }}_{{date_updated}}) {% if date %}){% endif %} <em>{{ title }}</em> . {{ labels['version'] | capitalize }}_{{ edition_raw }} [{{medium }}] ({% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}:_{{publisher}}) {{ draft }} . {{ authoritative_identifier | join: '. ' }}. {{ uri }}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
+    # TODO: omitted: author ids, page title, system requirements, subsidiary creator, rights metadata, distributor, persistent identifier, archive location, archive date and time, relationships
+  webresource: website
+    # TODO: component part
+  unpublished: "{{ creatornames }} ({{ role | capitalize }}) ({{date}} ({{ labels['updated'] }}_{{date_updated}}) {% if date %}){% endif %} <em>{{ title }}</em> [{{ medium }}] {{ draft }} . {{ labels['at'] | capitalize}}:_{{ access_location }}.  {{ authoritative_identifier | join: '. ' }}. {{ uri }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  misc: unpublished
+    # TODO: omitted: author ids, subsidiary titles, subsidiary creators, host archive, item attributes, relationships
+  presentation: unpublished
+  thesis: "{{ creatornames }} ({{ role | capitalize }}) ({{date}} ({{ labels['updated'] }}_{{date_updated}}) {% if date %}){% endif %} <em>{{ title }}</em> [{{ medium }}] ({% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}:_{{publisher}}). {{ labels['at'] | capitalize}}:_{{ access_location }}.  {{ authoritative_identifier | join: '. ' }}. {{ uri }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+

data/lib/relaton/render/general.rb

@@ -0,0 +1,23 @@
+require "relaton-render"
+
+module Relaton
+  module Render
+    module BIPM
+      class General < ::Relaton::Render::IsoDoc::General
+        def config_loc
+          YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+        end
+
+        def klass_initialize(_options)
+          @nametemplateklass = Relaton::Render::Template::Name
+          @seriestemplateklass = Relaton::Render::Template::Series
+          @extenttemplateklass = Relaton::Render::Template::Extent
+          @sizetemplateklass = Relaton::Render::Template::Size
+          @generaltemplateklass = Relaton::Render::Template::General
+          @fieldsklass = Relaton::Render::Fields
+          @parseklass = Relaton::Render::Parse
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render/parse.rb

@@ -0,0 +1,20 @@
+module Relaton
+  module Render
+    module BIPM
+      class Parse < ::Relaton::Render::Parse
+        def simple_or_host_xml2hash(doc, host)
+          ret = super
+          ret.merge(home_standard: home_standard(doc, ret[:publisher_raw]))
+        end
+
+        def home_standard(_doc, pubs)
+          pubs&.any? do |r|
+            ["International Organization for Standardization", "ISO",
+             "International Electrotechnical Commission", "IEC"]
+              .include?(r[:nonpersonal])
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -276,6 +276,9 @@ files:
 - lib/metanorma/bipm/relaton-bipm.rng
 - lib/metanorma/bipm/reqt.rng
 - lib/metanorma/bipm/version.rb
+- lib/relaton/render/config.yml
+- lib/relaton/render/general.rb
+- lib/relaton/render/parse.rb
 - metanorma-bipm.gemspec
 - metanorma.yml
 homepage: https://github.com/metanorma/metanorma-bipm