metanorma-ogc 1.2.4 → 1.2.5

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -15,6 +15,7 @@ module IsoDoc
       def insert_preface_sections(docxml)
         insert_keywords(docxml)
         insert_submitting_orgs(docxml)
+        insert_security(docxml)
       end
 
       def preface_init_insert_pt(docxml)
@@ -30,6 +31,17 @@ module IsoDoc
         docxml.at(ns("//preface/abstract"))
       end
 
+      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
+        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 { |org| orgs << org.text }

data/lib/isodoc/ogc/sections.rb

@@ -18,6 +18,11 @@ module IsoDoc
         intro_clause(f, out)
       end
 
+      def security(docxml, out)
+        f = docxml.at(ns("//preface/clause[@type = 'security']")) || return
+        intro_clause(f, out)
+      end
+
       def submitters(docxml, out)
         f = docxml.at(ns("//submitters")) || return
         intro_clause(f, out)
@@ -25,7 +30,7 @@ module IsoDoc
 
       def preface(isoxml, out)
         isoxml.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
-                        "@type = 'submitting_orgs')]")).each do |f|
+                        "@type = 'submitting_orgs' or @type = 'security')]")).each do |f|
           intro_clause(f, out)
         end
       end

data/lib/isodoc/ogc/word_convert.rb

@@ -144,6 +144,7 @@ module IsoDoc
           keywords docxml, div2
           foreword docxml, div2
           introduction docxml, div2
+          security docxml, div2
           submittingorgs docxml, div2
           submitters docxml, div2
           preface docxml, div2

data/lib/isodoc/ogc/xref.rb

@@ -107,11 +107,12 @@ module IsoDoc
         preface_names_numbered(d.at(ns("//preface/clause[@type = 'keywords']")))
         preface_names_numbered(d.at(ns("//foreword")))
         preface_names_numbered(d.at(ns("//introduction")))
+        preface_names_numbered(d.at(ns("//preface/clause[@type = 'security']")))
         preface_names_numbered(d.at(ns("//preface/clause"\
                                        "[@type = 'submitting_orgs']")))
         preface_names_numbered(d.at(ns("//submitters")))
         d.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
-                   "@type = 'submitting_orgs')]")).each do |c|
+                   "@type = 'submitting_orgs' or @type = 'security')]")).each do |c|
           preface_names_numbered(c)
         end
         preface_names_numbered(d.at(ns("//acknowledgements")))
@@ -143,13 +144,37 @@ module IsoDoc
       def preface_names_numbered(clause)
         return if clause.nil?
         @prefacenum += 1
-        pref = RomanNumerals.to_roman(@prefacenum).downcase
+        pref = preface_number(@prefacenum, 1)
         @anchors[clause["id"]] =
           { label: pref,
             level: 1, xref: preface_clause_name(clause), type: "clause" }
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
-                        "./references")).each_with_index do |c, i|
-          section_names1(c, "#{pref}.#{i + 1}", 2)
+        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+          preface_names_numbered1(c, "#{pref}.#{preface_number(i + 1, 2)}", 2)
+        end
+      end
+
+      def preface_names_numbered1(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, level: level, xref: l10n("#{@labels["clause"]} #{num}"),
+            type: "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)
+        end
+      end
+
+      def preface_number(num, level)
+        case level
+        when 1 then RomanNumerals.to_roman(num).upcase
+        when 2 then (64 + num).chr.to_s
+        when 3 then num.to_s
+        when 4 then (96 + num).chr.to_s
+        when 5 then RomanNumerals.to_roman(num).downcase
+        when 6 then "(#{num.to_s})"
+        when 7 then "(#{(96 + num).chr.to_s})"
+        when 8 then "(#{RomanNumerals.to_roman(num).downcase})"
+        else
+          num.to_s
         end
       end
 

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.2.4"
+    VERSION = "1.2.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc