metanorma-bipm 1.2.2 → 2.0.0

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -71,11 +71,11 @@ module IsoDoc
         unless name = node.at(ns("./#{elem}[not(@type = 'quoted')]"))
           return if node.at(ns("./#{elem}[@type = 'quoted']"))
 
-          node.children.empty? and node.add_child("<#{elem}></#{elem}>") or
+          (node.children.empty? and node.add_child("<#{elem}></#{elem}>")) or
             node.children.first.previous = "<#{elem}></#{elem}>"
           name = node.children.first
         end
-        if name.children.empty? then name.add_child(number)
+        if name.children.empty? then name.add_child(cleanup_entities(number))
         else (name.children.first.previous = "#{number}#{delim}")
         end
       end
@@ -250,6 +250,17 @@ module IsoDoc
         end
       end
 
+      def termsource1(elem)
+        while elem&.next_element&.name == "termsource"
+          elem << "; #{elem.next_element.remove.children.to_xml}"
+        end
+        elem.children = l10n("[#{@i18n.source} #{elem.children.to_xml.strip}]")
+      end
+
+      def bibliography_bibitem_number_skip(bibitem)
+        super || @xrefs.klass.standard?(bibitem)
+      end
+
       include Init
     end
   end

data/lib/{asciidoctor → metanorma}/bipm/bipm.rng

@@ -110,6 +110,7 @@
             <ref name="clause-subsection"/>
             <ref name="terms"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>
@@ -157,6 +158,7 @@
             <ref name="terms"/>
             <ref name="definitions"/>
             <ref name="references"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>

data/lib/{asciidoctor → metanorma}/bipm/converter.rb

@@ -1,9 +1,9 @@
-require "asciidoctor/standoc/converter"
-require "asciidoctor/generic/converter"
+require "metanorma/standoc/converter"
+require "metanorma/generic/converter"
 
-module Asciidoctor
+module Metanorma
   module BIPM
-    class Converter < Asciidoctor::Generic::Converter
+    class Converter < Metanorma::Generic::Converter
       register_for "bipm"
 
       def configuration
@@ -240,7 +240,7 @@ module Asciidoctor
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::BIPM::PdfConvert.new(doc_extract_attributes(node))
+        IsoDoc::BIPM::PdfConvert.new(pdf_extract_attributes(node))
       end
     end
   end

data/lib/{asciidoctor → metanorma}/bipm/isodoc.rng

@@ -32,6 +32,19 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="bibitem">
+      <element name="bibitem">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="hidden">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <ref name="BibliographicItem"/>
+      </element>
+    </define>
     <define name="section-title">
       <element name="title">
         <zeroOrMore>
@@ -58,7 +71,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -690,6 +703,7 @@
             <ref name="terms"/>
             <ref name="term-clause"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </oneOrMore>
       </element>
@@ -1680,6 +1694,7 @@
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
+          <ref name="floating-title"/>
         </choice>
       </oneOrMore>
     </choice>
@@ -1722,6 +1737,7 @@
           <ref name="terms"/>
           <ref name="definitions"/>
           <ref name="references"/>
+          <ref name="floating-title"/>
         </choice>
       </zeroOrMore>
     </group>
@@ -1796,6 +1812,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1814,9 +1844,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1880,17 +1907,37 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="geographicArea"/>
+      <attribute name="geographic-area"/>
     </optional>
     <choice>
       <ref name="expression_designation"/>
       <ref name="letter_symbol_designation"/>
       <ref name="graphical_symbol_designation"/>
     </choice>
+    <optional>
+      <ref name="fieldofapplication"/>
+    </optional>
+    <optional>
+      <ref name="usageinfo"/>
+    </optional>
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="fieldofapplication">
+    <element name="field-of-application">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="usageinfo">
+    <element name="usage-info">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="letter_symbol_designation">
     <element name="letter-symbol">
       <optional>
@@ -1942,11 +1989,15 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +2007,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2034,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2070,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2083,13 @@
       <value>common</value>
     </choice>
   </define>
+  <define name="GrammarNumber">
+    <choice>
+      <value>singular</value>
+      <value>dual</value>
+      <value>plural</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -2041,13 +2104,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termusage">
-    <element name="usageinfo">
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="termdefinition">
     <element name="definition">
       <choice>
@@ -2061,13 +2117,16 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
         <choice>
           <ref name="paragraph"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
         </choice>
       </oneOrMore>
       <zeroOrMore>
@@ -2076,7 +2135,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>
@@ -2491,4 +2550,17 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="floating-title">
+    <element name="floating-title">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="depth">
+        <data type="int"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "1.2.2".freeze
+    VERSION = "2.0.0".freeze
   end
 end

data/lib/metanorma/bipm.rb

@@ -1,6 +1,7 @@
 require "metanorma"
 require "metanorma-generic"
 require "metanorma/bipm/processor"
+require "metanorma/bipm/converter"
 
 module Metanorma
   module BIPM

data/lib/metanorma-bipm.rb

@@ -3,7 +3,6 @@ require "metanorma/bipm"
 require "isodoc/bipm"
 
 require "asciidoctor" unless defined? Asciidoctor::Converter
-require "asciidoctor/bipm"
 
 if defined? Metanorma
   require_relative "metanorma/bipm"

data/metanorma-bipm.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-generic", "~> 1.11.0"
-  spec.add_dependency "metanorma-iso", "~> 1.10.0"
+  spec.add_dependency "metanorma-generic", "~> 2.0.0"
+  spec.add_dependency "metanorma-iso", "~> 2.0.0"
 
-  spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

data/metanorma.yml

@@ -14,14 +14,14 @@ logo_path: lib/isodoc/bipm/html/logo.png
 i18nyaml: 
   en: lib/isodoc/bipm/i18n-en.yaml
   fr: lib/isodoc/bipm/i18n-fr.yaml
-validate_rng_file: lib/asciidoctor/bipm/bipm.rng
+validate_rng_file: lib/metanorma/bipm/bipm.rng
 htmlcoverpage: lib/isodoc/bipm/html/html_bipm_titlepage.html
 htmlintropage: lib/isodoc/bipm/html/html_bipm_intro.html
 htmlstylesheet: lib/isodoc/bipm/html/htmlstyle.scss
 scripts: lib/isodoc/bipm/html/scripts.html
 boilerplate:
-  en: lib/asciidoctor/bipm/boilerplate-en.xml
-  fr: lib/asciidoctor/bipm/boilerplate-fr.xml
+  en: lib/metanorma/bipm/boilerplate-en.xml
+  fr: lib/metanorma/bipm/boilerplate-fr.xml
 published_stages:
   - in-force
   - retired

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -200,16 +200,6 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
-- lib/asciidoctor/bipm.rb
-- lib/asciidoctor/bipm/basicdoc.rng
-- lib/asciidoctor/bipm/biblio.rng
-- lib/asciidoctor/bipm/bipm.rng
-- lib/asciidoctor/bipm/boilerplate-en.xml
-- lib/asciidoctor/bipm/boilerplate-fr.xml
-- lib/asciidoctor/bipm/boilerplate-jcgm-en.xml
-- lib/asciidoctor/bipm/converter.rb
-- lib/asciidoctor/bipm/isodoc.rng
-- lib/asciidoctor/bipm/reqt.rng
 - lib/isodoc/bipm.rb
 - lib/isodoc/bipm/base_convert.rb
 - lib/isodoc/bipm/bipm.brochure.xsl
@@ -248,7 +238,16 @@ files:
 - lib/isodoc/bipm/xref.rb
 - lib/metanorma-bipm.rb
 - lib/metanorma/bipm.rb
+- lib/metanorma/bipm/basicdoc.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/converter.rb
+- lib/metanorma/bipm/isodoc.rng
 - lib/metanorma/bipm/processor.rb
+- lib/metanorma/bipm/reqt.rng
 - lib/metanorma/bipm/version.rb
 - metanorma-bipm.gemspec
 - metanorma.yml
@@ -271,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: metanorma-bipm lets you write BIPM standards in Metanorma.

data/lib/asciidoctor/bipm.rb

@@ -1,8 +0,0 @@
-require "metanorma/bipm/version"
-require_relative "bipm/converter"
-
-module Asciidoctor
-  module BIPM
-
-  end
-end