metanorma-ogc 0.2.9 → 0.2.10

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

@@ -86,7 +86,7 @@ p.SourceTitle
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
-p.AdmonitionTitle
+p.AdmonitionTitle, p.RecommendationTitle, p.RecommendationTestTitle
         {mso-style-unhide:no;
         mso-style-qformat:yes;
         mso-style-parent:"";

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

@@ -1 +1,4 @@
 foreword: Preface
+recommendationtest: Recommendation Test
+requirementtest: Requirement Test
+permissiontest: Permission Test

data/lib/isodoc/ogc/metadata.rb

@@ -43,6 +43,10 @@ module IsoDoc
         set(:keywords, keywords)
       end
 
+      def unpublished(status)
+        !%w(published deprecated retired).include?(status.downcase)
+      end
+
       def version(isoxml, _out)
         super
         revdate = get[:revdate]
@@ -77,12 +81,17 @@ module IsoDoc
         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|
+      def type_capitalise(b)
+        b.split(/[- ]/).map do |w|
           w.capitalize unless %w(SWG).include? w
         end.join(" ")
-        set(:doctype, t)
+      end
+
+      def doctype(isoxml, _out)
+        b = isoxml&.at(ns("//bibdata/ext/doctype"))&.text and
+        set(:doctype, type_capitalise(b))
+        b = isoxml&.at(ns("//bibdata/ext/docsubtype"))&.text and
+        set(:docsubtype, type_capitalise(b))
       end
     end
   end

data/lib/isodoc/ogc/reqt.rb

@@ -6,75 +6,198 @@ module IsoDoc
   module Ogc
     module BaseConvert
       def recommend_table_attr(node)
-        attr_code(id: node["id"], class: "recommend",
-                  style: "border-collapse:collapse;border-spacing:0;" )
+        attr_code(id: node["id"], 
+                  class: node["type"] == "verification" ?
+                  "recommendtest" : "recommend",
+                  style: "border-collapse:collapse;border-spacing:0;")
       end
 
       REQ_TBL_ATTR =
-        { class: "example_label",
-          style: "width:100.0pt;padding:0 0 0 1em;margin-left:0pt;vertical-align:top;" }.freeze
+        { style: "vertical-align:top;", class: "recommend" }.freeze
 
       def recommendation_name(node, out, type)
-        out.p **{ class: "AdmonitionTitle" }  do |b|
+        label, title, lbl = recommendation_labels(node)
+        out.p **{ class: node["type"] == "verification" ?
+                  "RecommendationTestTitle" : "RecommendationTitle" }  do |b|
           lbl = anchor(node['id'], :label, false)
           b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
+          if title
+            b << " "
+            title.children.each { |n| parse(n,b) }
+          end
         end
       end
 
-      def recommend_title(node, div)
-        label = node.at(ns("./label"))
-        title = node.at(ns("./title"))
-        label || title or return
-        div.p do |p|
-          p.b do |b|
-            label and label.children.each { |n| parse(n,b) }
-            b << "#{clausedelim} " if label && title
-            title and title.children.each { |n| parse(n,b) }
+      def recommend_title(node, out)
+        label = node.at(ns("./label")) or return
+        out.tr do |tr|
+          tr.td **REQ_TBL_ATTR.merge(colspan: 2) do |td|
+            td.p do |p|
+              label.children.each { |n| parse(n, p) }
+            end
           end
         end
       end
 
-      def recommendation_body(node, tr)
-        tr.td **{ style: "vertical-align:top;", class: "recommend" } do |td|
-          recommend_title(node, td)
-          node.children.each do |n|
-            parse(n, td) unless %(label title).include?(n.name)
+      def recommendation_attributes1(node)
+        out = []
+        oblig = node["obligation"] and out << ["Obligation", oblig]
+        subj = node&.at(ns("./subject"))&.text and out << ["Subject", subj]
+        node.xpath(ns("./classification")).each do |c|
+          tag = c.at(ns("./tag"))
+          value = c.at(ns("./value"))
+          tag && value or next
+          out << [tag.text.capitalize, value.text]
+        end
+        out
+      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
           end
         end
       end
 
-      def recommendation_parse(node, out)
-        out.table **recommend_table_attr(node) do |t|
-          t.tr do |tr|
+      def requirement_component_parse(node, out)
+        return if node["exclude"] == "true"
+        node.elements.size == 1 && node.first_element_child.name == "dl" and
+          return reqt_dl(node.first_element_child, out)
+        out.tr do |tr|
+          tr.td **REQ_TBL_ATTR.merge(colspan: 2) do |td|
+            node.children.each { |n| parse(n, td) }
+          end
+        end
+      end
+
+      def reqt_dl(node, out)
+        node.xpath(ns("./dt")).each do |dt|
+          out.tr do |tr|
+            tr.td **REQ_TBL_ATTR do |td|
+              dt.children.each { |n| parse(n, td) }
+            end
+            dd = dt&.next_element and dd.name == "dd" or next
             tr.td **REQ_TBL_ATTR do |td|
-              recommendation_name(node, td, @recommendation_lbl)
+              dd.children.each { |n| parse(n, td) }
             end
-            recommendation_body(node, tr)
           end
         end
       end
 
-      def requirement_parse(node, out)
-        out.table **recommend_table_attr(node) do |t|
-          t.tr do |tr|
-            tr.td **REQ_TBL_ATTR do |td|
-              recommendation_name(node, td, @requirement_lbl)
+      def recommendation_header(node, out, label)
+        out.thead do |h|
+          h.tr do |tr|
+            tr.th **REQ_TBL_ATTR.merge(colspan: 2) do |td|
+              recommendation_name(node, td, label)
             end
-            recommendation_body(node, tr)
           end
         end
       end
 
-      def permission_parse(node, out)
+      def recommendation_parse1(node, out, label)
         out.table **recommend_table_attr(node) do |t|
-          t.tr do |tr|
-            tr.td **REQ_TBL_ATTR do |td|
-              recommendation_name(node, td, @permission_lbl)
+          recommendation_header(node, out, label)
+          t.tbody do |b|
+            recommend_title(node, b)
+            recommendation_attributes(node, b)
+            node.children.each do |n|
+              parse(n, t) unless reqt_metadata_node(n)
             end
-            recommendation_body(node, tr)
           end
         end
       end
+
+      def recommendation_parse(node, out)
+        recommendation_parse1(node, out, node["type"] == "verification" ?
+                              @labels["recommendationtest"] :
+                              @recommendation_lbl)
+      end
+
+      def requirement_parse(node, out)
+        recommendation_parse1(node, out, node["type"] == "verification" ?
+                              @labels["requirementtest"] : @requirement_lbl)
+      end
+
+      def permission_parse(node, out)
+        recommendation_parse1(node, out, node["type"] == "verification" ?
+                              @labels["permissiontest"] : @permission_lbl)
+      end
+
+      FIRST_LVL_REQ = IsoDoc::Function::XrefGen::FIRST_LVL_REQ
+
+      def sequential_permission_names(clause, klass, label)
+        c = ::IsoDoc::Function::XrefGen::Counter.new
+        clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
+          next if t["id"].nil? || t["id"].empty?
+          id = c.increment(t).print
+          @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
+          sequential_permission_names1(t, id, "permission[not(@type = 'verification')]", @permission_lbl)
+          sequential_permission_names1(t, id, "requirement[not(@type = 'verification')]", @requirement_lbl)
+          sequential_permission_names1(t, id, "recommendation[not(@type = 'verification')]", @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"])
+        end
+      end
+
+      def sequential_permission_names1(block, lbl, klass, label)
+        c = ::IsoDoc::Function::XrefGen::Counter.new
+        block.xpath(ns("./#{klass}")).each do |t|
+          next if t["id"].nil? || t["id"].empty?
+          id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
+          @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
+          sequential_permission_names1(t, id, "permission[not(@type = 'verification')]", @permission_lbl)
+          sequential_permission_names1(t, id, "requirement[not(@type = 'verification')]", @requirement_lbl)
+          sequential_permission_names1(t, id, "recommendation[not(@type = 'verification')]", @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"])
+        end
+      end
+
+      def sequential_asset_names(clause)
+        sequential_table_names(clause)
+        sequential_figure_names(clause)
+        sequential_formula_names(clause)
+        sequential_permission_names(clause, "permission[not(@type = 'verification')]", @permission_lbl)
+        sequential_permission_names(clause, "requirement[not(@type = 'verification')]", @requirement_lbl)
+        sequential_permission_names(clause, "recommendation[not(@type = 'verification')]", @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"])
+      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')]", @permission_lbl)
+        hierarchical_permission_names(clause, num, "requirement[not(@type = 'verification')]", @requirement_lbl)
+        hierarchical_permission_names(clause, num, "recommendation[not(@type = 'verification')]", @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"])
+      end
+
+      def hierarchical_permission_names(clause, num, klass, label)
+        c = ::IsoDoc::Function::XrefGen::Counter.new
+        clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
+          next if t["id"].nil? || t["id"].empty?
+          lbl = "#{num}#{hiersep}#{c.increment(t).print}"
+          @anchors[t["id"]] = anchor_struct(lbl, t, label, klass, t["unnumbered"])
+          sequential_permission_names1(t, lbl, "permission[not(@type = 'verification')]", @permission_lbl)
+          sequential_permission_names1(t, lbl, "requirement[not(@type = 'verification')]", @requirement_lbl)
+          sequential_permission_names1(t, lbl, "recommendation[not(@type = 'verification')]", @recommendation_lbl)
+          sequential_permission_names1(t, lbl, "permission[@type = 'verification']", @labels["permissiontest"])
+          sequential_permission_names1(t, lbl, "requirement[@type = 'verification']", @labels["requirementtest"])
+          sequential_permission_names1(t, lbl, "recommendation[@type = 'verification']", @labels["recommendationtest"])
+        end
+      end
     end
   end
 end

data/lib/isodoc/ogc/word_convert.rb

@@ -49,16 +49,6 @@ module IsoDoc
         end
       end
 
-=begin
-      def make_body2(body, docxml)
-        body.div **{ class: "WordSection2" } do |div2|
-          info docxml, div2
-          div2.p { |p| p << "&nbsp;" } # placeholder
-        end
-        section_break(body)
-      end
-=end
-
       def insert_toc(intro, docxml, level)
         toc = ""
         toc += make_WordToC(docxml, level)
@@ -148,6 +138,24 @@ module IsoDoc
         section_break(body)
       end
 
+      def word_cleanup(docxml)
+        word_recommend_cleanup(docxml)
+        super
+      end
+
+      def word_recommend_cleanup(docxml)
+        docxml.xpath("//table[@class = 'recommendtest']/thead/tr").each do |tr|
+          style_update(tr, "background:#C9C9C9;")
+        end
+        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;")
+        end
+      end
+
       include BaseConvert
     end
   end

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "0.2.9"
+    VERSION = "0.2.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -257,6 +257,7 @@ files:
 - lib/isodoc/ogc.rb
 - lib/isodoc/ogc/base_convert.rb
 - lib/isodoc/ogc/biblio.rb
+- lib/isodoc/ogc/html/_coverpage.scss
 - lib/isodoc/ogc/html/header.html
 - lib/isodoc/ogc/html/html_ogc_intro.html
 - lib/isodoc/ogc/html/html_ogc_titlepage.html
@@ -298,7 +299,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.