metanorma-generic 2.1.3 → 2.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/metanorma/generic/converter.rb +1 -1
  3. data/lib/metanorma/generic/isodoc.rng +32 -1
  4. data/lib/metanorma/generic/reqt.rng +1 -1
  5. data/lib/metanorma/generic/version.rb +1 -1
  6. data/metanorma-generic.gemspec +1 -1
  7. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a1ea2cd4613f684350bfa37ff726720ff2e84805ccd32cfde1678fb090834964
4
- data.tar.gz: a37875b2848be73265687de24eaa5ae00b755ae4e353fd36fa0dae88a0e0c29e
3
+ metadata.gz: 59a0bc61bb3f85604409957eca8092b40e2f9e09917bbb147ef5a58beffa196b
4
+ data.tar.gz: 1595b4c89c4ad8f94a10cb47ea2457aa8dbc834951783c5d3af9ff3d8111064a
5
5
  SHA512:
6
- metadata.gz: 1a92438595ed2a5cab6a73ccfb3bda7231c8a36597d7136f24b625a0d01502129a7fcda21ea77671bbef1eb190aa7c74b57cec977b1d935e8bdad31ba4d1b5bb
7
- data.tar.gz: b953cd5e9ff920b0222245901d790d9f50ff2b891c175fb7fc9c3b465f379747e9ac88deeac7737b1263734e8e70fa0f2510172bbff71aa3dab9992513a2bd5c
6
+ metadata.gz: a4c87263e31e78368481797483f20d2aa1c0d6d541d8615343fc45dbac458b3cbf74b284877e2f7cf2c06541756fcb48fbf6cc83434d58137a0f351bc6a1d0bb
7
+ data.tar.gz: 8df5e1ba0be302fcc9a1605eadfa1c6a3c62b500f282c33507ad50d17d517fd21fccb38b3ca344efa14740456bd36095600ea339fac1ac6933c632e4e0014cb2
data/lib/metanorma/generic/converter.rb CHANGED
@@ -65,7 +65,7 @@ module Metanorma
65
65
  elsif configuration&.bibliography_titles&.map(&:downcase)&.include? ret
66
66
  "bibliography"
67
67
  else
68
- ret
68
+ super
69
69
  end
70
70
  end
71
71
 
data/lib/metanorma/generic/isodoc.rng CHANGED
@@ -69,6 +69,17 @@
69
69
  </zeroOrMore>
70
70
  </element>
71
71
  </define>
72
+ <define name="AdmonitionType">
73
+ <choice>
74
+ <value>warning</value>
75
+ <value>note</value>
76
+ <value>tip</value>
77
+ <value>important</value>
78
+ <value>caution</value>
79
+ <value>statement</value>
80
+ <value>editorial</value>
81
+ </choice>
82
+ </define>
72
83
  <define name="index">
73
84
  <element name="index">
74
85
  <optional>
@@ -116,6 +127,11 @@
116
127
  <data type="boolean"/>
117
128
  </attribute>
118
129
  </optional>
130
+ <optional>
131
+ <attribute name="suppress_identifier">
132
+ <data type="boolean"/>
133
+ </attribute>
134
+ </optional>
119
135
  <ref name="BibliographicItem"/>
120
136
  </element>
121
137
  </define>
@@ -1269,7 +1285,12 @@
1269
1285
  </define>
1270
1286
  <define name="span">
1271
1287
  <element name="span">
1272
- <attribute name="class"/>
1288
+ <optional>
1289
+ <attribute name="class"/>
1290
+ </optional>
1291
+ <optional>
1292
+ <attribute name="style"/>
1293
+ </optional>
1273
1294
  <oneOrMore>
1274
1295
  <ref name="TextElement"/>
1275
1296
  </oneOrMore>
@@ -2488,6 +2509,16 @@
2488
2509
  <text/>
2489
2510
  </element>
2490
2511
  </optional>
2512
+ <optional>
2513
+ <element name="amendment">
2514
+ <text/>
2515
+ </element>
2516
+ </optional>
2517
+ <optional>
2518
+ <element name="corrigendum">
2519
+ <text/>
2520
+ </element>
2521
+ </optional>
2491
2522
  <optional>
2492
2523
  <element name="language">
2493
2524
  <text/>
data/lib/metanorma/generic/reqt.rng CHANGED
@@ -108,7 +108,7 @@
108
108
  </element>
109
109
  </define>
110
110
  <define name="label">
111
- <element name="label">
111
+ <element name="identifier">
112
112
  <oneOrMore>
113
113
  <ref name="TextElement"/>
114
114
  </oneOrMore>
data/lib/metanorma/generic/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Generic
3
- VERSION = "2.1.3".freeze
3
+ VERSION = "2.2.0".freeze
4
4
  end
5
5
  end
data/metanorma-generic.gemspec CHANGED
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
27
27
  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
28
28
 
29
29
  spec.add_dependency "htmlentities", "~> 4.3.4"
30
- spec.add_dependency "metanorma-standoc", "~> 2.1.0"
30
+ spec.add_dependency "metanorma-standoc", "~> 2.2.0"
31
31
  spec.add_dependency "ruby-jing"
32
32
 
33
33
  spec.add_development_dependency "debug"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-generic
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.3
4
+ version: 2.2.0
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-06-21 00:00:00.000000000 Z
11
+ date: 2022-08-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 2.1.0
33
+ version: 2.2.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 2.1.0
40
+ version: 2.2.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: ruby-jing
43
43
  requirement: !ruby/object:Gem::Requirement