metanorma-ietf 3.0.10.1 → 3.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 30a82e668dc96f4e303356f3f04bedcada52d358a35e2d7b28000402cbc1696a
4
- data.tar.gz: fee5dd82281153cb759cb087519880bd7374460c09927abadeadf84d09de2d39
3
+ metadata.gz: a1deb99aa6937a5ecea906469cd404152a74945e6e6fb595262c52358841bc53
4
+ data.tar.gz: 0cd0c817dffcc423b00043479704a63851807d0e1aa0ea77856c80871e6d11df
5
5
  SHA512:
6
- metadata.gz: 7db6cc698dce0d1fd826e724b6e1ee68d9e9cce5a0f52492cdddc0853fbfe204c2a4b67d6d9a96b1087e8fb560693fcf197cb169dff6cb2d304472854df21b8b
7
- data.tar.gz: fef70127a965f3a628d824ccdf4819a160866801eab03e9919072383c62c20599715f283dbec55e467f817ec99979509b58f4620cae3bdc7f54b623eaccff5a0
6
+ metadata.gz: 5ee37a0a08b9f25e7aea0a381e383e154dadff6fd0bd9196cf375b7a4e3b199f327426e9f210452bf1ae4513220e4a7b6f1790d67aaf6e4a409134772fa1888b
7
+ data.tar.gz: 4d1df87114db20f71ba28f2fea1f254f8bfb47a03db1269b8e6db1d0a10013dcd44f164a493f5c8b3409e0e1f311b2b7eb7d65dfe84401d70da76fbd13bb441d
@@ -4,8 +4,9 @@ require_relative "i18n"
4
4
  module IsoDoc
5
5
  module Ietf
6
6
  module Init
7
- def i18n_init(lang, script, i18nyaml = nil)
8
- @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
7
+ def i18n_init(lang, script, locale, i18nyaml = nil)
8
+ @i18n = I18n.new(lang, script, locale: locale,
9
+ i18nyaml: i18nyaml || @i18nyaml)
9
10
  end
10
11
 
11
12
  def fileloc(loc)
@@ -32,7 +32,7 @@ module IsoDoc
32
32
  def document_preprocess(docxml)
33
33
  @isodoc.reqt_models = Metanorma::Requirements
34
34
  .new({ default: "default", lang: @lang, script: @script,
35
- labels: @i18n.get })
35
+ locale: @locale, labels: @i18n.get })
36
36
  info docxml, nil
37
37
  @xrefs.parse docxml
38
38
  @isodoc.xrefs = @xrefs
@@ -43,8 +43,8 @@ module IsoDoc
43
43
  @xrefs.parse docxml
44
44
  end
45
45
 
46
- def metadata_init(lang, script, i18n)
47
- @meta = Metadata.new(lang, script, i18n)
46
+ def metadata_init(lang, script, locale, i18n)
47
+ @meta = Metadata.new(lang, script, locale, i18n)
48
48
  end
49
49
 
50
50
  def xref_init(lang, script, klass, i18n, options)
@@ -105,7 +105,7 @@ module IsoDoc
105
105
  @format = :rfc
106
106
  @suffix = "rfc.xml"
107
107
  @isodoc = IsoDoc::PresentationXMLConvert.new({})
108
- @isodoc.i18n_init("en", "Latn")
108
+ @isodoc.i18n_init("en", "Latn", nil, nil)
109
109
  end
110
110
 
111
111
  include ::IsoDoc::Ietf::Init
@@ -73,8 +73,14 @@
73
73
  <text/>
74
74
  </element>
75
75
  </define>
76
- <define name="script">
76
+ <define name="locale">
77
77
  <a:documentation>ISO-639</a:documentation>
78
+ <element name="locale">
79
+ <text/>
80
+ </element>
81
+ </define>
82
+ <define name="script">
83
+ <a:documentation>ISO-3166</a:documentation>
78
84
  <element name="script">
79
85
  <text/>
80
86
  </element>
@@ -93,6 +99,9 @@
93
99
  <!-- multiple languages and scripts possible: comma delimit them if so -->
94
100
  <attribute name="language"/>
95
101
  </optional>
102
+ <optional>
103
+ <attribute name="locale"/>
104
+ </optional>
96
105
  <optional>
97
106
  <attribute name="script"/>
98
107
  </optional>
@@ -136,6 +145,9 @@
136
145
  <!-- multiple languages and scripts possible: comma delimit them if so -->
137
146
  <attribute name="language"/>
138
147
  </optional>
148
+ <optional>
149
+ <attribute name="locale"/>
150
+ </optional>
139
151
  <optional>
140
152
  <attribute name="script"/>
141
153
  </optional>
@@ -650,6 +662,9 @@
650
662
  <zeroOrMore>
651
663
  <ref name="language"/>
652
664
  </zeroOrMore>
665
+ <zeroOrMore>
666
+ <ref name="locale"/>
667
+ </zeroOrMore>
653
668
  <zeroOrMore>
654
669
  <ref name="script"/>
655
670
  </zeroOrMore>
@@ -741,6 +756,9 @@
741
756
  <zeroOrMore>
742
757
  <ref name="language"/>
743
758
  </zeroOrMore>
759
+ <zeroOrMore>
760
+ <ref name="locale"/>
761
+ </zeroOrMore>
744
762
  <zeroOrMore>
745
763
  <ref name="script"/>
746
764
  </zeroOrMore>
@@ -854,6 +872,15 @@
854
872
  <optional>
855
873
  <attribute name="type"/>
856
874
  </optional>
875
+ <optional>
876
+ <attribute name="language"/>
877
+ </optional>
878
+ <optional>
879
+ <attribute name="locale"/>
880
+ </optional>
881
+ <optional>
882
+ <attribute name="script"/>
883
+ </optional>
857
884
  <data type="anyURI"/>
858
885
  </define>
859
886
  <define name="DateType">
@@ -882,6 +909,7 @@
882
909
  <value>vote-started</value>
883
910
  <value>vote-ended</value>
884
911
  <value>announced</value>
912
+ <value>stable-until</value>
885
913
  </choice>
886
914
  </define>
887
915
  <define name="bdate">
@@ -930,6 +958,9 @@
930
958
  <optional>
931
959
  <attribute name="language"/>
932
960
  </optional>
961
+ <optional>
962
+ <attribute name="locale"/>
963
+ </optional>
933
964
  <optional>
934
965
  <attribute name="script"/>
935
966
  </optional>
@@ -166,10 +166,10 @@ module Metanorma
166
166
  IsoDoc::Ietf::RfcConvert.new(html_extract_attributes(node))
167
167
  end
168
168
 
169
- def isodoc(lang, script, i18nyaml = nil)
169
+ def isodoc(lang, script, locale, i18nyaml = nil)
170
170
  conv = rfc_converter(EmptyAttr.new)
171
- i18n = conv.i18n_init(lang, script, i18nyaml)
172
- conv.metadata_init(lang, script, i18n)
171
+ i18n = conv.i18n_init(lang, script, locale, i18nyaml)
172
+ conv.metadata_init(lang, script, locale, i18n)
173
173
  conv
174
174
  end
175
175
  end
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ietf
3
- VERSION = "3.0.10.1".freeze
3
+ VERSION = "3.0.11".freeze
4
4
  end
5
5
  end
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
37
37
 
38
38
  spec.add_dependency "mathml2asciimath"
39
39
  spec.add_dependency "metanorma-ietf-data"
40
- spec.add_dependency "metanorma-standoc", "~> 2.2.0"
40
+ spec.add_dependency "metanorma-standoc", "~> 2.2.4"
41
41
 
42
42
  spec.add_development_dependency "debug"
43
43
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ietf
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.10.1
4
+ version: 3.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-09-07 00:00:00.000000000 Z
11
+ date: 2022-09-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mathml2asciimath
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 2.2.0
47
+ version: 2.2.4
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 2.2.0
54
+ version: 2.2.4
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: debug
57
57
  requirement: !ruby/object:Gem::Requirement