metanorma-ogc 1.3.5 → 1.4.0

data/lib/isodoc/ogc/reqt.rb

@@ -8,17 +8,22 @@ module IsoDoc
         return "recommendtest" if node["type"] == "abstracttest"
         return "recommendclass" if node["type"] == "class"
         return "recommendclass" if node["type"] == "conformanceclass"
+
         "recommend"
       end
 
       def recommendation_class(node)
-        node["type"] == "recommendtest" ?
-          "RecommendationTestTitle" : "RecommendationTitle"
+        if node["type"] == "recommendtest"
+          "RecommendationTestTitle"
+        else
+          "RecommendationTitle"
+        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)
@@ -27,7 +32,7 @@ module IsoDoc
           name.children.each { |n| b << n }
           b << l10n(":")
         end
-        if title =  node&.at(ns("./title"))&.remove
+        if title = node&.at(ns("./title"))&.remove
           b << l10n(" ") if name
           title.children.each { |n| b << n }
         end
@@ -41,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)
@@ -72,13 +110,16 @@ 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
 
       def requirement_component_parse(node, out)
         node.remove
         return if node["exclude"] == "true"
+
         node.elements.size == 1 && node.first_element_child.name == "dl" and
           return reqt_dl(node.first_element_child, out)
         b = out.add_child("<tr><td colspan='2'></td></tr>").first
@@ -99,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
 
@@ -110,8 +152,10 @@ module IsoDoc
         recommendation_attributes(node, b)
         node.elements.each do |n|
           next if %w(thead tbody).include?(n.name)
+
           requirement_component_parse(n, b)
         end
+        node.delete("type_original")
       end
 
       def recommendation_to_table(docxml)
@@ -145,8 +189,8 @@ module IsoDoc
           x = t.at(ns("./thead")) and x.replace(x.children)
           x = t.at(ns("./tbody")) and x.replace(x.children)
           x = t.at(ns("./tfoot")) and x.replace(x.children)
-          if x = t.at(ns("./tr/th[@colspan = '2']")) and
-              y = t.at(ns("./tr/td[@colspan = '2']"))
+          if (x = t.at(ns("./tr/th[@colspan = '2']"))) &&
+              (y = t.at(ns("./tr/td[@colspan = '2']")))
             requirement_table_cleanup1(x, y)
           end
           t.parent.parent.replace(t.children)

data/lib/isodoc/ogc/word_convert.rb

@@ -15,7 +15,7 @@ module IsoDoc
         super
       end
 
-      def default_fonts(options)
+      def default_fonts(_options)
         {
           bodyfont: '"Times New Roman",serif',
           headerfont: '"Times New Roman",serif',
@@ -27,7 +27,7 @@ module IsoDoc
         }
       end
 
-      def default_file_locations(options)
+      def default_file_locations(_options)
         {
           wordstylesheet: html_doc_path("wordstyle.scss"),
           standardstylesheet: html_doc_path("ogc.scss"),
@@ -40,7 +40,7 @@ module IsoDoc
       end
 
       def convert1(docxml, filename, dir)
-        if docxml&.at(ns('//bibdata/ext/doctype'))&.text == "white-paper"
+        if docxml&.at(ns("//bibdata/ext/doctype"))&.text == "white-paper"
           @wordstylesheet_name = html_doc_path("wordstyle_wp.scss")
           @standardstylesheet_name = html_doc_path("ogc_wp.scss")
           @wordcoverpage = html_doc_path("word_ogc_titlepage_wp.html")
@@ -86,7 +86,7 @@ module IsoDoc
                           <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;RecommendationTitle,recommendationtitle&quot; 
+        \\h \\z \\t &quot;RecommendationTitle,recommendationtitle&quot;#{' '}
         <span style='mso-element:field-separator'></span></span>
       TOC
 
@@ -117,7 +117,7 @@ module IsoDoc
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) +  WORD_TOC_SUFFIX1
+                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) + WORD_TOC_SUFFIX1
       end
 
       def make_FigureWordToC(docxml)
@@ -126,7 +126,7 @@ module IsoDoc
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) +  WORD_TOC_SUFFIX1
+                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) + WORD_TOC_SUFFIX1
       end
 
       def make_RecommendationWordToC(docxml)
@@ -135,7 +135,7 @@ module IsoDoc
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_RECOMMENDATION_PREFACE1}}) +  WORD_TOC_SUFFIX1
+                %{\\1#{WORD_TOC_RECOMMENDATION_PREFACE1}}) + WORD_TOC_SUFFIX1
       end
 
       def make_body2(body, docxml)
@@ -179,10 +179,11 @@ module IsoDoc
         x = "//div[@class = 'boilerplate-copyright']/div[1]/p[not(@class)]"
         docxml.xpath(x).each { |p| p["align"] = "center" }
         return unless @doctype == "white-paper"
-        docxml.xpath("//div[@class = 'boilerplate-copyright']//p[not(@class)]").
-          each { |p| p["class"] = "license" }
-        docxml.xpath("//div[@class = 'boilerplate-legal']//p[not(@class)]").
-          each { |p| p["class"] = "license" }
+
+        docxml.xpath("//div[@class = 'boilerplate-copyright']//p[not(@class)]")
+          .each { |p| p["class"] = "license" }
+        docxml.xpath("//div[@class = 'boilerplate-legal']//p[not(@class)]")
+          .each { |p| p["class"] = "license" }
       end
 
       def word_term_cleanup(docxml)
@@ -199,7 +200,7 @@ module IsoDoc
           style_update(tr, "background:#A5A5A5;")
         end
         docxml.xpath("//table[@class = 'recommend']/tbody").each do |tr|
-          tr.xpath("./tr").each_slice(2) do |tr1, tr2|
+          tr.xpath("./tr").each_slice(2) do |_tr1, tr2|
             tr2 && style_update(tr2, "background:#C9C9C9;")
           end
         end

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.5".freeze
+    VERSION = "1.4.0".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "isodoc", "~> 1.6.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.9.0"
+  spec.add_dependency "isodoc", "~> 1.7.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement