metanorma-bipm 2.1.13 → 2.2.1

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -9,7 +9,7 @@ module IsoDoc
   module BIPM
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
       def convert1(docxml, filename, dir)
-        @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/"\
+        @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/" \
                               "@acronym"))&.value == "JCGM"
         @iso = IsoDoc::Iso::PresentationXMLConvert
           .new({ language: @lang, script: @script })
@@ -18,9 +18,8 @@ module IsoDoc
         super
       end
 
-      def eref_localities1(target, type, from, upto, node, lang = "en")
-        @jcgm and return @iso.eref_localities1(target, type, from, upto,
-                                               node, lang)
+      def eref_localities1(opt)
+        @jcgm and return @iso.eref_localities1(opt)
         super
       end
 
@@ -46,7 +45,7 @@ module IsoDoc
 
         lbl = @xrefs.anchor(elem["id"], :label)
         t = elem.at(ns("./title")) and
-          t.children = "<strong>#{t.children.to_xml}</strong>"
+          t.children = "<strong>#{to_xml(t.children)}</strong>"
         prefix_name(elem, ".<tab/>", lbl, "title")
       end
 
@@ -118,7 +117,7 @@ module IsoDoc
       end
 
       def bibdata_titles(bibdata)
-        return unless app = bibdata.at(ns("//bibdata/ext/"\
+        return unless app = bibdata.at(ns("//bibdata/ext/" \
                                           "structuredidentifier/part"))
 
         bibdata.xpath(ns("//bibdata/title[@type = 'part']")).each do |t|
@@ -126,7 +125,7 @@ module IsoDoc
           t["type"] = "part-with-numbering"
           part = t["language"] == "en" ? "Part" : "Partie"
           # not looking up in YAML
-          t.children = l10n("#{part} #{app.text}: #{t.children.to_xml}",
+          t.children = l10n("#{part} #{app.text}: #{to_xml(t.children)}",
                             t["language"])
         end
       end
@@ -204,9 +203,27 @@ module IsoDoc
 
       def termsource1(elem)
         while elem&.next_element&.name == "termsource"
-          elem << "; #{elem.next_element.remove.children.to_xml}"
+          elem << "; #{to_xml(elem.next_element.remove.children)}"
         end
-        elem.children = l10n("[#{@i18n.source} #{elem.children.to_xml.strip}]")
+        elem.children = l10n("[#{@i18n.source} #{to_xml(elem.children).strip}]")
+      end
+
+      def norm_ref_entry_code(_ordinal, identifiers, _ids, _standard, datefn)
+        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)
+        standard and id = nil
+        ret = (ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]")
+        if ids[:sdo]
+          ret = prefix_bracketed_ref(ret)
+          ret += "#{ids[:sdo]}#{datefn} "
+        else
+          ret = prefix_bracketed_ref("#{ret}#{datefn}")
+        end
+        ret
       end
 
       include Init

data/lib/metanorma/bipm/basicdoc.rng

@@ -683,6 +683,9 @@
   </define>
   <define name="underline">
     <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <zeroOrMore>
         <ref name="PureTextElement"/>
       </zeroOrMore>

data/lib/metanorma/bipm/biblio-standoc.rng

@@ -47,7 +47,7 @@
     </element>
   </define>
   <define name="DocumentType">
-    <value>document</value>
+    <text/>
   </define>
   <define name="docsubtype">
     <element name="subdoctype">

data/lib/metanorma/bipm/isodoc.rng

@@ -571,6 +571,11 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="linenums">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -1238,6 +1243,11 @@
   </define>
   <define name="concept">
     <element name="concept">
+      <optional>
+        <attribute name="bold">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="ital">
           <data type="boolean"/>
@@ -2653,6 +2663,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
+      <text/>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.1.13".freeze
+    VERSION = "2.2.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.2.2"
-  spec.add_dependency "metanorma-iso", "~> 2.2.0"
+  spec.add_dependency "metanorma-generic", "~> 2.3.0"
+  spec.add_dependency "metanorma-iso", "~> 2.3.0"
 
   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.1.13
+  version: 2.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-12-19 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.2.2
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -297,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: metanorma-bipm lets you write BIPM standards in Metanorma.