metanorma-ogc 2.0.0 → 2.0.4

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -35,8 +35,7 @@ module IsoDoc
       def insert_security(docxml)
         s = docxml&.at(ns("//preface/clause[@type = 'security']"))&.remove or
           return
-        if a = submit_orgs_append_pt(docxml)
-          a.next = s
+        if a = submit_orgs_append_pt(docxml) then a.next = s
         else
           preface_init_insert_pt(docxml)&.children&.first
             &.add_previous_sibling(s)
@@ -46,8 +45,7 @@ module IsoDoc
       def insert_executivesummary(docxml)
         s = docxml&.at(ns("//preface/clause[@type = 'executivesummary']"))
           &.remove or return
-        if a = docxml.at(ns("//preface/abstract"))
-          a.next = s
+        if a = docxml.at(ns("//preface/abstract")) then a.next = s
         else
           preface_init_insert_pt(docxml)&.children&.first
             &.add_previous_sibling(s)
@@ -56,9 +54,7 @@ module IsoDoc
 
       def insert_submitting_orgs(docxml)
         orgs = docxml.xpath(ns(submittingorgs_path))
-          .each_with_object([]) do |org, m|
-          m << org.text
-        end
+          .each_with_object([]) { |org, m| m << org.text }
         return if orgs.empty?
 
         if a = submit_orgs_append_pt(docxml)
@@ -146,9 +142,8 @@ module IsoDoc
 
       def annex1(elem)
         lbl = @xrefs.anchor(elem["id"], :label)
-        if t = elem.at(ns("./title"))
+        t = elem.at(ns("./title")) and
           t.children = "<strong>#{t.children.to_xml}</strong>"
-        end
         prefix_name(elem, "<br/>", lbl, "title")
       end
 
@@ -171,7 +166,6 @@ module IsoDoc
       def block(docxml)
         super
         recommendation_to_table(docxml)
-        ol docxml
       end
 
       def section(docxml)
@@ -188,6 +182,14 @@ module IsoDoc
         end
       end
 
+      def bibdata(docxml)
+        docxml.xpath(ns("//bibdata/contributor[@type = 'author']")).each do |a|
+          a.at(ns("./description"))&.text == "contributor" and
+            a["type"] = "contributor"
+        end
+        super
+      end
+
       def bibdata_i18n(bib)
         doctype = bib&.at(ns("./ext/doctype"))
         rename_stage(bib&.at(ns("./status/stage")), doctype, bib)
@@ -197,31 +199,25 @@ module IsoDoc
       end
 
       def rename_stage(stage, doctype, _bib)
-        if stage&.text == "approved" &&
-            !%w(standard abstract-specification-topic
-                community-standard).include?(doctype&.text)
+        stage&.text == "approved" &&
+          !%w(standard abstract-specification-topic
+              community-standard).include?(doctype&.text) and
           stage.children = "published"
-        end
       end
 
       def rename_doctype(doctype, date)
         return unless doctype&.text == "white-paper" && date
 
-        if Date.iso8601(date.text) >= Date.iso8601("2021-12-16")
+        Date.iso8601(date.text) >= Date.iso8601("2021-12-16") and
           doctype.children = "technical-paper"
-        end
-      end
-
-      def ol(docxml)
-        docxml.xpath(ns("//ol")).each { |f| ol1(f) }
       end
 
-      def ol1(elem)
-        return unless elem["class"] == "steps"
+      def ol_depth(node)
+        return super unless node["class"] == "steps" ||
+          node.at(".//ancestor::xmlns:ol[@class = 'steps']")
 
-        idx = elem.xpath("./ancestor-or-self::xmlns:ol[@class = 'steps']").size
-        elem["type"] = %w(arabic alphabet roman alphabet_upper
-                          roman_upper)[(idx - 1) % 5]
+        idx = node.xpath("./ancestor-or-self::xmlns:ol[@class = 'steps']").size
+        %i(arabic alphabet roman alphabet_upper roman_upper)[(idx - 1) % 5]
       end
 
       def termsource1(elem)

data/lib/isodoc/ogc/reqt.rb

@@ -33,9 +33,8 @@ module IsoDoc
 
       def recommendation_name(node, out)
         b = out.add_child("<p class='#{recommendation_class(node)}'></p>").first
-        if name = node&.at(ns("./name"))&.remove
+        name = node&.at(ns("./name"))&.remove and
           name.children.each { |n| b << n }
-        end
         if title = node&.at(ns("./title"))&.remove
           b << l10n(": ") if name
           title.children.each { |n| b << n }
@@ -49,6 +48,7 @@ module IsoDoc
         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["class"] = "RecommendationLabel"
         p << label.children.to_xml
       end
 
@@ -64,6 +64,9 @@ module IsoDoc
         oblig = node["obligation"] and out << ["Obligation", oblig]
         subj = node&.at(ns("./subject"))&.remove&.children and
           out << [rec_subj(node), subj]
+        %w(general class).include?(node["type_original"]) and
+          test = @reqt_links[node["id"]] and
+          out << ["Conformance test", "<xref target='#{test}'/>"]
         node.xpath(ns("./inherit")).each do |i|
           out << ["Dependency", i.remove.children]
         end
@@ -75,7 +78,8 @@ module IsoDoc
         return node unless node.at(ns("./component[@class = 'step']"))
 
         d = node.at(ns("./component[@class = 'step']"))
-        d = d.replace("<ol class='steps'><li>#{d.children.to_xml}</li></ol>").first
+        d = d.replace("<ol class='steps'><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
@@ -100,7 +104,7 @@ module IsoDoc
       def recommendation_attr_keyvalue(node, key, value)
         tag = node&.at(ns("./#{key}"))&.remove
         value = node.at(ns("./#{value}"))&.remove
-        tag && value or return nil
+        (tag && value) or return nil
         node.remove
         [tag.text.capitalize, value.children]
       end
@@ -177,6 +181,7 @@ module IsoDoc
       end
 
       def recommendation_to_table(docxml)
+        @reqt_links = reqt_links(docxml)
         docxml.xpath(ns("//recommendation")).each do |r|
           recommendation_parse1(r, "recommendation")
         end
@@ -189,6 +194,16 @@ module IsoDoc
         requirement_table_cleanup(docxml)
       end
 
+      def reqt_links(docxml)
+        docxml.xpath(ns("//requirement | //recommendation | //permission"))
+          .each_with_object({}) do |r, m|
+            next unless %w(conformanceclass verification).include?(r["type"])
+            next unless subject = r&.at(ns("./subject/xref/@target"))&.text
+
+            m[subject] = r["id"]
+          end
+      end
+
       # table nested in table: merge label and caption into a single row
       def requirement_table_cleanup1(outer, inner)
         outer.delete("colspan")

data/lib/isodoc/ogc/xref.rb

@@ -23,7 +23,7 @@ module IsoDoc
           id = c.increment(t).print
           @anchors[t["id"]] = anchor_struct(id, t, label, klass,
                                             t["unnumbered"])
-          l = t.at(ns("./label"))&.text and @reqtlabels[l] = t["id"]
+          reqt_suffix_label(t)
           permission_parts(t, label, klass)
           sequential_permission_children(t, id)
         end
@@ -41,6 +41,13 @@ module IsoDoc
           "conformanceclass" => "@type = 'conformanceclass'" }
       end
 
+      def reqt_suffix_label(reqt)
+        if l = reqt.at(ns("./label"))&.text
+          @reqtlabels[l] = reqt["id"]
+          @anchors[reqt["id"]][:xref] += ": <tt>#{l}</tt>"
+        end
+      end
+
       def permission_parts(block, label, klass)
         block.xpath(ns("./component[@class = 'part']"))
           .each_with_index do |c, i|
@@ -116,7 +123,7 @@ module IsoDoc
           lbl = "#{num}#{hiersep}#{c.increment(t).print}"
           @anchors[t["id"]] = anchor_struct(lbl, t, label, klass,
                                             t["unnumbered"])
-          l = t.at(ns("./label"))&.text and @reqtlabels[l] = t["id"]
+          reqt_suffix_label(t)
           permission_parts(t, label, klass)
           sequential_permission_children(t, lbl)
         end
@@ -175,7 +182,7 @@ module IsoDoc
         @prefacenum += 1
         pref = preface_number(@prefacenum, 1)
         @anchors[clause["id"]] =
-          { label: pref,
+          { label: pref, 
             level: 1, xref: preface_clause_name(clause), type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           preface_names_numbered1(c, "#{pref}.#{preface_number(i + 1, 2)}", 2)
@@ -185,7 +192,7 @@ module IsoDoc
       def preface_names_numbered1(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, level: level, xref: l10n("#{@labels['clause']} #{num}"),
-            type: "clause" }
+            type: "clause", elem: @labels["clause"] }
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           lbl = "#{num}.#{preface_number(i + 1, level + 1)}"
           preface_names_numbered1(c, lbl, level + 1)

data/lib/metanorma/ogc/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>

data/lib/metanorma/ogc/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -401,9 +398,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/ogc/cleanup.rb

@@ -211,6 +211,21 @@ module Metanorma
           o = r&.at("./ancestor::*/@obligation")&.text and r["obligation"] = o
         end
       end
+
+      def sections_order_cleanup(xml)
+        super
+        sort_annexes(xml)
+      end
+
+      def sort_annexes(xml)
+        last = xml.at("//annex[last()]") or return
+        last.next = "<sentinel/>" and last = last.next_element
+        gl = xml.at("//annex[.//term]") and last.previous = gl.remove
+        rev = xml.at("//annex[title[normalize-space(.) = 'Revision history']]") ||
+          xml.at("//annex[title[normalize-space(.) = 'Revision History']]") and
+          last.previous = rev.remove
+        last.remove
+      end
     end
   end
 end

data/lib/metanorma/ogc/front.rb

@@ -36,6 +36,18 @@ module Metanorma
         end
       end
 
+      def personal_role(node, contrib, suffix)
+        type = node.attr("role#{suffix}")&.downcase || "editor"
+        if type == "contributor"
+          contrib.role **{ type: "author" } do |r|
+            r.description do |d|
+              d << type
+            end
+          end
+        else contrib.role **{ type: type }
+        end
+      end
+
       def ogc_editor(node, xml)
         return unless node.attr("editor")
 
@@ -51,7 +63,7 @@ module Metanorma
 
       def personal_author1(node, xml, suffix)
         xml.contributor do |c|
-          c.role **{ type: node&.attr("role#{suffix}")&.downcase || "editor" }
+          personal_role(node, c, suffix)
           c.person do |p|
             p.name do |n|
               if node.attr("fullname#{suffix}")

data/lib/metanorma/ogc/isodoc.rng

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="index">
+      <element name="index">
+        <optional>
+          <attribute name="to">
+            <data type="IDREF"/>
+          </attribute>
+        </optional>
+        <element name="primary">
+          <oneOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </oneOrMore>
+        </element>
+        <optional>
+          <element name="secondary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+        <optional>
+          <element name="tertiary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+    </define>
     <define name="bibitem">
       <element name="bibitem">
         <attribute name="id">
@@ -115,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -151,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1027,6 +1098,26 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="sub">
+      <element name="sub">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sup">
+      <element name="sup">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="pagebreak">
       <element name="pagebreak">
         <optional>
@@ -1041,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2216,7 +2317,18 @@
           <ref name="MultilingualRenderingType"/>
         </attribute>
       </optional>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="formula"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="quote"/>
+          <ref name="sourcecode"/>
+          <ref name="paragraph"/>
+          <ref name="figure"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termsource">
@@ -2563,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/ogc/validate.rb

@@ -14,6 +14,44 @@ module Metanorma
       def content_validate(doc)
         super
         bibdata_validate(doc.root)
+        reqt_link_validate(doc.root)
+      end
+
+      def reqt_link_validate(docxml)
+        ids = reqt_links(docxml)
+        reqt_to_conformance(ids, "general", "verification", "Requirement",
+                            "Conformance test")
+        reqt_to_conformance(ids, "class", "conformanceclass",
+                            "Requirement class", "Conformance class test")
+        conformance_to_reqt(ids, "general", "verification", "Requirement",
+                            "Conformance test")
+        conformance_to_reqt(ids, "class", "conformanceclass",
+                            "Requirement class", "Conformance class test")
+      end
+
+      def reqt_to_conformance(ids, reqtclass, confclass, reqtlabel, conflabel)
+        ids[reqtclass]&.each do |r|
+          ids[confclass]&.any? { |x| x[:subject] == r[:id] } or
+            @log.add("Requirements", r[:elem],
+                     "#{reqtlabel} #{r[:id]} has no corresponding #{conflabel}")
+        end
+      end
+
+      def conformance_to_reqt(ids, reqtclass, confclass, reqtlabel, conflabel)
+        ids[confclass]&.each do |x|
+          ids[reqtclass]&.any? { |r| x[:subject] == r[:id] } or
+            @log.add("Requirements", x[:elem],
+                     "#{conflabel} #{x[:id]} has no corresponding #{reqtlabel}")
+        end
+      end
+
+      def reqt_links(docxml)
+        docxml.xpath("//requirement | //recommendation | //permission")
+          .each_with_object({}) do |r, m|
+            m[r["type"]] ||= []
+            m[r["type"]] << { id: r["id"], elem: r,
+                              subject: r&.at("./subject/xref/@target")&.text }
+          end
       end
 
       def bibdata_validate(doc)

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.0.0".freeze
+    VERSION = "2.0.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639