metanorma-bipm 1.0.6 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64a23fe1ec38fdd6edc912843f0a71d26426842674e27859c968e3973cff519b
-  data.tar.gz: a9b8f00c4ebaff5fd36d32390e0edbe7aed2fc63a31aaec9af7b949c82656d03
+  metadata.gz: 05cfafc9fd505c192fdc441582a028bf9a843bd83019ebcc5b34c96fe9a74957
+  data.tar.gz: 8fc6e66fd0d5aeffc2fcdcd8f2efe14cf24efa4ba9d97e76fe96e7c7f7524f38
 SHA512:
-  metadata.gz: 6e3d8a6280a0cfebaba1b33c7bbc3e02dfe011d4a0545738b519e52d0b6211d2c0a3e2a087588cb7acbcbb095d69c8830685a498e170c3a3d584f156cea17df3
-  data.tar.gz: fc3870e78f57d64b19214f1b4b444ae83b49b7d46d42cc17f2d0df344972fc8bc2c94b9190a5b2bc3c23095f2c49bd1683da006cf9c3dc90c6de9d513d882e7d
+  metadata.gz: 504a7edc465d5519b341aed7aafea97d3ebae1908fed1984ca2d99800b63bc068adf31184dad33f7ce4b0919a12a5b2e763f4c90c620f8fe4d51c4e6c9a61d3a
+  data.tar.gz: 4db2cdc12258c9a5be1277e1761226b04b7b09cdd710bf0d436ccb081a9cacf2754ca8a2b3a4a9e4e6c830e9930f883ee230d6256ce6a190c93c703f350cef69

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@v2
         with:
@@ -40,3 +30,14 @@ jobs:
           bundler-cache: true
 
       - run: bundle exec rake
+
+  tests-passed:
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
+          repository: ${{ github.repository }}
+          event-type: tests-passed
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

data/.gitignore

@@ -0,0 +1,4 @@
+/.rubocop-https--*
+/.byebug_history
+/.rspec_status
+/coverage/

data/.hound.yml

@@ -0,0 +1,5 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -0,0 +1,10 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+inherit_from:
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+
+# local repo-specific modifications
+# ...
+
+AllCops:
+  TargetRubyVersion: 2.4

data/Gemfile

@@ -6,6 +6,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
-if File.exist? 'Gemfile.devel'
-  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+if File.exist? "Gemfile.devel"
+  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end

data/Rakefile

@@ -1,8 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'isodoc/gem_tasks'
+require "isodoc/gem_tasks"
 
 IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/asciidoctor/bipm/biblio.rng

@@ -124,7 +124,7 @@
           <value>application/tei+xml</value>
           <value>text/x-asciidoc</value>
           <value>text/markdown</value>
-          <value>application/x-isodoc+xml</value>
+          <value>application/x-metanorma+xml</value>
           <text/>
         </choice>
       </attribute>
@@ -452,6 +452,7 @@
       <attribute name="type">
         <choice>
           <value>isni</value>
+          <value>orcid</value>
           <value>uri</value>
         </choice>
       </attribute>
@@ -461,10 +462,7 @@
   <define name="org-identifier">
     <element name="identifier">
       <attribute name="type">
-        <choice>
-          <value>orcid</value>
-          <value>uri</value>
-        </choice>
+        <data type="string" datatypeLibrary=""/>
       </attribute>
       <text/>
     </element>
@@ -789,6 +787,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">
@@ -1106,7 +1105,7 @@
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>
-      <value>cited</value>
+      <value>cites</value>
       <value>isCitedIn</value>
     </choice>
   </define>

data/lib/asciidoctor/bipm/bipm.rng

@@ -245,6 +245,9 @@
       <optional>
         <ref name="doctype"/>
       </optional>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <ref name="editorialgroup"/>
       <optional>
         <ref name="comment-period"/>

data/lib/asciidoctor/bipm/converter.rb

@@ -1,5 +1,5 @@
 require "asciidoctor/standoc/converter"
-require 'asciidoctor/generic/converter'
+require "asciidoctor/generic/converter"
 
 module Asciidoctor
   module BIPM
@@ -19,20 +19,26 @@ module Asciidoctor
       end
 
       def org_abbrev
-          { org_name_long => configuration.organization_name_short }
+        { org_name_long => configuration.organization_name_short }
       end
 
       def metadata_committee(node, xml)
         return unless node.attr("committee-en") || node.attr("committee-fr")
+
         xml.editorialgroup do |a|
           metadata_committee1(node, a)
-          metadata_committee2(node, a)
+          i = 2
+          while node.attr("committee-en_#{i}") || node.attr("committee-fr_#{i}")
+            metadata_committee2(node, a, i)
+            i += 1
+          end
           metadata_workgroup(node, a)
         end
       end
 
-      def metadata_committee1(node, a)
-        a.committee **attr_code(acronym: node.attr("committee-acronym")) do |c|
+      def metadata_committee1(node, xml)
+        xml.committee **attr_code(acronym:
+                                  node.attr("committee-acronym")) do |c|
           e = node.attr("committee-en") and
             c.variant e, language: "en", script: "Latn"
           e = node.attr("committee-fr") and
@@ -40,24 +46,25 @@ module Asciidoctor
         end
       end
 
-      def metadata_committee2(node, a)
-        i = 2
-        while node.attr("committee-en_#{i}") || node.attr("committee-fr_#{i}")  do
-          a.committee **attr_code(acronym: node.attr("committee-acronym_#{i}")) do |c|
-            e = node.attr("committee-en_#{i}") and c.variant e, language: "en", script: "Latn"
-            e = node.attr("committee-fr_#{i}") and c.variant e, language: "fr", script: "Latn"
+      def metadata_committee2(node, xml, num)
+        xml.committee **attr_code(acronym:
+                                  node.attr("committee-acronym_#{num}")) do |c|
+          %w(en fr).each do |lg|
+            e = node.attr("committee-#{lg}_#{num}") and
+              c.variant e, language: lg, script: "Latn"
           end
-          i += 1
         end
       end
 
-      def metadata_workgroup(node, a)
-        a.workgroup node.attr("workgroup"),
-          **attr_code(acronym: node.attr("workgroup-acronym"))
+      def metadata_workgroup(node, xml)
+        xml.workgroup(node.attr("workgroup"),
+                      **attr_code(acronym: node.attr("workgroup-acronym")))
         i = 2
-        while node.attr("workgroup_#{i}") do
-          a.workgroup node.attr("workgroup_#{i}"),
+        while node.attr("workgroup_#{i}")
+          xml.workgroup(
+            node.attr("workgroup_#{i}"),
             **attr_code(acronym: node.attr("workgroup-acronym_#{i}"))
+          )
           i += 1
         end
       end
@@ -76,13 +83,15 @@ module Asciidoctor
         draft = node.attr("supersedes-draft#{suffix}")
         edition = node.attr("supersedes-edition#{suffix}")
         return false unless d || draft || edition
+
         relation_supersedes_self1(xml, d, edition, draft)
       end
 
-      def relation_supersedes_self1(xml, d, edition, draft)
+      def relation_supersedes_self1(xml, date, edition, draft)
         xml.relation **{ type: "supersedes" } do |r|
           r.bibitem do |b|
-            d and b.date d, **{ type: edition ? "published" : "circulated" }
+            date and b.date(date,
+                            **{ type: edition ? "published" : "circulated" })
             edition and b.edition edition
             draft and b.version do |v|
               v.draft draft
@@ -91,13 +100,13 @@ module Asciidoctor
         end
       end
 
-      def personal_role(node, c, suffix)
+      def personal_role(node, xml, suffix)
         role = node.attr("role#{suffix}") || "author"
         unless %w(author editor).include?(role.downcase)
           desc = role
           role = "editor"
         end
-        c.role desc, **{ type: role.downcase }
+        xml.role desc, **{ type: role.downcase }
       end
 
       def title(node, xml)
@@ -106,7 +115,7 @@ module Asciidoctor
           xml.title **attr_code(at.merge(type: "main")) do |t1|
             t1 << Metanorma::Utils::asciidoc_sub(node.attr("title-#{lang}"))
           end
-          %w(cover appendix annex part subpart).each do |w|
+          %w(cover appendix annex part subpart provenance).each do |w|
             typed_title(node, xml, lang, w)
           end
         end
@@ -115,6 +124,7 @@ module Asciidoctor
       def typed_title(node, xml, lang, type)
         at = { language: lang, format: "text/plain" }
         return unless title = node.attr("title-#{type}-#{lang}")
+
         xml.title **attr_code(at.merge(type: type)) do |t1|
           t1 << Metanorma::Utils::asciidoc_sub(title)
         end
@@ -122,21 +132,28 @@ module Asciidoctor
 
       def sectiontype_streamline(ret)
         case ret
-        when "introduction" then "clause"
+        when "introduction" then @jcgm ? "introduction" : "clause"
         else
           super
         end
       end
 
+      def sectiontype(node, level = true)
+        ret = sectiontype1(node)
+        return ret if ret == "terms and definitions"
+
+        super
+      end
+
       def inline_anchor_xref_attrs(node)
         flags = %w(pagenumber nosee nopage).each_with_object({}) do |w, m|
-          if /#{w}%/.match(node.text)
+          if /#{w}%/.match?(node.text)
             node.text = node.text.sub(/#{w}%/, "")
             m[w] = true
           end
         end
         ret = super
-        flags.keys.each { |k| ret[k.to_sym] = true }
+        flags.each_key { |k| ret[k.to_sym] = true }
         ret
       end
 
@@ -154,9 +171,6 @@ module Asciidoctor
         super.merge(attr_code(start: node.attr("start")))
       end
 
-      def section_names_terms_cleanup(x)
-      end
-
       def committee_validate(xml)
         committees = Array(configuration&.committees) || return
         committees.empty? and return
@@ -173,21 +187,45 @@ module Asciidoctor
       end
 
       def boilerplate_file(xmldoc)
-        return super unless xmldoc&.at("//bibdata/ext/editorialgroup/committee/@acronym")&.value == "JCGM"
+        return super unless @jcgm
+
         File.join(File.dirname(__FILE__), "boilerplate-jcgm-en.xml")
       end
 
+      def sections_cleanup(xml)
+        super
+        jcgm_untitled_sections_cleanup(xml) if @jcgm
+      end
+
+      def jcgm_untitled_sections_cleanup(xml)
+        xml.xpath("//clause//clause | //annex//clause | //introduction/clause")
+          .each do |c|
+          next if !c&.at("./title")&.text&.empty?
+
+          c["inline-header"] = true
+        end
+      end
+
+      def section_names_terms_cleanup(xml); end
+
+      def section_names_refs_cleanup(xml); end
+
       def mathml_mi_italics
         { uppergreek: false, upperroman: false,
           lowergreek: false, lowerroman: true }
       end
 
+      def document(node)
+        @jcgm = node.attr("committee-acronym") == "JCGM"
+        super
+      end
+
       def outputs(node, ret)
-        File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
-        presentation_xml_converter(node).convert(@filename + ".xml")
-        html_converter(node).convert(@filename + ".presentation.xml",
+        File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
+        presentation_xml_converter(node).convert("#{@filename}.xml")
+        html_converter(node).convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.html")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml",
+        pdf_converter(node)&.convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.pdf")
       end
 
@@ -201,6 +239,7 @@ module Asciidoctor
 
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
+
         IsoDoc::BIPM::PdfConvert.new(doc_extract_attributes(node))
       end
     end

data/lib/asciidoctor/bipm/isodoc.rng

@@ -45,6 +45,11 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="updatetype">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -86,6 +91,35 @@
         <text/>
       </element>
     </define>
+    <define name="erefType">
+      <optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="citeas"/>
+      <attribute name="type">
+        <ref name="ReferenceFormat"/>
+      </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
+      <optional>
+        <attribute name="case">
+          <choice>
+            <value>capital</value>
+            <value>lowercase</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="droploc">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <ref name="CitationType"/>
+      <text/>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -514,6 +548,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -775,8 +812,100 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="em">
+      <element name="em">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="strong">
+      <element name="strong">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="tt">
+      <element name="tt">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="keyword">
+      <element name="keyword">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="strike">
+      <element name="strike">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="underline">
+      <element name="underline">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="smallcap">
+      <element name="smallcap">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="pagebreak">
+      <element name="pagebreak">
+        <optional>
+          <attribute name="orientation">
+            <choice>
+              <value>landscape</value>
+              <value>portrait</value>
+            </choice>
+          </attribute>
+        </optional>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="docsubtype">
+    <element name="docsubtype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
   <define name="colgroup">
     <element name="colgroup">
       <oneOrMore>
@@ -793,7 +922,35 @@
     <value>internal</value>
   </define>
   <define name="TextElement" combine="choice">
-    <ref name="concept"/>
+    <choice>
+      <ref name="concept"/>
+      <ref name="add"/>
+      <ref name="del"/>
+    </choice>
+  </define>
+  <define name="add">
+    <element name="add">
+      <choice>
+        <ref name="PureTextElement"/>
+        <ref name="eref"/>
+        <ref name="stem"/>
+        <ref name="keyword"/>
+        <ref name="xref"/>
+        <ref name="hyperlink"/>
+      </choice>
+    </element>
+  </define>
+  <define name="del">
+    <element name="del">
+      <choice>
+        <ref name="PureTextElement"/>
+        <ref name="eref"/>
+        <ref name="stem"/>
+        <ref name="keyword"/>
+        <ref name="xref"/>
+        <ref name="hyperlink"/>
+      </choice>
+    </element>
   </define>
   <define name="concept">
     <element name="concept">
@@ -814,8 +971,170 @@
       <ref name="permission"/>
       <ref name="imagemap"/>
       <ref name="svgmap"/>
+      <ref name="inputform"/>
+    </choice>
+  </define>
+  <define name="inputform">
+    <element name="form">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="name"/>
+      <attribute name="action"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="TextElement"/>
+          <ref name="FormInput"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="FormInput">
+    <choice>
+      <ref name="input"/>
+      <ref name="formlabel"/>
+      <ref name="select"/>
+      <ref name="textarea"/>
+    </choice>
+  </define>
+  <define name="InputType">
+    <choice>
+      <value>button</value>
+      <value>checkbox</value>
+      <value>date</value>
+      <value>file</value>
+      <value>password</value>
+      <value>radio</value>
+      <value>submit</value>
+      <value>text</value>
     </choice>
   </define>
+  <define name="input">
+    <element name="input">
+      <attribute name="type">
+        <ref name="InputType"/>
+      </attribute>
+      <optional>
+        <attribute name="checked">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="readonly">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="maxlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="minlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
+  <define name="formlabel">
+    <element name="label">
+      <attribute name="for">
+        <data type="IDREF"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="select">
+    <element name="select">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="multiple">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="size">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="option"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="option">
+    <element name="option">
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="textarea">
+    <element name="textarea">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="rows">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="cols">
+          <data type="int"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
   <define name="bibliography">
     <element name="bibliography">
       <oneOrMore>
@@ -888,9 +1207,7 @@
   </define>
   <define name="IsoWorkgroup">
     <optional>
-      <attribute name="number">
-        <data type="int"/>
-      </attribute>
+      <attribute name="number"/>
     </optional>
     <optional>
       <attribute name="type"/>