metanorma-iso 1.8.1 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d170797212efc1050755714c1c875246a5b1b07ca8c4c1b6562b51ab2ee44a9
-  data.tar.gz: a6deb053bf737183c275a1f93a110d89f8fa42a093bafd514c7d672b5e16f427
+  metadata.gz: 5a0192dfdd4d26ab4c59d50a8b7e91e36ce83a27c9835f01221444e1ecf2c278
+  data.tar.gz: 4f4b37c785f3fe5c58777962943ebe8c27a38415cd178d8abab18dc95cf24192
 SHA512:
-  metadata.gz: 63752e6b4a75cba612fca7cacf5c0ccd7a4553f51b9743e667d7a2891737dff68deace61efcab395be2f22e8b4d6559ee8eee6c50ad84e3f13e627af1ca98a68
-  data.tar.gz: 401f42f155a7424266d3bf62cb6fca9a67ad1adeddf01145c55de95397a91de22847b56fa92563d64045eb6dc2682511eab3925d60f74b1ca737f8ecefacee63
+  metadata.gz: 91c94f57a7a8437f4c64366aeb1f14a5ede637357fd19485de1311e18d112ec22ff4325e35158c4322fc5a763292add832d4bc02b64c425e59b778e92ca757e8
+  data.tar.gz: 47e01118ffc205d246a082130c25893e6e3c41bc4c2ce171949d5f3e308e30a64c7ce49b903aa9f3434537eac2f275e50443f1887014b8a256a48061e38d3250

data/.github/workflows/rake.yml

@@ -4,7 +4,7 @@ name: rake
 
 on:
   push:
-    branches: [ master, main  ]
+    branches: [ master, main ]
     tags: [ v* ]
   pull_request:
 
@@ -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' ]
         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@master
 
@@ -49,5 +39,5 @@ jobs:
         with:
           token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
           repository: ${{ github.repository }}
-          event-type: notify
+          event-type: tests-passed
           client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

data/.hound.yml

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

data/.rubocop.yml

@@ -1,14 +1,10 @@
-# This project follows the Ribose OSS style guide.
-# https://github.com/riboseinc/oss-guides
-# All project-specific additions and overrides should be specified in this file.
+# 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:
-  DisplayCopNames: false
-  StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.4
-Rails:
-  Enabled: true
+  TargetRubyVersion: 2.5

data/lib/asciidoctor/iso/base.rb

@@ -44,6 +44,7 @@ module Asciidoctor
       def init(node)
         super
         @amd = %w(amendment technical-corrigendum).include? doctype(node)
+        @vocab = node.attr("docsubtype") == "vocabulary"
       end
 
       def ol_attrs(node)

data/lib/asciidoctor/iso/biblio.rng

@@ -787,6 +787,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">

data/lib/asciidoctor/iso/cleanup.rb

@@ -65,8 +65,12 @@ module Asciidoctor
         super
       end
 
-      TERM_CLAUSE = "//sections//terms".freeze
+      TERM_CLAUSE = "//sections//terms | "\
+        "//sections//clause[descendant::terms][not(descendant::definitions)]"
+        .freeze
+
       PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
+
       OTHERIDS = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or "\
         "@type = 'ISBN'".freeze
 
@@ -154,12 +158,20 @@ module Asciidoctor
 
           id = b.at("docidentifier").text
           b.at("./language | ./script | ./abstract | ./status")
-            .previous = <<~NOTE
-              <note type="Unpublished-Status">
-              <p>#{@i18n.under_preparation.sub(/%/, id)}</p></note>
-            NOTE
+            .previous = %(<note type="Unpublished-Status">
+                          <p>#{@i18n.under_preparation.sub(/%/, id)}</p></note>)
         end
       end
+
+      def termdef_boilerplate_insert(xmldoc, isodoc, once = false)
+        once = true
+        super
+      end
+
+      def term_defs_boilerplate_cont(src, term, isodoc)
+        @vocab and src.empty? and return
+        super
+      end
     end
   end
 end

data/lib/asciidoctor/iso/front.rb

@@ -115,7 +115,9 @@ module Asciidoctor
         return unless node.attr("title-amendment-#{lang}")
 
         xml.title(**attr_code(at.merge(type: "title-amd"))) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(node.attr("title-amendment-#{lang}"))
+          t1 << Metanorma::Utils::asciidoc_sub(
+            node.attr("title-amendment-#{lang}")
+          )
         end
       end
 

data/lib/asciidoctor/iso/front_id.rb

@@ -35,22 +35,26 @@ module Asciidoctor
 
       def stage_abbr(stage, substage, doctype)
         return nil if stage.to_i > 60
+
         ret = STAGE_ABBRS[stage.to_sym]
         ret = "PRF" if stage == "60" && substage == "00"
         ret = "AWI" if stage == "10" && substage == "99"
-        if %w(amendment technical-corrigendum technical-report 
-          technical-specification).include?(doctype)
+        if %w(amendment technical-corrigendum technical-report
+              technical-specification).include?(doctype)
           ret = "D" if stage == "40" && doctype == "amendment"
-          ret = "FD" if stage == "50" && %w(amendment technical-corrigendum).include?(doctype)
+          ret = "FD" if stage == "50" && %w(amendment technical-corrigendum)
+            .include?(doctype)
         end
         ret
       end
 
       def stage_name(stage, substage, doctype, iteration = nil)
         return "Proof" if stage == "60" && substage == "00"
+
         ret = STAGE_NAMES[stage.to_sym]
         if iteration && %w(20 30).include?(stage)
-          prefix = iteration.to_i.localize(@lang.to_sym).to_rbnf_s("SpelloutRules", "spellout-ordinal")
+          prefix = iteration.to_i.localize(@lang.to_sym)
+            .to_rbnf_s("SpelloutRules", "spellout-ordinal")
           ret = "#{prefix.capitalize} #{ret.downcase}"
         end
         ret
@@ -65,37 +69,39 @@ module Asciidoctor
       end
 
       def iso_id(node, xml)
-        return unless !@amd && node.attr("docnumber") || @amd && node.attr("updates")
+        !@amd && node.attr("docnumber") || @amd && node.attr("updates") or
+          return
+
         dn = iso_id1(node)
         dn1 = id_stage_prefix(dn, node, false)
         dn2 = id_stage_prefix(dn, node, true)
         xml.docidentifier dn1, **attr_code(type: "ISO")
-        xml.docidentifier id_langsuffix(dn1, node), **attr_code(type: "iso-with-lang")
-        xml.docidentifier id_langsuffix(dn2, node), **attr_code(type: "iso-reference")
+        xml.docidentifier(id_langsuffix(dn1, node),
+                          **attr_code(type: "iso-with-lang"))
+        xml.docidentifier(id_langsuffix(dn2, node),
+                          **attr_code(type: "iso-reference"))
       end
 
       def iso_id1(node)
         if @amd
           dn = node.attr("updates")
-          return add_amd_parts(dn, node)
+          add_amd_parts(dn, node)
         else
           part, subpart = node&.attr("partnumber")&.split(/-/)
-          return add_id_parts(node.attr("docnumber"), part, subpart)
+          add_id_parts(node.attr("docnumber"), part, subpart)
         end
       end
 
-      def add_amd_parts(dn, node)
-        a = node.attr("amendment-number")
-        c = node.attr("corrigendum-number")
+      def add_amd_parts(docnum, node)
         case doctype(node)
         when "amendment"
-          "#{dn}/Amd #{node.attr('amendment-number')}"
+          "#{docnum}/Amd #{node.attr('amendment-number')}"
         when "technical-corrigendum"
-          "#{dn}/Cor.#{node.attr('corrigendum-number')}"
+          "#{docnum}/Cor.#{node.attr('corrigendum-number')}"
         end
       end
 
-      def id_langsuffix(dn, node)
+      def id_langsuffix(docnum, node)
         lang = node.attr("language") || "en"
         suffix = case lang
                  when "en" then "(E)"
@@ -103,38 +109,43 @@ module Asciidoctor
                  else
                    "(X)"
                  end
-        "#{dn}#{suffix}"
+        "#{docnum}#{suffix}"
       end
 
       def structured_id(node, xml)
         return unless node.attr("docnumber")
+
         part, subpart = node&.attr("partnumber")&.split(/-/)
         xml.structuredidentifier do |i|
-          i.project_number node.attr("docnumber"),
-            **attr_code(part: part, subpart: subpart,
-                        amendment: node.attr("amendment-number"),
-                        corrigendum: node.attr("corrigendum-number"),
-                        origyr: node.attr("created-date"))
+          i.project_number(node.attr("docnumber"), **attr_code(
+            part: part, subpart: subpart,
+            amendment: node.attr("amendment-number"),
+            corrigendum: node.attr("corrigendum-number"),
+            origyr: node.attr("created-date")
+          ))
         end
       end
 
-      def add_id_parts(dn, part, subpart)
-        dn += "-#{part}" if part
-        dn += "-#{subpart}" if subpart
-        dn
+      def add_id_parts(docnum, part, subpart)
+        docnum += "-#{part}" if part
+        docnum += "-#{subpart}" if subpart
+        docnum
       end
 
       def id_stage_abbr(stage, substage, node, bare = false)
-        ret = bare ? 
-          IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
-          .status_abbrev(stage_abbr(stage, substage, doctype(node)),
-        substage, nil, nil, doctype(node)) :
-        IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
-          .status_abbrev(stage_abbr(stage, substage, doctype(node)),
-        substage, node.attr("iteration"),
-        node.attr("draft"), doctype(node))
-        if %w(amendment technical-corrigendum technical-report technical-specification).include?(doctype(node))
-          ret = ret + " " unless %w(D FD).include?(ret)
+        ret = if bare
+                IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
+                  .status_abbrev(stage_abbr(stage, substage, doctype(node)),
+                substage, nil, nil, doctype(node))
+              else
+                IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
+                  .status_abbrev(stage_abbr(stage, substage, doctype(node)),
+                substage, node.attr("iteration"),
+                node.attr("draft"), doctype(node))
+              end
+        if %w(amendment technical-corrigendum technical-report
+              technical-specification).include?(doctype(node))
+          ret = "#{ret} " unless %w(D FD).include?(ret)
         end
         ret
       end
@@ -143,51 +154,56 @@ module Asciidoctor
         stage = get_stage(node)
         abbr = id_stage_abbr(get_stage(node), get_substage(node), node, true)
         typeabbr = get_typeabbr(node, true)
-        typeabbr = "" if stage.to_i > 50 || stage.to_i == 60 && get_substage(node).to_i < 60
+        if stage.to_i > 50 || stage.to_i == 60 && get_substage(node).to_i < 60
+          typeabbr = ""
+        end
         "#{abbr}#{typeabbr}".strip
       end
 
-      def id_stage_prefix(dn, node, force_year)
+      def id_stage_prefix(docnum, node, force_year)
         stage = get_stage(node)
         typeabbr = get_typeabbr(node)
         if stage && (stage.to_i < 60)
-          dn = unpub_stage_prefix(dn, stage, typeabbr, node)
-        elsif typeabbr && !@amd then dn = "/#{typeabbr}#{dn}"
+          docnum = unpub_stage_prefix(docnum, stage, typeabbr, node)
+        elsif typeabbr == "DIR " then docnum = "#{typeabbr}#{docnum}"
+        elsif typeabbr && !@amd then docnum = "/#{typeabbr}#{docnum}"
         end
         (force_year || !(stage && (stage.to_i < 60))) and
-          dn = id_add_year(dn, node)
-        dn
+          docnum = id_add_year(docnum, node)
+        docnum
       end
 
-      def unpub_stage_prefix(dn, stage, typeabbr, node)
+      def unpub_stage_prefix(docnum, stage, typeabbr, node)
         abbr = id_stage_abbr(stage, get_substage(node), node)
         %w(40 50).include?(stage) && i = node.attr("iteration") and
           itersuffix = ".#{i}"
-        return dn if abbr.nil? || abbr.empty? # prefixes added in cleanup
-        return "/#{abbr}#{typeabbr} #{dn}#{itersuffix}" unless @amd
-        a = dn.split(%r{/})
+        return docnum if abbr.nil? || abbr.empty? # prefixes added in cleanup
+        return "/#{abbr}#{typeabbr} #{docnum}#{itersuffix}" unless @amd
+
+        a = docnum.split(%r{/})
         a[-1] = "#{abbr}#{a[-1]}#{itersuffix}"
         a.join("/")
       end
 
-      def id_add_year(dn, node)
+      def id_add_year(docnum, node)
         year = node.attr("copyright-year")
         @amd and year ||= node.attr("updated-date")&.sub(/-.*$/, "")
-        dn += ":#{year}" if year
-        dn
+        docnum += ":#{year}" if year
+        docnum
       end
 
       def get_stage(node)
-        stage = node.attr("status") || node.attr("docstage") || "60"
+        node.attr("status") || node.attr("docstage") || "60"
       end
 
       def get_substage(node)
         stage = get_stage(node)
-        node.attr("docsubstage") || ( stage == "60" ? "60" : "00" )
+        node.attr("docsubstage") || (stage == "60" ? "60" : "00")
       end
 
       def get_typeabbr(node, amd = false)
         case doctype(node)
+        when "directive" then "DIR "
         when "technical-report" then "TR "
         when "technical-specification" then "TS "
         when "amendment" then (amd ? "Amd " : "")

data/lib/asciidoctor/iso/isodoc.rng

@@ -45,6 +45,11 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="updatetype">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -543,6 +548,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -876,8 +884,28 @@
         </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>
@@ -927,7 +955,24 @@
   <define name="concept">
     <element name="concept">
       <optional>
-        <attribute name="term"/>
+        <element name="refterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="renderterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
       </optional>
       <choice>
         <ref name="eref"/>
@@ -943,8 +988,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>
@@ -1017,9 +1224,7 @@
   </define>
   <define name="IsoWorkgroup">
     <optional>
-      <attribute name="number">
-        <data type="int"/>
-      </attribute>
+      <attribute name="number"/>
     </optional>
     <optional>
       <attribute name="type"/>