metanorma-ogc 1.3.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9fa70d6fdbc72921c0981d6afaadbdfd358a37c74f84f7bae86e75bbca1d089
-  data.tar.gz: ef441a2182e40e3605395584d4afee319a1a9e725f092f4db9661e1be2641e08
+  metadata.gz: cf9c0a5cbffaabeba248b57a50309b3abed1c96eb1f222d8dbde3234ef0c2763
+  data.tar.gz: 31cd6c92355d6077705d51bff35c51fc300345b82a58a50fa9426e15301a9e73
 SHA512:
-  metadata.gz: a5e6a4a9bd68c5b4d45950c68ca316c9460dff1e8f874ebfba9c43d27eb19920cf16384fb687f55c6f5c78d8329902eba231ebdeda988462d67f6d910e127529
-  data.tar.gz: de1fc5ecc2a852c251857cb852c0195f0ce396ca0c8fc7c3e0db701678d5d5d7b9a049666e453f5a7e3bf586f4a7e750187cb24d6885a19578fada4bf0effc3c
+  metadata.gz: 619abf777ca9e6829561e1d446f58a92448d991506c887a0f0f019950c2b7e897061a625d97259d8c0078f4cd4a336a13d8ba452d271e73a2709a07a9b9bcc01
+  data.tar.gz: 2ddd0bf8b9b9b5915e194c80f88e22656039dedd9fb97a5d23aae76a39ac469758be9c2fea8553a091fb63056eaffc9c3c5aad1b949038d432cdd155ed1d6189

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/.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/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/ogc.rb

@@ -2,6 +2,5 @@ require "asciidoctor/ogc/converter"
 
 module Asciidoctor
   module Ogc
-
   end
 end

data/lib/asciidoctor/ogc/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/ogc/front.rb

@@ -12,8 +12,9 @@ module Asciidoctor
 
       def corporate_author(node, xml)
         return unless node.attr("submitting-organizations")
-        csv_split(HTMLEntities.new.decode(node.attr("submitting-organizations")),
-                  ";")&.each do |org|
+
+        csv_split(HTMLEntities.new
+          .decode(node.attr("submitting-organizations")), ";")&.each do |org|
           xml.contributor do |c|
             c.role **{ type: "author" }
             c.organization do |a|
@@ -37,6 +38,7 @@ module Asciidoctor
 
       def ogc_editor(node, xml)
         return unless node.attr("editor")
+
         xml.contributor do |c|
           c.role **{ type: "editor" }
           c.person do |p|
@@ -69,6 +71,7 @@ module Asciidoctor
 
       def metadata_committee(node, xml)
         return unless node.attr("committee")
+
         xml.editorialgroup do |a|
           a.committee(node.attr("committee") || "technical")
           node.attr("subcommittee") and
@@ -84,9 +87,11 @@ module Asciidoctor
 
       def externalid(node)
         return node.attr("external-id") if node.attr("external-id")
+
         d = doctype(node)
         a = node.attr("abbrev")
-        return unless d and a
+        return unless d && a
+
         url = "http://www.opengis.net/doc/#{IsoDoc::Ogc::DOCTYPE_ABBR[d]}/#{a}"
         v = (node.attr("edition") || node.attr("version")) and url += "/#{v}"
         url
@@ -107,7 +112,7 @@ module Asciidoctor
         if doctype(node) == "engineering-report"
           "http://www.opengis.net/doc/PER/t14-#{node.attr('referenceurlid')}"
         else
-          node.attr('referenceurlid')
+          node.attr("referenceurlid")
         end
       end
 
@@ -125,9 +130,9 @@ module Asciidoctor
 
       def metadata_date(node, xml)
         super
-        ogc_date(node, xml, "submissiondate", "received" )
-        ogc_date(node, xml, "publicationdate", "published" )
-        ogc_date(node, xml, "approvaldate", "issued" )
+        ogc_date(node, xml, "submissiondate", "received")
+        ogc_date(node, xml, "publicationdate", "published")
+        ogc_date(node, xml, "approvaldate", "issued")
       end
 
       def ogc_date(node, xml, ogcname, metanormaname)
@@ -139,27 +144,30 @@ module Asciidoctor
       end
 
       def metadata_version(node, xml)
-        node.set_attr("edition", node.attr("version"), false) if node.attr("version")
+        node.attr("version") and
+          node.set_attr("edition", node.attr("version"), false)
         super
       end
 
       def metadata_subdoctype(node, xml)
-        s = node.attr("docsubtype") 
+        s = node.attr("docsubtype")
         s1 = ::IsoDoc::Ogc::DOCSUBTYPE_ABBR.invert[s] and s = s1
         case doctype(node)
         when "standard"
           unless %w{conceptual-model conceptual-model-and-encoding
                     conceptual-model-and-implementation encoding extension
                     implementation profile profile-with-extension}.include? s
-            @log.add("Document Attributes", nil, "'#{s}' is not a permitted subtype of Standard: "\
-              "reverting to 'implementation'")
+            @log.add("Document Attributes", nil,
+                     "'#{s}' is not a permitted subtype of Standard: "\
+                     "reverting to 'implementation'")
             s = "implementation"
           end
         when "best-practice"
           unless %w{general encoding extension profile
                     profile-with-extension}.include? s
-            @log.add("Document Attributes", nil, "'#{s}' is not a permitted subtype of Standard: "\
-              "reverting to 'implementation'")
+            @log.add("Document Attributes", nil,
+                     "'#{s}' is not a permitted subtype of Standard: "\
+                     "reverting to 'implementation'")
             s = "general"
           end
         end

data/lib/asciidoctor/ogc/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>
@@ -943,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>
@@ -1017,9 +1207,7 @@
   </define>
   <define name="IsoWorkgroup">
     <optional>
-      <attribute name="number">
-        <data type="int"/>
-      </attribute>
+      <attribute name="number"/>
     </optional>
     <optional>
       <attribute name="type"/>

data/lib/asciidoctor/ogc/ogc.rng

@@ -79,20 +79,18 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="docsubtype">
-    <element name="docsubtype">
-      <choice>
-        <value>conceptual-model</value>
-        <value>conceptual-model-and-encoding</value>
-        <value>conceptual-model-and-implementation</value>
-        <value>encoding</value>
-        <value>extension</value>
-        <value>implementation</value>
-        <value>profile</value>
-        <value>profile-with-extension</value>
-        <value>general</value>
-      </choice>
-    </element>
+  <define name="DocumentSubtype">
+    <choice>
+      <value>conceptual-model</value>
+      <value>conceptual-model-and-encoding</value>
+      <value>conceptual-model-and-implementation</value>
+      <value>encoding</value>
+      <value>extension</value>
+      <value>implementation</value>
+      <value>profile</value>
+      <value>profile-with-extension</value>
+      <value>general</value>
+    </choice>
   </define>
   <define name="submitters">
     <element name="submitters">