metanorma-un 0.11.4 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2cd25bae43933dc01cf94b5ec520f8256f6666f1347de87c3e780075b7dd7bb
-  data.tar.gz: b1daa1f704b95231892d971b57a0c604eedc3b72802fe27c1128e486b4581510
+  metadata.gz: 685e31d7fc85ce0a52b12083277ac402cb5b6b83986e475e12b73404f352ef51
+  data.tar.gz: 4ee46f06018b888e6278c2f8fe26b1873f2d13bd10d12e8bea6ffdd620f12876
 SHA512:
-  metadata.gz: 3a7536d448c4518a056f0bbf0a31b14459a9e188de88ad0b094119588eedb3fd8fd41b5cdcb407c4cab0067a633477625c4c1adbfdaab760142dccc09d9294b3
-  data.tar.gz: 0a3c9c4a39e5ea3561e532d3abd7b8e33027f65c9d2377fe8b68c5a59b6a405bea1d79d6b1ee8ba70a65a19fe265cb89db16f81d8e54e006e910e58ca81d05cd
+  metadata.gz: 2fa2d63b98276010c9096b5807606074d5f9dccad511d1704248d442fc4685a289a208d2e260e0d55e2682915923206a3d8d3ae94bdea5a95051ee8b94c0e042
+  data.tar.gz: f0f2c9d4256a130eb5e17c85b2ef53b9df9f933b51989cec546c40537242549f900a12efd4964089e7df68952f550aa4fda34f73a675272d6abcc13f6fa3ed1b

data/Gemfile

@@ -4,8 +4,12 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-gemspec
+group :development, :test do
+  gem "rspec"
+end
 
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
+
+gemspec

data/lib/isodoc/un/i18n.rb

@@ -1,9 +1,14 @@
 module IsoDoc
   module UN
     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/un/xref.rb

@@ -159,11 +159,12 @@ module IsoDoc
         ]
       end
 
-      def sequential_admonition_names(clause)
+      def sequential_admonition_names(clause, container: false)
         i = 0
         clause.xpath(ns(".//admonition")).noblank.each do |t|
           i += 1 unless t["unnumbered"] == "true"
-          @anchors[t["id"]] = anchor_struct(i.to_s, nil, @labels["admonition"],
+          @anchors[t["id"]] =
+            anchor_struct(i.to_s, container ? t : nil, @labels["admonition"],
                                             "box", t["unnumbered"])
         end
       end
@@ -178,9 +179,9 @@ module IsoDoc
         end
       end
 
-      def sequential_asset_names(clause)
+      def sequential_asset_names(clause, container: false)
         super
-        sequential_admonition_names(clause)
+        sequential_admonition_names(clause, container: container)
       end
 
       def hierarchical_asset_names(clause, num)

data/lib/metanorma/un/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/un/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/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.11.4".freeze
+    VERSION = "0.11.6".freeze
   end
 end

data/metanorma-un.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "roman-numerals"
   spec.add_dependency "twitter_cldr"
 
-  spec.add_dependency "metanorma-standoc", "~> 2.6.3"
+  spec.add_dependency "metanorma-standoc", "~> 2.7.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-un
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2023-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement