metanorma-ogc 2.3.13 → 2.4.0

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -10,6 +10,8 @@ module IsoDoc
         super
       end
 
+      def middle_title(docxml); end
+
       def convert1(docxml, filename, dir)
         info docxml, nil
         super
@@ -62,8 +64,7 @@ module IsoDoc
       def insert_submitting_orgs(docxml)
         orgs = docxml.xpath(ns(submittingorgs_path))
           .each_with_object([]) { |org, m| m << org.text }
-        return if orgs.empty?
-
+        orgs.empty? and return
         if a = submit_orgs_append_pt(docxml)
           a.next = submitting_orgs_clause(orgs)
         else
@@ -76,8 +77,7 @@ module IsoDoc
         <<~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>
+          <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
@@ -87,8 +87,7 @@ module IsoDoc
         <<~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>The following are keywords to be used by search engines and document catalogues.</p>
           <p>#{kwords.join(', ')}</p></clause>
         KEYWORDS
       end
@@ -123,9 +122,7 @@ module IsoDoc
         super
         docxml.xpath(ns("//foreword | //preface/abstract | " \
                         "//submitters | //introduction | //acknowledgements"))
-          .each do |f|
-          clause1(f)
-        end
+          .each { |f| clause1(f) }
       end
 
       def clause1(elem)
@@ -159,16 +156,14 @@ module IsoDoc
       end
 
       def rename_doctype(doctype, date)
-        return unless doctype&.text == "white-paper" && date
-
+        (doctype&.text == "white-paper" && date) or return
         Date.iso8601(date.text) >= Date.iso8601("2021-12-16") and
           doctype.children = "technical-paper"
       end
 
       def ol_depth(node)
-        return super unless node["class"] == "steps" ||
-          node.at(".//ancestor::xmlns:ol[@class = 'steps']")
-
+        node["class"] == "steps" ||
+          node.at(".//ancestor::xmlns:ol[@class = 'steps']") or return super
         idx = node.xpath("./ancestor-or-self::xmlns:ol[@class = 'steps']").size
         %i(arabic alphabet roman alphabet_upper roman_upper)[(idx - 1) % 5]
       end
@@ -200,21 +195,33 @@ module IsoDoc
         xml.children = "#{f}#{xml.xpath(ns(keep)).to_xml}"
       end
 
+      SECT_TERMS = "//sections/terms | //sections/clause[descendant::terms]"
+        .freeze
+
       def display_order(docxml)
         i = 0
         i = display_order_xpath(docxml, "//preface/*", i)
         i = display_order_at(docxml, "//clause[@type = 'scope']", i)
         i = display_order_at(docxml, "//clause[@type = 'conformance']", i)
         i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
-        i = display_order_at(docxml, "//sections/terms | " \
-                                     "//sections/clause[descendant::terms]", i)
-        i = display_order_at(docxml, "//sections/definitions", i)
-        i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
+        i = display_order_clauses(docxml, i)
         i = display_order_xpath(docxml, "//annex", i)
         i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
         display_order_xpath(docxml, "//indexsect", i)
       end
 
+      def display_order_clauses(docxml, idx)
+        if docxml.at(ns("//bibdata/ext/doctype"))&.text == "engineering-report"
+          xpath = "#{SECT_TERMS} | //sections/definitions | " +
+            @xrefs.klass.middle_clause(docxml)
+          return display_order_xpath(docxml, xpath, idx)
+        end
+        idx = display_order_at(docxml, SECT_TERMS, idx)
+        idx = display_order_at(docxml, "//sections/definitions", idx)
+        display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml),
+                            idx)
+      end
+
       def norm_ref_entry_code(_ordinal, _idents, _ids, _standard, _datefn, _bib)
         ""
       end

data/lib/isodoc/ogc/sections.rb

@@ -1,21 +1,10 @@
 module IsoDoc
   module Ogc
     module BaseConvert
-      def front(isoxml, out)
-        p = isoxml.at(ns("//preface")) or return
-        p.elements.each do |e|
-          if is_clause?(e.name)
-            case e.name
-            when "abstract" then abstract e, out
-            when "foreword" then foreword e, out
-            when "introduction" then introduction e, out
-            when "submitters" then intro_clause e, out
-            when "clause" then preface e, out
-            when "acknowledgements" then acknowledgements e, out
-            end
-          else
-            preface_block(e, out)
-          end
+      def top_element_render(node, out)
+        case node.name
+        when "submitters" then intro_clause node, out
+        else super
         end
       end
 
@@ -23,9 +12,6 @@ module IsoDoc
         case clause["type"]
         when "toc"
           table_of_contents(clause, out)
-        when "executivesummary", "security", "submitting_orgs",
-          "keywords"
-          intro_clause(clause, out)
         else
           intro_clause(clause, out)
         end
@@ -66,15 +52,6 @@ module IsoDoc
       def acknowledgements(clause, out)
         intro_clause(clause, out)
       end
-
-      def conformance(isoxml, out, num)
-        f = isoxml.at(ns("//clause[@type = 'conformance']")) or return num
-        out.div **attr_code(id: f["id"]) do |div|
-          clause_name(f, f&.at(ns("./title")), div, nil)
-          f.elements.each { |e| parse(e, div) unless e.name == "title" }
-        end
-        num
-      end
     end
   end
 end

data/lib/isodoc/ogc/word_convert.rb

@@ -87,27 +87,8 @@ module IsoDoc
       end
 
       def make_body2(body, docxml)
-        body.div **{ class: "WordSection2" } do |div2|
-          @prefacenum = 0
-          info docxml, div2
-          boilerplate docxml, div2
-          front docxml, div2
-=begin
-          preface_block docxml, div2
-          abstract docxml, div2
-          executivesummary docxml, div2
-          keywords docxml, div2
-          foreword docxml, div2
-          introduction docxml, div2
-          security docxml, div2
-          submittingorgs docxml, div2
-          submitters docxml, div2
-          preface docxml, div2
-          acknowledgements docxml, div2
-=end
-          div2.p { |p| p << "&#xA0;" } # placeholder
-        end
-        section_break(body)
+        @prefacenum = 0
+        super
       end
 
       def word_cleanup(docxml)
@@ -160,7 +141,7 @@ module IsoDoc
 
       def toWord(result, filename, dir, header)
         result = from_xhtml(word_cleanup(to_xhtml(result)))
-          .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
+          .gsub("-DOUBLE_HYPHEN_ESCAPE-", "--")
         @wordstylesheet = wordstylesheet_update
         Html2Doc.new(
           filename: filename, imagedir: @localdir,

data/lib/isodoc/ogc/xref.rb

@@ -11,12 +11,23 @@ module IsoDoc
           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(
-            doc.at(ns("//sections/terms | //sections/clause[descendant::terms]")),
-            n, 1
-          )
-          n = section_names(doc.at(ns("//sections/definitions")), n, 1)
-          clause_names(doc, n)
+          initial_anchor_names_middle(doc, n,
+                                      doc.at(ns("//bibdata/ext/doctype"))&.text)
+        end
+      end
+
+      TERMS_SECT = "//sections/terms | //sections/clause[descendant::terms]"
+        .freeze
+
+      def initial_anchor_names_middle(doc, num, doctype)
+        if doctype == "engineering-report"
+          doc.xpath(ns(@klass.middle_clause(doc)) +
+                       " | #{ns(TERMS_SECT)} | " + ns("//sections/definitions"))
+            .each_with_index { |c, _i| section_names(c, num, 1) }
+        else
+          num = section_names(doc.at(ns(TERMS_SECT)), num, 1)
+          num = section_names(doc.at(ns("//sections/definitions")), num, 1)
+          clause_names(doc, num)
         end
       end
 

data/lib/metanorma/ogc/boilerplate.adoc

@@ -16,7 +16,7 @@ Recipients of this document are requested to submit, with their comments, notifi
 == license-statement
 === License Agreement
 
->Use of this document is subject to the license agreement at https://www.ogc.org/license[]
+Use of this document is subject to the license agreement at https://www.ogc.org/license[]
 
 == legal-statement
 {% if doctype == "Standard" or doctype == "Community Standard" or doctype == "Abstract Specification" %}
@@ -35,7 +35,7 @@ Recipients of this document are invited to submit, with their comments, notifica
 
 {% elsif doctype == "Engineering Report" %}
 === Notice
-This document is not an OGC Standard. This document is an OGC Public Engineering Report created as a deliverable in an OGC Interoperability Initiative and is <em>not an official position</em> of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.
+This document is not an OGC Standard. This document is an OGC Public Engineering Report created as a deliverable in an OGC Interoperability Initiative and is _not an official position_ of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.
 
 Further, any OGC Engineering Report should not be referenced as required or mandatory technology in procurements. However, the discussions in this document could very well lead to the definition of an OGC Standard.
 

data/lib/metanorma/ogc/converter.rb

@@ -88,7 +88,8 @@ module Metanorma
 
       def clause_parse(attrs, xml, node)
         case node.attr("heading")&.downcase || node.title.downcase
-        when "submitters" then return submitters_parse(attrs, xml, node)
+        when "submitters", "contributors"
+          return submitters_parse(attrs, xml, node)
         when "conformance" then attrs = attrs.merge(type: "conformance")
         when "security considerations"
           attrs = attrs.merge(type: "security")
@@ -99,8 +100,11 @@ module Metanorma
       end
 
       def submitters_parse(attrs, xml, node)
+        title = @i18n.submitters
+        doctype(node) == "engineering-report" and
+          title = @i18n.contributors_clause
         xml.submitters **attr_code(attrs) do |xml_section|
-          xml_section.title @i18n.submitters
+          xml_section.title title
           xml_section << node.content
         end
       end

data/lib/metanorma/ogc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.2 -->
+<!-- VERSION v1.2.3 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -836,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.3.13".freeze
+    VERSION = "2.4.0".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "metanorma-standoc", "~> 2.4.2"
+  spec.add_dependency "metanorma-standoc", "~> 2.5.0"
 
   spec.add_development_dependency "debug"
   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: 2.3.13
+  version: 2.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement