metanorma-ogc 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f445d36f0ad3b59ddb508a02ca1ca10a9d5bd11a8b1801eacabd9e65a11be8d
-  data.tar.gz: 59738a68ffd41eb0a372d238069fb93bf3f1f3536c38a087364ec9f5ec24246b
+  metadata.gz: d41c94f6c5235bd9608de229a92f399595a1884d3d02ab39d8e8fe8deb0354bf
+  data.tar.gz: 6cf593114c1695d886c65f3a9a104fbe25b3db30cd18f3a3e99a05947c70f42d
 SHA512:
-  metadata.gz: fa9dafae47b31024aeeabf37a3ef5c029f4bb21a076b1bd0f18c75b75fed2db551122781d6b341b35716e0e66fa4d01a9d245641ce4c4520cf265ed8b65e55a2
-  data.tar.gz: 92dbb5dca9f69df3b206432bb65c1302bcc81e2233b37e1b63342d01b55d1c3810eb979da3a316475d4f5600ead2c2f53a0c587806455a703c4853f26bcf42b6
+  metadata.gz: 5dbd25ed142e0c53ca3243cab6ea8b7a0de156ab90d7687d9b49b17c48a3c6006f9039515c3b93990e2d865c632eb1042fb66d9a5c55d96669a7aec036c738d0
+  data.tar.gz: 150a39555ef6af6c6748d2fd267292b8033dfa3576482e23b8b271662883d06b5138050f24fc4ef010d82dbf22c981789e84400ad03c53b6061faa995aaca325

data/.github/workflows/macos.yml

@@ -2,13 +2,14 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: macos
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +21,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          sudo gem install bundler -v "~> 2" --force
+          sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1

data/.github/workflows/ubuntu.yml

@@ -2,13 +2,14 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: ubuntu
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +21,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler 
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1

data/.github/workflows/windows.yml

@@ -2,13 +2,14 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: windows
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -21,7 +22,7 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler 
           bundle config --local path vendor/bundle
           bundle update
           bundle install --jobs 4 --retry 3

data/README.adoc

@@ -86,7 +86,6 @@ See https://www.metanorma.com/author/ogc/[Write Open Geospatial Consortium docum
 
 == Examples
 
-* link:spec/examples/rfc6350.adoc[] is an Metanorma AsciiDoc version of https://tools.ietf.org/html/rfc6350[RFC 6350].
-* link:spec/examples/rfc6350.html[] is an HTML file generated from the Asciidoctor.
-* link:spec/examples/rfc6350.doc[] is a Word document generated from the Asciidoctor.
+* Example documents are avalable at the https://github.com/metanorma/mn-samples-ogc[mn-samples-ogc] repository.
+* Document templates are available at the https://github.com/metanorma/mn-templates-ogc[mn-templates-ogc] repository.
 

data/lib/asciidoctor/ogc/basicdoc.rng

@@ -52,9 +52,9 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="BasicBlock"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="note"/>
     </zeroOrMore>
@@ -284,6 +284,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>
@@ -564,6 +567,7 @@
       <ref name="pagebreak"/>
       <ref name="bookmark"/>
       <ref name="image"/>
+      <ref name="index"/>
     </choice>
   </define>
   <define name="PureTextElement">
@@ -688,6 +692,17 @@
       <empty/>
     </element>
   </define>
+  <define name="index">
+    <element name="index">
+      <attribute name="primary"/>
+      <optional>
+        <attribute name="secondary"/>
+      </optional>
+      <optional>
+        <attribute name="tertiary"/>
+      </optional>
+    </element>
+  </define>
   <!-- bare ID element, used for referencing arbitrary spans of text -->
   <define name="bookmark">
     <element name="bookmark">

data/lib/asciidoctor/ogc/biblio.rng

@@ -34,7 +34,7 @@
     </data>
   </define>
   <start>
-    <ref name="relaton_collection"/>
+    <ref name="bibitem"/>
   </start>
   <define name="status">
     <element name="status">
@@ -278,10 +278,12 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <ref name="orgname"/>
-      <optional>
+      <oneOrMore>
+        <ref name="orgname"/>
+      </oneOrMore>
+      <zeroOrMore>
         <ref name="subdivision"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="abbreviation"/>
       </optional>
@@ -357,6 +359,9 @@
   </define>
   <define name="phone">
     <element name="phone">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -1024,6 +1029,8 @@
       <value>correctedBy</value>
       <value>revises</value>
       <value>revisedBy</value>
+      <value>describes</value>
+      <value>describedBy</value>
     </choice>
   </define>
   <define name="docrelation">

data/lib/asciidoctor/ogc/isodoc.rng

@@ -207,9 +207,9 @@
     </optional>
     <choice>
       <group>
-        <optional>
+        <zeroOrMore>
           <ref name="BasicBlock"/>
-        </optional>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
@@ -244,9 +244,9 @@
     </optional>
     <choice>
       <group>
-        <optional>
+        <zeroOrMore>
           <ref name="BasicBlock"/>
-        </optional>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
@@ -289,9 +289,9 @@
       </optional>
       <choice>
         <group>
-          <optional>
+          <zeroOrMore>
             <ref name="BasicBlock"/>
-          </optional>
+          </zeroOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>

data/lib/asciidoctor/ogc/isostandard.rng

@@ -6,7 +6,9 @@
     </start>
     <define name="organization">
       <element name="organization">
-        <ref name="orgname"/>
+        <oneOrMore>
+          <ref name="orgname"/>
+        </oneOrMore>
         <optional>
           <ref name="abbreviation"/>
         </optional>
@@ -74,10 +76,12 @@
     <define name="sections">
       <element name="sections">
         <ref name="clause"/>
-        <choice>
-          <ref name="term-clause"/>
-          <ref name="terms"/>
-        </choice>
+        <optional>
+          <choice>
+            <ref name="term-clause"/>
+            <ref name="terms"/>
+          </choice>
+        </optional>
         <optional>
           <ref name="definitions"/>
         </optional>
@@ -395,6 +399,7 @@
         </optional>
         <choice>
           <ref name="image"/>
+          <ref name="pre"/>
           <oneOrMore>
             <ref name="subfigure"/>
           </oneOrMore>

data/lib/asciidoctor/ogc/ogc.rng

@@ -51,21 +51,34 @@
     </define>
     <define name="DocumentType">
       <choice>
-        <value>standard</value>
-        <value>standard-with-suite</value>
         <value>abstract-specification</value>
-        <value>community-standard</value>
-        <value>profile</value>
         <value>best-practice</value>
-        <value>engineering-report</value>
+        <value>candidate-standard</value>
+        <value>conformance-class</value>
+        <value>change-request</value>
+        <value>community-practice</value>
+        <value>community-standard</value>
         <value>discussion-paper</value>
-        <value>reference-model</value>
-        <value>user-guide</value>
+        <value>draft-discussion-paper</value>
+        <value>interoperability-program-report</value>
+        <value>implementation-standard</value>
+        <value>implementation-standard-corrigendum</value>
+        <value>extension-package-standard</value>
+        <value>notes</value>
+        <value>ogc-reference-model</value>
+        <value>profile-corrigendum</value>
+        <value>public-engineering-report</value>
         <value>policy</value>
-        <value>guide</value>
-        <value>amendment</value>
-        <value>technical-corrigendum</value>
-        <value>administrative</value>
+        <value>policy-name-type-specification</value>
+        <value>primer</value>
+        <value>profile</value>
+        <value>request-for-comment</value>
+        <value>retired</value>
+        <value>standard-application-profile</value>
+        <value>test-suite</value>
+        <value>whitepaper</value>
+        <value>approved-technical-baseline</value>
+        <value>recommendation-paper</value>
       </choice>
     </define>
     <define name="editorialgroup">

data/lib/isodoc/ogc/html/ogc.scss

@@ -25,7 +25,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
         text-align:left;
         mso-pagination:widow-orphan;
         tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
-        font-size:10.0pt;
+        font-size:10.5pt;
         font-family:$bodyfont;
         mso-fareast-font-family:Calibri;
         mso-bidi-font-family:"Courier New";

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
   end
 end

data/metanorma-ogc.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "isodoc", "~> 1.0.0"
   spec.add_dependency "iso-639"
 
-  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2019-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement