metanorma-ogc 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7861239c1f4e7838cbc7d20c8ef140bca08b5041faa586a4fa27730a5133ecb
-  data.tar.gz: 650181b76786a892c9327d1f88d4e925836b96badb255142f57236350eacce84
+  metadata.gz: 868dc6938ff146d001b5510963acea058cefe084d7a0b9d68e9d78916a6f122c
+  data.tar.gz: 4fce9933efebce96fb0b6c034c2297aeba957c1e7ad490f396f0f12dd04d415b
 SHA512:
-  metadata.gz: ddd4e2f8fa8fc49e5025eefc97cebba4bbff58dbd05e3748b9da5385e6901043d8e67cba3b09091c1b7e25d26d14f3a84f360de7fae6abd2634f1828ef2ab99a
-  data.tar.gz: 99311ec02dd10b3c750f5af2ba48d457a7ffc0d74a2595a64fa7ffe805809acb93a404e85a28a263fda3fb42499a78e543e6dd1e36149db7dc0019d1a13af791
+  metadata.gz: 3d15e4958895e014be50a293e945fc2abb0b21548803621663fde417235de6e4719c221689338e4e7de806dbfd7d94f5a08d32dc4dd8834343e8610638a297dc
+  data.tar.gz: 1f9566897b6ae34a99077f0ce09d5c8b36ab73ecb2e47ddb21aa3cdc75cd606e851243741641419f5ae9b3878798f45b59f20191ac015b0662750d33c8cc5b00

data/.github/workflows/macos.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: macos
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-macos:

data/.github/workflows/ubuntu.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: ubuntu
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-linux:
@@ -25,7 +24,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler 
+          gem install bundler
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1
@@ -37,3 +36,15 @@ jobs:
       - name: Run specs
         run: |
           bundle exec rake
+      - name: Trigger dependent repositories
+        if: github.ref == 'refs/heads/master'
+        env:
+          GH_USERNAME: ${{ secrets.PAT_USERNAME }}
+          GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
+        run: |
+          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
+          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
+          for repo in $DEPENDENT_REPOS
+          do
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
+          done

data/.github/workflows/windows.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-windows:
@@ -26,7 +25,7 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler 
+          gem install bundler
           bundle config --local path vendor/bundle
           bundle update
           bundle install --jobs 4 --retry 3

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://travis-ci.com/metanorma/metanorma-ogc.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma-ogc"]
-image:https://ci.appveyor.com/api/projects/status/skjvy856hpon74tj?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/metanorma/metanorma-ogc"]
+image:https://github.com/metanorma/metanorma-ogc/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/metanorma/metanorma-ogc/actions?workflow=macos"]
+image:https://github.com/metanorma/metanorma-ogc/workflows/ubuntu/badge.svg["Build Status (ubuntu)", link="https://github.com/metanorma/metanorma-ogc/actions?workflow=ubuntu"]
+image:https://github.com/metanorma/metanorma-ogc/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/metanorma/metanorma-ogc/actions?workflow=windows"]
 image:https://codeclimate.com/github/metanorma/metanorma-ogc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-ogc"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-ogc.svg["Pull Requests", link="https://github.com/metanorma/metanorma-ogc/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-ogc/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-ogc/releases"]

data/lib/asciidoctor/ogc/biblio.rng

@@ -703,21 +703,11 @@
   </define>
   <define name="TypedTitleString">
     <optional>
-      <attribute name="type">
-        <ref name="TitleType"/>
-      </attribute>
+      <attribute name="type"/>
     </optional>
     <ref name="FormattedString"/>
   </define>
-  <define name="TitleType">
-    <choice>
-      <value>alternative</value>
-      <value>original</value>
-      <value>unofficial</value>
-      <value>subtitle</value>
-      <value>main</value>
-    </choice>
-  </define>
+  <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
     <optional>
       <attribute name="type"/>

data/lib/asciidoctor/ogc/boilerplate.xml

@@ -3,11 +3,17 @@
     <clause>
       <title>Copyright notice</title>
 
-      <p align="center">Copyright
+      <p>Copyright
         © {{ docyear }} Open Geospatial Consortium<br/>
         To obtain additional rights of use, visit 
         <link target="http://www.opengeospatial.org/legal/">http://www.opengeospatial.org/legal/</link></p>
     </clause>
+    <clause>
+      <title>Note</title>
+      <p>Attention is drawn to the possibility that some of the elements of this document may be the subject of patent rights. The Open Geospatial Consortium shall not be held responsible for identifying any or all such patent rights.</p>
+
+      <p>Recipients of this document are requested to submit, with their comments, notification of any relevant patent claims or other intellectual property rights of which they may be aware that might be infringed by any implementation of the standard set forth in this document, and to provide supporting documentation.</p>
+    </clause>
   </copyright-statement>
   <license-statement>
     <clause>
@@ -71,7 +77,9 @@
         authorization of LICENSOR or such copyright holder. LICENSOR is and shall at
         all times be the sole entity that may authorize you or any third party to use
         certification marks, trademarks or other special designations to indicate
-        compliance with any LICENSOR standards or specifications. This Agreement is
+        compliance with any LICENSOR standards or specifications.</p>
+     
+      <p> This Agreement is
         governed by the laws of the Commonwealth of Massachusetts. The application to
         this Agreement of the United Nations Convention on Contracts for the
         International Sale of Goods is hereby expressly excluded. In the event any
@@ -80,88 +88,63 @@
         modified the entire Agreement shall remain in full force and effect. No
         decision, action or inaction by LICENSOR shall be construed to be a waiver of
         any rights or remedies available to it.</p>
+
+      <p>None of the Intellectual Property or underlying information or technology may be downloaded or otherwise exported or reexported in violation of U.S. export laws and regulations. In addition, you are responsible for complying with any local laws in your jurisdiction which may impact your right to import, export or use the Intellectual Property, and you represent that you have complied with any regulations or registration procedures required by applicable law to make this license enforceable.</p>
     </clause>
   </license-statement>
 
   <legal-statement>
-    {% if stage == "Published" or stage == "Withdrawn" %}
     {% if doctype == "Standard" or doctype == "Community Standard" %}
+    {% if stage == "Published" or stage == "Withdrawn" %}
     <clause>
       <title>Warning</title>
       <p>This document is an OGC Member approved international standard. This document is available on a royalty free, non-discriminatory basis. Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.
       </p>
     </clause>
-
-    {% elsif doctype == "Discussion Paper" %}
+    {% else %}
     <clause>
-      <title>Warning</title>
-      <p>This document is not an OGC Standard. This document is an OGC Discussion Paper and is therefore <em>not an official position</em> of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard. Further, an OGC Discussion Paper should not be referenced as required or mandatory technology in procurements.
-      </p>
+      <title>Warning for Drafts</title>
+      <p>This document is not an OGC Standard. This document is distributed for review and comment. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
+
+      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
     </clause>
+    {% endif %}
 
 
     {% elsif doctype == "Engineering Report" %}
     <clause>
       <title>Warning</title>
-      <p>This document is not an OGC Standard. This document is an OGC Public Engineering Report created as a deliverable in an OGC Interoperability Initiative and is <em>not an official position</em> of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard. Further, any OGC Engineering Report should not be referenced as required or mandatory technology in procurements.
-      </p>
+      <p>This document is not an OGC Standard. This document is an OGC Public Engineering Report created as a deliverable in an OGC Interoperability Initiative and is <em>not an official position</em> of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.</p>
+     
+      <p>Further, any OGC Engineering Report should not be referenced as required or mandatory technology in procurements. However, the discussions in this document could very well lead to the definition of an OGC Standard.</p>
     </clause>
 
 
     {% elsif doctype == "Best Practice" %}
     <clause>
       <title>Warning</title>
-      <p>This document defines an OGC Best Practices on a particular technology or approach related to an OGC standard. This document is <em>not</em> an OGC Standard and may not be referred to as an OGC Standard. It is subject to change without notice. However, this document is an <em>official</em> position of the OGC membership on this particular technology topic.
-      </p>
-    </clause>
+      <p>This document defines an OGC Best Practice on a particular technology or approach related to an OGC standard. This document is <em>not</em> an OGC Standard and may not be referred to as an OGC Standard. It is subject to change without notice. However, this document is an <em>official</em> position of the OGC membership on this particular technology topic.</p>
 
-    {% elsif doctype == "Policy" %}
-    <clause>
-      <title>Warning</title>
-      <p>This document is an OGC Policies and Procedures Document. The document is subject to change based on membership requirements and motions. Please note that the OGC <link target="http://www.opengeospatial.org/ogc/policies/directives">Policies Related to OGC Standards</link> should be also be read.
-      </p>
-    </clause>
-    {% else %}
-    <clause>
-      <title>Warning</title>
-      <p>This document is published by OGC. 
-      </p>
+      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
     </clause>
-    {% endif %}
 
-    {% else %}
+    {% elsif doctype == "Release Notes" %}
     <clause>
-      <title>Warning for Drafts</title>
-
-      {% if doctype == "Standard" or doctype == "Standard With Suite" %}
-      <p>This document is not an OGC Standard. This document is distributed for review and comment. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
-
-      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
-
-      {% elsif doctype == "Best Practice" %}
-      <p>This document defines an OGC Best Practice on a particular technology or approach related to an OGC standard. This document is not an OGC Standard and may not be referred to as an OGC Standard. It is subject to change without notice. However, this document is an official position of the OGC membership on this particular technology topic.</p>
-
-      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
-
-      {% elsif doctype == "Discussion Paper" %}
-      <p>This document is not an OGC Standard. This document is an OGC Discussion Paper and is therefore not an official position of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard. Further, an OGC Discussion Paper should not be referenced as required or mandatory technology in procurements.</p>
-
-      {% elsif doctype == "White Paper" %}
-      <p>This document is not an OGC Standard. This document is an OGC White Paper and is therefore not an official position of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard. Further, an OGC White Paper should not be referenced as required or mandatory technology in procurements.</p>
-
-      {% elsif doctype == "Release Notes" %}
+      <title>Warning</title>
       <p>This document is not an OGC standard. This document provides release notes for an OGC standard. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
 
       <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
 
-      {% else %}
-       <p>This document is not an OGC Standard. This document is distributed for review and comment. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
-
-      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
-      {% endif %}
+    </clause>
 
+    {% else %}
+    <clause>
+      <title>Warning</title>
+      <p>This document is not an OGC Standard. This document is an OGC {{ doctype }} and is therefore not an official position of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.</p>
+      <p>Further, an OGC {{ doctype }} should not be referenced as required or mandatory technology in procurements.</p>
     </clause>
     {% endif %}
+
   </legal-statement>
 
 

data/lib/asciidoctor/ogc/converter.rb

@@ -62,7 +62,7 @@ module Asciidoctor
           word_converter(node).convert filename unless node.attr("nodoc")
           pdf_converter(node).convert filename unless node.attr("nodoc")
         end
-        @log.write(@filename + ".err") unless @novalid
+        @log.write(@localdir + @filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end

data/lib/asciidoctor/ogc/isodoc.rng

@@ -101,9 +101,7 @@
         <ref name="structuredidentifier"/>
       </zeroOrMore>
     </define>
-    <define name="TitleType">
-      <text/>
-    </define>
+    <!-- TitleType = text -->
     <define name="sections">
       <element name="sections">
         <oneOrMore>

data/lib/isodoc/ogc/base_convert.rb

@@ -2,21 +2,12 @@ require "isodoc"
 require_relative "metadata"
 require_relative "reqt"
 require_relative "biblio"
+require_relative "sections"
 require "fileutils"
 
 module IsoDoc
   module Ogc
     module BaseConvert
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{anchor(annex['id'], :label)} "
-          t.br
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
       def fileloc(loc)
         File.join(File.dirname(__FILE__), loc)
       end
@@ -63,68 +54,12 @@ module IsoDoc
 
       def load_yaml(lang, script)
         y = if @i18nyaml then YAML.load_file(@i18nyaml)
-            elsif lang == "en"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
             else
               YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
             end
         super.merge(y)
       end
 
-      def keywords(_docxml, out)
-        kw = @meta.get[:keywords]
-        kw.empty? and return
-        @prefacenum += 1
-        out.div **{ class: "Section3" } do |div|
-          clause_name(RomanNumerals.to_roman(@prefacenum).downcase,
-                      "Keywords", div,  class: "IntroTitle")
-          div.p "The following are keywords to be used by search engines and "\
-            "document catalogues."
-          div.p kw.join(", ")
-        end
-      end
-
-      SUBMITTINGORGS =
-        "//bibdata/contributor[role/@type = 'author']/organization/name".freeze
-
-      def submittingorgs(docxml, out)
-        orgs = []
-        docxml.xpath(ns(SUBMITTINGORGS)).each { |org| orgs << org.text }
-        return if orgs.empty?
-        @prefacenum += 1
-        out.div **{ class: "Section3" } do |div|
-          clause_name(RomanNumerals.to_roman(@prefacenum).downcase,
-                      "Submitting Organizations", div,  class: "IntroTitle")
-          div.p "The following organizations submitted this Document to the "\
-            "Open Geospatial Consortium (OGC):"
-          div.ul do |ul|
-            orgs.each { |org| ul.li org }
-          end
-        end
-      end
-
-      def submitters(docxml, out)
-        f = docxml.at(ns("//submitters")) || return
-        @prefacenum += 1
-        out.div **{ class: "Section3" } do |div|
-          clause_name(anchor(f['id'], :label), "Submitters", div,
-                      class: "IntroTitle")
-          f.elements.each { |e| parse(e, div) unless e.name == "title" }
-        end
-      end
-
-      def preface(isoxml, out)
-        title_attr = { class: "IntroTitle" }
-        isoxml.xpath(ns("//preface/clause")).each do |f|
-          @prefacenum += 1
-          out.div **{ class: "Section3", id: f["id"] } do |div|
-            clause_name(RomanNumerals.to_roman(@prefacenum).downcase,
-                        f&.at(ns("./title")), div, title_attr)
-            f.elements.each { |e| parse(e, div) unless e.name == "title" }
-          end
-        end
-      end
-
       def preface_names_numbered(clause)
         return if clause.nil?
         @prefacenum += 1
@@ -138,44 +73,24 @@ module IsoDoc
         end
       end
 
-      def abstract(isoxml, out)
-        f = isoxml.at(ns("//preface/abstract")) || return
-        @prefacenum += 1
-        page_break(out)
-        out.div **attr_code(id: f["id"]) do |s|
-          clause_name(anchor(f["id"], :label), @abstract_lbl, s,
-                      class: "AbstractTitle")
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
-        end
+      def example_parse(node, out)
+        name = node.at(ns("./name"))
+        example_name_parse(node, out, name) #if name
+        super
       end
 
-      def foreword(isoxml, out)
-        f = isoxml.at(ns("//foreword")) || return
-        @prefacenum += 1
-        page_break(out)
-        out.div **attr_code(id: f["id"]) do |s|
-          clause_name(anchor(f["id"], :label), @foreword_lbl, s,
-                      class: "ForewordTitle")
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
-        end
+      def example_label(node, div, name)
       end
 
-      def acknowledgements(isoxml, out)
-        f = isoxml.at(ns("//acknowledgements")) || return
-        @prefacenum += 1
-        out.div **{ class: "Section3", id: f["id"] } do |div|
-          clause_name(anchor(f["id"], :label), f&.at(ns("./title")), div,
-                      class: "IntroTitle")
-          f.elements.each { |e| parse(e, div) unless e.name == "title" }
+      def example_name_parse(node, div, name)
+        lbl = anchor(node['id'], :label, false)
+        div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
+          lbl.nil? or p << l10n("#{@example_lbl} #{lbl}")
+          name and !lbl.nil? and p << "&nbsp;&mdash; "
+          name&.children&.each { |n| parse(n, p) }
         end
       end
 
-      def example_parse(node, out)
-        name = node.at(ns("./name"))
-        sourcecode_name_parse(node, out, name) if name
-        super
-      end
-
       def initial_anchor_names(d)
         @prefacenum = 0
         preface_names_numbered(d.at(ns("//preface/abstract")))
@@ -220,16 +135,6 @@ module IsoDoc
         sequential_asset_names(d.xpath(ns(middle_sections)))
       end
 
-      def conformance(isoxml, out, num)
-        f = isoxml.at(ns("//clause[title = 'Conformance']")) or return num
-        out.div **attr_code(id: f["id"]) do |div|
-          num = num + 1
-          clause_name(num, "Conformance", div, nil)
-          f.elements.each { |e| parse(e, div) unless e.name == "title" }
-        end
-        num
-      end
-
       def middle(isoxml, out)
         middle_title(out)
         i = scope isoxml, out, 0

data/lib/isodoc/ogc/biblio.rb

@@ -91,7 +91,7 @@ module IsoDoc
           c = extract_city(b)
           y = extract_year(b)
           out << "#{pub_abbrev}: " if pub_abbrev
-          out << render_identifier(bibitem_ref_code(b))
+          out << render_identifier(inline_bibitem_ref_code(b))
           out << ", "
           out.i do |i|
             iso_title(b)&.children&.each { |n| parse(n, i) }
@@ -104,6 +104,16 @@ module IsoDoc
           out << "(#{y})." if y
         end
       end
+
+      def inline_bibitem_ref_code(b)
+      id = b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
+                   "or @type = 'ISSN' or @type = 'ISBN')]"))
+      id ||= b.at(ns("./docidentifier[not(@type = 'metanorma')]"))
+      return id if id
+      id = Nokogiri::XML::Node.new("docidentifier", b.document)
+      id << "(NO ID)"
+      id
+    end
     end
   end
 end

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

@@ -135,7 +135,10 @@ nav {
 }
 
 .document-type-band {
-  @include docBand($order: 2, $textLength: 150px, $offset: 180px);
+  @include docBand($order: 2, $offset: 180px);
+  .document-type {
+    top: 20px;
+  }
 }
 
 #governance-band p.document-type {
@@ -295,6 +298,13 @@ table {
     font-weight: 400;
   }
 }
+.docstage-box {
+  table,
+  table th,
+  table td {
+    border: none
+  }
+}
 
 table.recommendtest {
   @include table($border: none !important);

data/lib/isodoc/ogc/i18n-en.yaml

@@ -5,3 +5,6 @@ permissiontest: Permission Test
 recommendationclass: Recommendation Class
 requirementclass: Requirement Class
 permissionclass: Permission Class
+abstracttest: Abstract Test
+conformanceclass: Conformance Class
+example: Example

data/lib/isodoc/ogc/metadata.rb

@@ -54,6 +54,7 @@ module IsoDoc
         set(:authors, extract_person_names(authors))
         editors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'editor']/person"))
         set(:editors, extract_person_names(editors))
+        agency(isoxml)
       end
 
       def docid(isoxml, _out)
@@ -75,34 +76,11 @@ module IsoDoc
 
       def version(isoxml, _out)
         super
-        revdate = get[:revdate]
-        set(:revdate_monthyear, monthyr(revdate))
         set(:edition, isoxml&.at(ns("//bibdata/edition"))&.text)
         lg = ISO_639.find_by_code(isoxml&.at(ns("//bibdata/language"))&.text)
         set(:doclanguage, lg ? lg[3] : "English")
       end
 
-      MONTHS = {
-        "01": "January",
-        "02": "February",
-        "03": "March",
-        "04": "April",
-        "05": "May",
-        "06": "June",
-        "07": "July",
-        "08": "August",
-        "09": "September",
-        "10": "October",
-        "11": "November",
-        "12": "December",
-      }.freeze
-
-      def monthyr(isodate)
-        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
-        return isodate unless m && m[:yr] && m[:mo]
-        return "#{MONTHS[m[:mo].to_sym]} #{m[:yr]}"
-      end
-
       def url(xml, _out)
         super
         a = xml.at(ns("//bibdata/uri[@type = 'previous']")) and set(:previousuri, a.text)

data/lib/isodoc/ogc/reqt.rb

@@ -7,7 +7,9 @@ module IsoDoc
     module BaseConvert
       def recommend_class(node)
         return "recommendtest" if node["type"] == "verification"
+        return "recommendtest" if node["type"] == "abstracttest"
         return "recommendclass" if node["type"] == "class"
+        return "recommendclass" if node["type"] == "conformanceclass"
         "recommend"
       end
 
@@ -22,7 +24,7 @@ module IsoDoc
 
       def recommendation_name(node, out, type)
         label, title, lbl = recommendation_labels(node)
-        out.p **{ class: node["type"] == "verification" ?
+        out.p **{ class: %w(verification abstracttest).include?(node["type"]) ?
                   "RecommendationTestTitle" : "RecommendationTitle" }  do |b|
           lbl = anchor(node['id'], :label, false)
           b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
@@ -47,24 +49,45 @@ module IsoDoc
       def recommendation_attributes1(node)
         out = []
         oblig = node["obligation"] and out << ["Obligation", oblig]
-        subj = node&.at(ns("./subject"))&.text and
-          out << [node["type"] == "class" ? "Target Type" : "Subject", subj]
-        node.xpath(ns("./inherit")).each { |i| out << ["Dependency", i.text] }
+        subj = node&.at(ns("./subject"))&.text and out << [rec_subj(node), subj]
+        node.xpath(ns("./inherit")).each do |i|
+          out << recommendation_attr_parse(i, "Dependency")
+        end
         node.xpath(ns("./classification")).each do |c|
-          tag = c.at(ns("./tag")) or next
-          value = c.at(ns("./value")) or next
-          out << [tag.text.capitalize, value.text]
+          line = recommendation_attr_keyvalue(c, "tag", "value") and out << line
         end
         out
       end
 
+      def rec_subj(node)
+        %w(class conformanceclass).include?(node["type"]) ?
+                  "Target Type" : "Subject"
+      end
+
+      def recommendation_attr_parse(node, label)
+        text = noko do |xml|
+          node.children.each { |n| parse(n, xml) }
+        end.join
+        [label, text]
+      end
+
+      def recommendation_attr_keyvalue(node, key, value)
+        tag = node.at(ns("./#{key}")) or return nil
+        value = node.at(ns("./#{value}")) or return nil
+        [tag.text.capitalize, value.text]
+      end
+
       def recommendation_attributes(node, out)
         ret = recommendation_attributes1(node)
         return if ret.empty?
         ret.each do |i|
           out.tr do |tr|
-            tr.td i[0], **REQ_TBL_ATTR
-            tr.td i[1], **REQ_TBL_ATTR
+            tr.td **REQ_TBL_ATTR do |td|
+              td << i[0]
+            end
+            tr.td **REQ_TBL_ATTR do |td|
+              td << i[1] 
+            end
           end
         end
       end
@@ -121,6 +144,8 @@ module IsoDoc
         label = case node["type"]
                 when "verification" then @labels["recommendationtest"]
                 when "class" then @labels["recommendationclass"]
+                when "abstracttest" then @labels["abstracttest"]
+                when "conformanceclass" then @labels["conformanceclass"]
                 else
                   @recommendation_lbl
                 end
@@ -131,6 +156,8 @@ module IsoDoc
         label = case node["type"]
                 when "verification" then @labels["requirementtest"]
                 when "class" then @labels["requirementclass"]
+                when "abstracttest" then @labels["abstracttest"]
+                when "conformanceclass" then @labels["conformanceclass"]
                 else
                   @requirement_lbl
                 end
@@ -141,6 +168,8 @@ module IsoDoc
         label = case node["type"]
                 when "verification" then @labels["permissiontest"]
                 when "class" then @labels["permissionclass"]
+                when "abstracttest" then @labels["abstracttest"]
+                when "conformanceclass" then @labels["conformanceclass"]
                 else
                   @permission_lbl
                 end
@@ -159,16 +188,30 @@ module IsoDoc
         end
       end
 
+      def req_class_paths
+        {  
+          "class" => "@type = 'class'", 
+          "test" => "@type = 'verification'", 
+          "" => "not(@type = 'verification' or @type = 'class' or @type = 'abstracttest' or @type = 'conformanceclass')",
+        }
+      end
+
+      def req_class_paths2
+        {
+          "abstracttest" => "@type = 'abstracttest'",
+          "conformanceclass" => "@type = 'conformanceclass'",
+        }
+      end
+
       def sequential_permission_children(t, id)
-        sequential_permission_names1(t, id, "permission[not(@type = 'verification' or @type = 'class')]", @permission_lbl)
-        sequential_permission_names1(t, id, "requirement[not(@type = 'verification' or @type = 'class')]", @requirement_lbl)
-        sequential_permission_names1(t, id, "recommendation[not(@type = 'verification' or @type = 'class')]", @recommendation_lbl)
-        sequential_permission_names1(t, id, "permission[@type = 'verification']", @labels["permissiontest"])
-        sequential_permission_names1(t, id, "requirement[@type = 'verification']", @labels["requirementtest"])
-        sequential_permission_names1(t, id, "recommendation[@type = 'verification']", @labels["recommendationtest"])
-        sequential_permission_names1(t, id, "permission[@type = 'class']", @labels["permissionclass"])
-        sequential_permission_names1(t, id, "requirement[@type = 'class']", @labels["requirementclass"])
-        sequential_permission_names1(t, id, "recommendation[@type = 'class']", @labels["recommendationclass"])
+        req_class_paths.each do |k, v|
+          sequential_permission_names1(t, id, "permission[#{v}]", @labels["permission#{k}"])
+          sequential_permission_names1(t, id, "requirement[#{v}]", @labels["requirement#{k}"])
+          sequential_permission_names1(t, id, "recommendation[#{v}]",  @labels["recommendation#{k}"])
+        end
+        req_class_paths2.each do |k, v|
+          sequential_permission_names1(t, id, "*[#{v}]", @labels[k])
+        end
       end
 
       def sequential_permission_names1(block, lbl, klass, label)
@@ -185,30 +228,28 @@ module IsoDoc
         sequential_table_names(clause)
         sequential_figure_names(clause)
         sequential_formula_names(clause)
-        sequential_permission_names(clause, "permission[not(@type = 'verification' or @type = 'class')]", @permission_lbl)
-        sequential_permission_names(clause, "requirement[not(@type = 'verification' or @type = 'class')]", @requirement_lbl)
-        sequential_permission_names(clause, "recommendation[not(@type = 'verification' or @type = 'class')]", @recommendation_lbl)
-        sequential_permission_names(clause, "permission[@type = 'verification']", @labels["permissiontest"])
-        sequential_permission_names(clause, "requirement[@type = 'verification']", @labels["requirementtest"])
-        sequential_permission_names(clause, "recommendation[@type = 'verification']", @labels["recommendationtest"])
-        sequential_permission_names(clause, "permission[@type = 'class']", @labels["permissionclass"])
-        sequential_permission_names(clause, "requirement[@type = 'class']", @labels["requirementclass"])
-        sequential_permission_names(clause, "recommendation[@type = 'class']", @labels["recommendationclass"])
+        req_class_paths.each do |k, v|
+          sequential_permission_names(clause, "permission[#{v}]", @labels["permission#{k}"])
+          sequential_permission_names(clause, "requirement[#{v}]", @labels["requirement#{k}"])
+          sequential_permission_names(clause, "recommendation[#{v}]",  @labels["recommendation#{k}"])
+        end
+        req_class_paths2.each do |k, v|
+          sequential_permission_names(clause, "*[#{v}]", @labels[k])
+        end
       end
 
       def hierarchical_asset_names(clause, num)
         hierarchical_table_names(clause, num)
         hierarchical_figure_names(clause, num)
         hierarchical_formula_names(clause, num)
-        hierarchical_permission_names(clause, num, "permission[not(@type = 'verification' or @type = 'class')]", @permission_lbl)
-        hierarchical_permission_names(clause, num, "requirement[not(@type = 'verification' or @type = 'class')]", @requirement_lbl)
-        hierarchical_permission_names(clause, num, "recommendation[not(@type = 'verification' or @type = 'class')]", @recommendation_lbl)
-        hierarchical_permission_names(clause, num, "permission[@type = 'verification']", @labels["permissiontest"])
-        hierarchical_permission_names(clause, num, "requirement[@type = 'verification']", @labels["requirementtest"])
-        hierarchical_permission_names(clause, num, "recommendation[@type = 'verification']", @labels["recommendationtest"])
-        hierarchical_permission_names(clause, num, "permission[@type = 'class']", @labels["permissionclass"])
-        hierarchical_permission_names(clause, num, "requirement[@type = 'class']", @labels["requirementclass"])
-        hierarchical_permission_names(clause, num, "recommendation[@type = 'class']", @labels["recommendationclass"])
+        req_class_paths.each do |k, v|
+          hierarchical_permission_names(clause, num, "permission[#{v}]", @labels["permission#{k}"])
+          hierarchical_permission_names(clause, num, "requirement[#{v}]", @labels["requirement#{k}"])
+          hierarchical_permission_names(clause, num, "recommendation[#{v}]",  @labels["recommendation#{k}"])
+        end
+        req_class_paths2.each do |k, v|
+          hierarchical_permission_names(clause, num, "*[#{v}]", @labels[k])
+        end
       end
 
       def hierarchical_permission_names(clause, num, klass, label)

data/lib/isodoc/ogc/sections.rb

@@ -0,0 +1,111 @@
+module IsoDoc
+  module Ogc
+    module BaseConvert
+      def annex_name(annex, name, div)
+        div.h1 **{ class: "Annex" } do |t|
+          t << "#{anchor(annex['id'], :label)} "
+          t.br
+          t.b do |b|
+            name&.children&.each { |c2| parse(c2, b) }
+          end
+        end
+      end
+
+      def keywords(_docxml, out)
+        kw = @meta.get[:keywords]
+        kw.empty? and return
+        @prefacenum += 1
+        out.div **{ class: "Section3" } do |div|
+          clause_name(RomanNumerals.to_roman(@prefacenum).downcase,
+                      "Keywords", div,  class: "IntroTitle")
+          div.p "The following are keywords to be used by search engines and "\
+            "document catalogues."
+          div.p kw.join(", ")
+        end
+      end
+
+      SUBMITTINGORGS =
+        "//bibdata/contributor[role/@type = 'author']/organization/name".freeze
+
+      def submittingorgs(docxml, out)
+        orgs = []
+        docxml.xpath(ns(SUBMITTINGORGS)).each { |org| orgs << org.text }
+        return if orgs.empty?
+        @prefacenum += 1
+        out.div **{ class: "Section3" } do |div|
+          clause_name(RomanNumerals.to_roman(@prefacenum).downcase,
+                      "Submitting Organizations", div,  class: "IntroTitle")
+          div.p "The following organizations submitted this Document to the "\
+            "Open Geospatial Consortium (OGC):"
+          div.ul do |ul|
+            orgs.each { |org| ul.li org }
+          end
+        end
+      end
+
+      def submitters(docxml, out)
+        f = docxml.at(ns("//submitters")) || return
+        @prefacenum += 1
+        out.div **{ class: "Section3" } do |div|
+          clause_name(anchor(f['id'], :label), "Submitters", div,
+                      class: "IntroTitle")
+          f.elements.each { |e| parse(e, div) unless e.name == "title" }
+        end
+      end
+
+      def preface(isoxml, out)
+        title_attr = { class: "IntroTitle" }
+        isoxml.xpath(ns("//preface/clause")).each do |f|
+          @prefacenum += 1
+          out.div **{ class: "Section3", id: f["id"] } do |div|
+            clause_name(RomanNumerals.to_roman(@prefacenum).downcase,
+                        f&.at(ns("./title")), div, title_attr)
+            f.elements.each { |e| parse(e, div) unless e.name == "title" }
+          end
+        end
+      end
+
+      def abstract(isoxml, out)
+        f = isoxml.at(ns("//preface/abstract")) || return
+        @prefacenum += 1
+        page_break(out)
+        out.div **attr_code(id: f["id"]) do |s|
+          clause_name(anchor(f["id"], :label), @abstract_lbl, s,
+                      class: "AbstractTitle")
+          f.elements.each { |e| parse(e, s) unless e.name == "title" }
+        end
+      end
+
+      def foreword(isoxml, out)
+        f = isoxml.at(ns("//foreword")) || return
+        @prefacenum += 1
+        page_break(out)
+        out.div **attr_code(id: f["id"]) do |s|
+          clause_name(anchor(f["id"], :label), @foreword_lbl, s,
+                      class: "ForewordTitle")
+          f.elements.each { |e| parse(e, s) unless e.name == "title" }
+        end
+      end
+
+      def acknowledgements(isoxml, out)
+        f = isoxml.at(ns("//acknowledgements")) || return
+        @prefacenum += 1
+        out.div **{ class: "Section3", id: f["id"] } do |div|
+          clause_name(anchor(f["id"], :label), f&.at(ns("./title")), div,
+                      class: "IntroTitle")
+          f.elements.each { |e| parse(e, div) unless e.name == "title" }
+        end
+      end
+
+      def conformance(isoxml, out, num)
+        f = isoxml.at(ns("//clause[title = 'Conformance']")) or return num
+        out.div **attr_code(id: f["id"]) do |div|
+          num = num + 1
+          clause_name(num, "Conformance", div, nil)
+          f.elements.each { |e| parse(e, div) unless e.name == "title" }
+        end
+        num
+      end
+    end
+  end
+end

data/lib/isodoc/ogc/word_convert.rb

@@ -12,13 +12,14 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
-        #FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
       end
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Times New Roman",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Times New Roman",serif'),
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+                     '"Times New Roman",serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                       '"Times New Roman",serif'),
           monospacefont: '"Courier New",monospace'
         }
       end
@@ -35,7 +36,6 @@ module IsoDoc
         }
       end
 
-
       def metadata_init(lang, script, labels)
         @meta = Metadata.new(lang, script, labels)
       end
@@ -144,17 +144,27 @@ module IsoDoc
       def word_cleanup(docxml)
         super
         word_recommend_cleanup(docxml)
+        word_copyright_cleanup(docxml)
         word_license_cleanup(docxml)
         word_term_cleanup(docxml)
         docxml
       end
 
       def word_license_cleanup(docxml)
-        docxml.xpath("//div[@class = 'boilerplate-license']//p[not(@class)]").each do |p|
+        x = "//div[@class = 'boilerplate-license']//p[not(@class)]"
+        docxml.xpath(x).each do |p|
           p["class"] = "license"
         end
       end
 
+      # center only the Copyright notice
+      def word_copyright_cleanup(docxml)
+        x = "//div[@class = 'boilerplate-copyright']/div[1]/p[not(@class)]"
+        docxml.xpath(x).each do |p|
+          p["align"] = "center"
+        end
+      end
+
       def word_term_cleanup(docxml)
         docxml.xpath("//p[@class = 'TermNum']//p[@class = 'Terms']").each do |p|
           p.replace(p.children)

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -259,6 +259,7 @@ files:
 - lib/isodoc/ogc/metadata.rb
 - lib/isodoc/ogc/pdf_convert.rb
 - lib/isodoc/ogc/reqt.rb
+- lib/isodoc/ogc/sections.rb
 - lib/isodoc/ogc/word_convert.rb
 - lib/metanorma-ogc.rb
 - lib/metanorma/ogc.rb