metanorma-ogc 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6f6cbb5bc0bc2323c2ca580974c1b8088c17cd1b8e54ce952ad349990518d1
-  data.tar.gz: c33fb7fe87342becdb7d44ecd64422d5b911230622f0f571b1318d802b89ead2
+  metadata.gz: c36eb2eb19714efe36a2bddd955d89702cbabb9a3206b636f39d89cdddb9b196
+  data.tar.gz: 5fa6aaadc06ada3a8f856b33cdd95b8fc3407df9c25f7b43f30d6cac045ab565
 SHA512:
-  metadata.gz: 2c8ce9e3fd6cdf2a2f8f349c5991bde3d6809d73cba6b515a20f99dde628d041012602697bad104f21b9578622e18b5acfe6d7b172ae80b08546396f5fdfb527
-  data.tar.gz: 70e85764d9f88e93075742ca70b5d2c4bfed91b12c5ccf201421f1760235f684732f70f73073e7795dca982f9ec39ef7e14bc8648afb8e9ed6bd7e411e06aa6a
+  metadata.gz: c45ff6fe107ed9e9e34b63925a01c4244943e261224d969412183a81baa0ee67fe3ca5ed870ef1cf485cb6c6e9be747e90307c46d3207ae6341e7388db43c4d9
+  data.tar.gz: 0fbc5ca07fda92e07ed344beb8aa9d359eccfad72b0ba4514af0880a43db1dc3c74909551592c561ba55ec0d82c9ae68ce8568dc594f187f875549f7d10095ee

data/lib/isodoc/ogc/pdf_convert.rb

@@ -11,14 +11,13 @@ module IsoDoc
         super
       end
 
-      def pdf_stylesheet(docxml)
-        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+      def pdf_stylesheet(_docxml)
         %w(abstract-specification-topic best-practice draft-standard
            change-request-supporting-document community-practice
            community-standard discussion-paper engineering-report policy
            reference-model release-notes standard user-guide test-suite
-           white-paper).include? doctype or doctype = "other"
-        "ogc.#{doctype}.xsl"
+           white-paper).include? @doctype or @doctype = "other"
+        "ogc.#{@doctype}.xsl"
       end
     end
   end

data/lib/isodoc/ogc/word_convert.rb

@@ -40,13 +40,12 @@ module IsoDoc
       end
 
       def convert1(docxml, filename, dir)
-        if docxml&.at(ns("//bibdata/ext/doctype"))&.text == "white-paper"
+        if @doctype == "white-paper"
           @wordstylesheet_name = html_doc_path("wordstyle_wp.scss")
           @standardstylesheet_name = html_doc_path("ogc_wp.scss")
           @wordcoverpage = html_doc_path("word_ogc_titlepage_wp.html")
           @wordintropage = html_doc_path("word_ogc_intro_wp.html")
           @header = html_doc_path("header_wp.html")
-          @doctype = "white-paper"
           options[:bodyfont] = '"Arial",sans-serif'
           options[:headerfont] = '"Lato",sans-serif'
           options[:normalfontsize] = "11.0pt"

data/lib/isodoc/ogc/xref.rb

@@ -12,7 +12,7 @@ module IsoDoc
              "//sections/definitions | " \
              "//sections/clause[descendant::definitions][not(descendant::terms)]",
              @klass.middle_clause(docxml)]
-        ret + if docxml.at(ns("//bibdata/ext/doctype"))&.text == "engineering-report"
+        ret + if @doctype == "engineering-report"
                 [{ path: a.join(" | "), multi: true }]
               else
                 [{ path: a[0] }, { path: a[1] }, { path: a[2], multi: true }]

data/lib/metanorma/ogc/cleanup.rb

@@ -34,16 +34,32 @@ module Metanorma
       def insert_security(xml, sect)
         description = "document"
         description = "standard" if %w(standard community-standard)
-          .include?(sect.at("//bibdata/ext/doctype")&.text)
+          .include?(@doctype)
+        @doctype == "engineering-report" and return remove_security(xml)
         preface = sect.at("//preface") ||
           sect.add_previous_sibling("<preface/>").first
         sect = xml.at("//clause[@type = 'security']")&.remove ||
-          "<clause type='security' #{add_id}>" \
-          "<title>Security considerations</title>" \
-          "<p>#{@i18n.security_empty.sub(/%/, description)}</p></clause>"
+          create_security_clause(xml)
         preface.add_child sect
       end
 
+      def remove_security(xml)
+        a = xml.at("//clause[@type = 'security']") and
+          a.delete("type")
+      end
+
+      def create_security_clause(xml)
+        doctype = xml.at("//bibdata/ext/doctype")&.text
+        description = "document"
+        description = "standard" if %w(standard community-standard)
+          .include?(doctype)
+        <<~CLAUSE
+          <clause type='security' #{add_id}>
+            <title>Security considerations</title>
+            <p>#{@i18n.security_empty.sub('%', description)}</p></clause>
+        CLAUSE
+      end
+
       def insert_submitters(xml, sect)
         if xml.at("//submitters")
           preface = sect.at("//preface") ||
@@ -62,9 +78,11 @@ module Metanorma
         super
         a = xmldoc.at("//bibdata/status/stage")
         a.text == "published" and a.children = "approved"
-        doctype = xmldoc.at("//bibdata/ext/doctype")
-        doctype.text == "technical-paper" and
+        if @doctype == "technical-paper"
+          doctype = xmldoc.at("//bibdata/ext/doctype")
           doctype.children = "white-paper"
+          @doctype = "white-paper"
+        end
       end
 
       def section_names_terms_cleanup(xml)

data/lib/metanorma/ogc/validate.rb

@@ -2,7 +2,6 @@ module Metanorma
   module Ogc
     class Converter < Standoc::Converter
       def validate(doc)
-        @doctype = doc.at("//bibdata/ext/doctype")&.text
         content_validate(doc)
         schema_validate(formattedstr_strip(doc.dup),
                         File.join(File.dirname(__FILE__), "ogc.rng"))

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.4.1".freeze
+    VERSION = "2.4.2".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.5.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.6.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.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-09-11 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.5.4
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement