metanorma-ogc 2.7.4 → 2.7.5

data/lib/isodoc/ogc/presentation_sections.rb

@@ -4,15 +4,24 @@ module IsoDoc
       def middle_title(docxml); end
 
       def preface_rearrange(doc)
-        super
+        [
+          ["//preface/abstract",
+           %w(executivesummary foreword introduction clause acknowledgements)],
+          ["//preface/executivesummary",
+           %w(foreword introduction clause acknowledgements)],
+          ["//preface/foreword",
+           %w(introduction clause acknowledgements)],
+          ["//preface/introduction",
+           %w(clause acknowledgements)],
+          ["//preface/acknowledgements", %w()],
+        ].each do |x|
+          preface_move(doc.xpath(ns(x[0])), x[1], doc)
+        end
         insert_preface_sections(doc)
       end
 
       def insert_preface_sections(doc)
-        preface_insert(doc.at(ns("//preface/clause" \
-                                 "[@type = 'executivesummary']")),
-                       doc.at(ns("//preface/abstract")), doc)
-        preface_insert(doc.at(ns("//preface//submitters")),
+        preface_insert(doc.at(ns("//preface//clause[@type = 'submitters' or @type = 'contributors']")),
                        submit_orgs_append_pt(doc), doc)
         insert_submitting_orgs(doc)
         preface_insert(doc.at(ns("//preface/clause[@type = 'security']")),
@@ -39,8 +48,8 @@ module IsoDoc
       def submit_orgs_append_pt(docxml)
         docxml.at(ns("//foreword")) ||
           docxml.at(ns("//preface/clause[@type = 'keywords']")) ||
-          docxml.at(ns("//preface/clause[@type = 'executivesummary']")) ||
-          docxml.at(ns("//preface/abstract"))
+          docxml.at(ns("//preface/abstract")) ||
+          docxml.at(ns("//preface/executivesummary"))
       end
 
       def insert_submitting_orgs(docxml)
@@ -78,7 +87,7 @@ module IsoDoc
         kw = @meta.get[:keywords]
         kw.empty? and return
         if abstract =
-             docxml.at(ns("//preface/clause[@type = 'executivesummary']")) ||
+             docxml.at(ns("//preface/executivesummary")) ||
              docxml.at(ns("//preface/abstract"))
           abstract.next = keyword_clause(kw)
         else
@@ -88,12 +97,7 @@ module IsoDoc
       end
 
       def annex_delim(_elem)
-      "<br/>"
-    end
-
-      def clause(docxml)
-        super
-        docxml.xpath(ns("//submitters")).each { |f| clause1(f) }
+        "<br/>"
       end
 
       def clause1(elem)

data/lib/isodoc/ogc/sections.rb

@@ -1,13 +1,6 @@
 module IsoDoc
   module Ogc
     module BaseConvert
-      def top_element_render(node, out)
-        case node.name
-        when "submitters" then intro_clause node, out
-        else super
-        end
-      end
-
       def preface(clause, out)
         case clause["type"]
         when "toc"
@@ -17,10 +10,6 @@ module IsoDoc
         end
       end
 
-      def sections_names
-        super + %w[submitters]
-      end
-
       def intro_clause(elem, out)
         out.div class: "Section3", id: elem["id"] do |div|
           clause_name(elem, elem&.at(ns("./fmt-title")), div,

data/lib/isodoc/ogc/xref.rb

@@ -42,7 +42,7 @@ module IsoDoc
       def middle_section_asset_names(doc)
         middle_sections =
           "//clause[@type = 'scope' or @type = 'conformance'] | //foreword | " \
-          "//introduction | //preface/abstract | //submitters | " \
+          "//introduction | //preface/abstract | " \
           "//acknowledgements | //preface/clause | " \
           "#{@klass.norm_ref_xpath} | //sections/terms | " \
           "//sections/definitions | //clause[parent::sections]"
@@ -69,7 +69,7 @@ module IsoDoc
       def preface_names_numbered1(clause, parentnum, num, level)
         lbl = clause_number_semx(parentnum, clause, num)
         @anchors[clause["id"]] =
-          { label: lbl, level: level, 
+          { label: lbl, level: level,
             xref: labelled_autonum(@labels["clause"], lbl),
             type: "clause", elem: @labels["clause"] }
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
@@ -110,7 +110,7 @@ module IsoDoc
           @anchors[t["id"]] = anchor_struct(
             c.print, t,
             @labels["sourcecode"], "sourcecode",
-            { unnumb: t["unnumbered"], container: container}
+            { unnumb: t["unnumbered"], container: container }
           )
         end
       end
@@ -123,13 +123,12 @@ module IsoDoc
       def hierarchical_sourcecode_names(clauses, num)
         c = Counter.new
         nodeSet(clauses).each do |clause|
-        clause.xpath(ns(LISTING)).noblank.each do |t|
-          @anchors[t["id"]] =
-            anchor_struct(#"#{num}#{hier_separator}#{c.increment(t).print}", 
-                          hiersemx(clause, num, c.increment(t), t),
-                          t, @labels["sourcecode"],
-                          "sourcecode", { unnumb:t["unnumbered"] })
-        end
+          clause.xpath(ns(LISTING)).noblank.each do |t|
+            @anchors[t["id"]] =
+              anchor_struct(hiersemx(clause, num, c.increment(t), t),
+                            t, @labels["sourcecode"],
+                            "sourcecode", { unnumb: t["unnumbered"] })
+          end
         end
       end
     end

data/lib/metanorma/ogc/cleanup.rb

@@ -14,7 +14,6 @@ module Metanorma
 
       def make_preface(xml, sect)
         super
-        insert_execsummary(xml, sect)
         insert_security(xml, sect)
         insert_submitters(xml, sect)
       end
@@ -23,17 +22,9 @@ module Metanorma
         %(id="_#{UUIDTools::UUID.random_create}")
       end
 
-      def insert_execsummary(xml, sect)
-        summ = xml&.at("//clause[@type = 'executivesummary']")&.remove or
-          return
-        preface = sect.at("//preface") ||
-          sect.add_previous_sibling("<preface/>").first
-        preface.add_child summ
-      end
-
       def insert_security(xml, sect)
-        description = "document"
-        description = "standard" if %w(standard community-standard)
+        "document"
+        "standard" if %w(standard community-standard)
           .include?(@doctype)
         @doctype == "engineering-report" and return remove_security(xml)
         preface = sect.at("//preface") ||
@@ -61,14 +52,13 @@ module Metanorma
       end
 
       def insert_submitters(xml, sect)
-        if xml.at("//submitters")
-          preface = sect.at("//preface") ||
+        if xml.at("//clause[@type = 'submitters' or @type = 'contributors']")
+          p = sect.at("//preface") ||
             sect.add_previous_sibling("<preface/>").first
-          xml.xpath("//submitters").each do |s|
-            s.xpath(".//table").each do |t|
-              t["unnumbered"] = true
-            end
-            preface.add_child s.remove
+          xml.xpath("//clause[@type = 'submitters' or @type = 'contributors']")
+            .each do |s|
+            s.xpath(".//table").each { |t| t["unnumbered"] = true }
+            p.add_child s.remove
           end
         end
       end

data/lib/metanorma/ogc/converter.rb

@@ -11,9 +11,6 @@ module Metanorma
     # schema encapsulation of the document for validation
     #
     class Converter < Standoc::Converter
-      #XML_ROOT_TAG = "ogc-standard".freeze
-      #XML_NAMESPACE = "https://www.metanorma.org/ns/ogc".freeze
-
       register_for "ogc"
 
       def init_toc(node)
@@ -71,10 +68,8 @@ module Metanorma
 
       def override_style(node)
         s = node.attr("style")
-        if %w(executive_summary overview future_outlook value_proposition
-              contributors).include?(s)
+        if %w(overview future_outlook value_proposition contributors).include?(s)
           node.set_attr("style", "preface")
-          s == "executive_summary" and s = "executivesummary"
           node.set_attr("type", s)
         end
         if %w(aims objectives topics outlook security).include?(s)
@@ -93,6 +88,12 @@ module Metanorma
         end
       end
 
+      # legacy encoding
+      def sectiontype1(node)
+        role_style(node, "executive_summary") and return "executivesummary"
+        super
+      end
+
       def outputs(node, ret)
         File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
         presentation_xml_converter(node).convert("#{@filename}.xml")
@@ -105,20 +106,18 @@ module Metanorma
       end
 
       def clause_parse(attrs, xml, node)
-        %w(executivesummary overview future_outlook value_proposition
+        %w(overview future_outlook value_proposition
            contributors aims objectives topics outlook security)
           .include?(node.attr("type")) and
           attrs = attrs.merge(type: node.attr("type"))
         case node.attr("heading")&.downcase || node.title.downcase
         when "submitters"
-          return submitters_parse(attrs, xml, node)
+          return submitters_parse(attrs.merge(type: "submitters"), xml, node)
         when "contributors"
           return submitters_parse(attrs.merge(type: "contributors"), xml, node)
         when "conformance" then attrs = attrs.merge(type: "conformance")
         when "security considerations"
           attrs = attrs.merge(type: "security")
-        when "executive summary"
-          attrs = attrs.merge(type: "executivesummary")
         end
         super
       end
@@ -128,7 +127,7 @@ module Metanorma
         doctype(node) == "engineering-report" ||
           attrs[:type] == "contributors" and
           title = @i18n.contributors_clause
-        xml.submitters **attr_code(attrs) do |xml_section|
+        xml.clause **attr_code(attrs) do |xml_section|
           xml_section.title title
           xml_section << node.content
         end
@@ -164,7 +163,8 @@ module Metanorma
         end
       end
 
-      def highlight_parse(text, xml)
+      # KILL 
+      def highlight_parsex(text, xml)
         xml.hi { |s| s << text }
       end
 

data/lib/metanorma/ogc/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.0.3 -->
+<!-- VERSION v2.0.4 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -1328,6 +1328,7 @@ numbers</a:documentation>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
+          <ref name="executivesummary"/>
         </choice>
       </oneOrMore>
     </element>
@@ -1351,6 +1352,11 @@ numbers</a:documentation>
       <ref name="Content-Section"/>
     </element>
   </define>
+  <define name="executivesummary">
+    <element name="executivesummary">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="indexsect">
     <element name="indexsect">
       <ref name="Content-Section"/>
@@ -1576,6 +1582,15 @@ used in document amendments</a:documentation>
   <define name="annex">
     <element name="annex">
       <ref name="Annex-Section"/>
+      <zeroOrMore>
+        <ref name="annex-appendix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="annex-appendix">
+    <a:documentation>Appendix, distinct subclause type for annexes (annex to annex, rather than subclause to annex)</a:documentation>
+    <element name="appendix">
+      <ref name="Clause-Section"/>
     </element>
   </define>
   <define name="terms">

data/lib/metanorma/ogc/ogc.rng

@@ -1,39 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar ns='https://www.metanorma.org/ns/standoc' xmlns="http://relaxng.org/ns/structure/1.0">
   <include href="relaton-ogc.rng"/>
-  <include href="isodoc.rng">
-    <define name="preface">
-      <element name="preface">
-        <optional>
-          <ref name="abstract"/>
-        </optional>
-        <ref name="foreword"/>
-        <optional>
-          <ref name="submitters"/>
-        </optional>
-      </element>
-    </define>
-  </include>
-  <!-- end overrides -->
-  <define name="TextElement" combine="choice">
-    <ref name="hi"/>
-  </define>
-  <define name="PureTextElement" combine="choice">
-    <ref name="hi"/>
-  </define>
-  <define name="hi">
-    <element name="hi">
-      <zeroOrMore>
-        <choice>
-          <ref name="PureTextElement"/>
-          <ref name="stem"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="submitters">
-    <element name="submitters">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
+  <include href="isodoc.rng"/>
 </grammar>
+<!-- end overrides -->

data/lib/metanorma/ogc/validate.rb

@@ -56,7 +56,7 @@ module Metanorma
       end
 
       def execsummary_validate(xmldoc)
-        sect = xmldoc.at("//clause[@type = 'executivesummary']")
+        sect = xmldoc.at("//executivesummary")
         @doctype == "engineering-report" && sect.nil? and
           @log.add("Style", nil,
                    "Executive Summary required for Engineering Reports!")
@@ -136,8 +136,8 @@ module Metanorma
         root.at("//bibdata/contributor[role/@type = 'author']/organization/" \
                 "name") or
           @log.add("Style", nil, "Submitting Organizations is missing!")
-        root.at("//submitters") or @log.add("Style", nil,
-                                            "Submitters is missing!")
+        root.at("//clause[@type = 'submitters' or @type = 'contributors']") or
+          @log.add("Style", nil, "Submitters is missing!")
       end
 
       def norm_ref_validate(doc)

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.7.4".freeze
+    VERSION = "2.7.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639