metanorma-ogc 1.3.8 → 1.4.0

data/lib/isodoc/ogc/reqt.rb

@@ -20,9 +20,10 @@ module IsoDoc
         end
       end
 
-      def recommendation_header(r)
-        h = r.add_child("<thead><tr><th scope='colgroup' colspan='2'></th></tr></thead>")
-        recommendation_name(r, h.at(ns(".//th")))
+      def recommendation_header(recommend)
+        h = recommend.add_child("<thead><tr><th scope='colgroup' colspan='2'>"\
+                                "</th></tr></thead>")
+        recommendation_name(recommend, h.at(ns(".//th")))
       end
 
       def recommendation_name(node, out)
@@ -45,20 +46,53 @@ module IsoDoc
       end
 
       def recommendation_attributes1(node)
-        out = []
+        out = recommendation_attributes1_head(node, [])
+        out = recommendation_attributes1_component(node, out)
+        node.xpath(ns("./classification")).each do |c|
+          line = recommendation_attr_keyvalue(c, "tag", "value") and out << line
+        end
+        out
+      end
+
+      def recommendation_attributes1_head(node, out)
         oblig = node["obligation"] and out << ["Obligation", oblig]
-        subj = node&.at(ns("./subject"))&.remove&.children and out << [rec_subj(node), subj]
+        subj = node&.at(ns("./subject"))&.remove&.children and
+          out << [rec_subj(node), subj]
         node.xpath(ns("./inherit")).each do |i|
           out << ["Dependency", i.remove.children]
         end
-        node.xpath(ns("./classification")).each do |c|
-          line = recommendation_attr_keyvalue(c, "tag", "value") and out << line
+        out
+      end
+
+      def strict_capitalize_phrase(str)
+        str.split(/ /).map do |w|
+          letters = w.chars
+          letters.first.upcase!
+          letters.join
+        end.join(" ")
+      end
+
+      def recommendation_attributes1_component(node, out)
+        node.xpath(ns("./component[not(@class = 'part')]")).each do |c|
+          out << case c["class"]
+                 when "test-purpose" then ["Test Purpose", c.remove.children]
+                 when "test-method" then ["Test Method", c.remove.children]
+                 else [strict_capitalize_phrase(c["class"]), c.remove.children]
+                 end
+        end
+        node.xpath(ns("./component[@class = 'part']")).each_with_index do |c, i|
+          out << [(i + "A".ord).chr.to_s, c.remove.children]
         end
         out
       end
 
       def rec_subj(node)
-        node["type"] == "recommendclass" ? "Target Type" : "Subject"
+        case node["type_original"]
+        when "class" then "Target Type"
+        when "conformanceclass" then "Requirement Class"
+        when "verification", "abstracttest" then "Requirement"
+        else "Subject"
+        end
       end
 
       def recommendation_attr_keyvalue(node, key, value)
@@ -76,7 +110,8 @@ module IsoDoc
       end
 
       def preserve_in_nested_table?(node)
-        return true if %w(recommendation requirement permission table).include?(node.name)
+        return true if %w(recommendation requirement permission
+                          table).include?(node.name)
 
         false
       end
@@ -105,6 +140,7 @@ module IsoDoc
       def recommendation_base(node, klass)
         node.name = "table"
         node["class"] = klass
+        node["type_original"] = node["type"]
         node["type"] = recommend_class(node)
       end
 
@@ -119,6 +155,7 @@ module IsoDoc
 
           requirement_component_parse(n, b)
         end
+        node.delete("type_original")
       end
 
       def recommendation_to_table(docxml)

data/lib/isodoc/ogc/xref.rb

@@ -24,6 +24,7 @@ module IsoDoc
           @anchors[t["id"]] = anchor_struct(id, t, label, klass,
                                             t["unnumbered"])
           l = t.at(ns("./label"))&.text and @reqtlabels[l] = t["id"]
+          permission_parts(t, label, klass)
           sequential_permission_children(t, id)
         end
       end
@@ -32,7 +33,7 @@ module IsoDoc
         { "class" => "@type = 'class'",
           "test" => "@type = 'verification'",
           "" => "not(@type = 'verification' or @type = 'class' or "\
-          "@type = 'abstracttest' or @type = 'conformanceclass')" }
+                "@type = 'abstracttest' or @type = 'conformanceclass')" }
       end
 
       def req_class_paths2
@@ -40,15 +41,27 @@ module IsoDoc
           "conformanceclass" => "@type = 'conformanceclass'" }
       end
 
-      def sequential_permission_children(t, id)
+      def permission_parts(block, label, klass)
+        block.xpath(ns("./component[@class = 'part']"))
+          .each_with_index do |c, i|
+          next if c["id"].nil? || c["id"].empty?
+
+          @anchors[c["id"]] = anchor_struct((i + "A".ord).chr.to_s, c, label,
+                                            klass, c["unnumbered"])
+        end
+      end
+
+      REQS = %w(permission requirement recommendation).freeze
+
+      def sequential_permission_children(block, idx)
         req_class_paths.each do |k, v|
-          %w(permission requirement recommendation).each do |r|
-            sequential_permission_names1(t, id, "#{r}[#{v}]",
+          REQS.each do |r|
+            sequential_permission_names1(block, idx, "#{r}[#{v}]",
                                          @labels["#{r}#{k}"])
           end
         end
         req_class_paths2.each do |k, v|
-          sequential_permission_names1(t, id, "*[#{v}]", @labels[k])
+          sequential_permission_names1(block, idx, "*[#{v}]", @labels[k])
         end
       end
 
@@ -60,6 +73,7 @@ module IsoDoc
           id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
           @anchors[t["id"]] = anchor_struct(id, t, label, klass,
                                             t["unnumbered"])
+          permission_parts(t, label, klass)
           sequential_permission_children(t, id)
         end
       end
@@ -69,7 +83,7 @@ module IsoDoc
         sequential_figure_names(clause)
         sequential_formula_names(clause)
         req_class_paths.each do |k, v|
-          %w(permission requirement recommendation).each do |r|
+          REQS.each do |r|
             sequential_permission_names(clause, "#{r}[#{v}]",
                                         @labels["#{r}#{k}"])
           end
@@ -84,7 +98,7 @@ module IsoDoc
         hierarchical_figure_names(clause, num)
         hierarchical_formula_names(clause, num)
         req_class_paths.each do |k, v|
-          %w(permission requirement recommendation).each do |r|
+          REQS.each do |r|
             hierarchical_permission_names(clause, num, "#{r}[#{v}]",
                                           @labels["#{r}#{k}"])
           end
@@ -103,51 +117,54 @@ module IsoDoc
           @anchors[t["id"]] = anchor_struct(lbl, t, label, klass,
                                             t["unnumbered"])
           l = t.at(ns("./label"))&.text and @reqtlabels[l] = t["id"]
+          permission_parts(t, label, klass)
           sequential_permission_children(t, lbl)
         end
       end
 
-      def initial_anchor_names(d)
-        @prefacenum = 0
-        preface_names_numbered(d.at(ns("//preface/abstract")))
-        preface_names_numbered(d.at(ns("//preface/clause[@type = 'keywords']")))
-        preface_names_numbered(d.at(ns("//foreword")))
-        preface_names_numbered(d.at(ns("//introduction")))
-        preface_names_numbered(d.at(ns("//preface/clause[@type = 'security']")))
-        preface_names_numbered(d.at(ns("//preface/clause"\
-                                       "[@type = 'submitting_orgs']")))
-        preface_names_numbered(d.at(ns("//submitters")))
-        d.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
-                   "@type = 'submitting_orgs' or @type = 'security')]")).each do |c|
-          preface_names_numbered(c)
-        end
-        preface_names_numbered(d.at(ns("//acknowledgements")))
-        sequential_asset_names(d.xpath(ns(
-                                         "//preface/abstract | //foreword | //introduction | "\
-                                         "//submitters | //acknowledgements | //preface/clause",
-                                       )))
+      def initial_anchor_names(doc)
+        preface_anchor_names(doc)
         n = Counter.new
-        n = section_names(d.at(ns("//clause[@type = 'scope']")), n, 1)
-        n = section_names(d.at(ns("//clause[@type = 'conformance']")), n, 1)
-        n = section_names(d.at(ns(@klass.norm_ref_xpath)), n, 1)
+        n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
+        n = section_names(doc.at(ns("//clause[@type = 'conformance']")), n, 1)
+        n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
         n = section_names(
-          d.at(ns("//sections/terms | //sections/clause[descendant::terms]")),
+          doc.at(ns("//sections/terms | //sections/clause[descendant::terms]")),
           n, 1
         )
-        n = section_names(d.at(ns("//sections/definitions")), n, 1)
-        middle_section_asset_names(d)
-        clause_names(d, n)
-        termnote_anchor_names(d)
-        termexample_anchor_names(d)
+        n = section_names(doc.at(ns("//sections/definitions")), n, 1)
+        middle_section_asset_names(doc)
+        clause_names(doc, n)
+        termnote_anchor_names(doc)
+        termexample_anchor_names(doc)
+      end
+
+      def preface_anchor_names(doc)
+        @prefacenum = 0
+        ["//preface/abstract", "//preface/clause[@type = 'keywords']",
+         "//foreword", "//introduction", "//preface/clause[@type = 'security']",
+         "//preface/clause[@type = 'submitting_orgs']",
+         "//submitters"].each do |path|
+          preface_names_numbered(doc.at(ns(path)))
+        end
+        doc.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
+                     "@type = 'submitting_orgs' or @type = 'security')]"))
+          .each { |c| preface_names_numbered(c) }
+        preface_names_numbered(doc.at(ns("//acknowledgements")))
+        sequential_asset_names(
+          doc.xpath(ns("//preface/abstract | //foreword | //introduction | "\
+                       "//submitters | //acknowledgements | //preface/clause")),
+        )
       end
 
-      def middle_section_asset_names(d)
-        middle_sections = "//clause[@type = 'scope' or @type = 'conformance'] "\
-          "| //foreword | //introduction | //preface/abstract | "\
-          "//submitters | //acknowledgements | //preface/clause | "\
+      def middle_section_asset_names(doc)
+        middle_sections =
+          "//clause[@type = 'scope' or @type = 'conformance'] | //foreword | "\
+          "//introduction | //preface/abstract | //submitters | "\
+          "//acknowledgements | //preface/clause | "\
           " #{@klass.norm_ref_xpath} | //sections/terms | "\
           "//sections/definitions | //clause[parent::sections]"
-        sequential_asset_names(d.xpath(ns(middle_sections)))
+        sequential_asset_names(doc.xpath(ns(middle_sections)))
       end
 
       def preface_names_numbered(clause)
@@ -192,7 +209,7 @@ module IsoDoc
         super
         return unless @klass.ogc_draft_ref?(ref)
 
-        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref] + " (draft)" }
+        @anchors[ref["id"]] = { xref: "#{@anchors[ref['id']][:xref]}  (draft)" }
       end
     end
   end

data/lib/metanorma/ogc/processor.rb

@@ -22,11 +22,12 @@ module Metanorma
       def fonts_manifest
         {
           "Lato" => nil,
+          "Lato Light" => nil,
           "Arial" => nil,
           "STIX Two Math" => nil,
           "Source Han Sans" => nil,
+          "Source Han Sans Normal" => nil,
           "Fira Code" => nil,
-          "Courier" => nil,
           "Courier New" => nil,
           "Times New Roman" => nil,
           "Overpass" => nil,

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.3.8".freeze
+    VERSION = "1.4.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639