metanorma-bipm 2.1.5 → 2.1.8

data/lib/metanorma/bipm/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/lib/metanorma/bipm/isodoc.rng

@@ -1285,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/bipm/processor.rb

@@ -10,7 +10,7 @@ module Metanorma
       def output_formats
         super.merge(
           html: "html",
-          pdf: "pdf"
+          pdf: "pdf",
         ).tap { |hs| hs.delete(:doc) }
       end
 
@@ -37,14 +37,17 @@ module Metanorma
         "Metanorma::BIPM #{Metanorma::BIPM::VERSION}"
       end
 
-      def output(isodoc_node, inname, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options = {})
         case format
         when :html
-          IsoDoc::BIPM::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::BIPM::HtmlConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :presentation
-          IsoDoc::BIPM::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::BIPM::PresentationXMLConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::BIPM::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::BIPM::PdfConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/bipm/reqt.rng

@@ -108,7 +108,7 @@
     </element>
   </define>
   <define name="label">
-    <element name="label">
+    <element name="identifier">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.1.5".freeze
+    VERSION = "2.1.8".freeze
   end
 end

data/lib/metanorma-bipm.rb

@@ -5,7 +5,7 @@ require "isodoc/bipm"
 
 require "asciidoctor" unless defined? Asciidoctor::Converter
 
-if defined? Metanorma
+if defined? Metanorma::Registry
   require_relative "metanorma/bipm"
   Metanorma::Registry.instance.register(Metanorma::BIPM::Processor)
 end

data/metanorma-bipm.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.1.0"
-  spec.add_dependency "metanorma-iso", "~> 2.1.0"
+  spec.add_dependency "metanorma-generic", "~> 2.2.0"
+  spec.add_dependency "metanorma-iso", "~> 2.1.8"
 
   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.5
+  version: 2.1.8
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-09-06 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.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.8
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +217,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -237,7 +238,6 @@ files:
 - lib/isodoc/bipm/doccontrol.rb
 - lib/isodoc/bipm/html/html_bipm_intro.html
 - lib/isodoc/bipm/html/html_bipm_titlepage.html
-- lib/isodoc/bipm/html/htmlstyle.css
 - lib/isodoc/bipm/html/htmlstyle.scss
 - lib/isodoc/bipm/html/logo.png
 - lib/isodoc/bipm/html/scripts.html
@@ -285,7 +285,7 @@ homepage: https://github.com/metanorma/metanorma-bipm
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -300,8 +300,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: metanorma-bipm lets you write BIPM standards in Metanorma.
 test_files: []