metanorma-un 0.7.5 → 0.8.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (24) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +4 -32
  3. data/.gitignore +10 -0
  4. data/lib/isodoc/un/html/htmlstyle.css +25 -18
  5. data/lib/isodoc/un/html/htmlstyle.scss +8 -2
  6. data/lib/isodoc/un/html/unece.css +1 -2
  7. data/lib/isodoc/un/html/unece.scss +0 -1
  8. data/lib/isodoc/un/un.plenary-attachment.xsl +2151 -1497
  9. data/lib/isodoc/un/un.plenary.xsl +2151 -1497
  10. data/lib/isodoc/un/un.recommendation.xsl +2013 -1276
  11. data/lib/{asciidoctor → metanorma}/un/basicdoc.rng +5 -3
  12. data/lib/{asciidoctor → metanorma}/un/biblio.rng +7 -5
  13. data/lib/{asciidoctor → metanorma}/un/boilerplate.xml +0 -0
  14. data/lib/{asciidoctor → metanorma}/un/converter.rb +2 -2
  15. data/lib/{asciidoctor → metanorma}/un/isodoc.rng +98 -1
  16. data/lib/{asciidoctor → metanorma}/un/reqt.rng +0 -0
  17. data/lib/{asciidoctor → metanorma}/un/un.rng +6 -1
  18. data/lib/{asciidoctor → metanorma}/un/validate.rb +1 -1
  19. data/lib/metanorma/un/version.rb +1 -1
  20. data/lib/metanorma/un.rb +1 -0
  21. data/lib/metanorma-un.rb +0 -1
  22. data/metanorma-unece.gemspec +1 -1
  23. metadata +12 -13
  24. data/lib/asciidoctor/un.rb +0 -7
data/lib/{asciidoctor → metanorma}/un/basicdoc.rng RENAMED
@@ -173,9 +173,11 @@
173
173
  <data type="dateTime"/>
174
174
  </attribute>
175
175
  </optional>
176
- <attribute name="from">
177
- <data type="IDREF"/>
178
- </attribute>
176
+ <optional>
177
+ <attribute name="from">
178
+ <data type="IDREF"/>
179
+ </attribute>
180
+ </optional>
179
181
  <optional>
180
182
  <attribute name="to">
181
183
  <data type="IDREF"/>
data/lib/{asciidoctor → metanorma}/un/biblio.rng RENAMED
@@ -209,9 +209,6 @@
209
209
  <zeroOrMore>
210
210
  <ref name="contact"/>
211
211
  </zeroOrMore>
212
- <zeroOrMore>
213
- <ref name="uri"/>
214
- </zeroOrMore>
215
212
  </element>
216
213
  </define>
217
214
  <define name="fullname">
@@ -401,9 +398,9 @@
401
398
  <choice>
402
399
  <!-- iso191606 TODO -->
403
400
  <group>
404
- <oneOrMore>
401
+ <zeroOrMore>
405
402
  <ref name="street"/>
406
- </oneOrMore>
403
+ </zeroOrMore>
407
404
  <ref name="city"/>
408
405
  <optional>
409
406
  <ref name="state"/>
@@ -828,6 +825,11 @@
828
825
  <optional>
829
826
  <attribute name="scope"/>
830
827
  </optional>
828
+ <optional>
829
+ <attribute name="primary">
830
+ <data type="boolean"/>
831
+ </attribute>
832
+ </optional>
831
833
  <text/>
832
834
  </element>
833
835
  </define>
data/lib/{asciidoctor → metanorma}/un/boilerplate.xml RENAMED
File without changes
data/lib/{asciidoctor → metanorma}/un/converter.rb RENAMED
@@ -1,9 +1,9 @@
1
1
  require "asciidoctor"
2
- require "asciidoctor/standoc/converter"
2
+ require "metanorma/standoc/converter"
3
3
  require "fileutils"
4
4
  require_relative "validate"
5
5
 
6
- module Asciidoctor
6
+ module Metanorma
7
7
  module UN
8
8
  class Converter < Standoc::Converter
9
9
  XML_ROOT_TAG = "un-standard".freeze
data/lib/{asciidoctor → metanorma}/un/isodoc.rng RENAMED
@@ -32,6 +32,56 @@
32
32
  <ref name="DocumentType"/>
33
33
  </element>
34
34
  </define>
35
+ <define name="index">
36
+ <element name="index">
37
+ <optional>
38
+ <attribute name="to">
39
+ <data type="IDREF"/>
40
+ </attribute>
41
+ </optional>
42
+ <element name="primary">
43
+ <oneOrMore>
44
+ <choice>
45
+ <ref name="PureTextElement"/>
46
+ <ref name="stem"/>
47
+ </choice>
48
+ </oneOrMore>
49
+ </element>
50
+ <optional>
51
+ <element name="secondary">
52
+ <oneOrMore>
53
+ <choice>
54
+ <ref name="PureTextElement"/>
55
+ <ref name="stem"/>
56
+ </choice>
57
+ </oneOrMore>
58
+ </element>
59
+ </optional>
60
+ <optional>
61
+ <element name="tertiary">
62
+ <oneOrMore>
63
+ <choice>
64
+ <ref name="PureTextElement"/>
65
+ <ref name="stem"/>
66
+ </choice>
67
+ </oneOrMore>
68
+ </element>
69
+ </optional>
70
+ </element>
71
+ </define>
72
+ <define name="bibitem">
73
+ <element name="bibitem">
74
+ <attribute name="id">
75
+ <data type="ID"/>
76
+ </attribute>
77
+ <optional>
78
+ <attribute name="hidden">
79
+ <data type="boolean"/>
80
+ </attribute>
81
+ </optional>
82
+ <ref name="BibliographicItem"/>
83
+ </element>
84
+ </define>
35
85
  <define name="section-title">
36
86
  <element name="title">
37
87
  <zeroOrMore>
@@ -690,6 +740,7 @@
690
740
  <ref name="terms"/>
691
741
  <ref name="term-clause"/>
692
742
  <ref name="definitions"/>
743
+ <ref name="floating-title"/>
693
744
  </choice>
694
745
  </oneOrMore>
695
746
  </element>
@@ -1013,6 +1064,26 @@
1013
1064
  </zeroOrMore>
1014
1065
  </element>
1015
1066
  </define>
1067
+ <define name="sub">
1068
+ <element name="sub">
1069
+ <zeroOrMore>
1070
+ <choice>
1071
+ <ref name="PureTextElement"/>
1072
+ <ref name="stem"/>
1073
+ </choice>
1074
+ </zeroOrMore>
1075
+ </element>
1076
+ </define>
1077
+ <define name="sup">
1078
+ <element name="sup">
1079
+ <zeroOrMore>
1080
+ <choice>
1081
+ <ref name="PureTextElement"/>
1082
+ <ref name="stem"/>
1083
+ </choice>
1084
+ </zeroOrMore>
1085
+ </element>
1086
+ </define>
1016
1087
  <define name="pagebreak">
1017
1088
  <element name="pagebreak">
1018
1089
  <optional>
@@ -1680,6 +1751,7 @@
1680
1751
  <ref name="clause-subsection"/>
1681
1752
  <ref name="terms"/>
1682
1753
  <ref name="definitions"/>
1754
+ <ref name="floating-title"/>
1683
1755
  </choice>
1684
1756
  </oneOrMore>
1685
1757
  </choice>
@@ -1722,6 +1794,7 @@
1722
1794
  <ref name="terms"/>
1723
1795
  <ref name="definitions"/>
1724
1796
  <ref name="references"/>
1797
+ <ref name="floating-title"/>
1725
1798
  </choice>
1726
1799
  </zeroOrMore>
1727
1800
  </group>
@@ -2200,7 +2273,18 @@
2200
2273
  <ref name="MultilingualRenderingType"/>
2201
2274
  </attribute>
2202
2275
  </optional>
2203
- <ref name="paragraph"/>
2276
+ <oneOrMore>
2277
+ <choice>
2278
+ <ref name="formula"/>
2279
+ <ref name="ul"/>
2280
+ <ref name="ol"/>
2281
+ <ref name="dl"/>
2282
+ <ref name="quote"/>
2283
+ <ref name="sourcecode"/>
2284
+ <ref name="paragraph"/>
2285
+ <ref name="figure"/>
2286
+ </choice>
2287
+ </oneOrMore>
2204
2288
  </element>
2205
2289
  </define>
2206
2290
  <define name="termsource">
@@ -2534,4 +2618,17 @@
2534
2618
  </oneOrMore>
2535
2619
  </element>
2536
2620
  </define>
2621
+ <define name="floating-title">
2622
+ <element name="floating-title">
2623
+ <attribute name="id">
2624
+ <data type="ID"/>
2625
+ </attribute>
2626
+ <attribute name="depth">
2627
+ <data type="int"/>
2628
+ </attribute>
2629
+ <zeroOrMore>
2630
+ <ref name="TextElement"/>
2631
+ </zeroOrMore>
2632
+ </element>
2633
+ </define>
2537
2634
  </grammar>
data/lib/{asciidoctor → metanorma}/un/reqt.rng RENAMED
File without changes
data/lib/{asciidoctor → metanorma}/un/un.rng RENAMED
@@ -96,7 +96,10 @@
96
96
  <define name="sections">
97
97
  <element name="sections">
98
98
  <oneOrMore>
99
- <ref name="clause"/>
99
+ <choice>
100
+ <ref name="clause"/>
101
+ <ref name="floating-title"/>
102
+ </choice>
100
103
  </oneOrMore>
101
104
  </element>
102
105
  </define>
@@ -186,6 +189,7 @@
186
189
  <ref name="clause-subsection"/>
187
190
  <ref name="terms"/>
188
191
  <ref name="definitions"/>
192
+ <ref name="floating-title"/>
189
193
  </choice>
190
194
  </zeroOrMore>
191
195
  </group>
@@ -233,6 +237,7 @@
233
237
  <ref name="terms"/>
234
238
  <ref name="definitions"/>
235
239
  <ref name="references"/>
240
+ <ref name="floating-title"/>
236
241
  </choice>
237
242
  </zeroOrMore>
238
243
  </group>
data/lib/{asciidoctor → metanorma}/un/validate.rb RENAMED
@@ -1,4 +1,4 @@
1
- module Asciidoctor
1
+ module Metanorma
2
2
  module UN
3
3
  class Converter < Standoc::Converter
4
4
  def content_validate(doc)
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.7.5".freeze
3
+ VERSION = "0.8.3".freeze
4
4
  end
5
5
  end
data/lib/metanorma/un.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  require "metanorma/un/processor"
2
2
  require "metanorma/un/input"
3
3
  require "metanorma/un/version"
4
+ require "metanorma/un/converter"
4
5
 
5
6
  module Metanorma
6
7
  module UN
data/lib/metanorma-un.rb CHANGED
@@ -1,6 +1,5 @@
1
1
  require "metanorma/un"
2
2
  require "asciidoctor"
3
- require "asciidoctor/un"
4
3
  require "isodoc/un"
5
4
 
6
5
  if defined? Metanorma
data/metanorma-unece.gemspec CHANGED
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
30
30
  spec.add_dependency "roman-numerals"
31
31
  spec.add_dependency "twitter_cldr"
32
32
 
33
- spec.add_dependency "metanorma-standoc", "~> 1.11.0"
33
+ spec.add_dependency "metanorma-standoc", "~> 2.0.0"
34
34
 
35
35
  spec.add_development_dependency "debug"
36
36
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-un
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.5
4
+ version: 0.8.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-12-27 00:00:00.000000000 Z
11
+ date: 2022-02-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.11.0
61
+ version: 2.0.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 1.11.0
68
+ version: 2.0.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: debug
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -228,15 +228,6 @@ files:
228
228
  - bin/console
229
229
  - bin/rspec
230
230
  - bin/setup
231
- - lib/asciidoctor/un.rb
232
- - lib/asciidoctor/un/basicdoc.rng
233
- - lib/asciidoctor/un/biblio.rng
234
- - lib/asciidoctor/un/boilerplate.xml
235
- - lib/asciidoctor/un/converter.rb
236
- - lib/asciidoctor/un/isodoc.rng
237
- - lib/asciidoctor/un/reqt.rng
238
- - lib/asciidoctor/un/un.rng
239
- - lib/asciidoctor/un/validate.rb
240
231
  - lib/isodoc/un.rb
241
232
  - lib/isodoc/un/base_convert.rb
242
233
  - lib/isodoc/un/html/header.html
@@ -269,8 +260,16 @@ files:
269
260
  - lib/metanorma-un.rb
270
261
  - lib/metanorma/un.rb
271
262
  - lib/metanorma/un/UN_emblem_blue.svg
263
+ - lib/metanorma/un/basicdoc.rng
264
+ - lib/metanorma/un/biblio.rng
265
+ - lib/metanorma/un/boilerplate.xml
266
+ - lib/metanorma/un/converter.rb
272
267
  - lib/metanorma/un/input.rb
268
+ - lib/metanorma/un/isodoc.rng
273
269
  - lib/metanorma/un/processor.rb
270
+ - lib/metanorma/un/reqt.rng
271
+ - lib/metanorma/un/un.rng
272
+ - lib/metanorma/un/validate.rb
274
273
  - lib/metanorma/un/version.rb
275
274
  - metanorma-unece.gemspec
276
275
  homepage: https://github.com/metanorma/metanorma-un
data/lib/asciidoctor/un.rb DELETED
@@ -1,7 +0,0 @@
1
- require "asciidoctor/un/converter"
2
-
3
- module Asciidoctor
4
- module UN
5
-
6
- end
7
- end