metanorma-ogc 0.1.3 → 0.1.4

data/lib/asciidoctor/ogc/isostandard.rng

@@ -92,6 +92,12 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -118,6 +124,12 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -149,6 +161,12 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <optional>
         <attribute name="inline-header">
           <data type="boolean"/>
@@ -212,6 +230,12 @@
             <data type="ID"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="language"/>
+        </optional>
+        <optional>
+          <attribute name="script"/>
+        </optional>
         <optional>
           <attribute name="obligation">
             <choice>
@@ -230,6 +254,12 @@
             <data type="ID"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="language"/>
+        </optional>
+        <optional>
+          <attribute name="script"/>
+        </optional>
         <optional>
           <attribute name="obligation">
             <choice>
@@ -303,6 +333,12 @@
             <data type="ID"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="language"/>
+        </optional>
+        <optional>
+          <attribute name="script"/>
+        </optional>
         <optional>
           <attribute name="inline-header">
             <data type="boolean"/>
@@ -525,6 +561,29 @@
         <value>guide</value>
       </choice>
     </define>
+    <define name="structuredidentifier">
+      <element name="structuredidentifier">
+        <optional>
+          <attribute name="type"/>
+        </optional>
+        <group>
+          <ref name="documentnumber"/>
+          <optional>
+            <ref name="tc-documentnumber"/>
+          </optional>
+        </group>
+      </element>
+    </define>
+    <define name="foreword">
+      <element name="foreword">
+        <ref name="Basic-Section"/>
+      </element>
+    </define>
+    <define name="introduction">
+      <element name="introduction">
+        <ref name="Content-Section"/>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <!--
@@ -581,29 +640,6 @@
       <ref name="Basic-Section"/>
     </element>
   </define>
-  <define name="foreword">
-    <element name="foreword">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
-  <define name="introduction">
-    <element name="introduction">
-      <ref name="Content-Section"/>
-    </element>
-  </define>
-  <define name="structuredidentifier">
-    <element name="structuredidentifier">
-      <optional>
-        <attribute name="type"/>
-      </optional>
-      <group>
-        <ref name="documentnumber"/>
-        <optional>
-          <ref name="tc-documentnumber"/>
-        </optional>
-      </group>
-    </element>
-  </define>
   <define name="documentnumber">
     <element name="project-number">
       <optional>
@@ -662,6 +698,12 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <optional>
         <attribute name="inline-header">
           <data type="boolean"/>
@@ -723,6 +765,12 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <optional>
         <attribute name="inline-header">
           <data type="boolean"/>
@@ -755,6 +803,12 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <optional>
         <attribute name="inline-header">
           <data type="boolean"/>

data/lib/isodoc/ogc/base_convert.rb

@@ -1,5 +1,7 @@
 require "isodoc"
 require_relative "metadata"
+require_relative "reqt"
+require_relative "biblio"
 require "fileutils"
 
 module IsoDoc
@@ -61,8 +63,10 @@ module IsoDoc
         kw.empty? and return
         @prefacenum += 1
         out.div **{ class: "Section3" } do |div|
-          clause_name(RomanNumerals.to_roman(@prefacenum).downcase, "Keywords", div,  class: "IntroTitle")
-          div.p "The following are keywords to be used by search engines and document catalogues."
+          clause_name(RomanNumerals.to_roman(@prefacenum).downcase,
+                      "Keywords", div,  class: "IntroTitle")
+          div.p "The following are keywords to be used by search engines and "\
+            "document catalogues."
           div.p kw.join(", ")
         end
       end
@@ -76,12 +80,12 @@ module IsoDoc
         return if orgs.empty?
         @prefacenum += 1
         out.div **{ class: "Section3" } do |div|
-          clause_name(RomanNumerals.to_roman(@prefacenum).downcase, "Submitting Organizations", div,  class: "IntroTitle")
-          div.p "The following organizations submitted this Document to the Open Geospatial Consortium (OGC):"
+          clause_name(RomanNumerals.to_roman(@prefacenum).downcase,
+                      "Submitting Organizations", div,  class: "IntroTitle")
+          div.p "The following organizations submitted this Document to the "\
+            "Open Geospatial Consortium (OGC):"
           div.ul do |ul|
-            orgs.each do |org|
-              ul.li org
-            end
+            orgs.each { |org| ul.li org }
           end
         end
       end
@@ -89,7 +93,8 @@ module IsoDoc
       def submitters(docxml, out)
         f = docxml.at(ns("//submitters")) || return
         out.div **{ class: "Section3" } do |div|
-          clause_name(anchor(f['id'], :label), "Submitters", div,  class: "IntroTitle")
+          clause_name(anchor(f['id'], :label), "Submitters", div,
+                      class: "IntroTitle")
           f.elements.each { |e| parse(e, div) unless e.name == "title" }
         end
       end
@@ -100,7 +105,8 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: RomanNumerals.to_roman(@prefacenum).downcase,
             level: 1, xref: preface_clause_name(clause), type: "clause" }
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).each_with_index do |c, i|
+        clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
+          each_with_index do |c, i|
           section_names1(c, "#{@prefacenum}.#{i + 1}", 2)
         end
       end
@@ -110,7 +116,8 @@ module IsoDoc
         @prefacenum += 1
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(anchor(f["id"], :label), @abstract_lbl, s, class: "AbstractTitle")
+          clause_name(anchor(f["id"], :label), @abstract_lbl, s,
+                      class: "AbstractTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
@@ -120,7 +127,8 @@ module IsoDoc
         @prefacenum += 1
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(anchor(f["id"], :label), @foreword_lbl, s, class: "ForewordTitle")
+          clause_name(anchor(f["id"], :label), @foreword_lbl, s,
+                      class: "ForewordTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
@@ -131,136 +139,6 @@ module IsoDoc
         super
       end
 
-      def error_parse(node, out)
-        case node.name
-        when "recommendation" then recommendation_parse(node, out)
-        when "requirement" then requirement_parse(node, out)
-        when "permission" then permission_parse(node, out)
-        else
-          super
-        end
-      end
-
-      def anchor_names(docxml)
-        super
-        recommendation_anchor_names(docxml)
-        requirement_anchor_names(docxml)
-        permission_anchor_names(docxml)
-      end
-
-      def recommendation_anchor_names(docxml)
-        i = 0
-        docxml.xpath(ns("//recommendation")).each do |x|
-          next if x["id"].nil? || x["id"].empty?
-          @anchors[x["id"]] = anchor_struct(i+1, nil, "Recommendation", "recommendation", x["unnumbered"])
-          i += 1 unless x["unnumbered"]
-        end
-      end
-
-      def requirement_anchor_names(docxml)
-        i = 0
-        docxml.xpath(ns("//requirement")).each_with_index do |x|
-          next if x["id"].nil? || x["id"].empty?
-          @anchors[x["id"]] = anchor_struct(i+1, nil, "Requirement", "requirement", x["unnumbered"])
-          i += 1 unless x["unnumbered"]
-        end
-      end
-
-      def permission_anchor_names(docxml)
-        i = 0
-        docxml.xpath(ns("//permission")).each do |x|
-          next if x["id"].nil? || x["id"].empty?
-          @anchors[x["id"]] = anchor_struct(i+1, nil, "Permission", "permission", x["unnumbered"])
-          i += 1 unless x["unnumbered"]
-        end
-      end
-
-      def recommend_table_attr(node)
-        attr_code(id: node["id"], class: "recommend",
-                  cellspacing: 0, cellpadding: 0,
-                  style: "border-collapse:collapse" )
-      end
-
-      REQ_TBL_ATTR =
-        { valign: "top", class: "example_label",
-          style: "width:100.0pt;padding:0 0 0 1em;margin-left:0pt" }.freeze
-
-      def recommend_name_parse(node, div)
-        name = node&.at(ns("./name"))&.text or return
-        div.p do |p|
-          p.b name
-        end
-      end
-
-      def recommendation_parse(node, out)
-        out.table **recommend_table_attr(node) do |t|
-          t.tr do |tr|
-            tr.td **REQ_TBL_ATTR do |td|
-              recommendation_label(node, td)
-            end
-            tr.td **{ valign: "top", class: "recommend" } do |td|
-              recommend_name_parse(node, td)
-              node.children.each { |n| parse(n, td) unless n.name == "name" }
-            end
-          end
-        end
-      end
-
-      def recommendation_label(node, out)
-        n = get_anchors[node["id"]]
-        label = (n.nil? ||  n[:label].nil? || n[:label].empty?) ?
-          "Recommendation" : l10n("#{"Recommendation"} #{n[:label]}")
-        out.p **{class: "RecommendationTitle" } do |p|
-          p << label
-        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|
-              requirement_label(node, td)
-            end
-            tr.td **{ valign: "top", class: "recommend" } do |td|
-              recommend_name_parse(node, td)
-              node.children.each { |n| parse(n, td) unless n.name == "name" }
-            end
-          end
-        end
-      end
-
-      def requirement_label(node, out)
-        n = get_anchors[node["id"]]
-        label = (n.nil? || n[:label].nil? || n[:label].empty?) ?
-          "Requirement" : l10n("#{"Requirement"} #{n[:label]}")
-        out.p **{class: "RecommendationTitle" } do |p|
-          p << label
-        end
-      end
-
-      def permission_parse(node, out)
-        out.table **recommend_table_attr(node) do |t|
-          t.tr do |tr|
-            tr.td **REQ_TBL_ATTR do |td|
-              permission_label(node, td)
-            end
-            tr.td **{ valign: "top", class: "recommend" } do |td|
-              recommend_name_parse(node, td)
-              node.children.each { |n| parse(n, td) unless n.name == "name" }
-            end
-          end
-        end
-      end
-
-      def permission_label(node, out)
-        n = get_anchors[node["id"]]
-        label = (n.nil? || n[:label].nil? || n[:label].empty?) ?
-          "Permission" : l10n("#{"Permission"} #{n[:label]}")
-        out.p **{class: "RecommendationTitle" } do |p|
-          p << label
-        end
-      end
-
       def initial_anchor_names(d)
         @prefacenum = 0
         preface_names(d.at(ns("//preface/abstract")))
@@ -269,11 +147,13 @@ module IsoDoc
         preface_names(d.at(ns("//introduction")))
         @prefacenum += 1 if d.at(ns(SUBMITTINGORGS))
         preface_names(d.at(ns("//submitters")))
-        sequential_asset_names(d.xpath(ns("//preface/abstract | //foreword | //introduction | //submitters")))
+        sequential_asset_names(d.xpath(ns("//preface/abstract | //foreword | "\
+"//introduction | //submitters")))
         n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
         n = section_names(d.at(ns("//clause[title = 'Conformance']")), n, 1)
         n = section_names(d.at(ns(
-          "//references[title = 'Normative References' or title = 'Normative references']")), n, 1)
+          "//references[title = 'Normative References' or "\
+          "title = 'Normative references']")), n, 1)
         n = section_names(d.at(ns("//sections/terms | "\
                                   "//sections/clause[descendant::terms]")), n, 1)
         n = section_names(d.at(ns("//sections/definitions")), n, 1)
@@ -284,26 +164,19 @@ module IsoDoc
       end
 
       MIDDLE_CLAUSE =
-        "//clause[parent::sections][not(xmlns:title = 'Scope' or xmlns:title = 'Conformance')]"\
-        "[not(descendant::terms)]".freeze
+        "//clause[parent::sections][not(xmlns:title = 'Scope' or "\
+        "xmlns:title = 'Conformance')][not(descendant::terms)]".freeze
 
       def middle_section_asset_names(d)
-        middle_sections = "//clause[title = 'Scope' or title = 'Conformance'] | "\
-          "//foreword | //introduction | "\
-          "//references[title = 'Normative References' or title = 'Normative references'] | "\
+        middle_sections = "//clause[title = 'Scope' or title = 'Conformance'] "\
+          "| //foreword | //introduction | "\
+          "//references[title = 'Normative References' or title = "\
+          "'Normative references'] | "\
           "//sections/terms | "\
           "//sections/definitions | //clause[parent::sections]"
         sequential_asset_names(d.xpath(ns(middle_sections)))
       end
 
-=begin
-      def clause_names(docxml, sect_num)
-        docxml.xpath(ns(self.class::MIDDLE_CLAUSE)).each_with_index do |c, i|
-          section_names(c, (i + sect_num), 1)
-        end
-      end
-=end
-
       def conformance(isoxml, out, num)
         f = isoxml.at(ns("//clause[title = 'Conformance']")) or return num
         out.div **attr_code(id: f["id"]) do |div|
@@ -316,21 +189,6 @@ module IsoDoc
         num
       end
 
-=begin
-      def clause(isoxml, out, num)
-        isoxml.xpath(ns(self.class::MIDDLE_CLAUSE)).each do |c|
-          out.div **attr_code(id: c["id"]) do |div|
-            num = num + 1
-            clause_name(num,
-                        c&.at(ns("./title"))&.content, div, nil)
-            c.elements.each do |e|
-              parse(e, div) unless e.name == "title"
-            end
-          end
-        end
-      end
-=end
-
       def middle(isoxml, out)
         middle_title(out)
         i = scope isoxml, out, 0