metanorma-generic 2.2.1.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 659bc5b25f106f07e3aa23d3dcb17609ec43f50c7263a1643f6fdd34ff4e166f
-  data.tar.gz: 63d42dc39e025bd8d2acdae2e7e9aaa79b85bebc3399913a96cf14c08c208123
+  metadata.gz: e47c1e0506d6b40cb425824d37f34a4c48610c5a92a301305425dbca76c9952e
+  data.tar.gz: f2505fc678139eaba373f08ae1d058e34d32e4016981536cb4f5a5a984e75ab1
 SHA512:
-  metadata.gz: 3ed6e8c02f244e135b3bc169cdef61d420c1e71e82dde98752ec07741d20798c24af59928ee9085708fdd806b1c4d62a408faf9a58761de2a4d209cbf03c865d
-  data.tar.gz: b253e605a626694a82b1b9ad7aa87ce26c2c9d486eb888f96c4e648c2cc7d4f16781158134097ce80ce3765adb79c347e2eed035e317c3b434c526dd33937c22
+  metadata.gz: 2d708f224849accec31667209d80442776b64b7a8df211c765e51943095aa8184dfb490530465327f5b315233d54d122fb946ab2c8bf667774101c9b77e6bfbe
+  data.tar.gz: e84fc5a09ba497091c5f415ce72336af38a274459f7f0729d0a44bf7e77e8bd873db0a308f59eda53413b79a0fcdfc17cfc8429ee1f50f4ba4c4b42c838c2e2d

data/lib/isodoc/generic/init.rb

@@ -7,8 +7,8 @@ require_relative "utils"
 module IsoDoc
   module Generic
     module Init
-      def metadata_init(lang, script, i18n)
-        @meta = Metadata.new(lang, script, i18n)
+      def metadata_init(lang, script, locale, i18n)
+        @meta = Metadata.new(lang, script, locale, i18n)
       end
 
       def xref_init(lang, script, _klass, i18n, options)
@@ -16,11 +16,11 @@ module IsoDoc
         @xrefs = Xref.new(lang, script, html, i18n, options)
       end
 
-      def i18n_init(lang, script, i18nyaml = nil)
+      def i18n_init(lang, script, locale, i18nyaml = nil)
         f = Metanorma::Generic.configuration.i18nyaml
         f = nil unless f.is_a? String
         @i18n = I18n.new(
-          lang, script, i18nyaml: i18nyaml || f || @i18nyaml)
+          lang, script, locale: locale, i18nyaml: i18nyaml || f || @i18nyaml)
       end
 
       include Utils

data/lib/isodoc/generic/metadata.rb

@@ -28,7 +28,7 @@ end
 module IsoDoc
   module Generic
     class Metadata < IsoDoc::Metadata
-      def initialize(lang, script, labels)
+      def initialize(lang, script, locale, labels)
         super
         here = File.dirname(__FILE__)
         default_logo_path =

data/lib/metanorma/generic/biblio.rng

@@ -73,8 +73,14 @@
       <text/>
     </element>
   </define>
-  <define name="script">
+  <define name="locale">
     <a:documentation>ISO-639</a:documentation>
+    <element name="locale">
+      <text/>
+    </element>
+  </define>
+  <define name="script">
+    <a:documentation>ISO-3166</a:documentation>
     <element name="script">
       <text/>
     </element>
@@ -93,6 +99,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -136,6 +145,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -650,6 +662,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -741,6 +756,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -854,6 +872,15 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -882,6 +909,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">
@@ -930,6 +958,9 @@
       <optional>
         <attribute name="language"/>
       </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
       <optional>
         <attribute name="script"/>
       </optional>

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.2.1.1".freeze
+    VERSION = "2.2.2".freeze
   end
 end

data/metanorma-generic.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "Metanorma template gem for customisation."
   spec.description   = <<~DESCRIPTION
         Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
-    #{'    '}
+
         Formerly known as metanorma-acme
   DESCRIPTION
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 2.2.2"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.2.1.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -192,8 +192,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: "    Metanorma template gem for customisation. This gem is meant to be
-  customised for any downstream use.\n    \n    Formerly known as metanorma-acme\n"
+description: |
+  Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
+
+  Formerly known as metanorma-acme
 email:
 - open.source@ribose.com
 executables: []