metanorma-ogc 0.0.9 → 0.1.0

data/lib/isodoc/ogc/base_convert.rb

@@ -7,7 +7,7 @@ module IsoDoc
     module BaseConvert
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
+          t << "#{anchor(annex['id'], :label)} "
           t.br
           t.b do |b|
             name&.children&.each { |c2| parse(c2, b) }
@@ -89,7 +89,7 @@ module IsoDoc
       def submitters(docxml, out)
         f = docxml.at(ns("//submitters")) || return
         out.div **{ class: "Section3" } do |div|
-          clause_name(get_anchors[f['id']][:label], "Submitters", div,  class: "IntroTitle")
+          clause_name(anchor(f['id'], :label), "Submitters", div,  class: "IntroTitle")
           f.elements.each { |e| parse(e, div) unless e.name == "title" }
         end
       end
@@ -110,7 +110,7 @@ module IsoDoc
         @prefacenum += 1
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(get_anchors[f["id"]][:label], @abstract_lbl, s, class: "AbstractTitle")
+          clause_name(anchor(f["id"], :label), @abstract_lbl, s, class: "AbstractTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
@@ -120,7 +120,7 @@ module IsoDoc
         @prefacenum += 1
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(get_anchors[f["id"]][:label], @foreword_lbl, s, class: "ForewordTitle")
+          clause_name(anchor(f["id"], :label), @foreword_lbl, s, class: "ForewordTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
@@ -149,20 +149,29 @@ module IsoDoc
       end
 
       def recommendation_anchor_names(docxml)
-        docxml.xpath(ns("//recommendation")).each_with_index do |x, i|
-          @anchors[x["id"]] = anchor_struct(i+1, nil, "Recommendation", "recommendation")
+        i = 0
+        docxml.xpath(ns("//recommendation")).each do |x|
+          next if x["id"].nil? || x["id"].empty?
+          @anchors[x["id"]] = anchor_struct(i+1, nil, "Recommendation", "recommendation", x["unnumbered"])
+          i += 1 unless x["unnumbered"]
         end
       end
 
       def requirement_anchor_names(docxml)
-        docxml.xpath(ns("//requirement")).each_with_index do |x, i|
-          @anchors[x["id"]] = anchor_struct(i+1, nil, "Requirement", "requirement")
+        i = 0
+        docxml.xpath(ns("//requirement")).each_with_index do |x|
+          next if x["id"].nil? || x["id"].empty?
+          @anchors[x["id"]] = anchor_struct(i+1, nil, "Requirement", "requirement", x["unnumbered"])
+          i += 1 unless x["unnumbered"]
         end
       end
 
       def permission_anchor_names(docxml)
-        docxml.xpath(ns("//permission")).each_with_index do |x, i|
-          @anchors[x["id"]] = anchor_struct(i+1, nil, "Permission", "permission")
+        i = 0
+        docxml.xpath(ns("//permission")).each do |x|
+          next if x["id"].nil? || x["id"].empty?
+          @anchors[x["id"]] = anchor_struct(i+1, nil, "Permission", "permission", x["unnumbered"])
+          i += 1 unless x["unnumbered"]
         end
       end
 
@@ -199,7 +208,7 @@ module IsoDoc
 
       def recommendation_label(node, out)
         n = get_anchors[node["id"]]
-        label = (n.nil? || n[:label].empty?) ?
+        label = (n.nil? ||  n[:label].nil? || n[:label].empty?) ?
           "Recommendation" : l10n("#{"Recommendation"} #{n[:label]}")
         out.p **{class: "RecommendationTitle" } do |p|
           p << label
@@ -222,7 +231,7 @@ module IsoDoc
 
       def requirement_label(node, out)
         n = get_anchors[node["id"]]
-        label = (n.nil? || n[:label].empty?) ?
+        label = (n.nil? || n[:label].nil? || n[:label].empty?) ?
           "Requirement" : l10n("#{"Requirement"} #{n[:label]}")
         out.p **{class: "RecommendationTitle" } do |p|
           p << label
@@ -245,7 +254,7 @@ module IsoDoc
 
       def permission_label(node, out)
         n = get_anchors[node["id"]]
-        label = (n.nil? || n[:label].empty?) ?
+        label = (n.nil? || n[:label].nil? || n[:label].empty?) ?
           "Permission" : l10n("#{"Permission"} #{n[:label]}")
         out.p **{class: "RecommendationTitle" } do |p|
           p << label
@@ -257,7 +266,7 @@ module IsoDoc
         preface_names(d.at(ns("//preface/abstract")))
         @prefacenum += 1 if d.at(ns("//keyword"))
         preface_names(d.at(ns("//foreword")))
-        #preface_names(d.at(ns("//introduction")))
+        preface_names(d.at(ns("//introduction")))
         @prefacenum += 1 if d.at(ns(SUBMITTINGORGS))
         preface_names(d.at(ns("//submitters")))
         sequential_asset_names(d.xpath(ns("//preface/abstract | //foreword | //introduction | //submitters")))

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

@@ -1,5 +1,5 @@
-<div class="document-stage-band" id='{{ status | downcase | replace: " ", "-" }}-band'>
-    <p class="document-stage">{{ status }}</p>
+<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'>
@@ -80,11 +80,11 @@
   </div>
 
   <div class="coverpage-stage-block" >
-    <p><span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{{ status }}</span></p>
+    <p><span class="coverpage-maturity" id="{{ stage | replace: ' ', '-' | downcase }}">{{ stage }}</span></p>
   </div>
 </div>
 
-{% if status == "Published" or status == "Withdrawn" %}
+{% if stage == "Published" or stage == "Withdrawn" %}
 {% if doctype == "Standard" or doctype == "Standard With Suite" %}
   <div class="coverpage-warning">
     <span class="title">Warning</span>

data/lib/isodoc/ogc/html/word_ogc_titlepage.html

@@ -49,7 +49,7 @@ style='mso-color-alt:windowtext'><a href="http://www.opengeospatial.org/legal/">
 style='mso-color-alt:windowtext'>http://www.opengeospatial.org/legal/</span></a></span></span>.<b
 style='mso-bidi-font-weight:normal'><o:p></o:p></b></span></p>
 
-{% if status == "Published" or status == "Withdrawn" %}
+{% if stage == "Published" or stage == "Withdrawn" %}
 
 {% if doctype == "Standard" or doctype == "Standard With Suite" %}
 <p class="MsoNormal" align="center" style='margin-bottom:6.0pt;text-align:center;
@@ -99,7 +99,7 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>Thi
 <o:p></o:p></span></p>
 {% endif %}
 
-{% if status == "Policy" %}
+{% if stage == "Policy" %}
 <p class="MsoNormal" align="center" style='margin-bottom:6.0pt;text-align:center;
 border:none;mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:
 1.0pt 4.0pt 1.0pt 4.0pt'><b style='mso-bidi-font-weight:normal'><span
@@ -186,7 +186,7 @@ page;mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'>
   auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
   mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
   lang=EN-GB style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
-  stage:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>        </span>{{ status }}<o:p></o:p></span></p>
+  stage:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>        </span>{{ stage }}<o:p></o:p></span></p>
   <p class=zzCover align=left style='margin-bottom:0cm;margin-bottom:.0001pt;
   text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
   mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:

data/lib/isodoc/ogc/html_convert.rb

@@ -74,6 +74,7 @@ module IsoDoc
           abstract docxml, div3
           keywords docxml, div3
           foreword docxml, div3
+          introduction docxml, div3
           submittingorgs docxml, div3
           submitters docxml, div3
           middle docxml, div3

data/lib/isodoc/ogc/metadata.rb

@@ -7,7 +7,6 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
         super
-        set(:status, "XXX")
       end
 
       def title(isoxml, _out)
@@ -20,7 +19,7 @@ module IsoDoc
       end
 
       def author(isoxml, _out)
-        tc = isoxml.at(ns("//bibdata/editorialgroup/committee"))
+        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
         set(:tc, tc.text) if tc
         authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person"))
         set(:authors, extract_person_names(authors))
@@ -33,16 +32,12 @@ module IsoDoc
         set(:externalid, isoxml&.at(ns("//bibdata/docidentifier[@type = 'ogc-external']"))&.text)
       end
 
-      def status_print(status)
-        status.split(/-/).map{ |w| w.capitalize }.join(" ")
-      end
-
       def status_abbr(status)
       end
 
       def keywords(isoxml, _out)
         keywords = []
-        isoxml.xpath(ns("//bibdata/keyword")).each do |kw|
+        isoxml.xpath(ns("//bibdata/ext/keyword")).each do |kw|
           keywords << kw.text
         end
         set(:keywords, keywords)
@@ -52,7 +47,7 @@ module IsoDoc
         super
         revdate = get[:revdate]
         set(:revdate_monthyear, monthyr(revdate))
-        set(:edition, isoxml&.at(ns("//version/edition"))&.text)
+        set(:edition, isoxml&.at(ns("//bibdata/edition"))&.text)
         set(:language, ISO_639.find_by_code(isoxml&.at(ns("//bibdata/language"))&.text))
       end
 
@@ -81,6 +76,14 @@ module IsoDoc
         super
         a = xml.at(ns("//bibdata/uri[@type = 'previous']")) and set(:previousuri, a.text)
       end
+
+      def doctype(isoxml, _out)
+        b = isoxml&.at(ns("//bibdata/ext/doctype"))&.text || return
+        t = b.split(/[- ]/).map do |w|
+          w.capitalize unless %w(SWG).include? w
+        end.join(" ")
+        set(:doctype, t)
+      end
     end
   end
 end

data/lib/isodoc/ogc/pdf_convert.rb

@@ -72,6 +72,7 @@ module IsoDoc
           abstract docxml, div3
           keywords docxml, div3
           foreword docxml, div3
+          introduction docxml, div3
           submittingorgs docxml, div3
           submitters docxml, div3
           middle docxml, div3

data/lib/isodoc/ogc/word_convert.rb

@@ -140,6 +140,7 @@ module IsoDoc
           abstract docxml, div2
           keywords docxml, div2
           foreword docxml, div2
+          introduction docxml, div2
           submittingorgs docxml, div2
           submitters docxml, div2
           div2.p { |p| p << "&nbsp;" } # placeholder

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

data/metanorma-ogc.gemspec

@@ -22,12 +22,13 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.1.0"
-  spec.add_dependency "isodoc", "~> 0.9.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 0.10.0"
   spec.add_dependency "iso-639"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
@@ -41,5 +42,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.3.0"
-  spec.add_development_dependency "metanorma-cli", "~> 1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: iso-639
   requirement: !ruby/object:Gem::Requirement
@@ -248,20 +248,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: metanorma-cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.2
 description: 'Metanorma for the Open Geospatial Consortium.
 
   '
@@ -293,6 +279,7 @@ files:
 - lib/asciidoctor/ogc/isostandard.rng
 - lib/asciidoctor/ogc/ogc.rng
 - lib/asciidoctor/ogc/reqt.rng
+- lib/asciidoctor/ogc/validate.rb
 - lib/isodoc/ogc.rb
 - lib/isodoc/ogc/base_convert.rb
 - lib/isodoc/ogc/html/header.html
@@ -327,7 +314,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -335,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Metanorma for the Open Geospatial Consortium.