metanorma-ogc 2.8.4 → 2.8.5

data/lib/metanorma/ogc/converter.rb

@@ -1,9 +1,11 @@
 require "asciidoctor"
 require "metanorma/standoc/converter"
 require "fileutils"
+require "date"
 require_relative "front"
 require_relative "validate"
 require_relative "cleanup"
+require_relative "sections"
 
 module Metanorma
   module Ogc
@@ -17,9 +19,6 @@ module Metanorma
         @tocrecommendations = true
       end
 
-      # ignore, we generate ToC outside of asciidoctor
-      def toc(value); end
-
       def default_requirement_model
         "ogc"
       end
@@ -45,44 +44,35 @@ module Metanorma
         d
       end
 
-      def sectiontype(node, level = true)
-        ret = sectiontype_streamline(sectiontype1(node))
-        return ret if ret == "terms and definitions" &&
-          node.attr("style") == "appendix" && node.level == 1
-
-        super
-      end
-
-      def section(node)
-        override_style(node)
-        super
-      end
-
-      def override_style(node)
-        s = node.attr("style")
-        if %w(overview future_outlook value_proposition contributors).include?(s)
-          node.set_attr("style", "preface")
-          node.set_attr("type", s)
-        end
-        if %w(aims objectives topics outlook security).include?(s)
-          node.set_attr("type", s)
+      def document_scheme(node)
+        if r = node.attr("document-scheme")
+          r == "2022" ? "current" : "2021"
+        elsif r = node.attr("published-date")
+          published_date_scheme(r)
+        elsif r = node.attr("copyright-year")
+          r.to_i >= 2022 ? "current" : "2021"
+        else "current"
         end
       end
 
-      def sectiontype_streamline(ret)
-        case ret
-        when "preface" then "foreword"
-        when "foreword", "introduction" then "donotrecognise-foreword"
-        when "references" then "normative references"
-        when "glossary" then "terms and definitions"
-        else super
-        end
+      def published_date_scheme(date_str)
+        published_date = parse_flexible_date(date_str) or return nil
+        cutoff_date = Date.new(2021, 11, 8)
+        published_date >= cutoff_date ? "current" : "2021"
+      rescue Date::Error, ArgumentError
+        nil
       end
 
-      # legacy encoding
-      def sectiontype1(node)
-        role_style(node, "executive_summary") and return "executivesummary"
-        super
+      def parse_flexible_date(date_str)
+        case date_str
+        when /^\d{4}$/
+          Date.new(date_str.to_i, 1, 1)
+        when /^\d{4}-\d{2}$/
+          year, month = date_str.split("-").map(&:to_i)
+          Date.new(year, month, 1)
+        else
+          Date.parse(date_str)
+        end
       end
 
       def outputs(node, ret)
@@ -96,75 +86,15 @@ module Metanorma
                                      false, "#{@filename}.pdf")
       end
 
-      def clause_parse(attrs, xml, node)
-        %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.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")
-        end
-        super
-      end
-
-      def submitters_parse(attrs, xml, node)
-        title = @i18n.submitters
-        doctype(node) == "engineering-report" ||
-          attrs[:type] == "contributors" and
-          title = @i18n.contributors_clause
-        xml.clause **attr_code(attrs) do |xml_section|
-          section_title(xml_section, title)
-          xml_section << node.content
-        end
-      end
-
       def style(_node, _text)
         nil
       end
 
-      def term_def_parse(attrs, xml, node, _toplevel)
-        if node.attr("style") == "appendix" && node.level == 1
-          terms_annex_parse(attrs, xml, node)
-        else
-          super
-        end
-      end
-
       def table_cell(node, xml_tr, tblsec)
         node.set_attr("valign", "middle")
         super
       end
 
-      def terms_annex_parse(attrs, xml, node)
-        attrs1 = attrs.merge(id: "_#{UUIDTools::UUID.random_create}")
-        xml.annex **attr_code(attrs1) do |xml_section|
-          section_title(xml_section, node.title)
-          attrs.delete(:anchor)
-          xml_section.terms **attr_code(attrs) do |terms|
-            (s = node.attr("source")) && s.split(",").each do |s1|
-              terms.termdocsource(nil, **attr_code(bibitemid: s1))
-            end
-            terms << node.content
-          end
-        end
-      end
-
-      def set_obligation(attrs, node)
-        if node.attr("style") == "appendix" && node.level == 1
-          attrs[:obligation] = if node.attributes.has_key?("obligation")
-                                 node.attr("obligation")
-                               else "informative"
-                               end
-        else super
-        end
-      end
-
       OGC_COLORS = {
         "text": "rgb(88, 89, 91)",
         "secondary-shade-1": "rgb(237, 193, 35)",
@@ -202,7 +132,7 @@ module Metanorma
 
       def update_colors(node)
         c = OGC_COLORS.dup
-        if document_scheme(node) == "2022"
+        if document_scheme(node) == "current"
           c[:"secondary-shade-1"] = "rgb(0, 177, 255)"
           c[:"secondary-shade-2"] = "rgb(0, 177, 255)"
         end
@@ -236,11 +166,12 @@ module Metanorma
       # preempt subdoctype warning
       def adoc2xml(text, flavour)
         Nokogiri::XML(text).root and return text
-        c = Asciidoctor
-          .convert("= X\nA\n:semantic-metadata-headless: true\n" \
+        c = isolated_asciidoctor_convert(
+          "= X\nA\n:semantic-metadata-headless: true\n" \
                    ":novalid:\n:docsubtype: implementation\n" \
                    ":doctype: standard\n\n#{text}\n",
-                   backend: flavour, header_footer: true)
+          backend: flavour, header_footer: true,
+        )
         Nokogiri::XML(c).at("//xmlns:sections")
       end
     end

data/lib/metanorma/ogc/sections.rb

@@ -0,0 +1,110 @@
+module Metanorma
+  module Ogc
+    class Converter < Standoc::Converter
+      # ignore, we generate ToC outside of asciidoctor
+      def toc(value); end
+
+      def sectiontype(node, level = true)
+        ret = sectiontype_streamline(sectiontype1(node))
+        return ret if ret == "terms and definitions" &&
+          node.attr("style") == "appendix" && node.level == 1
+
+        super
+      end
+
+      def section(node)
+        override_style(node)
+        super
+      end
+
+      def override_style(node)
+        s = node.attr("style")
+        if %w(overview future_outlook value_proposition
+              contributors).include?(s)
+          node.set_attr("style", "preface")
+          node.set_attr("type", s)
+        end
+        if %w(aims objectives topics outlook security).include?(s)
+          node.set_attr("type", s)
+        end
+      end
+
+      def sectiontype_streamline(ret)
+        case ret
+        when "preface" then "foreword"
+        when "foreword", "introduction" then "donotrecognise-foreword"
+        when "references" then "normative references"
+        when "glossary" then "terms and definitions"
+        else super
+        end
+      end
+
+      # legacy encoding
+      def sectiontype1(node)
+        role_style(node, "executive_summary") and return "executivesummary"
+        super
+      end
+
+      def clause_parse(attrs, xml, node)
+        %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.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")
+        end
+        super
+      end
+
+      def submitters_parse(attrs, xml, node)
+        title = @i18n.submitters
+        doctype(node) == "engineering-report" ||
+          attrs[:type] == "contributors" and
+          title = @i18n.contributors_clause
+        xml.clause **attr_code(attrs) do |xml_section|
+          section_title(xml_section, title)
+          xml_section << node.content
+        end
+      end
+
+      def term_def_parse(attrs, xml, node, _toplevel)
+        if node.attr("style") == "appendix" && node.level == 1
+          terms_annex_parse(attrs, xml, node)
+        else
+          super
+        end
+      end
+
+      def terms_annex_parse(attrs, xml, node)
+        attrs1 = attrs.merge(id: "_#{UUIDTools::UUID.random_create}")
+        xml.annex **attr_code(attrs1) do |xml_section|
+          section_title(xml_section, node.title)
+          attrs.delete(:anchor)
+          xml_section.terms **attr_code(attrs) do |terms|
+            (s = node.attr("source")) && s.split(",").each do |s1|
+              terms.termdocsource(nil, **attr_code(bibitemid: s1))
+            end
+            terms << node.content
+          end
+        end
+      end
+
+      def set_obligation(attrs, node)
+        if node.attr("style") == "appendix" && node.level == 1
+          attrs[:obligation] = if node.attributes.has_key?("obligation")
+                                 node.attr("obligation")
+                               else "informative"
+                               end
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.8.4".freeze
+    VERSION = "2.8.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.8.4
+  version: 2.8.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-15 00:00:00.000000000 Z
+date: 2025-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -303,6 +303,7 @@ files:
 - lib/metanorma/ogc/processor.rb
 - lib/metanorma/ogc/relaton-ogc.rng
 - lib/metanorma/ogc/reqt.rng
+- lib/metanorma/ogc/sections.rb
 - lib/metanorma/ogc/validate.rb
 - lib/metanorma/ogc/version.rb
 - lib/relaton/render/config.yml