metanorma-ogc 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a8edafd9da436d2118d264222ff13e771e35bff107a7758a2c27c1f346b12fb
-  data.tar.gz: 4f970b93ca56712cc41ea2bdb9a3cfbddea6b8471acf9ceb9e80546ea8a5ffe9
+  metadata.gz: 13fbc569b404283fdee6b37d4d07319a4b2fd7fb380a9475885693a41a13c662
+  data.tar.gz: 84f5bc9f758b9d1822e529663d15fc978601ebc6bcfe23ac1c683ccd69ba6a9a
 SHA512:
-  metadata.gz: 8bb73f9338de4466d6706ddf15aaf951155726cee950430b1d79abfb4fe306a77ff18fada9cc5fa71920518cf06f386fddc2d38151ce9d3ae1fdc924ce78c3f0
-  data.tar.gz: 4099c50a591583455df3be7f8bc4906fd7309022fbcd36e28922f96e12f1c066e1d2a75b8965335313745a40fc1d0f2f7118c0f3d7a74e87dd2699fde750393c
+  metadata.gz: 744250296f3f6f1f2fc8137af1fdb987a3434a528f892db9722f5f5fb6549da7bf6a36fe6f30061a434671e92919125e3dcc807feb4be67eb6ed57d60a4bd45c
+  data.tar.gz: 3f6a685482e35e773a12a16cc25a621830bfaed9c04f3ed7dd32cfddc231c63fe70c1793c4be5f6744e1dab605561d16bb39f2b1c2b93d39eda1cf3ebd131b92

data/lib/isodoc/ogc/i18n.rb

@@ -1,9 +1,14 @@
 module IsoDoc
   module Ogc
     class I18n < IsoDoc::I18n
+      def load_file(fname)
+        f = File.join(File.dirname(__FILE__), fname)
+        File.exist?(f) ? YAML.load_file(f) : {}
+      end
+
       def load_yaml1(lang, script)
-        y = YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-        super.deep_merge(y)
+        y = load_file("i18n-#{yaml_lang(lang, script)}.yaml")
+        y.empty? ? load_file("i18n-en.yaml").merge(super) : super.deep_merge(y)
       end
     end
   end

data/lib/isodoc/ogc/xref.rb

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

data/lib/metanorma/ogc/biblio.rng

@@ -374,6 +374,16 @@
       <ref name="image"/>
     </element>
   </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -760,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>

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.2.8 -->
+<!-- VERSION v1.2.9 -->
 <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">
@@ -1958,6 +1958,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <choice>
+            <value>letter</value>
+            <value>symbol</value>
+            <value>formula</value>
+            <value>equation</value>
+          </choice>
+        </attribute>
+      </optional>
       <element name="name">
         <oneOrMore>
           <choice>

data/lib/metanorma/ogc/validate.rb

@@ -25,7 +25,7 @@ module Metanorma
         @doctype == "engineering-report" and return
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(draft swg-draft oab-review public-rfc tc-vote work-item-draft
-           approved deprecated retired rescinded).include? stage or
+           approved deprecated retired rescinded legacy).include? stage or
           @log.add("Document Attributes", nil,
                    "#{stage} is not a recognised status")
         stage_type_validate(stage, @doctype)
@@ -40,7 +40,7 @@ module Metanorma
               when "best-practice", "community-practice"
                 %w(draft swg-draft work-item-draft).include?(stage)
               else %w(swg-draft oab-review public-rfc tc-vote
-                      work-item-draft deprecated rescinded).include?(stage)
+                      work-item-draft deprecated rescinded legacy).include?(stage)
               end
         err and @log.add("Document Attributes", nil,
                          "#{stage} is not an allowed status for #{doctype}")

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.4.6".freeze
+    VERSION = "2.4.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639