metanorma-ietf 3.0.10.1 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30a82e668dc96f4e303356f3f04bedcada52d358a35e2d7b28000402cbc1696a
-  data.tar.gz: fee5dd82281153cb759cb087519880bd7374460c09927abadeadf84d09de2d39
+  metadata.gz: a1deb99aa6937a5ecea906469cd404152a74945e6e6fb595262c52358841bc53
+  data.tar.gz: 0cd0c817dffcc423b00043479704a63851807d0e1aa0ea77856c80871e6d11df
 SHA512:
-  metadata.gz: 7db6cc698dce0d1fd826e724b6e1ee68d9e9cce5a0f52492cdddc0853fbfe204c2a4b67d6d9a96b1087e8fb560693fcf197cb169dff6cb2d304472854df21b8b
-  data.tar.gz: fef70127a965f3a628d824ccdf4819a160866801eab03e9919072383c62c20599715f283dbec55e467f817ec99979509b58f4620cae3bdc7f54b623eaccff5a0
+  metadata.gz: 5ee37a0a08b9f25e7aea0a381e383e154dadff6fd0bd9196cf375b7a4e3b199f327426e9f210452bf1ae4513220e4a7b6f1790d67aaf6e4a409134772fa1888b
+  data.tar.gz: 4d1df87114db20f71ba28f2fea1f254f8bfb47a03db1269b8e6db1d0a10013dcd44f164a493f5c8b3409e0e1f311b2b7eb7d65dfe84401d70da76fbd13bb441d

data/lib/isodoc/ietf/init.rb

@@ -4,8 +4,9 @@ require_relative "i18n"
 module IsoDoc
   module Ietf
     module Init
-      def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
+      def i18n_init(lang, script, locale, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, locale: locale,
+                                       i18nyaml: i18nyaml || @i18nyaml)
       end
 
       def fileloc(loc)

data/lib/isodoc/ietf/rfc_convert.rb

@@ -32,7 +32,7 @@ module IsoDoc
       def document_preprocess(docxml)
         @isodoc.reqt_models = Metanorma::Requirements
           .new({ default: "default", lang: @lang, script: @script,
-                 labels: @i18n.get })
+                 locale: @locale, labels: @i18n.get })
         info docxml, nil
         @xrefs.parse docxml
         @isodoc.xrefs = @xrefs
@@ -43,8 +43,8 @@ module IsoDoc
         @xrefs.parse docxml
       end
 
-      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)
@@ -105,7 +105,7 @@ module IsoDoc
         @format = :rfc
         @suffix = "rfc.xml"
         @isodoc = IsoDoc::PresentationXMLConvert.new({})
-        @isodoc.i18n_init("en", "Latn")
+        @isodoc.i18n_init("en", "Latn", nil, nil)
       end
 
       include ::IsoDoc::Ietf::Init

data/lib/metanorma/ietf/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/ietf/converter.rb

@@ -166,10 +166,10 @@ module Metanorma
         IsoDoc::Ietf::RfcConvert.new(html_extract_attributes(node))
       end
 
-      def isodoc(lang, script, i18nyaml = nil)
+      def isodoc(lang, script, locale, i18nyaml = nil)
         conv = rfc_converter(EmptyAttr.new)
-        i18n = conv.i18n_init(lang, script, i18nyaml)
-        conv.metadata_init(lang, script, i18n)
+        i18n = conv.i18n_init(lang, script, locale, i18nyaml)
+        conv.metadata_init(lang, script, locale, i18n)
         conv
       end
     end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.0.10.1".freeze
+    VERSION = "3.0.11".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 2.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.0.10.1
+  version: 3.0.11
 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: mathml2asciimath
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement