metanorma-ogc 1.3.8 → 1.4.3

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -20,15 +20,15 @@ module IsoDoc
 
       def preface_init_insert_pt(docxml)
         docxml.at(ns("//preface")) ||
-          docxml.at(ns("//sections")).
-          add_previous_sibling("<preface> </preface>").first
+          docxml.at(ns("//sections"))
+            .add_previous_sibling("<preface> </preface>").first
       end
 
       def submit_orgs_append_pt(docxml)
         docxml.at(ns("//introduction")) ||
-        docxml.at(ns("//foreword")) ||
-        docxml.at(ns("//preface/clause[@type = 'keywords']")) ||
-        docxml.at(ns("//preface/abstract"))
+          docxml.at(ns("//foreword")) ||
+          docxml.at(ns("//preface/clause[@type = 'keywords']")) ||
+          docxml.at(ns("//preface/abstract"))
       end
 
       def insert_security(docxml)
@@ -37,42 +37,45 @@ module IsoDoc
         if a = submit_orgs_append_pt(docxml)
           a.next = s
         else
-          preface_init_insert_pt(docxml)&.children&.first&.
-            add_previous_sibling(s)
+          preface_init_insert_pt(docxml)&.children&.first
+            &.add_previous_sibling(s)
         end
       end
 
       def insert_submitting_orgs(docxml)
-        orgs = []
-        docxml.xpath(ns(submittingorgs_path)).each { |org| orgs << org.text }
+        orgs = docxml.xpath(ns(submittingorgs_path))
+          .each_with_object([]) do |org, m|
+          m << org.text
+        end
         return if orgs.empty?
+
         if a = submit_orgs_append_pt(docxml)
           a.next = submitting_orgs_clause(orgs)
         else
-          preface_init_insert_pt(docxml)&.children&.first&.
-            add_previous_sibling(submitting_orgs_clause(orgs))
+          preface_init_insert_pt(docxml)&.children&.first
+            &.add_previous_sibling(submitting_orgs_clause(orgs))
         end
       end
 
       def submitting_orgs_clause(orgs)
-        <<~END
-        <clause id="_#{UUIDTools::UUID.random_create}" type="submitting_orgs">
-        <title>Submitting Organizations</title>
-        <p>The following organizations submitted this Document to the
-           Open Geospatial Consortium (OGC):</p>
-         <ul>#{orgs.map { |m| "<li>#{m}</li>" }.join("\n")}</ul>
-         </clause>
-        END
-      end
-
-      def keyword_clause(kw)
-        <<~END
-        <clause id="_#{UUIDTools::UUID.random_create}" type="keywords">
-        <title>Keywords</title>
-        <p>The following are keywords to be used by search engines and
-            document catalogues.</p>
-        <p>#{kw.join(", ")}</p></clause>
-        END
+        <<~SUBMITTING
+          <clause id="_#{UUIDTools::UUID.random_create}" type="submitting_orgs">
+          <title>Submitting Organizations</title>
+          <p>The following organizations submitted this Document to the
+             Open Geospatial Consortium (OGC):</p>
+           <ul>#{orgs.map { |m| "<li>#{m}</li>" }.join("\n")}</ul>
+           </clause>
+        SUBMITTING
+      end
+
+      def keyword_clause(kwords)
+        <<~KEYWORDS
+          <clause id="_#{UUIDTools::UUID.random_create}" type="keywords">
+          <title>Keywords</title>
+          <p>The following are keywords to be used by search engines and
+              document catalogues.</p>
+          <p>#{kwords.join(', ')}</p></clause>
+        KEYWORDS
       end
 
       def insert_keywords(docxml)
@@ -81,28 +84,29 @@ module IsoDoc
         if abstract = docxml.at(ns("//preface/abstract"))
           abstract.next = keyword_clause(kw)
         else
-          preface_init_insert_pt(docxml)&.children&.first&.
-            add_previous_sibling(keyword_clause(kw))
+          preface_init_insert_pt(docxml)&.children&.first
+            &.add_previous_sibling(keyword_clause(kw))
         end
       end
 
-      def example1(f)
-        lbl = @xrefs.anchor(f['id'], :label, false) or return
-        prefix_name(f, "&nbsp;&mdash; ", l10n("#{@i18n.example} #{lbl}"), "name")
+      def example1(elem)
+        lbl = @xrefs.anchor(elem["id"], :label, false) or return
+        prefix_name(elem, "&nbsp;&mdash; ", l10n("#{@i18n.example} #{lbl}"),
+                    "name")
       end
 
-      def recommendation1(f, type)
-        type = recommendation_class_label(f)
-        label = f&.at(ns("./label"))&.text
-        if inject_crossreference_reqt?(f, label)
+      def recommendation1(elem, _type)
+        type = recommendation_class_label(elem)
+        label = elem&.at(ns("./label"))&.text
+        if inject_crossreference_reqt?(elem, label)
           n = @xrefs.anchor(@xrefs.reqtlabels[label], :xref, false)
           lbl = (n.nil? ? type : n)
-          f&.at(ns("./title"))&.remove # suppress from display if embedded
+          elem&.at(ns("./title"))&.remove # suppress from display if embedded
         else
-          n = @xrefs.anchor(f['id'], :label, false)
+          n = @xrefs.anchor(elem["id"], :label, false)
           lbl = (n.nil? ? type : l10n("#{type} #{n}"))
         end
-        prefix_name(f, "", lbl, "name")
+        prefix_name(elem, "", lbl, "name")
       end
 
       # embedded reqts xref to top level reqts via label lookup
@@ -126,23 +130,30 @@ module IsoDoc
         end
       end
 
-      def annex1(f)
-        lbl = @xrefs.anchor(f['id'], :label)
-        if t = f.at(ns("./title"))
+      def annex1(elem)
+        lbl = @xrefs.anchor(elem["id"], :label)
+        if t = elem.at(ns("./title"))
           t.children = "<strong>#{t.children.to_xml}</strong>"
         end
-        prefix_name(f, "<br/>", lbl, "title")
+        prefix_name(elem, "<br/>", lbl, "title")
       end
 
       def clause(docxml)
         super
         docxml.xpath(ns("//foreword | //preface/abstract | "\
-                        "//submitters | //introduction | //acknowledgements")).
-                       each do |f|
+                        "//submitters | //introduction | //acknowledgements"))
+          .each do |f|
           clause1(f)
         end
       end
 
+      def clause1(elem)
+        return if elem.name == "terms" && elem.parent.name == "annex" &&
+          elem.parent.xpath(ns("./terms")).size == 1
+
+        super
+      end
+
       def block(docxml)
         super
         recommendation_to_table(docxml)
@@ -166,4 +177,3 @@ module IsoDoc
     end
   end
 end
-

data/lib/isodoc/ogc/reqt.rb

@@ -1,4 +1,5 @@
 require "isodoc"
+require "metanorma-utils"
 
 module IsoDoc
   module Ogc
@@ -12,6 +13,10 @@ module IsoDoc
         "recommend"
       end
 
+      def recommend_class?(node)
+        %w(recommendtest recommendclass recommend).include? node["type"]
+      end
+
       def recommendation_class(node)
         if node["type"] == "recommendtest"
           "RecommendationTestTitle"
@@ -20,45 +25,75 @@ 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)
         b = out.add_child("<p class='#{recommendation_class(node)}'></p>").first
         if name = node&.at(ns("./name"))&.remove
           name.children.each { |n| b << n }
-          b << l10n(":")
         end
         if title = node&.at(ns("./title"))&.remove
-          b << l10n(" ") if name
+          b << l10n(": ") if name
           title.children.each { |n| b << n }
         end
       end
 
       def recommend_title(node, out)
         label = node&.at(ns("./label"))&.remove or return
+        label.xpath(ns(".//xref | .//eref | .//quote/source"))
+          .each { |f| xref1(f) }
+        label.xpath(ns(".//concept")).each { |f| concept1(f) }
         b = out.add_child("<tr><td colspan='2'><p></p></td></tr>")
         p = b.at(ns(".//p"))
-        p << label.children
+        p << label.text
       end
 
       def recommendation_attributes1(node)
-        out = []
+        out = recommendation_attributes1_head(node, [])
+        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
-        end
         out
       end
 
+      def recommendation_steps(node)
+        node.elements.each { |e| recommendation_steps(e) }
+        return node unless node.at(ns("./component[@class = 'step']"))
+
+        d = node.at(ns("./component[@class = 'step']"))
+        d = d.replace("<ol><li>#{d.children.to_xml}</li></ol>").first
+        node.xpath(ns("./component[@class = 'step']")).each do |f|
+          f = f.replace("<li>#{f.children.to_xml}</li>").first
+          d << f
+        end
+      end
+
+      def recommendation_attributes1_component(node, out)
+        node = recommendation_steps(node)
+        out << "<tr><td>#{node['label']}</td><td>#{node.children}</td></tr>"
+      end
+
       def rec_subj(node)
-        node["type"] == "recommendclass" ? "Target Type" : "Subject"
+        case node["type_original"]
+        when "class" then "Target type"
+        when "conformanceclass" then "Requirements class"
+        when "verification", "abstracttest" then "Requirement"
+        else "Subject"
+        end
       end
 
       def recommendation_attr_keyvalue(node, key, value)
@@ -70,13 +105,15 @@ module IsoDoc
       end
 
       def recommendation_attributes(node, out)
+        recommend_title(node, out)
         recommendation_attributes1(node).each do |i|
           out.add_child("<tr><td>#{i[0]}</td><td>#{i[1]}</td></tr>")
         end
       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
@@ -87,8 +124,11 @@ module IsoDoc
 
         node.elements.size == 1 && node.first_element_child.name == "dl" and
           return reqt_dl(node.first_element_child, out)
+        node.name == "component" and
+          return recommendation_attributes1_component(node, out)
         b = out.add_child("<tr><td colspan='2'></td></tr>").first
-        b.at(ns(".//td")) << (preserve_in_nested_table?(node) ? node : node.children)
+        b.at(ns(".//td")) <<
+          (preserve_in_nested_table?(node) ? node : node.children)
       end
 
       def reqt_dl(node, out)
@@ -105,20 +145,34 @@ module IsoDoc
       def recommendation_base(node, klass)
         node.name = "table"
         node["class"] = klass
+        node["type_original"] = node["type"]
         node["type"] = recommend_class(node)
+        recommendation_component_labels(node)
+      end
+
+      def recommendation_component_labels(node)
+        node.xpath(ns("./component[@class = 'part']")).each_with_index do |c, i|
+          c["label"] = (i + "A".ord).chr.to_s
+        end
+        node.xpath(ns("./component[not(@class = 'part')]")).each do |c|
+          c["label"] = case c["class"]
+                       when "test-purpose" then "Test purpose"
+                       when "test-method" then "Test method"
+                       else Metanorma::Utils.strict_capitalize_first(c["class"])
+                       end
+        end
       end
 
       def recommendation_parse1(node, klass)
         recommendation_base(node, klass)
         recommendation_header(node)
         b = node.add_child("<tbody></tbody>").first
-        recommend_title(node, b)
         recommendation_attributes(node, b)
-        node.elements.each do |n|
-          next if %w(thead tbody).include?(n.name)
-
-          requirement_component_parse(n, b)
-        end
+        node.elements.reject do |n|
+          %w(thead tbody classification subject
+             inherit).include?(n.name)
+        end.each { |n| requirement_component_parse(n, b) }
+        node.delete("type_original")
       end
 
       def recommendation_to_table(docxml)
@@ -135,27 +189,27 @@ module IsoDoc
       end
 
       # table nested in table: merge label and caption into a single row
-      def requirement_table_cleanup1(x, y)
-        x.delete("colspan")
-        x.delete("scope")
-        y.delete("colspan")
-        y.delete("scope")
-        x.name = "td"
-        p = x.at(ns("./p[@class = 'RecommendationTitle']")) and
+      def requirement_table_cleanup1(outer, inner)
+        outer.delete("colspan")
+        outer.delete("scope")
+        inner.delete("colspan")
+        inner.delete("scope")
+        outer.name = "td"
+        p = outer.at(ns("./p[@class = 'RecommendationTitle']")) and
           p.delete("class")
-        x.parent << y.dup
-        y.parent.remove
+        outer.parent << inner.dup
+        inner.parent.remove
       end
 
       def requirement_table_cleanup(docxml)
-        docxml.xpath(ns("//table[@type = 'recommendclass']/tbody/tr/td/table")).each do |t|
-          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']"))) &&
-              (y = t.at(ns("./tr/td[@colspan = '2']")))
-            requirement_table_cleanup1(x, y)
+        docxml.xpath(ns("//table[@type = 'recommendclass']/tbody/tr/td/table"))
+          .each do |t|
+          t.xpath(ns("./thead | ./tbody |./tfoot")).each do |x|
+            x.replace(x.children)
           end
+          (x = t.at(ns("./tr/th[@colspan = '2']"))) &&
+            (y = t.at(ns("./tr/td[@colspan = '2']"))) and
+            requirement_table_cleanup1(x, y)
           t.parent.parent.replace(t.children)
         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)
@@ -183,8 +200,7 @@ module IsoDoc
         when 6 then "(#{num})"
         when 7 then "(#{(96 + num).chr})"
         when 8 then "(#{RomanNumerals.to_roman(num).downcase})"
-        else
-          num.to_s
+        else num.to_s
         end
       end
 
@@ -192,7 +208,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.3".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.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -218,6 +218,7 @@ files:
 - lib/asciidoctor/ogc/basicdoc.rng
 - lib/asciidoctor/ogc/biblio.rng
 - lib/asciidoctor/ogc/boilerplate.xml
+- lib/asciidoctor/ogc/cleanup.rb
 - lib/asciidoctor/ogc/converter.rb
 - lib/asciidoctor/ogc/front.rb
 - lib/asciidoctor/ogc/isodoc.rng