metanorma-bipm 2.2.10 → 2.2.12

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -25,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")
@@ -41,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>"
@@ -60,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
@@ -118,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
@@ -147,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)
@@ -164,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()]")
@@ -181,8 +172,7 @@ module IsoDoc
 
       # notes and remarques (list notes) are not numbered
       def note1(elem)
-        return if elem.parent.name == "bibitem" || elem["notag"] == "true"
-
+        elem.parent.name == "bibitem" || elem["notag"] == "true" and return
         lbl = l10n(note_label(elem))
         prefix_name(elem, "", lbl, "name")
       end
@@ -191,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 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)
+      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)

data/lib/metanorma/bipm/boilerplate-en.adoc

@@ -0,0 +1,15 @@
+== copyright-statement
+=== {blank}
+
+[align=center]
+© Bureau International des Poids et Mesures {{ docyear }} all rights reserved
+
+== license-statement
+=== Copyright statement
+This document is distributed under the terms of the Creative Commons Attribution 4.0 International License (http://creativecommons.org/licenses/by/4.0/:[]), which permits unrestricted use, distribution, and reproduction in any medium, provided you give appropriate credit to the original author(s) and the source, provide a link to the Creative Commons license, and indicate if changes were made.
+
+== feedback-statement
+BIPM +
+Pavillon de Breteuil +
+F-92312 Sèvres Cedex +
+FRANCE

data/lib/metanorma/bipm/boilerplate-fr.adoc

@@ -0,0 +1,14 @@
+== copyright-statement
+=== {blank}
+[align="center"]
+© Bureau international des poids et mesures {{ docyear }} tous droits réservés
+
+== license-statement
+=== Note concernant les droits d’auteur
+Ce document est distribué selon les termes et conditions de la licence Creative Commons Attribution 4.0 International (http://creativecommons.org/licenses/by/4.0/:[]), qui permet l’utilisation sans restriction, la distribution et la reproduction sur quelque support que soit, sous réserve de mentionner dûment l’auteur ou les auteurs originaux ainsi que la source de l’œuvre, d’intégrer un lien vers la licence Creative Commons et d’indiquer si des modifications ont été effectuées.
+
+== feedback-statement
+BIPM +
+Pavillon de Breteuil +
+F-92312 Sèvres Cedex +
+FRANCE

data/lib/metanorma/bipm/boilerplate-jcgm-en.adoc

@@ -0,0 +1,32 @@
+== copyright-statement
+=== {blank}
+© JCGM {{ docyear }}
+
+Copyright of this JCGM guidance document is shared jointly by the JCGM member organizations (BIPM, IEC, 
+IFCC, ILAC, ISO, IUPAC, IUPAP and OIML).
+
+== license-statement
+=== Copyright
+Even if electronic versions are available free of charge on the website of one or more of the JCGM member organizations, economic and moral copyrights related to all JCGM publications are internationally protected. The JCGM does not, without its written authorisation, permit third parties to rewrite or re-brand issues, to sell copies to the public, or to broadcast or use on-line its publications. Equally, the JCGM also objects to distortion, augmentation or mutilation of its publications, including its titles, slogans and logos, and those of its member organizations.
+
+=== Official versions and translations
+The only official versions of documents are those published by the JCGM, in their original languages.
+
+The JCGM’s publications may be translated into languages other than those in which the documents were originally published by the JCGM. Permission must be obtained from the JCGM before a translation can be made. All translations should respect the original and official format of the formulae and units (without any conversion to other formulae or units), and contain the following statement (to be translated into the chosen language):
+
+____
+All JCGM’s products are internationally protected by copyright. This translation of the original JCGM document has been produced with the permission of the JCGM. The JCGM retains full internationally protected copyright on the design and content of this document and on the JCGM’s titles, slogan and logos. The member organizations of the JCGM also retain full internationally protected right on their titles, slogans and logos included in the JCGM’s publications. The only official version is the document published by the JCGM, in the original languages.
+____
+
+The JCGM does not accept any liability for the relevance, accuracy, completeness or quality of the information and materials offered in any translation. A copy of the translation shall be provided to the JCGM at the time of publication.
+
+=== Reproduction
+The JCGM’s publications may be reproduced, provided written permission has been granted by the JCGM. A sample of any reproduced document shall be provided to the JCGM at the time of reproduction and contain the following statement:A
+
+____
+This document is reproduced with the permission of the JCGM, which retains full internationally protected copyright on the design and content of this document and on the JCGM’s titles, slogans and logos. The member organizations of the JCGM also retain full internationally protected right on their titles, slogans and logos included in the JCGM’s publications. The only official versions are the original versions of the documents published by the JCGM.
+____
+
+== legal-statement
+=== Disclaimer
+The JCGM and its member organizations have published this document to enhance access to information about metrology. They endeavor to update it on a regular basis, but cannot guarantee the accuracy at all times and shall not be responsible for any direct or indirect damage that may result from its use. Any reference to commercial products of any kind (including but not restricted to any software, data or hardware) or links to websites, over which the JCGM and its member organizations have no control and for which they assume no responsibility, does not imply any approval, endorsement or recommendation by the JCGM and its member organizations.

data/lib/metanorma/bipm/converter.rb

@@ -96,10 +96,12 @@ module Metanorma
         end
       end
 
-      def boilerplate_file(xmldoc)
-        return super unless @jcgm
-
-        File.join(File.dirname(__FILE__), "boilerplate-jcgm-en.xml")
+      def boilerplate_file(_xmldoc)
+        if @jcgm
+          File.join(File.dirname(__FILE__), "boilerplate-jcgm-en.adoc")
+        else
+          File.join(File.dirname(__FILE__), "boilerplate-#{@lang}.adoc")
+        end
       end
 
       def sections_cleanup(xml)

data/lib/metanorma/bipm/isodoc.rng

@@ -1012,6 +1012,7 @@
       <ref name="del"/>
       <ref name="span"/>
       <ref name="erefstack"/>
+      <ref name="date_inline"/>
     </choice>
   </define>
   <define name="add">
@@ -1053,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>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.2.10".freeze
+    VERSION = "2.2.12".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -266,9 +266,9 @@ files:
 - lib/metanorma/bipm/biblio-standoc.rng
 - lib/metanorma/bipm/biblio.rng
 - lib/metanorma/bipm/bipm.rng
-- lib/metanorma/bipm/boilerplate-en.xml
-- lib/metanorma/bipm/boilerplate-fr.xml
-- lib/metanorma/bipm/boilerplate-jcgm-en.xml
+- lib/metanorma/bipm/boilerplate-en.adoc
+- lib/metanorma/bipm/boilerplate-fr.adoc
+- lib/metanorma/bipm/boilerplate-jcgm-en.adoc
 - lib/metanorma/bipm/converter.rb
 - lib/metanorma/bipm/front.rb
 - lib/metanorma/bipm/isodoc.rng

data/lib/metanorma/bipm/boilerplate-en.xml

@@ -1,20 +0,0 @@
-<boilerplate>
-  <copyright-statement>
-    <clause>
-      <p align="center"> © Bureau International des Poids et Mesures {{ docyear }} all rights reserved</p>
-    </clause>
-  </copyright-statement>
-  <license-statement>
-    <clause>
-      <title>Copyright statement</title>
-      <p>This document is distributed under the terms of the Creative Commons Attribution 4.0 International License (<link target="http://creativecommons.org/licenses/by/4.0/"/>), which permits unrestricted use, distribution, and reproduction in any medium, provided you give appropriate credit to the original author(s) and the source, provide a link to the Creative Commons license, and indicate if changes were made.</p>
-    </clause>
-  </license-statement>
-  <feedback-statement>
-    <p>BIPM<br/>
-      Pavillon de Breteuil<br/>
-      F-92312 Sèvres Cedex<br/>
-      FRANCE</p>
-  </feedback-statement>
-</boilerplate>
-

data/lib/metanorma/bipm/boilerplate-fr.xml

@@ -1,20 +0,0 @@
-<boilerplate>
-  <copyright-statement>
-    <clause>
-      <p align="center"> © Bureau international des poids et mesures {{ docyear }} tous droits réservés</p>
-    </clause>
-  </copyright-statement>
-  <license-statement>
-    <clause>
-    <title>Note concernant les droits d’auteur</title>
-    <p>Ce document est distribué selon les termes et conditions de la licence Creative Commons Attribution 4.0 International (<link target="http://creativecommons.org/licenses/by/4.0/"/>), qui permet l’utilisation sans restriction, la distribution et la reproduction sur quelque support que soit, sous réserve de mentionner dûment l’auteur ou les auteurs originaux ainsi que la source de l’œuvre, d’intégrer un lien vers la licence Creative Commons et d’indiquer si des modifications ont été effectuées.</p>
-  </clause>
-  </license-statement>
-  <feedback-statement>
-    <p>BIPM<br/>
-      Pavillon de Breteuil<br/>
-      F-92312 Sèvres Cedex<br/>
-      FRANCE</p>
-  </feedback-statement>
-</boilerplate>
-

data/lib/metanorma/bipm/boilerplate-jcgm-en.xml

@@ -1,37 +0,0 @@
-<boilerplate>
-  <copyright-statement>
-    <clause>
-      <p> © JCGM {{ docyear }} </p>
-      <p>Copyright of this JCGM guidance document is shared jointly by the JCGM member organizations (BIPM, IEC, 
-        IFCC, ILAC, ISO, IUPAC, IUPAP and OIML).</p>
-    </clause>
-  </copyright-statement>
-  <license-statement>
-    <clause>
-      <title>Copyright</title>
-      <p>Even if electronic versions are available free of charge on the website of one or more of the JCGM member organizations, economic and moral copyrights related to all JCGM publications are internationally protected. The JCGM does not, without its written authorisation, permit third parties to rewrite or re-brand issues, to sell copies to the public, or to broadcast or use on-line its publications. Equally, the JCGM also objects to distortion, augmentation or mutilation of its publications, including its titles, slogans and logos, and those of its member organizations.</p>
-    </clause>
-    <clause>
-      <title>Official versions and translations</title>
-      <p>The only official versions of documents are those published by the JCGM, in their original languages.</p>
-
-      <p>The JCGM’s publications may be translated into languages other than those in which the documents were originally published by the JCGM. Permission must be obtained from the JCGM before a translation can be made. All translations should respect the original and official format of the formulae and units (without any conversion to other formulae or units), and contain the following statement (to be translated into the chosen language):</p>
-
-      <quote>All JCGM’s products are internationally protected by copyright. This translation of the original JCGM document has been produced with the permission of the JCGM. The JCGM retains full internationally protected copyright on the design and content of this document and on the JCGM’s titles, slogan and logos. The member organizations of the JCGM also retain full internationally protected right on their titles, slogans and logos included in the JCGM’s publications. The only official version is the document published by the JCGM, in the original languages.</quote>
-
-      <p>The JCGM does not accept any liability for the relevance, accuracy, completeness or quality of the information and materials offered in any translation. A copy of the translation shall be provided to the JCGM at the time of publication.</p>
-    </clause>
-    <clause>
-      <title>Reproduction</title>
-      <p>The JCGM’s publications may be reproduced, provided written permission has been granted by the JCGM. A sample of any reproduced document shall be provided to the JCGM at the time of reproduction and contain the following statement:</p>
-      <quote>This document is reproduced with the permission of the JCGM, which retains full internationally protected copyright on the design and content of this document and on the JCGM’s titles, slogans and logos. The member organizations of the JCGM also retain full internationally protected right on their titles, slogans and logos included in the JCGM’s publications. The only official versions are the original versions of the documents published by the JCGM.</quote>
-    </clause>
-  </license-statement>
-  <legal-statement>
-    <clause>
-    <title>Disclaimer</title>
-    <p>The JCGM and its member organizations have published this document to enhance access to information about metrology. They endeavor to update it on a regular basis, but cannot guarantee the accuracy at all times and shall not be responsible for any direct or indirect damage that may result from its use. Any reference to commercial products of any kind (including but not restricted to any software, data or hardware) or links to websites, over which the JCGM and its member organizations have no control and for which they assume no responsibility, does not imply any approval, endorsement or recommendation by the JCGM and its member organizations.</p>
-  </clause>
-  </legal-statement>
-</boilerplate>
-