metanorma-ogc 2.5.14 → 2.6.0

data/lib/metanorma/ogc/converter.rb

@@ -64,6 +64,24 @@ module Metanorma
         super
       end
 
+      def section(node)
+        override_style(node)
+        super
+      end
+
+      def override_style(node)
+        s = node.attr("style")
+        if %w(executive_summary 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)
+          node.set_attr("type", s)
+        end
+      end
+
       def sectiontype_streamline(ret)
         case ret
         when "preface" then "foreword"
@@ -87,6 +105,10 @@ module Metanorma
       end
 
       def clause_parse(attrs, xml, node)
+        %w(executivesummary 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)
@@ -156,6 +178,54 @@ module Metanorma
         end
       end
 
+      OGC_COLORS = {
+        "text": "rgb(88, 89, 91)",
+        "secondary-shade-1": "rgb(237, 193, 35)",
+        "secondary-shade-2": "rgb(246, 223, 140)",
+        "background-definition-term": "rgb(215, 243, 255)",
+        "background-definition-description": "rgb(242, 251, 255)",
+        "text-title": "rgb(33, 55, 92)",
+        "background-page": "rgb(33, 55, 92)",
+        "background-text-label-legacy": "rgb(33, 60, 107)",
+        "background-term-preferred-label": "rgb(249, 235, 187)",
+        "background-term-deprecated-label": "rgb(237, 237, 238)",
+        "background-term-admitted-label": "rgb(223, 236, 249)",
+        "background-table-header": "rgb(33, 55, 92)",
+        "background-table-row-even": "rgb(252, 246, 222)",
+        "background-table-row-odd": "rgb(254, 252, 245)",
+        "admonition-note": "rgb(79, 129, 189)",
+        "admonition-tip": "rgb(79, 129, 189)",
+        "admonition-editor": "rgb(79, 129, 189)",
+        "admonition-important": "rgb(79, 129, 189)",
+        "admonition-warning": "rgb(79, 129, 189)",
+        "admonition-caution": "rgb(79, 129, 189)",
+        "admonition-todo": "rgb(79, 129, 189)",
+        "admonition-safety-precaution": "rgb(79, 129, 189)",
+      }.freeze
+
+      def metadata_attrs(node)
+        c = update_colors(node)
+        ret = super
+        c.keys.sort.each do |k|
+          ret += "<presentation-metadata><name>color-#{k}</name>" \
+            "<value>#{c[k]}</value></presentation-metadata>"
+        end
+        ret
+      end
+
+      def update_colors(node)
+        c = OGC_COLORS.dup
+        if document_scheme(node) == "2022"
+          c[:"secondary-shade-1"] = "rgb(0, 177, 255)"
+          c[:"secondary-shade-2"] = "rgb(0, 177, 255)"
+        end
+        if node.attr("doctype") == "white-paper"
+          c[:"text-title"] = "rgb(68, 84, 106)"
+          c[:"background-page"] = "rgb(68, 84, 106)"
+        end
+        c
+      end
+
       def presentation_xml_converter(node)
         IsoDoc::Ogc::PresentationXMLConvert
           .new(html_extract_attributes(node)

data/lib/metanorma/ogc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.2 -->
+<!-- VERSION v1.3.3 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -331,9 +331,9 @@
       <zeroOrMore>
         <ref name="table-note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="FigureAttr">
       <optional>
@@ -380,9 +380,9 @@
       <zeroOrMore>
         <ref name="note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="source">
       <element name="source">

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.5.14".freeze
+    VERSION = "2.6.0".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "metanorma-standoc", "~> 2.9.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.9.3"
 
   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.5.14
+  version: 2.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-19 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.9.0
+        version: 2.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.9.3
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,7 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.devel
 - LICENSE
 - README.adoc
 - lib/isodoc/ogc.rb