metanorma-ogc 2.2.4 → 2.2.5

data/lib/metanorma/ogc/isodoc.rng

@@ -19,19 +19,7 @@
 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
-  <!-- include "biblio.rnc" { } -->
   <include href="basicdoc.rng">
-    <start>
-      <ref name="standard-document"/>
-    </start>
-    <define name="doctype">
-      <element name="doctype">
-        <optional>
-          <attribute name="abbreviation"/>
-        </optional>
-        <ref name="DocumentType"/>
-      </element>
-    </define>
     <define name="admonition">
       <element name="admonition">
         <attribute name="type">
@@ -117,24 +105,6 @@
         </optional>
       </element>
     </define>
-    <define name="bibitem">
-      <element name="bibitem">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="hidden">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="suppress_identifier">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <ref name="BibliographicItem"/>
-      </element>
-    </define>
     <define name="section-title">
       <element name="title">
         <zeroOrMore>
@@ -248,42 +218,6 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
-    <define name="localityStack">
-      <element name="localityStack">
-        <optional>
-          <attribute name="connective">
-            <choice>
-              <value>and</value>
-              <value>or</value>
-              <value>from</value>
-              <value>to</value>
-              <value/>
-            </choice>
-          </attribute>
-        </optional>
-        <zeroOrMore>
-          <ref name="locality"/>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="sourceLocalityStack">
-      <element name="sourceLocalityStack">
-        <optional>
-          <attribute name="connective">
-            <choice>
-              <value>and</value>
-              <value>or</value>
-              <value>from</value>
-              <value>to</value>
-              <value/>
-            </choice>
-          </attribute>
-        </optional>
-        <zeroOrMore>
-          <ref name="sourceLocality"/>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -827,21 +761,6 @@
         </zeroOrMore>
       </element>
     </define>
-    <define name="BibDataExtensionType">
-      <ref name="doctype"/>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <optional>
-        <ref name="editorialgroup"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="structuredidentifier"/>
-      </zeroOrMore>
-    </define>
     <!-- TitleType = text -->
     <define name="sections">
       <element name="sections">
@@ -881,7 +800,7 @@
           <ref name="BasicBlock"/>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="bibitem"/>
+          <ref name="doc_bibitem"/>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
@@ -1219,6 +1138,24 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="doc_bibitem">
+    <element name="bibitem">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <optional>
+        <attribute name="hidden">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="suppress_identifier">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <ref name="BibliographicItem"/>
+    </element>
+  </define>
   <define name="image" combine="choice">
     <element name="svg">
       <oneOrMore>
@@ -1237,14 +1174,6 @@
       <value>tag</value>
     </choice>
   </define>
-  <define name="docsubtype">
-    <element name="subdoctype">
-      <ref name="DocumentSubtype"/>
-    </element>
-  </define>
-  <define name="DocumentSubtype">
-    <text/>
-  </define>
   <define name="colgroup">
     <element name="colgroup">
       <oneOrMore>
@@ -1606,45 +1535,6 @@
       </choice>
     </element>
   </define>
-  <define name="editorialgroup">
-    <element name="editorialgroup">
-      <oneOrMore>
-        <ref name="technical-committee"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="technical-committee">
-    <element name="technical-committee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="IsoWorkgroup">
-    <optional>
-      <attribute name="number"/>
-    </optional>
-    <optional>
-      <attribute name="type"/>
-    </optional>
-    <optional>
-      <attribute name="identifier"/>
-    </optional>
-    <optional>
-      <attribute name="prefix"/>
-    </optional>
-    <text/>
-  </define>
-  <define name="ics">
-    <element name="ics">
-      <element name="code">
-        <text/>
-      </element>
-      <optional>
-        <element name="text">
-          <text/>
-        </element>
-      </optional>
-    </element>
-  </define>
   <define name="standard-document">
     <element name="standard-document">
       <attribute name="version"/>
@@ -2475,71 +2365,6 @@
       </optional>
     </element>
   </define>
-  <define name="structuredidentifier">
-    <element name="structuredidentifier">
-      <optional>
-        <attribute name="type"/>
-      </optional>
-      <oneOrMore>
-        <element name="agency">
-          <text/>
-        </element>
-      </oneOrMore>
-      <optional>
-        <element name="class">
-          <text/>
-        </element>
-      </optional>
-      <element name="docnumber">
-        <text/>
-      </element>
-      <optional>
-        <element name="partnumber">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="edition">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="version">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="supplementtype">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="supplementnumber">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="amendment">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="corrigendum">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="language">
-          <text/>
-        </element>
-      </optional>
-      <optional>
-        <element name="year">
-          <text/>
-        </element>
-      </optional>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>
@@ -2813,4 +2638,7 @@
       </attribute>
     </element>
   </define>
+  <start>
+    <ref name="standard-document"/>
+  </start>
 </grammar>

data/lib/metanorma/ogc/ogc.rng

@@ -5,52 +5,11 @@
     we cannot have a new default namespace: we will end up with a grammar with two different
     namespaces, one for isostandard and one for csand additions. And we do not want that.
   -->
+  <include href="relaton-ogc.rng"/>
   <include href="isodoc.rng">
     <start>
       <ref name="ogc-standard"/>
     </start>
-    <define name="DocumentType">
-      <choice>
-        <value>abstract-specification-topic</value>
-        <value>best-practice</value>
-        <value>change-request-supporting-document</value>
-        <value>community-practice</value>
-        <value>community-standard</value>
-        <value>discussion-paper</value>
-        <value>engineering-report</value>
-        <value>other</value>
-        <value>policy</value>
-        <value>reference-model</value>
-        <value>release-notes</value>
-        <value>standard</value>
-        <value>user-guide</value>
-        <value>white-paper</value>
-        <value>test-suite</value>
-      </choice>
-    </define>
-    <define name="editorialgroup">
-      <element name="editorialgroup">
-        <ref name="committee"/>
-        <optional>
-          <ref name="subcommittee"/>
-        </optional>
-        <optional>
-          <ref name="workgroup"/>
-        </optional>
-      </element>
-    </define>
-    <define name="BibDataExtensionType">
-      <optional>
-        <ref name="doctype"/>
-      </optional>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <ref name="editorialgroup"/>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-    </define>
     <define name="preface">
       <element name="preface">
         <optional>
@@ -62,19 +21,6 @@
         </optional>
       </element>
     </define>
-    <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>
   </include>
   <define name="TextElement" combine="choice">
     <ref name="hi"/>
@@ -97,25 +43,6 @@
       <ref name="Basic-Section"/>
     </element>
   </define>
-  <define name="committee">
-    <element name="committee">
-      <choice>
-        <value>technical</value>
-        <value>planning</value>
-        <value>strategic-member-advisory</value>
-      </choice>
-    </element>
-  </define>
-  <define name="subcommittee">
-    <element name="subcommittee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="workgroup">
-    <element name="workgroup">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
   <define name="ogc-standard">
     <element name="ogc-standard">
       <attribute name="version"/>

data/lib/metanorma/ogc/relaton-ogc.rng

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <include href="biblio-standoc.rng">
+    <define name="DocumentType">
+      <choice>
+        <value>abstract-specification-topic</value>
+        <value>best-practice</value>
+        <value>change-request-supporting-document</value>
+        <value>community-practice</value>
+        <value>community-standard</value>
+        <value>discussion-paper</value>
+        <value>engineering-report</value>
+        <value>other</value>
+        <value>policy</value>
+        <value>reference-model</value>
+        <value>release-notes</value>
+        <value>standard</value>
+        <value>user-guide</value>
+        <value>white-paper</value>
+        <value>test-suite</value>
+      </choice>
+    </define>
+    <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="editorialgroup">
+      <element name="editorialgroup">
+        <ref name="committee"/>
+        <optional>
+          <ref name="subcommittee"/>
+        </optional>
+        <optional>
+          <ref name="workgroup"/>
+        </optional>
+      </element>
+    </define>
+    <define name="BibDataExtensionType">
+      <optional>
+        <attribute name="schema-version"/>
+      </optional>
+      <optional>
+        <ref name="doctype"/>
+      </optional>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
+      <ref name="editorialgroup"/>
+      <zeroOrMore>
+        <ref name="ics"/>
+      </zeroOrMore>
+    </define>
+  </include>
+  <define name="committee">
+    <element name="committee">
+      <choice>
+        <value>technical</value>
+        <value>planning</value>
+        <value>strategic-member-advisory</value>
+      </choice>
+    </element>
+  </define>
+  <define name="subcommittee">
+    <element name="subcommittee">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+  <define name="workgroup">
+    <element name="workgroup">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+</grammar>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.2.4".freeze
+    VERSION = "2.2.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -215,6 +215,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/automerge.yml"
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
@@ -282,6 +283,7 @@ files:
 - lib/metanorma-ogc.rb
 - lib/metanorma/ogc.rb
 - lib/metanorma/ogc/basicdoc.rng
+- lib/metanorma/ogc/biblio-standoc.rng
 - lib/metanorma/ogc/biblio.rng
 - lib/metanorma/ogc/boilerplate.xml
 - lib/metanorma/ogc/cleanup.rb
@@ -290,6 +292,7 @@ files:
 - lib/metanorma/ogc/isodoc.rng
 - lib/metanorma/ogc/ogc.rng
 - lib/metanorma/ogc/processor.rb
+- lib/metanorma/ogc/relaton-ogc.rng
 - lib/metanorma/ogc/reqt.rng
 - lib/metanorma/ogc/validate.rb
 - lib/metanorma/ogc/version.rb