metanorma-ogc 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4584b19640ae392d32331f799e97e13e6716ac96fe509b7ccf1c0c533778982d
-  data.tar.gz: 7db35d1b9b76cbc831f30acd5abf1b0a474819625898c2089fbb1e8083401872
+  metadata.gz: f7861239c1f4e7838cbc7d20c8ef140bca08b5041faa586a4fa27730a5133ecb
+  data.tar.gz: 650181b76786a892c9327d1f88d4e925836b96badb255142f57236350eacce84
 SHA512:
-  metadata.gz: 0131aa4d4e433d368d47f431b5d6c45cf798a1340b3eb2083ceb1b5a51739570225832d9303f11b134a4fe721f6bdf3332b9d92b45cc2f50430c8d610a2348a9
-  data.tar.gz: bc237907bc224453c0d6dee4ce0beaa28e3611dec7bde17eeedd43279f179489558b43cd5f35091b2e84d9353f559239ae1ef130b2e86ca726530e2e2eeb20fc
+  metadata.gz: ddd4e2f8fa8fc49e5025eefc97cebba4bbff58dbd05e3748b9da5385e6901043d8e67cba3b09091c1b7e25d26d14f3a84f360de7fae6abd2634f1828ef2ab99a
+  data.tar.gz: 99311ec02dd10b3c750f5af2ba48d457a7ffc0d74a2595a64fa7ffe805809acb93a404e85a28a263fda3fb42499a78e543e6dd1e36149db7dc0019d1a13af791

data/lib/asciidoctor/ogc/converter.rb

@@ -33,7 +33,7 @@ module Asciidoctor
           reference-model release-notes standard user-guide white-paper 
           test-suite}.include? d
           @warned_doctype or
-            warn "'#{d}' is not a legal document type: reverting to 'standard'"
+            @log.add("Document Attributes", nil, "'#{d}' is not a legal document type: reverting to 'standard'")
           @warned_doctype = true
           d = "standard"
         end
@@ -62,6 +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
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end

data/lib/asciidoctor/ogc/front.rb

@@ -93,7 +93,7 @@ module Asciidoctor
         a = node.attr("abbrev")
         return unless d and a
         url = "http://www.opengis.net/doc/#{IsoDoc::Ogc::DOCTYPE_ABBR[d]}/#{a}"
-        v = node.attr("edition") and url += "/#{v}"
+        v = (node.attr("edition") || node.attr("version")) and url += "/#{v}"
         url
       end
 
@@ -150,6 +150,11 @@ module Asciidoctor
         end
       end
 
+      def metadata_version(node, xml)
+        node.set_attr("edition", node.attr("version"), false) if node.attr("version")
+        super
+      end
+
       def metadata_subdoctype(node, xml)
         s = node.attr("docsubtype") 
         s1 = ::IsoDoc::Ogc::DOCSUBTYPE_ABBR.invert[s] and s = s1
@@ -158,15 +163,15 @@ module Asciidoctor
           unless %w{conceptual-model conceptual-model-and-encoding
                     conceptual-model-and-implementation encoding extension
                     implementation profile profile-with-extension}.include? s
-            warn "'#{s}' is not a permitted subtype of Standard: "\
-              "reverting to 'implementation'"
+            @log.add("Document Attributes", nil, "'#{s}' is not a permitted subtype of Standard: "\
+              "reverting to 'implementation'")
             s = "implementation"
           end
         when "best-practice"
           unless %w{general encoding extension profile
                     profile-with-extension}.include? s
-            warn "'#{s}' is not a permitted subtype of Standard: "\
-              "reverting to 'implementation'"
+            @log.add("Document Attributes", nil, "'#{s}' is not a permitted subtype of Standard: "\
+              "reverting to 'implementation'")
             s = "general"
           end
         end

data/lib/asciidoctor/ogc/isodoc.rng

@@ -645,6 +645,11 @@
     <optional>
       <attribute name="script"/>
     </optional>
+    <optional>
+      <attribute name="inline-header">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="obligation">
         <choice>

data/lib/asciidoctor/ogc/validate.rb

@@ -19,16 +19,18 @@ module Asciidoctor
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(swg-draft oab-review public-rfc tc-vote
         published deprecated retired).include? stage or
-        warn "Document Attributes: #{stage} is not a recognised status"
+        @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
       end
 
       def version_validate(xmldoc)
         version = xmldoc&.at("//bibdata/edition")&.text
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         if %w(engineering-report discussion-paper).include? doctype
-          warn "Version not permitted for #{doctype}" unless version.nil?
+          version.nil? or
+          @log.add("Document Attributes", nil, "Version not permitted for #{doctype}") 
         else
-          warn "Version required for #{doctype}" if version.nil?
+          version.nil? and
+          @log.add("Document Attributes", nil,  "Version required for #{doctype}") 
         end
       end
 
@@ -74,7 +76,7 @@ module Asciidoctor
       def seqcheck(names, msg, accepted)
         n = names.shift
         unless accepted.include? n
-          warn "OGC style: #{msg}"
+          @log.add("Style", nil, msg)
           names = []
         end
         names
@@ -93,7 +95,7 @@ module Asciidoctor
           n = names.shift
         end
         unless n
-          warn "OGC style: Document must contain at least one clause"
+          @log.add("Style", nil, "Document must contain at least one clause")
           return
         end
         root.at("//references | //clause[descendant::references]"\
@@ -103,14 +105,14 @@ module Asciidoctor
       end
 
       def preface_sequence_validate(root)
-        root.at("//preface/abstract") or warn "OGC style: Abstract is missing!"
+        root.at("//preface/abstract") or @log.add("Style", nil, "Abstract is missing!")
         root.at("//bibdata/keyword | //bibdata/ext/keyword") or
-          warn "OGC style: Keywords are missing!"
-        root.at("//foreword") or warn "OGC style: Preface is missing!"
+          @log.add("Style", nil, "Keywords are missing!")
+        root.at("//foreword") or @log.add("Style", nil,  "Preface is missing!")
         root.at("//bibdata/contributor[role/@type = 'author']/organization/"\
                 "name") or
-               warn "OGC style: Submitting Organizations is missing!"
-        root.at("//submitters") or warn "OGC style: Submitters is missing!"
+               @log.add("Style", nil, "Submitting Organizations is missing!")
+        root.at("//submitters") or @log.add("Style", nil, "Submitters is missing!")
       end
     end
   end

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

@@ -1,8 +1,8 @@
-<div class="document-stage-band" id='{{ stage | downcase | replace: " ", "-" }}-band'>
+<div class="document-stage-band" id="{{ stage | downcase | replace: ' ', '-' }}-band">
     <p class="document-stage">{{ stage }}</p>
 </div>
 
-<div class="document-type-band" id='{{ doctype | downcase | replace: " ", "-" }}-band'>
+<div class="document-type-band" id="{{ doctype | downcase | replace: ' ', '-' }}-band">
     <p class="document-type">OGC {{ doctype }}</p>
 </div>
 
@@ -54,13 +54,13 @@
       {% if previousuri %}
       <span class="label">Previous URI: </span> <span class="value"><a href="{{ previousuri }}">{{previousuri}}</a></span>
       {% endif %}
-      {% if edition %}
-      <span class="label">Version: </span> <span class="value">{{ edition }}</span>
-      {% endif %}
     </div>
 
-    {% if xml or pdf or doc %}
     <div class="coverpage-alt-formats">
+      {% if edition %}
+      <span class="label">Version: </span> <span class="value">{{ edition }}</span><br/>
+      {% endif %}
+    {% if xml or pdf or doc %}
       <span class="label">Additional Formats: </span>
       {% if xml %}
       <span class="value"><a href="{{ xml }}"><i class="far fa-file-code"></i>XML</a></span>
@@ -72,8 +72,8 @@
       <span class="value"><a href="{{ doc }}"><i class="far fa-file-word"></i>DOC</a></span>
       {% endif %}
       </span>
-    </div>
     {% endif %}
+    </div>
 
   </div>
 

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

@@ -1,23 +1,44 @@
 $doctype-colors-list: (
-  standard: rgb(216, 236, 168),
-  governance: #750697,
-  policy-and-procedures: #750697,
+  standard: #3D9970,
+  abstract-specification-topic: #3D9970,
+  reference-model: #3D9970,
+
+  best-practice: #39CCCC,
+  discussion-paper: #39CCCC,
+  white-paper: #39CCCC,
+  engineering-report: #39CCCC,
+
+  release-notes: #FFDC00,
+  user-guide: #FFDC00,
+
+  community-practice: #FF851B,
+  community-standard: #FF851B,
+
+  other: #0074D9,
+  policy: #0074D9,
+  change-request-supporting-document: #0074D9,
+
+  test-suite: #001F3F,
+
 );
 
 
 $docstage-colors-list: (
-  rfc: #48a0e7,
-  candidate: #fd06fd,
+  candidate: #8B9EB7,
+  working-draft: #8B9EB7,
+  proposal: #8B9EB7,
+  oab-review: #8B9EB7,
+  committee-draft: #8B9EB7,
+  swg-draft: #8B9EB7,
+
+  public-rfc: #48a0e7,
+
+  tc-vote: #fd06fd,
+
   published: #9abd48,
+
   deprecated: #7e0d13,
   retired: #7e0d13,
-  working-draft: #f780ec,
-  proposal: #f780ec,
-  committee-draft: #fd06fd,
-  draft-standard: #fd06fd,
-  standard: #9abd48,
-  obsolete: #7e0d13,
-  guide: #48a0e7,
 );
 
 

data/lib/isodoc/ogc/reqt.rb

@@ -58,7 +58,6 @@ module IsoDoc
         out
       end
 
-
       def recommendation_attributes(node, out)
         ret = recommendation_attributes1(node)
         return if ret.empty?

data/lib/isodoc/ogc/word_convert.rb

@@ -142,8 +142,8 @@ module IsoDoc
       end
 
       def word_cleanup(docxml)
-        word_recommend_cleanup(docxml)
         super
+        word_recommend_cleanup(docxml)
         word_license_cleanup(docxml)
         word_term_cleanup(docxml)
         docxml
@@ -168,9 +168,10 @@ module IsoDoc
         docxml.xpath("//table[@class = 'recommend']/thead/tr").each do |tr|
           style_update(tr, "background:#A5A5A5;")
         end
-        docxml.xpath("//table[@class = 'recommend']/tbody/tr").
-          each_slice(2) do |tr1, tr2|
-          tr2 && style_update(tr2, "background:#C9C9C9;")
+        docxml.xpath("//table[@class = 'recommend']/tbody").each do |tr|
+          tr.xpath("./tr").each_slice(2) do |tr1, tr2|
+            tr2 && style_update(tr2, "background:#C9C9C9;")
+          end
         end
       end
 

data/lib/metanorma/ogc/version.rb

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

data/metanorma-ogc.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.3.0"
-  spec.add_dependency "isodoc", "~> 1.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.3.20"
+  spec.add_dependency "isodoc", "~> 1.0.20"
   spec.add_dependency "iso-639"
 
   spec.add_development_dependency "byebug", "~> 9.1"
@@ -39,5 +39,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.20
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.20
 - !ruby/object:Gem::Dependency
   name: iso-639
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: metanorma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 description: 'Metanorma for the Open Geospatial Consortium.
 
   '