metanorma-ogc 2.3.6 → 2.3.8

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -5,12 +5,21 @@ require_relative "../../relaton/render/general"
 module IsoDoc
   module Ogc
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
+      end
+
       def convert1(docxml, filename, dir)
         info docxml, nil
         insert_preface_sections(docxml)
         super
       end
 
+      def rouge_css_location
+        File.read(File.join(@libdir, "html", "rouge.css"))
+      end
+
       def insert_preface_sections(doc)
         preface_insert(doc.at(ns("//preface/clause" \
                                  "[@type = 'executivesummary']")),
@@ -215,6 +224,14 @@ module IsoDoc
         prefix_bracketed_ref("#{ret}#{datefn}")
       end
 
+      def deprecates(elem)
+        elem << "&#xa0;<span class='AdmittedLabel'>#{@i18n.deprecated}</span>"
+      end
+
+      def admits(elem)
+        elem << "&#xa0;<span class='AdmittedLabel'>#{@i18n.admitted}</span>"
+      end
+
       include Init
     end
   end

data/lib/isodoc/ogc/xref.rb

@@ -93,6 +93,17 @@ module IsoDoc
 
         @anchors[ref["id"]] = { xref: "#{@anchors[ref['id']][:xref]} (draft)" }
       end
+
+      def sequential_permission_body(id, block, label, klass, model)
+        @anchors[block["id"]] = model.postprocess_anchor_struct(
+          block, anchor_struct(id, nil,
+                               label, klass, block["unnumbered"])
+        )
+        model.permission_parts(block, id, label, klass).each do |n|
+          @anchors[n[:id]] = anchor_struct(n[:number], nil, n[:label],
+                                           n[:klass], false)
+        end
+      end
     end
   end
 end

data/lib/metanorma/ogc/isodoc.rng

@@ -382,6 +382,9 @@
         <optional>
           <ref name="dl"/>
         </optional>
+        <optional>
+          <ref name="source"/>
+        </optional>
       </element>
     </define>
     <define name="figure">
@@ -404,9 +407,6 @@
           <attribute name="class"/>
         </optional>
         <ref name="BlockAttributes"/>
-        <optional>
-          <ref name="source"/>
-        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -431,6 +431,20 @@
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
+        <optional>
+          <ref name="source"/>
+        </optional>
+      </element>
+    </define>
+    <define name="source">
+      <element name="source">
+        <attribute name="status">
+          <ref name="SourceStatusType"/>
+        </attribute>
+        <ref name="origin"/>
+        <optional>
+          <ref name="modification"/>
+        </optional>
       </element>
     </define>
     <define name="sourcecode">
@@ -2099,10 +2113,7 @@
   <define name="termsource">
     <element name="termsource">
       <attribute name="status">
-        <choice>
-          <value>identical</value>
-          <value>modified</value>
-        </choice>
+        <ref name="SourceStatusType"/>
       </attribute>
       <attribute name="type">
         <choice>
@@ -2116,6 +2127,17 @@
       </optional>
     </element>
   </define>
+  <define name="SourceStatusType">
+    <choice>
+      <value>identical</value>
+      <value>modified</value>
+      <value>restyled</value>
+      <value>context-added</value>
+      <value>generalisation</value>
+      <value>specialisation</value>
+      <value>unspecified</value>
+    </choice>
+  </define>
   <define name="origin">
     <element name="origin">
       <choice>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.3.6".freeze
+    VERSION = "2.3.8".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.4.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.4.2"
 
   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.3.6
+  version: 2.3.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-04-10 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.4.0
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +238,8 @@ files:
 - lib/isodoc/ogc/html/ogc.scss
 - lib/isodoc/ogc/html/ogc_wp.css
 - lib/isodoc/ogc/html/ogc_wp.scss
+- lib/isodoc/ogc/html/preprocess.xslt
+- lib/isodoc/ogc/html/rouge.css
 - lib/isodoc/ogc/html/scripts.html
 - lib/isodoc/ogc/html/word_ogc_intro.html
 - lib/isodoc/ogc/html/word_ogc_intro_wp.html