metanorma-ogc 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a77fd983398d390d95aa82f46e12ce33a86501f4238bedcdebe2dc149d1f0962
-  data.tar.gz: 4f0b5aad19b3e6d8f5434d41328aa0d71a1df1a3b12dcd30a42232452be28c34
+  metadata.gz: eea51c0d090677e7d33baba438144ba8124e0013784531aad6157444eb64fe78
+  data.tar.gz: 7fda2b26713c8075c24307ec3db64547de91920540c88b64d029fbf40e59fb56
 SHA512:
-  metadata.gz: 3c872166528dc90fefee0cf0e8af8f7bb5d9ffea093da95811eb6651655dc1e41e3a5e82f6a31d5f27bf6180f8b6466d96e0ad6a8c70658b6fb7ddfb9210efae
-  data.tar.gz: 7eb9b45dc65701d0db400832eafca7b06e9cfecbd25f82c463a89f396ceb2e232795c3319ee1fc889c8ecf03e18483665e06f843d776b2911ae21fd0511dde91
+  metadata.gz: 9c2e579039e84e10a4f3d91ee1da183e220c1d4d337b6a3bdfb7032d2f706603fba5618b94f854ca6fbb076de01b014496f7f8e3500cbc7b9307542753b35867
+  data.tar.gz: 9e4d01426f51cbe26229d864578c1a2e24c6cdd3a04b3f6346abb6a5e90895d7698701f7cc4716b044d2b0ba96a55c0a65b8a552e77f6626eb88652da4d595cf

data/.travis.yml

@@ -8,9 +8,9 @@ rvm:
   - ruby-head
 before_install:
   - gem install bundler -v 2.0.1
-  - npm install -g puppeteer
-  - npm install
-  - unset _JAVA_OPTIONS
+  - travis_retry sudo apt-get update
+  - sudo bash -c "curl -L https://raw.githubusercontent.com/metanorma/metanorma-linux-setup/master/ubuntu-install-puppeteer.sh | bash"
 matrix:
   allow_failures:
     - rvm: ruby-head
+

data/README.adoc

@@ -1,8 +1,9 @@
 = metanorma-ogc: Metanorma processor for the Open Geospatial Consortium document class
 
 image:https://img.shields.io/gem/v/metanorma-ogc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-ogc"]
-image:https://img.shields.io/travis/riboseinc/metanorma-ogc/master.svg["Build Status", link="https://travis-ci.com/riboseinc/metanorma-ogc"]
-image:https://codeclimate.com/github/riboseinc/metanorma-ogc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-ogc"]
+image:https://img.shields.io/travis/metanorma/metanorma-ogc/master.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma-ogc"]
+image:https://ci.appveyor.com/api/projects/status/odgc3ltblokvd6e7?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/metanorma-ogc"]
+image:https://codeclimate.com/github/metanorma/metanorma-ogc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-ogc"]
 
 WARNING: This gem is still under development.
 
@@ -30,7 +31,7 @@ as end deliverable OGC documents.
 
 == Structure
 
-This gem inherits from the https://github.com/riboseinc/metanorma-standoc
+This gem inherits from the https://github.com/metanorma/metanorma-standoc
 gem, and aligns closely to it.
 
 
@@ -38,13 +39,13 @@ gem, and aligns closely to it.
 
 Please see https://www.metanorma.com for instructions to get started.
 
-If you are using a Mac, the https://github.com/riboseinc/metanorma-macos-setup
+If you are using a Mac, the https://github.com/metanorma/metanorma-macos-setup
 repository has instructions on setting up your machine to run Metanorma
 scripts such as this one. You need only run the following in a Terminal console:
 
 [source,console]
 ----
-$ bash <(curl -s https://raw.githubusercontent.com/riboseinc/metanorma-macos-setup/master/metanorma-setup)
+$ bash <(curl -s https://raw.githubusercontent.com/metanorma/metanorma-macos-setup/master/metanorma-setup)
 $ gem install metanorma-cli
 $ gem install metanorma-ogc
 ----
@@ -79,241 +80,9 @@ if you do not get expected results, try bracketing terms your in AsciiMathML
 expressions.
 ////
 
+== Documentation
 
-== Approach
-
-=== Document model
-
-The OGC document model is detailed here:
-
-* https://github.com/riboseinc/metanorma-model-ogc[OGC document model]
-
-It is an instance of the
-https://github.com/riboseinc/metanorma-model-standoc[StandardDocument model].
-
-
-=== Document input
-
-Document input to Metanorma is for the compilation of content into the
-Metanorma XML document.
-
-The Metanorma-OGC processor supports AsciiDoc input.
-
-AsciiDoc is selected has been selected as the authoring tool to generate the document
-model representation of OGC standards.
-
-Similar to Markdown, AsciiDoc is a lightweight markup format, but
-combines the rigor and expressivity of DocBook.
-A number of editors (through plugins) support preview of AsciiDoc files,
-so textual content can be previewed without running the Metanorma toolchain.
-
-The Metanorma processor automates numbering of headings, figures,
-tables etc, automatically generates references and citations,
-and  the resulting output presentations.
-
-NOTE: The Asciidoctor gem is used for AsciiDoc input parsing.
-
-
-== Document attributes
-
-=== Common attributes
-
-Metadata of the document is provided through AsciiDoc document attributes.
-
-https://github.com/riboseinc/metanorma-standoc[Metanorma-Standoc]
-documents all common Metanorma document attributes.
-Where these preexisting metanorma attributes correspond to attributes already used
-by OGC in their Asciidoctor template, they are treated as synonyms of the Metanorma
-attributes.  The attributes relevant to OGC documents include:
-
-`:edition:`:: The document version; e.g. `2.0`.
-
-`:revdate:`:: The date the document was last updated.
-
-`:copyright-year:` (OGC: `:copyrightYear`):: The year which will be claimed as when the copyright for
-the document was issued.
-
-`:title:`:: The main component of the English title of the document
-(mandatory). (The first line of the AsciiDoc document, which contains the title
-introduced with `=`, is ignored)
-
-`:doctype:`:: The document type (mandatory). The permitted types are:
-+
---
-* Standards
-`standard`::: Implementation Standard
-`standard-with-suite`::: Implementation Standard with Compliance Suite
-`abstract-specification`::: Abstract Specification
-`community-standard`::: Community Standard
-`profile`::: Profile / Application Profile
-`best-practice`::: Best Practices Document
-
-* Other
-`engineering-report`::: Engineering Report
-`discussion-paper`::: Discussion Paper
-`reference-model`::: OGC Reference Model
-`user-guide`::: User Guide
-`policy`::: OGC Policy Document
-`guide`::: Guide
-`amendment`::: Technical Amendment
-`technical-corrigendum`::: Corrigendum (errata) Changes to OGC Standards
-`administrative`::: Internal administrative documents
---
-
-`:status:`:: Document status/stage. The permitted types are:
-+
-`rfc`::: OGC RFC (proposal)
-`candidate`::: Candidate Standard
-`published`::: Published
-`deprecated`::: Deprecated
-`retired`::: Retired
-
-`:committee:`:: The name of the relevant committee producing the document (mandatory). The legal values are:
-`technical`, `planning`, `strategic-member-advisory`
-`:subcommittee:`:: The name of the relevant subcommittee producing the document
-`:workgroup:` (OGC: `:workingGroup:`):: The name of the relevant working group producing the document (mandatory)
-
-`:language:`:: The language of the document (e.g. `en`) (mandatory)
-
-`:published-date:` (OGC: `:publicationDate:`):: The publication date for the document.
-`:issued-date:`  (OGC: `:approvalDate:`):: The approval date for the document.
-`:created-date:`:: The creation date for the document.
-`:received-date:`  (OGC: `:submissionDate:`):: The date at which the document was submitted to the standards body.
-
-`:uri:`:: The URI to which this standard is published.
-`:xml-uri:`:: The URI for the Metanorma XML as which this standard is published.
-`:pdf-uri:`:: The URI for the PDF as which this standard is published.
-`:doc-uri:`:: The URI for the DOC as which this standard is published.
-`:docnumber:`  (OGC: `docReference`):: The internal identifier referring to this document.
-
-`:draft:`:: If present, review notes are included in the
-Metanorma XML output; otherwise they are suppressed.
-
-
-=== OGC-specific attributes
-
-The following document attributes are specific to this document class:
-
-`:external-id:`:: The external identifier referring to this document.
-`:referenceURLID:`:: The identifier embedded into a document type-specific
-external URL.
-`:previous-uri:`:: URI of previous version of the document.
-`:subcommittee-type:`:: The type of the relevant subcommittee producing the document
-`:subcommittee-number:`:: The number of the relevant subcommittee producing the document
-`:workgroup-type:`:: The type of the relevant workgroup producing the document
-`:workgroup-number:`:: The number of the relevant workgroup producing the document
-
-`:keywords:`:: Comma-delimited list of the keywords associated with the document.
-`:submitting-organizations:`:: Semicolon-delimited list of the submitting organisations
-for this document. (The organisation names themselves may contain commas; e.g.
-`University of Calgary, Canada; National Central University, Taiwan`.
-
-`:fullname{_i}:`:: The full name of a person who is a contributor to the document.
-A second person is indicated by using a numeric suffix: `:fullname:`, `:fullname_2:`, `fullname_3:`, &c.
-
-`:surname{_i}:`:: The surname of a person who is a contributor to the document.
-`:givenname{_i}:`:: The given name(s) of a person who is a contributor to the document.
-`:role{_i}:`:: The role of a a person who is a contributor to the document. By default,
-they are coded as an `editor`; they can also be represented as an `author`.
-
-OGC `:editor:`:: corresponds to `:fullname:` with `role` = "editor"
-
-== Asciidoctor features specific to OGC
-
-The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]
-gem documents the customisations of Asciidoctor markup common to all metanorma gems.
-The following markup is specific to this gem:
-
-=== Section names
-
-The Normative References section may be named just "References", reflecting OGC practice.
-
-=== Preliminary elements
-
-The following clauses are preliminary elements, and are moved into the frontispiece
-of the document (in Metanorma, the document preface):
-
-* Abstract
-* Keywords
-* Preface
-* Submitting Organizations
-* Submitters
-
-The abstract is recognised as the first clause with an `abstract` style attribute:
-
-[source,asciidoc]
-----
-[abstract]
-== Abstract
-
-xxx
-----
-
-The preface is recognised as the text between the Asciidoctor document attributes and
-the first Asciidoctor section title; it must not be given a section title of its own.
-
-[source,asciidoc]
-----
-:received-date: 2019-01-01
-
-.Preface
-
-preface text
-
-=== Submitters
-----
-
-Keywords and Submitting Organizations consist of lists. They are treated as document metadata,
-and are entered as a document attribute.
-The prefatory text introducing them is added automatically.
-
-Submitters are treated as a table, contained in a section with the title `Submitters`:
-
-[source,asciidoc]
-----
-=== Submitters
-
-|===
-|Name |Representing |OGC member
-
-|Steve Liang | University of Calgary, Canada / SensorUp Inc. | Yes
-|===
-----
-
-=== Examples
-
-Unlike the normal case in Metanorma, examples can have captions:
-
-[source,asciidoc]
-----
-[example]
-.Example caption
-====
-Text
-====
-----
-
-=== Recommendations, requirements, and permissions
-
-Distinct recommendations, requirements and permissions are recognised in Metanorma
-Asciidoctor as tables whose first cell contains the text _Recommendation_, _Requirement_, _Permission_,
-optionally followed by a number (which is ignored in parsing; the elements are renumberd
-automatically in rendering.) These are currently constituted of two elements: an internal
-label, which is parsed as the first paragraph of the second table cell, and the body of
-the recommendation etc., which is parsed as the remainder of the second table cell.
-
-[source,asciidoc]
-----
-[[recommendation1]]
-|===
-|Recommendation |/ogc/recommendation/wfs/2 +
-
-If the API definition document uses the OpenAPI Specification 3.0,
-the document SHOULD conform to the
-<<rc_oas30,OpenAPI Specification 3.0 requirements class>>.
-|===
-----
-
+See https://www.metanorma.com/author/ogc/[Write Open Geospatial Consortium documents with Metanorma]
 
 == Examples
 

data/README.adoc.old

@@ -0,0 +1,187 @@
+= metanorma-ogc: Asciidoctor processor for Open Geospatial Consortium  documents
+
+image:https://img.shields.io/gem/v/metanorma-ogc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-ogc"]
+image:https://img.shields.io/travis/riboseinc/metanorma-ogc/master.svg["Build Status", link="https://travis-ci.com/riboseinc/metanorma-ogc"]
+image:https://codeclimate.com/github/riboseinc/metanorma-ogc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-ogc"]
+
+WARNING: This gem is still under development.
+
+== Functionality
+
+This gem processes documents following a template for generating OGC documents. 
+For http://asciidoctor.org/[Asciidoctor] input, the Metanorma toolchain uses the Asciidoctor gem as its parser.
+
+The gem currently inherits from the https://github.com/riboseinc/metanorma-standoc
+gem, and aligns closely to it. Refer to the ISO gem documentation
+for guidance, including https://github.com/riboseinc/metanorma-iso/wiki/Guidance-for-authoring
+
+The following outputs are generated.
+
+* an XML representation of the document, intended as a document model for OGC documents.
+* The XML representation is processed in turn to generate the following outputs
+as end deliverable OGC documents.
+** HTML
+** http://asciimath.org[AsciiMathML] is to be used for mathematical formatting.
+The gem uses the https://github.com/asciidoctor/asciimath[Ruby AsciiMath parser],
+which is syntactically stricter than the common MathJax processor;
+if you do not get expected results, try bracketing terms your in AsciiMathML
+expressions.
+
+== Usage
+
+The preferred way to invoke this gem is via the `metanorma` script:
+
+[source,console]
+----
+$ metanorma --type ogc a.adoc                   # output HTML 
+$ metanorma --type ogc --extensions html a.adoc # output just HTML
+$ metanorma --type ogc --extensions xml a.adoc  # output RSD XML
+----
+
+The gem translates the document into Metanorma XML format, and then
+validates its output against the Metanorma XML document model; errors are
+reported to console against the XML, and are intended for users to
+check that they have provided all necessary components of the
+document.
+
+The gem then converts the XML into HTML.
+
+The gem can also be invoked directly within asciidoctor, though this is deprecated:
+
+[source,console]
+----
+$ asciidoctor -b ogc -r 'metanorma-ogc' a.adoc  
+----
+
+=== Installation
+
+If you are using a Mac, the https://github.com/riboseinc/metanorma-macos-setup
+repository has instructions on setting up your machine to run Metanorma
+scripts such as this one. You need only run the following in a Terminal console:
+
+[source,console]
+----
+$ bash <(curl -s https://raw.githubusercontent.com/riboseinc/metanorma-macos-setup/master/metanorma-setup)
+$ gem install metanorma-ogc
+$ gem install metanorma-cli
+----
+
+== Approach
+
+=== Document model
+
+The OGC Document model used by this gem is an instance of the
+https://github.com/riboseinc/isodoc-models[StandardDocument model].
+
+The Metanorma XML format intends to introduce rigor into the OGC
+standards authoring process, and is prescribed in a separate document.
+
+=== Asciidoctor
+
+Asciidoctor has been selected as the authoring tool to generate the document
+model representation of OGC standards. It is a document formatting tool like
+Markdown and DocBook, which combines the relative ease of use of the former
+(using relatively lightweight markup), and the rigor and expressively of the
+latter (it has a well-defined syntax, and was in fact initially developed as a
+DocBook document authoring tool). Asciidoctor has built-in capability to output
+Text, DocBook and HTML; so it can be used to preview the file as it is being
+autA
+
+Generating documents via a document model substantially automated formatting
+associated with the document, including automating numbering of headings, figures,
+tables etc, and automatically generating references and citations.
+hored.
+
+== Document Attributes
+
+=== Common attributes
+
+The gem relies on Asciidoctor document attributes to provide necessary
+metadata about the document. The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]
+gem documents the Asciidoctor document attributes common to all metanorma gems. 
+Where these preexisting metanorma attributes correspond to attributes already used
+by OGC in their Asciidoctor template, they are treated as synonyms of the Metanorma
+attributes.  These include:
+
+`:edition:`:: The document version; e.g. `2.0`.
+
+`:revdate:`:: The date the document was last updated
+
+`:copyright-year:`:: The year which will be claimed as when the copyright for
+the document was issued
+
+`:title:`:: The main component of the English title of the document
+(mandatory). (The first line of the AsciiDoc document, which contains the title
+introduced with `=`, is ignored)
+
+`:doctype:`:: The document type (mandatory). The permitted types are:
++
+--
+* Standards
+implementation-standard::: Implementation Standard (with or without Compliance Suite)
+abstract-specification::: Abstract Specification (with or without Compliance Suite)
+community-standard::: Community Standard (with or without Compliance Suite)
+profile::: Profile (with or without Compliance Suite)
+best-practices::: Best Practices Document
+* Other
+engineering-report::: Engineering Report
+discussion-paper::: Discussion Paper
+white-paper::: White Paper
+user-guide::: User Guide
+policy-directive::: Technical Committee Policy Directive
+informative::: Informative
+--
+
+`:status:``:: The document status. The permitted types are: 
+
+* SWG Work
+* OAB Review
+* OGC-NA Review
+* Public Review
+* Prepare for Approval
+* TC Approval to Vote
+* TC Vote
+* PC Vote
+* Published
+
+`:committee:` (OGC: `:workingGroup:`):: The name of the relevant committee (mandatory)
+
+`:language:` :: The language of the document (only `en` for now)  (mandatory)
+
+`:published-date` (OGC: `:publicationDate:`):: The publication date for the document.
+`:issued-date` (OGC: `:approvalDate:`):: The approval date for the document.
+`:created-date`:: The creation date for the document.
+`:submitted-date` (OGC: `:submissionDate:`):: The date at which the document was submitted to the standards body.
+
+`:uri:`:: The URI to which this standard is published.
+`:docnumber:` (OGC: `docReference`):: The internal identifier referring to this document.
+
+The attribute `:draft:`, if present, includes review notes in the XML output;
+these are otherwise suppressed.
+
+== Asciidoctor features specific to OGC
+
+The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]
+gem documents the customisations of Asciidoctor markup common to all metanorma gems.
+The following markup is specific to this gem:
+
+`:external-id:`:: The external identifier referring to this document.
+`:referenceURLID:`:: The identifier embedded into a document type-specific
+external URL.
+
+`:fullname{_i}`:: The full name of a person who is a contributor to the document.
+A second person is indicated by using a numeric suffix: `:fullname`, `:fullname_2`, `fullname_3`, &c.
+
+`:surname{_i}`:: The surname of a person who is a contributor to the document.
+`:givenname{_i}`:: The given name(s) of a person who is a contributor to the document.
+`:role{_i}`:: The role of a a person who is a contributor to the document. By default,
+they are coded as an `editor`; they can also be represented as an `author`.
+
+OGC `:editor:`:: corresponds to `:fullname:` with `role` = "editor"
+
+== Examples
+
+* link:spec/examples/rfc6350.adoc[] is an Metanorma Asciidoctor 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.
+

data/appveyor.yml

@@ -0,0 +1,30 @@
+version: '{build}'
+
+environment:
+  matrix:
+    - RUBY_VERSION: 25
+    - RUBY_VERSION: 24
+    - RUBY_VERSION: 23
+    - RUBY_VERSION: _trunk
+
+matrix:
+  allow_failures:
+    - RUBY_VERSION: _trunk
+
+install:
+  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
+  - refreshenv
+
+build_script:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle update
+  - bundle install
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake
+

data/lib/asciidoctor/ogc/biblio.rng

@@ -156,9 +156,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="uri"/>
-      </optional>
+      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -246,9 +246,9 @@
       <optional>
         <ref name="abbreviation"/>
       </optional>
-      <optional>
+      <zeroOrMore>
         <ref name="uri"/>
-      </optional>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="org-identifier"/>
       </zeroOrMore>
@@ -469,12 +469,13 @@
       <value>film</value>
       <value>video</value>
       <value>broadcast</value>
-      <value>graphic work</value>
+      <value>graphic_work</value>
       <value>music</value>
       <value>patent</value>
       <value>inbook</value>
       <value>incollection</value>
       <value>inproceedings</value>
+      <value>journal</value>
     </choice>
   </define>
   <define name="BibliographicItem">
@@ -739,39 +740,44 @@
     <element name="series">
       <optional>
         <attribute name="type">
-          <choice>
-            <value>main</value>
-            <value>alt</value>
-          </choice>
+          <ref name="SeriesType"/>
         </attribute>
       </optional>
       <choice>
-        <ref name="btitle"/>
         <ref name="formattedref"/>
+        <group>
+          <ref name="btitle"/>
+          <optional>
+            <ref name="bplace"/>
+          </optional>
+          <optional>
+            <ref name="seriesorganization"/>
+          </optional>
+          <optional>
+            <ref name="abbreviation"/>
+          </optional>
+          <optional>
+            <ref name="seriesfrom"/>
+          </optional>
+          <optional>
+            <ref name="seriesto"/>
+          </optional>
+          <optional>
+            <ref name="seriesnumber"/>
+          </optional>
+          <optional>
+            <ref name="seriespartnumber"/>
+          </optional>
+        </group>
       </choice>
-      <optional>
-        <ref name="bplace"/>
-      </optional>
-      <optional>
-        <ref name="seriesorganization"/>
-      </optional>
-      <optional>
-        <ref name="abbreviation"/>
-      </optional>
-      <optional>
-        <ref name="seriesfrom"/>
-      </optional>
-      <optional>
-        <ref name="seriesto"/>
-      </optional>
-      <optional>
-        <ref name="seriesnumber"/>
-      </optional>
-      <optional>
-        <ref name="seriespartnumber"/>
-      </optional>
     </element>
   </define>
+  <define name="SeriesType">
+    <choice>
+      <value>main</value>
+      <value>alt</value>
+    </choice>
+  </define>
   <define name="seriesorganization">
     <element name="organization">
       <text/>
@@ -831,25 +837,29 @@
       <ref name="ContributorInfo"/>
     </element>
   </define>
+  <define name="DocRelationType">
+    <choice>
+      <value>obsoletes</value>
+      <value>updates</value>
+      <value>updatedBy</value>
+      <value>complements</value>
+      <value>derivedFrom</value>
+      <value>translatedFrom</value>
+      <value>adoptedFrom</value>
+      <value>equivalent</value>
+      <value>identical</value>
+      <value>nonequivalent</value>
+      <value>includedIn</value>
+      <value>includes</value>
+      <value>instance</value>
+      <value>partOf</value>
+      <value>hasDraft</value>
+    </choice>
+  </define>
   <define name="docrelation">
     <element name="relation">
       <attribute name="type">
-        <choice>
-          <value>obsoletes</value>
-          <value>updates</value>
-          <value>updatedBy</value>
-          <value>complements</value>
-          <value>derivedFrom</value>
-          <value>translatedFrom</value>
-          <value>adoptedFrom</value>
-          <value>equivalent</value>
-          <value>identical</value>
-          <value>nonequivalent</value>
-          <value>includedIn</value>
-          <value>includes</value>
-          <value>instance</value>
-          <value>partOf</value>
-        </choice>
+        <ref name="DocRelationType"/>
       </attribute>
       <element name="bibitem">
         <ref name="BibliographicItem"/>
@@ -861,9 +871,6 @@
   </define>
   <define name="version">
     <element name="version">
-      <optional>
-        <ref name="vedition"/>
-      </optional>
       <optional>
         <ref name="revision-date"/>
       </optional>

data/lib/asciidoctor/ogc/converter.rb

@@ -29,7 +29,7 @@ module Asciidoctor
         result << "</ogc-standard>"
         result = textcleanup(result)
         ret1 = cleanup(Nokogiri::XML(result))
-        validate(ret1)
+        validate(ret1) unless @novalid
         ret1.root.add_namespace(nil, Metanorma::Ogc::DOCUMENT_NAMESPACE)
         ret1
       end

data/lib/asciidoctor/ogc/isodoc.rng

@@ -18,6 +18,7 @@
   of this.
 -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="reqt.rng"/>
   <include href="biblio.rng">
     <define name="status">
       <element name="status">

data/lib/asciidoctor/ogc/reqt.rng

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!--
+    Presupposes isodoc.rnc, is included in it
+    include "isodoc.rnc" { }
+  -->
+  <define name="requirement">
+    <element name="requirement">
+      <ref name="RequirementType"/>
+    </element>
+  </define>
+  <define name="recommendation">
+    <element name="recommendation">
+      <ref name="RequirementType"/>
+    </element>
+  </define>
+  <define name="permission">
+    <element name="permission">
+      <ref name="RequirementType"/>
+    </element>
+  </define>
+  <define name="RequirementType">
+    <optional>
+      <attribute name="obligation">
+        <ref name="ObligationType"/>
+      </attribute>
+    </optional>
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <ref name="reqtitle"/>
+    </optional>
+    <optional>
+      <ref name="label"/>
+    </optional>
+    <optional>
+      <ref name="subject"/>
+    </optional>
+    <optional>
+      <ref name="reqinherit"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="classification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <choice>
+        <ref name="measurementtarget"/>
+        <ref name="specification"/>
+        <ref name="verification"/>
+        <ref name="import"/>
+        <ref name="description"/>
+      </choice>
+    </zeroOrMore>
+    <optional>
+      <ref name="reqt_references"/>
+    </optional>
+    <zeroOrMore>
+      <choice>
+        <ref name="requirement"/>
+        <ref name="recommendation"/>
+        <ref name="permission"/>
+      </choice>
+    </zeroOrMore>
+  </define>
+  <define name="reqtitle">
+    <element name="title">
+      <ref name="FormattedString"/>
+    </element>
+  </define>
+  <define name="label">
+    <element name="label">
+      <text/>
+    </element>
+  </define>
+  <define name="subject">
+    <element name="subject">
+      <text/>
+    </element>
+  </define>
+  <define name="reqinherit">
+    <element name="subject">
+      <text/>
+    </element>
+  </define>
+  <define name="measurementtarget">
+    <element name="measurement-target">
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
+  <define name="specification">
+    <element name="specification">
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
+  <define name="verification">
+    <element name="verification">
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
+  <define name="import">
+    <element name="import">
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
+  <define name="description">
+    <element name="description">
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
+  <define name="reqt_references">
+    <element name="references">
+      <oneOrMore>
+        <ref name="bibitem"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="RequirementSubpart">
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <optional>
+      <attribute name="exclude">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <oneOrMore>
+      <ref name="BasicBlock"/>
+    </oneOrMore>
+  </define>
+  <define name="ObligationType">
+    <choice>
+      <value>requirement</value>
+      <value>recommendation</value>
+      <value>permission</value>
+    </choice>
+  </define>
+  <define name="classification">
+    <element name="classification">
+      <ref name="classification_tag"/>
+      <ref name="classification_value"/>
+    </element>
+  </define>
+  <define name="classification_tag">
+    <element name="tag">
+      <text/>
+    </element>
+  </define>
+  <define name="classification_value">
+    <element name="value">
+      <text/>
+    </element>
+  </define>
+</grammar>

data/lib/isodoc/ogc/html/html_ogc_titlepage.html

@@ -143,17 +143,12 @@
 
 <div class="info-section">
 <div class="copyright">
+  <p><b>Copyright notice</b></p>
   <p class="year">
-    &copy; {{ docyear }} Open Geospatial Consortium
+    Copyright &copy; {{ docyear }} Open Geospatial Consortium
   </p>
 
   <p class="message">
-    All rights reserved. Unless otherwise specified, no part of this
-    publication may be reproduced or utilized otherwise in any form or by any
-    means, electronic or mechanical, including photocopying, or posting on the
-    internet or an intranet, without prior written permission. Permission can
-    be requested from the address below.
-
     To obtain additional rights of use, visit <a href="http://www.opengeospatial.org/legal/">http://www.opengeospatial.org/legal/</a>.
   </p>
 

data/lib/isodoc/ogc/html/scripts.html

@@ -1,7 +1,7 @@
   <script>
     //TOC generation
       $('#toc').toc({
-          'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
+          'selectors': toclevel(), //elements to use as headings
           'container': 'main', //element to find all selectors in
           'smoothScrolling': true, //enable or disable smooth scrolling on click
           'prefix': 'toc', //prefix for anchor tags and class names

data/lib/isodoc/ogc/html/scripts.pdf.html

@@ -1,7 +1,7 @@
   <script>
     //TOC generation
       $('#toc').toc({
-          'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
+          'selectors': toclevel(), //elements to use as headings
           'container': 'main', //element to find all selectors in
           'smoothScrolling': true, //enable or disable smooth scrolling on click
           'prefix': 'toc', //prefix for anchor tags and class names

data/lib/isodoc/ogc/html_convert.rb

@@ -37,22 +37,11 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
 
-      def html_head
+      def googlefonts
         <<~HEAD.freeze
-          <title>{{ doctitle }}</title>
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-
-    <!--TOC script import-->
-    <script type="text/javascript" src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
-
-    <!--Google fonts-->
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet" />
     <link href="https://fonts.googleapis.com/css?family=Teko:300,400,500" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-    <!--Font awesome import for the link icon-->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/solid.css" integrity="sha384-rdyFrfAIC05c5ph7BKz3l5NG5yEottvO/DQ0dCrwD8gzeQDjYBHNr1ucUpQuljos" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/fontawesome.css" integrity="sha384-u5J7JghGz0qUrmEsWzBQkfvc8nK3fUT7DCaQzNQ+q4oEXhGSx+P2OqjWsfIRB8QT" crossorigin="anonymous">
-    <style class="anchorjs"></style>
         HEAD
       end
 

data/lib/isodoc/ogc/pdf_convert.rb

@@ -35,22 +35,11 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
 
-      def html_head()
+      def googlefonts()
         <<~HEAD.freeze
-        <title>{{ doctitle }}</title>
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-
-    <!--TOC script import-->
-    <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
-
-    <!--Google fonts-->
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet" />
     <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet" />
     <link href="https://fonts.googleapis.com/css?family=Teko:300,400,500" rel="stylesheet">
-    <!--Font awesome import for the link icon-->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/solid.css" integrity="sha384-rdyFrfAIC05c5ph7BKz3l5NG5yEottvO/DQ0dCrwD8gzeQDjYBHNr1ucUpQuljos" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/fontawesome.css" integrity="sha384-u5J7JghGz0qUrmEsWzBQkfvc8nK3fUT7DCaQzNQ+q4oEXhGSx+P2OqjWsfIRB8QT" crossorigin="anonymous">
-    <style class="anchorjs"></style>
         HEAD
       end
 

data/lib/isodoc/ogc/word_convert.rb

@@ -58,9 +58,9 @@ module IsoDoc
       end
 =end
 
-      def insert_toc(intro, docxml)
+      def insert_toc(intro, docxml, level)
         toc = ""
-        toc += make_WordToC(docxml)
+        toc += make_WordToC(docxml, level)
         if docxml.at("//p[@class = 'TableTitle']")
           toc += %{<p class="TOCTitle">List of Tables</p>}
           toc += make_TableWordToC(docxml)
@@ -132,18 +132,6 @@ module IsoDoc
                 %{\\1#{WORD_TOC_RECOMMENDATION_PREFACE1}}) +  WORD_TOC_SUFFIX1
       end
 
-      def make_WordToC(docxml)
-        toc = ""
-        docxml.xpath("//h1[not(ancestor::*[@class = 'WordSection2'])] |"\
-                     "//h1[contains(., 'Executive Summary')] |"\
-                     "//h2[not(ancestor::*[@class = 'WordSection2'])] |"\
-                     "//h3[not(ancestor::*[@class = 'WordSection2'])]").each do |h|
-          toc += word_toc_entry(h.name[1].to_i, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_PREFACE1}}) +  WORD_TOC_SUFFIX1
-      end
-
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]} "

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "0.0.6"
+    VERSION = "0.0.8"
   end
 end

data/metanorma-ogc.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
     Metanorma for the Open Geospatial Consortium.
   DESCRIPTION
 
-  spec.homepage      = "https://github.com/riboseinc/metanorma-ogc"
+  spec.homepage      = "https://github.com/metanorma/metanorma-ogc"
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -279,7 +279,9 @@ files:
 - Gemfile
 - LICENSE
 - README.adoc
+- README.adoc.old
 - Rakefile
+- appveyor.yml
 - bin/console
 - bin/rspec
 - bin/setup
@@ -290,6 +292,7 @@ files:
 - lib/asciidoctor/ogc/isodoc.rng
 - lib/asciidoctor/ogc/isostandard.rng
 - lib/asciidoctor/ogc/ogc.rng
+- lib/asciidoctor/ogc/reqt.rng
 - lib/isodoc/ogc.rb
 - lib/isodoc/ogc/html/header.html
 - lib/isodoc/ogc/html/html_ogc_intro.html
@@ -311,7 +314,7 @@ files:
 - lib/metanorma/ogc/processor.rb
 - lib/metanorma/ogc/version.rb
 - metanorma-ogc.gemspec
-homepage: https://github.com/riboseinc/metanorma-ogc
+homepage: https://github.com/metanorma/metanorma-ogc
 licenses:
 - BSD-2-Clause
 metadata: {}