metanorma-generic 2.2.1.1 → 2.2.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/automerge.yml +31 -0
  3. data/lib/isodoc/generic/init.rb +4 -4
  4. data/lib/isodoc/generic/metadata.rb +1 -1
  5. data/lib/metanorma/generic/basicdoc.rng +0 -27
  6. data/lib/metanorma/generic/biblio.rng +77 -19
  7. data/lib/metanorma/generic/converter.rb +7 -8
  8. data/lib/metanorma/generic/generic.rng +4 -92
  9. data/lib/metanorma/generic/isodoc.rng +31 -194
  10. data/lib/metanorma/generic/version.rb +1 -1
  11. data/metanorma-generic.gemspec +2 -2
  12. metadata +9 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 659bc5b25f106f07e3aa23d3dcb17609ec43f50c7263a1643f6fdd34ff4e166f
4
- data.tar.gz: 63d42dc39e025bd8d2acdae2e7e9aaa79b85bebc3399913a96cf14c08c208123
3
+ metadata.gz: 6819c1980c2e5bbe996be858acfd849ed3a418cf3979bb738cf498616718c74f
4
+ data.tar.gz: 8f2d6e8b5b3a201a10d885fa4278eba17620763c3b6e0141f9997b7024b8ed26
5
5
  SHA512:
6
- metadata.gz: 3ed6e8c02f244e135b3bc169cdef61d420c1e71e82dde98752ec07741d20798c24af59928ee9085708fdd806b1c4d62a408faf9a58761de2a4d209cbf03c865d
7
- data.tar.gz: b253e605a626694a82b1b9ad7aa87ce26c2c9d486eb888f96c4e648c2cc7d4f16781158134097ce80ce3765adb79c347e2eed035e317c3b434c526dd33937c22
6
+ metadata.gz: 38cbc49619136da5fb74eb9316cd0ff649210e785efd6deab3c8fde147dcf2cd259ba8ace98890aa2fe7ad776f0837cd210b818743ebebdd4793b0362c3f395e
7
+ data.tar.gz: fa946993f35f7d43b67e3aa76aa74e874b37392039c92fc1f1a710976a4ea99564f0bb4bcb4090842e7a0c8b647b3f6bc13ed3c28c699dcc00ca1c12aa87724a
data/.github/workflows/automerge.yml ADDED
@@ -0,0 +1,31 @@
1
+ # Auto-generated by Cimas: Do not edit it manually!
2
+ # See https://github.com/metanorma/cimas
3
+ # source: https://github.com/marketplace/actions/merge-pull-requests#usage
4
+ name: automerge
5
+ on:
6
+ pull_request:
7
+ types:
8
+ - labeled
9
+ - unlabeled
10
+ - synchronize
11
+ - opened
12
+ - edited
13
+ - ready_for_review
14
+ - reopened
15
+ - unlocked
16
+ pull_request_review:
17
+ types:
18
+ - submitted
19
+ check_suite:
20
+ types:
21
+ - completed
22
+ status: {}
23
+ jobs:
24
+ automerge:
25
+ runs-on: ubuntu-latest
26
+ steps:
27
+ - id: automerge
28
+ name: automerge
29
+ uses: "pascalgn/automerge-action@v0.15.3"
30
+ env:
31
+ GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
data/lib/isodoc/generic/init.rb CHANGED
@@ -7,8 +7,8 @@ require_relative "utils"
7
7
  module IsoDoc
8
8
  module Generic
9
9
  module Init
10
- def metadata_init(lang, script, i18n)
11
- @meta = Metadata.new(lang, script, i18n)
10
+ def metadata_init(lang, script, locale, i18n)
11
+ @meta = Metadata.new(lang, script, locale, i18n)
12
12
  end
13
13
 
14
14
  def xref_init(lang, script, _klass, i18n, options)
@@ -16,11 +16,11 @@ module IsoDoc
16
16
  @xrefs = Xref.new(lang, script, html, i18n, options)
17
17
  end
18
18
 
19
- def i18n_init(lang, script, i18nyaml = nil)
19
+ def i18n_init(lang, script, locale, i18nyaml = nil)
20
20
  f = Metanorma::Generic.configuration.i18nyaml
21
21
  f = nil unless f.is_a? String
22
22
  @i18n = I18n.new(
23
- lang, script, i18nyaml: i18nyaml || f || @i18nyaml)
23
+ lang, script, locale: locale, i18nyaml: i18nyaml || f || @i18nyaml)
24
24
  end
25
25
 
26
26
  include Utils
data/lib/isodoc/generic/metadata.rb CHANGED
@@ -28,7 +28,7 @@ end
28
28
  module IsoDoc
29
29
  module Generic
30
30
  class Metadata < IsoDoc::Metadata
31
- def initialize(lang, script, labels)
31
+ def initialize(lang, script, locale, labels)
32
32
  super
33
33
  here = File.dirname(__FILE__)
34
34
  default_logo_path =
data/lib/metanorma/generic/basicdoc.rng CHANGED
@@ -1,10 +1,5 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
- <include href="biblio.rng">
4
- <start>
5
- <ref name="document"/>
6
- </start>
7
- </include>
8
3
  <define name="document">
9
4
  <element name="document">
10
5
  <optional>
@@ -1125,26 +1120,4 @@
1125
1120
  </zeroOrMore>
1126
1121
  </element>
1127
1122
  </define>
1128
- <define name="ext">
1129
- <element name="ext">
1130
- <ref name="BibDataExtensionType"/>
1131
- </element>
1132
- </define>
1133
- <define name="BibDataExtensionType">
1134
- <ref name="doctype"/>
1135
- </define>
1136
- <define name="doctype">
1137
- <element name="doctype">
1138
- <ref name="DocumentType"/>
1139
- </element>
1140
- </define>
1141
- <define name="DocumentType">
1142
- <value>document</value>
1143
- </define>
1144
- <define name="BibData">
1145
- <ref name="BibliographicItem"/>
1146
- <optional>
1147
- <ref name="ext"/>
1148
- </optional>
1149
- </define>
1150
1123
  </grammar>
data/lib/metanorma/generic/biblio.rng CHANGED
@@ -33,9 +33,10 @@
33
33
  <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
34
34
  </data>
35
35
  </define>
36
- <start>
37
- <ref name="bibitem"/>
38
- </start>
36
+ <!-- start = bibitem -->
37
+ <define name="BibData">
38
+ <ref name="BibliographicItem"/>
39
+ </define>
39
40
  <define name="status">
40
41
  <element name="status">
41
42
  <ref name="stage"/>
@@ -73,8 +74,14 @@
73
74
  <text/>
74
75
  </element>
75
76
  </define>
76
- <define name="script">
77
+ <define name="locale">
77
78
  <a:documentation>ISO-639</a:documentation>
79
+ <element name="locale">
80
+ <text/>
81
+ </element>
82
+ </define>
83
+ <define name="script">
84
+ <a:documentation>ISO-3166</a:documentation>
78
85
  <element name="script">
79
86
  <text/>
80
87
  </element>
@@ -93,6 +100,9 @@
93
100
  <!-- multiple languages and scripts possible: comma delimit them if so -->
94
101
  <attribute name="language"/>
95
102
  </optional>
103
+ <optional>
104
+ <attribute name="locale"/>
105
+ </optional>
96
106
  <optional>
97
107
  <attribute name="script"/>
98
108
  </optional>
@@ -136,6 +146,9 @@
136
146
  <!-- multiple languages and scripts possible: comma delimit them if so -->
137
147
  <attribute name="language"/>
138
148
  </optional>
149
+ <optional>
150
+ <attribute name="locale"/>
151
+ </optional>
139
152
  <optional>
140
153
  <attribute name="script"/>
141
154
  </optional>
@@ -158,27 +171,25 @@
158
171
  </define>
159
172
  <define name="contributor">
160
173
  <element name="contributor">
161
- <zeroOrMore>
174
+ <oneOrMore>
162
175
  <ref name="role"/>
163
- </zeroOrMore>
176
+ </oneOrMore>
164
177
  <ref name="ContributorInfo"/>
165
178
  </element>
166
179
  </define>
167
180
  <define name="role">
168
181
  <element name="role">
169
- <optional>
170
- <attribute name="type">
171
- <choice>
172
- <value>author</value>
173
- <value>performer</value>
174
- <value>publisher</value>
175
- <value>editor</value>
176
- <value>adapter</value>
177
- <value>translator</value>
178
- <value>distributor</value>
179
- </choice>
180
- </attribute>
181
- </optional>
182
+ <attribute name="type">
183
+ <choice>
184
+ <value>author</value>
185
+ <value>performer</value>
186
+ <value>publisher</value>
187
+ <value>editor</value>
188
+ <value>adapter</value>
189
+ <value>translator</value>
190
+ <value>distributor</value>
191
+ </choice>
192
+ </attribute>
182
193
  <zeroOrMore>
183
194
  <ref name="roledescription"/>
184
195
  </zeroOrMore>
@@ -500,6 +511,17 @@
500
511
  </define>
501
512
  <define name="localityStack">
502
513
  <element name="localityStack">
514
+ <optional>
515
+ <attribute name="connective">
516
+ <choice>
517
+ <value>and</value>
518
+ <value>or</value>
519
+ <value>from</value>
520
+ <value>to</value>
521
+ <value/>
522
+ </choice>
523
+ </attribute>
524
+ </optional>
503
525
  <zeroOrMore>
504
526
  <ref name="locality"/>
505
527
  </zeroOrMore>
@@ -512,6 +534,17 @@
512
534
  </define>
513
535
  <define name="sourceLocalityStack">
514
536
  <element name="sourceLocalityStack">
537
+ <optional>
538
+ <attribute name="connective">
539
+ <choice>
540
+ <value>and</value>
541
+ <value>or</value>
542
+ <value>from</value>
543
+ <value>to</value>
544
+ <value/>
545
+ </choice>
546
+ </attribute>
547
+ </optional>
515
548
  <zeroOrMore>
516
549
  <ref name="sourceLocality"/>
517
550
  </zeroOrMore>
@@ -614,6 +647,9 @@
614
647
  <ref name="BibItemType"/>
615
648
  </attribute>
616
649
  </optional>
650
+ <optional>
651
+ <attribute name="schema-version"/>
652
+ </optional>
617
653
  <optional>
618
654
  <ref name="fetched"/>
619
655
  </optional>
@@ -650,6 +686,9 @@
650
686
  <zeroOrMore>
651
687
  <ref name="language"/>
652
688
  </zeroOrMore>
689
+ <zeroOrMore>
690
+ <ref name="locale"/>
691
+ </zeroOrMore>
653
692
  <zeroOrMore>
654
693
  <ref name="script"/>
655
694
  </zeroOrMore>
@@ -705,6 +744,9 @@
705
744
  <ref name="BibItemType"/>
706
745
  </attribute>
707
746
  </optional>
747
+ <optional>
748
+ <attribute name="schema-version"/>
749
+ </optional>
708
750
  <optional>
709
751
  <ref name="fetched"/>
710
752
  </optional>
@@ -741,6 +783,9 @@
741
783
  <zeroOrMore>
742
784
  <ref name="language"/>
743
785
  </zeroOrMore>
786
+ <zeroOrMore>
787
+ <ref name="locale"/>
788
+ </zeroOrMore>
744
789
  <zeroOrMore>
745
790
  <ref name="script"/>
746
791
  </zeroOrMore>
@@ -854,6 +899,15 @@
854
899
  <optional>
855
900
  <attribute name="type"/>
856
901
  </optional>
902
+ <optional>
903
+ <attribute name="language"/>
904
+ </optional>
905
+ <optional>
906
+ <attribute name="locale"/>
907
+ </optional>
908
+ <optional>
909
+ <attribute name="script"/>
910
+ </optional>
857
911
  <data type="anyURI"/>
858
912
  </define>
859
913
  <define name="DateType">
@@ -882,6 +936,7 @@
882
936
  <value>vote-started</value>
883
937
  <value>vote-ended</value>
884
938
  <value>announced</value>
939
+ <value>stable-until</value>
885
940
  </choice>
886
941
  </define>
887
942
  <define name="bdate">
@@ -930,6 +985,9 @@
930
985
  <optional>
931
986
  <attribute name="language"/>
932
987
  </optional>
988
+ <optional>
989
+ <attribute name="locale"/>
990
+ </optional>
933
991
  <optional>
934
992
  <attribute name="script"/>
935
993
  </optional>
data/lib/metanorma/generic/converter.rb CHANGED
@@ -33,13 +33,12 @@ module Metanorma
33
33
  "{{ organization_name_short }} {{ docnumeric }}"
34
34
  docid = xmldoc.at("//bibdata/docidentifier")
35
35
  id = boilerplate_isodoc(xmldoc).populate_template(template, nil)
36
- id.empty? and docid.remove or docid.children = id
36
+ (id.empty? and docid.remove) or docid.children = id
37
37
  end
38
38
 
39
39
  def doctype(node)
40
40
  d = super
41
- configuration.doctypes or return d == "article" ?
42
- (configuration.default_doctype || "standard") : d
41
+ configuration.doctypes or return d == "article" ? (configuration.default_doctype || "standard") : d
43
42
  type = configuration.default_doctype ||
44
43
  configuration.doctypes.keys.dig(0) || "standard"
45
44
  unless configuration.doctypes.keys.include? d
@@ -56,13 +55,13 @@ module Metanorma
56
55
  end
57
56
 
58
57
  def sectiontype_streamline(ret)
59
- if configuration&.termsdefs_titles&.map(&:downcase)&.include? ret
58
+ if configuration.termsdefs_titles&.map(&:downcase)&.include? ret
60
59
  "terms and definitions"
61
- elsif configuration&.symbols_titles&.map(&:downcase)&.include? ret
60
+ elsif configuration.symbols_titles&.map(&:downcase)&.include? ret
62
61
  "symbols and abbreviated terms"
63
- elsif configuration&.normref_titles&.map(&:downcase)&.include? ret
62
+ elsif configuration.normref_titles&.map(&:downcase)&.include? ret
64
63
  "normative references"
65
- elsif configuration&.bibliography_titles&.map(&:downcase)&.include? ret
64
+ elsif configuration.bibliography_titles&.map(&:downcase)&.include? ret
66
65
  "bibliography"
67
66
  else
68
67
  super
@@ -103,7 +102,7 @@ module Metanorma
103
102
  end
104
103
 
105
104
  def stage_validate(xmldoc)
106
- stages = configuration&.stage_abbreviations&.keys || return
105
+ stages = configuration.stage_abbreviations&.keys || return
107
106
  stages.empty? and return
108
107
  stage = xmldoc&.at("//bibdata/status/stage")&.text
109
108
  stages.include? stage or
data/lib/metanorma/generic/generic.rng CHANGED
@@ -1,95 +1,7 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar ns="https://www.metanorma.org/ns/generic" xmlns="http://relaxng.org/ns/structure/1.0">
3
- <!--
4
- Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
5
- we cannot have a new default namespace: we will end up with a grammar with two different
6
- namespaces, one for isostandard and one for csand additions. And we do not want that.
7
- -->
8
- <include href="isodoc.rng">
9
- <start>
10
- <ref name="generic-standard"/>
11
- </start>
12
- <define name="DocumentType">
13
- <choice>
14
- <value>policy-and-procedures</value>
15
- <value>best-practices</value>
16
- <value>supporting-document</value>
17
- <value>report</value>
18
- <value>legal</value>
19
- <value>directives</value>
20
- <value>proposal</value>
21
- <value>standard</value>
22
- </choice>
23
- </define>
24
- <define name="editorialgroup">
25
- <element name="editorialgroup">
26
- <oneOrMore>
27
- <ref name="committee"/>
28
- </oneOrMore>
29
- </element>
30
- </define>
31
- <define name="BibDataExtensionType">
32
- <optional>
33
- <ref name="doctype"/>
34
- </optional>
35
- <optional>
36
- <ref name="docsubtype"/>
37
- </optional>
38
- <ref name="editorialgroup"/>
39
- <zeroOrMore>
40
- <ref name="ics"/>
41
- </zeroOrMore>
42
- <optional>
43
- <ref name="security"/>
44
- </optional>
45
- </define>
46
- </include>
47
- <define name="committee">
48
- <element name="committee">
49
- <attribute name="type">
50
- <choice>
51
- <value>technical</value>
52
- <value>provisional</value>
53
- </choice>
54
- </attribute>
55
- <text/>
56
- </element>
57
- </define>
58
- <define name="security">
59
- <element name="security">
60
- <text/>
61
- </element>
62
- </define>
63
- <define name="generic-standard">
64
- <element name="generic-standard">
65
- <attribute name="version"/>
66
- <attribute name="type">
67
- <choice>
68
- <value>semantic</value>
69
- <value>presentation</value>
70
- </choice>
71
- </attribute>
72
- <ref name="bibdata"/>
73
- <zeroOrMore>
74
- <ref name="termdocsource"/>
75
- </zeroOrMore>
76
- <optional>
77
- <ref name="misccontainer"/>
78
- </optional>
79
- <optional>
80
- <ref name="boilerplate"/>
81
- </optional>
82
- <ref name="preface"/>
83
- <oneOrMore>
84
- <ref name="sections"/>
85
- </oneOrMore>
86
- <zeroOrMore>
87
- <ref name="annex"/>
88
- </zeroOrMore>
89
- <ref name="bibliography"/>
90
- <zeroOrMore>
91
- <ref name="indexsect"/>
92
- </zeroOrMore>
93
- </element>
94
- </define>
3
+ <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
4
+ <include href="biblio-standoc.rng"/>
5
+ <include href="isodoc.rng"/>
95
6
  </grammar>
7
+ <!-- end overrides -->
data/lib/metanorma/generic/isodoc.rng CHANGED
@@ -19,19 +19,7 @@
19
19
  -->
20
20
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
21
21
  <include href="reqt.rng"/>
22
- <!-- include "biblio.rnc" { } -->
23
22
  <include href="basicdoc.rng">
24
- <start>
25
- <ref name="standard-document"/>
26
- </start>
27
- <define name="doctype">
28
- <element name="doctype">
29
- <optional>
30
- <attribute name="abbreviation"/>
31
- </optional>
32
- <ref name="DocumentType"/>
33
- </element>
34
- </define>
35
23
  <define name="admonition">
36
24
  <element name="admonition">
37
25
  <attribute name="type">
@@ -117,24 +105,6 @@
117
105
  </optional>
118
106
  </element>
119
107
  </define>
120
- <define name="bibitem">
121
- <element name="bibitem">
122
- <attribute name="id">
123
- <data type="ID"/>
124
- </attribute>
125
- <optional>
126
- <attribute name="hidden">
127
- <data type="boolean"/>
128
- </attribute>
129
- </optional>
130
- <optional>
131
- <attribute name="suppress_identifier">
132
- <data type="boolean"/>
133
- </attribute>
134
- </optional>
135
- <ref name="BibliographicItem"/>
136
- </element>
137
- </define>
138
108
  <define name="section-title">
139
109
  <element name="title">
140
110
  <zeroOrMore>
@@ -205,6 +175,15 @@
205
175
  <data type="boolean"/>
206
176
  </attribute>
207
177
  </optional>
178
+ <optional>
179
+ <attribute name="style">
180
+ <choice>
181
+ <value>basic</value>
182
+ <value>full</value>
183
+ <value>short</value>
184
+ </choice>
185
+ </attribute>
186
+ </optional>
208
187
  <ref name="XrefBody"/>
209
188
  </element>
210
189
  </define>
@@ -239,42 +218,6 @@
239
218
  <ref name="PureTextElement"/>
240
219
  </oneOrMore>
241
220
  </define>
242
- <define name="localityStack">
243
- <element name="localityStack">
244
- <optional>
245
- <attribute name="connective">
246
- <choice>
247
- <value>and</value>
248
- <value>or</value>
249
- <value>from</value>
250
- <value>to</value>
251
- <value/>
252
- </choice>
253
- </attribute>
254
- </optional>
255
- <zeroOrMore>
256
- <ref name="locality"/>
257
- </zeroOrMore>
258
- </element>
259
- </define>
260
- <define name="sourceLocalityStack">
261
- <element name="sourceLocalityStack">
262
- <optional>
263
- <attribute name="connective">
264
- <choice>
265
- <value>and</value>
266
- <value>or</value>
267
- <value>from</value>
268
- <value>to</value>
269
- <value/>
270
- </choice>
271
- </attribute>
272
- </optional>
273
- <zeroOrMore>
274
- <ref name="sourceLocality"/>
275
- </zeroOrMore>
276
- </element>
277
- </define>
278
221
  <define name="ul">
279
222
  <element name="ul">
280
223
  <attribute name="id">
@@ -818,21 +761,6 @@
818
761
  </zeroOrMore>
819
762
  </element>
820
763
  </define>
821
- <define name="BibDataExtensionType">
822
- <ref name="doctype"/>
823
- <optional>
824
- <ref name="docsubtype"/>
825
- </optional>
826
- <optional>
827
- <ref name="editorialgroup"/>
828
- </optional>
829
- <zeroOrMore>
830
- <ref name="ics"/>
831
- </zeroOrMore>
832
- <zeroOrMore>
833
- <ref name="structuredidentifier"/>
834
- </zeroOrMore>
835
- </define>
836
764
  <!-- TitleType = text -->
837
765
  <define name="sections">
838
766
  <element name="sections">
@@ -872,7 +800,7 @@
872
800
  <ref name="BasicBlock"/>
873
801
  </zeroOrMore>
874
802
  <zeroOrMore>
875
- <ref name="bibitem"/>
803
+ <ref name="doc_bibitem"/>
876
804
  <zeroOrMore>
877
805
  <ref name="note"/>
878
806
  </zeroOrMore>
@@ -1210,6 +1138,24 @@
1210
1138
  </define>
1211
1139
  </include>
1212
1140
  <!-- end overrides -->
1141
+ <define name="doc_bibitem">
1142
+ <element name="bibitem">
1143
+ <attribute name="id">
1144
+ <data type="ID"/>
1145
+ </attribute>
1146
+ <optional>
1147
+ <attribute name="hidden">
1148
+ <data type="boolean"/>
1149
+ </attribute>
1150
+ </optional>
1151
+ <optional>
1152
+ <attribute name="suppress_identifier">
1153
+ <data type="boolean"/>
1154
+ </attribute>
1155
+ </optional>
1156
+ <ref name="BibliographicItem"/>
1157
+ </element>
1158
+ </define>
1213
1159
  <define name="image" combine="choice">
1214
1160
  <element name="svg">
1215
1161
  <oneOrMore>
@@ -1228,14 +1174,6 @@
1228
1174
  <value>tag</value>
1229
1175
  </choice>
1230
1176
  </define>
1231
- <define name="docsubtype">
1232
- <element name="subdoctype">
1233
- <ref name="DocumentSubtype"/>
1234
- </element>
1235
- </define>
1236
- <define name="DocumentSubtype">
1237
- <text/>
1238
- </define>
1239
1177
  <define name="colgroup">
1240
1178
  <element name="colgroup">
1241
1179
  <oneOrMore>
@@ -1597,45 +1535,6 @@
1597
1535
  </choice>
1598
1536
  </element>
1599
1537
  </define>
1600
- <define name="editorialgroup">
1601
- <element name="editorialgroup">
1602
- <oneOrMore>
1603
- <ref name="technical-committee"/>
1604
- </oneOrMore>
1605
- </element>
1606
- </define>
1607
- <define name="technical-committee">
1608
- <element name="technical-committee">
1609
- <ref name="IsoWorkgroup"/>
1610
- </element>
1611
- </define>
1612
- <define name="IsoWorkgroup">
1613
- <optional>
1614
- <attribute name="number"/>
1615
- </optional>
1616
- <optional>
1617
- <attribute name="type"/>
1618
- </optional>
1619
- <optional>
1620
- <attribute name="identifier"/>
1621
- </optional>
1622
- <optional>
1623
- <attribute name="prefix"/>
1624
- </optional>
1625
- <text/>
1626
- </define>
1627
- <define name="ics">
1628
- <element name="ics">
1629
- <element name="code">
1630
- <text/>
1631
- </element>
1632
- <optional>
1633
- <element name="text">
1634
- <text/>
1635
- </element>
1636
- </optional>
1637
- </element>
1638
- </define>
1639
1538
  <define name="standard-document">
1640
1539
  <element name="standard-document">
1641
1540
  <attribute name="version"/>
@@ -2466,71 +2365,6 @@
2466
2365
  </optional>
2467
2366
  </element>
2468
2367
  </define>
2469
- <define name="structuredidentifier">
2470
- <element name="structuredidentifier">
2471
- <optional>
2472
- <attribute name="type"/>
2473
- </optional>
2474
- <oneOrMore>
2475
- <element name="agency">
2476
- <text/>
2477
- </element>
2478
- </oneOrMore>
2479
- <optional>
2480
- <element name="class">
2481
- <text/>
2482
- </element>
2483
- </optional>
2484
- <element name="docnumber">
2485
- <text/>
2486
- </element>
2487
- <optional>
2488
- <element name="partnumber">
2489
- <text/>
2490
- </element>
2491
- </optional>
2492
- <optional>
2493
- <element name="edition">
2494
- <text/>
2495
- </element>
2496
- </optional>
2497
- <optional>
2498
- <element name="version">
2499
- <text/>
2500
- </element>
2501
- </optional>
2502
- <optional>
2503
- <element name="supplementtype">
2504
- <text/>
2505
- </element>
2506
- </optional>
2507
- <optional>
2508
- <element name="supplementnumber">
2509
- <text/>
2510
- </element>
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>
2522
- <optional>
2523
- <element name="language">
2524
- <text/>
2525
- </element>
2526
- </optional>
2527
- <optional>
2528
- <element name="year">
2529
- <text/>
2530
- </element>
2531
- </optional>
2532
- </element>
2533
- </define>
2534
2368
  <define name="term-clause">
2535
2369
  <element name="clause">
2536
2370
  <optional>
@@ -2804,4 +2638,7 @@
2804
2638
  </attribute>
2805
2639
  </element>
2806
2640
  </define>
2641
+ <start>
2642
+ <ref name="standard-document"/>
2643
+ </start>
2807
2644
  </grammar>
data/lib/metanorma/generic/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Generic
3
- VERSION = "2.2.1.1".freeze
3
+ VERSION = "2.2.3".freeze
4
4
  end
5
5
  end
data/metanorma-generic.gemspec CHANGED
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
11
11
  spec.summary = "Metanorma template gem for customisation."
12
12
  spec.description = <<~DESCRIPTION
13
13
  Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
14
- #{' '}
14
+
15
15
  Formerly known as metanorma-acme
16
16
  DESCRIPTION
17
17
 
@@ -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.2.2"
30
+ spec.add_dependency "metanorma-standoc", "~> 2.2.4"
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.2.1.1
4
+ version: 2.2.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: 2022-09-07 00:00:00.000000000 Z
11
+ date: 2022-10-24 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.2.2
33
+ version: 2.2.4
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.2.2
40
+ version: 2.2.4
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: ruby-jing
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -192,14 +192,17 @@ dependencies:
192
192
  - - "~>"
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0.9'
195
- description: " Metanorma template gem for customisation. This gem is meant to be
196
- customised for any downstream use.\n \n Formerly known as metanorma-acme\n"
195
+ description: |
196
+ Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
197
+
198
+ Formerly known as metanorma-acme
197
199
  email:
198
200
  - open.source@ribose.com
199
201
  executables: []
200
202
  extensions: []
201
203
  extra_rdoc_files: []
202
204
  files:
205
+ - ".github/workflows/automerge.yml"
203
206
  - ".github/workflows/rake.yml"
204
207
  - ".github/workflows/release.yml"
205
208
  - ".gitignore"