metanorma-ogc 1.5.2 → 1.5.5

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -13,9 +13,10 @@ module IsoDoc
       end
 
       def insert_preface_sections(docxml)
-        insert_keywords(docxml)
+        insert_executivesummary(docxml)
         insert_submitting_orgs(docxml)
         insert_security(docxml)
+        insert_keywords(docxml)
       end
 
       def preface_init_insert_pt(docxml)
@@ -42,6 +43,17 @@ module IsoDoc
         end
       end
 
+      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
+        else
+          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_with_object([]) do |org, m|
@@ -81,7 +93,9 @@ module IsoDoc
       def insert_keywords(docxml)
         kw = @meta.get[:keywords]
         kw.empty? and return
-        if abstract = docxml.at(ns("//preface/abstract"))
+        if abstract =
+             docxml.at(ns("//preface/clause[@type = 'executivesummary']")) ||
+             docxml.at(ns("//preface/abstract"))
           abstract.next = keyword_clause(kw)
         else
           preface_init_insert_pt(docxml)&.children&.first
@@ -157,6 +171,7 @@ module IsoDoc
       def block(docxml)
         super
         recommendation_to_table(docxml)
+        ol docxml
       end
 
       def section(docxml)
@@ -174,14 +189,49 @@ module IsoDoc
       end
 
       def bibdata_i18n(bib)
-        stage = bib&.at(ns("./status/stage"))
         doctype = bib&.at(ns("./ext/doctype"))
+        rename_stage(bib&.at(ns("./status/stage")), doctype, bib)
+        rename_doctype(doctype, bib&.at(ns("./date[@type = 'published']")) ||
+                       bib&.at(ns("./date[@type = 'issued']")))
+        super
+      end
+
+      def rename_stage(stage, doctype, _bib)
         if stage&.text == "approved" &&
             !%w(standard abstract-specification-topic
                 community-standard).include?(doctype&.text)
           stage.children = "published"
         end
-        super
+      end
+
+      def rename_doctype(doctype, date)
+        return unless doctype&.text == "white-paper" && date
+
+        if Date.iso8601(date.text) >= Date.iso8601("2021-12-16")
+          doctype.children = "technical-paper"
+        end
+      end
+
+      def ol(docxml)
+        docxml.xpath(ns("//ol")).each do |f|
+          ol1(f)
+        end
+      end
+
+      def ol1(elem)
+        return unless elem["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]
+      end
+
+      def termsource1(elem)
+        while elem&.next_element&.name == "termsource"
+          elem << "; #{elem.next_element.remove.children.to_xml}"
+        end
+        elem.children = l10n("[<strong>#{@i18n.source}:</strong> "\
+                             "#{elem.children.to_xml.strip}]")
       end
 
       include Init

data/lib/isodoc/ogc/reqt.rb

@@ -114,7 +114,7 @@ module IsoDoc
 
       def preserve_in_nested_table?(node)
         return true if %w(recommendation requirement permission
-                          table).include?(node.name)
+                          table ol dl ul).include?(node.name)
 
         false
       end

data/lib/isodoc/ogc/sections.rb

@@ -20,7 +20,13 @@ module IsoDoc
       end
 
       def security(docxml, out)
-        f = docxml.at(ns("//preface/clause[@type = 'security']")) || return
+        f = docxml.at(ns("//preface/clause[@type = 'security']")) or return
+        intro_clause(f, out)
+      end
+
+      def executivesummary(docxml, out)
+        f = docxml.at(ns("//preface/clause[@type = 'executivesummary']")) or
+          return
         intro_clause(f, out)
       end
 
@@ -31,7 +37,8 @@ module IsoDoc
 
       def preface(isoxml, out)
         isoxml.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
-                        "@type = 'submitting_orgs' or @type = 'security')]"))
+                        "@type = 'submitting_orgs' or @type = 'security' or "\
+                        "@type = 'executivesummary')]"))
           .each do |f|
           intro_clause(f, out)
         end

data/lib/isodoc/ogc/word_convert.rb

@@ -86,7 +86,7 @@ module IsoDoc
                           <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;RecommendationTitle,recommendationtitle&quot;#{' '}
+        \\h \\z \\t &quot;RecommendationTitle,RecommendationTestTitle,recommendationtitle,recommendationtesttitle&quot;#{' '}
         <span style='mso-element:field-separator'></span></span>
       TOC
 
@@ -131,13 +131,37 @@ module IsoDoc
 
       def make_RecommendationWordToC(docxml)
         toc = ""
-        docxml.xpath("//p[@class = 'RecommendationTitle']").each do |h|
+        docxml.xpath("//p[@class = 'RecommendationTitle' or @class = 'RecommendationTestTitle']").sort_by do |h|
+          recommmendation_sort_key(h.text)
+        end.each do |h|
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
                 %{\\1#{WORD_TOC_RECOMMENDATION_PREFACE1}}) + WORD_TOC_SUFFIX1
       end
 
+      def recommmendation_sort_key(header)
+        m = /^([^0-9]+) (\d+)/.match(header) || /^([^:]+)/.match(header)
+        "#{recommmendation_sort_key1(m[1])}::#{'%04d' % m[2].to_i}"
+      end
+
+      def recommmendation_sort_key1(type)
+        case type.downcase
+        when "requirements class" then "01"
+        when "recommendations class" then "02"
+        when "permissions class" then "03"
+        when "requirement" then "04"
+        when "recommendation" then "05"
+        when "permission" then "06"
+        when "conformance class" then "07"
+        when "abstract test" then "08"
+        when "requirements test" then "09"
+        when "recommendations test" then "10"
+        when "permissions test" then "11"
+        else "z"
+        end
+      end
+
       def make_body2(body, docxml)
         body.div **{ class: "WordSection2" } do |div2|
           @prefacenum = 0
@@ -145,6 +169,7 @@ module IsoDoc
           boilerplate docxml, div2
           preface_block docxml, div2
           abstract docxml, div2
+          executivesummary docxml, div2
           keywords docxml, div2
           foreword docxml, div2
           introduction docxml, div2
@@ -211,8 +236,7 @@ module IsoDoc
         @wordstylesheet = wordstylesheet_update
         Html2Doc.process(
           result,
-          filename: filename,
-          imagedir: @localdir,
+          filename: filename, imagedir: @localdir,
           stylesheet: @wordstylesheet&.path,
           header_file: header&.path, dir: dir,
           asciimathdelims: [@openmathdelim, @closemathdelim],

data/lib/isodoc/ogc/xref.rb

@@ -141,14 +141,16 @@ module IsoDoc
 
       def preface_anchor_names(doc)
         @prefacenum = 0
-        ["//preface/abstract", "//preface/clause[@type = 'keywords']",
+        ["//preface/abstract", "//preface/clause[@type = 'executivesummary']",
+         "//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')]"))
+                     "@type = 'submitting_orgs' or @type = 'security' or "\
+                     "@type = 'executivesummary')]"))
           .each { |c| preface_names_numbered(c) }
         preface_names_numbered(doc.at(ns("//acknowledgements")))
         sequential_asset_names(

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.5.2".freeze
+    VERSION = "1.5.5".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "iso-639"
   spec.add_dependency "metanorma-standoc", "~> 1.11.0"
 
-  spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.11.0
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Metanorma for the Open Geospatial Consortium.