metanorma-generic 3.0.1 → 3.0.2

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: 7b9fbaa1e091c0f6edaa501c80a824e4ff03da4f2298cc0c7eb448b8022559d0
4
- data.tar.gz: 74607e5b5d24376bde715a7e00596265b3d32c1b5b4550608783d089109f813b
3
+ metadata.gz: c10147fe8de1d7fdb1b0ffcd4de3a10c1b960be041369472b856b11450191223
4
+ data.tar.gz: bf0445889f6cd89d423ed952c3662f7c91d85789b79680d94321072dd710a21e
5
5
  SHA512:
6
- metadata.gz: f898b9d663f6619d91ad5d46d7d9e48a656f4c013006124d76b95a992b3ff87821d98fa4eae34aacdcc076c5a31c9b597bf957371d6abcca79c0ca1eb3bf9fa2
7
- data.tar.gz: d29162d79ecfb40d3f4b3655ebb856a48d575b19f727302cf2cad5b9b77c58228e027ce01102af616fc64059da2c7a3d14c6e00ccf66e46d2de6c413304b0e79
6
+ metadata.gz: d376ef3e2f1af9837fe800a2d62663878177c6dcaa427fb54b71da2e4967b5e727f426e35c9134b3b753b023f628931419de33360a669e97aaade5f083e055e8
7
+ data.tar.gz: 9f6f2182063b04321a35d466ca1bc5d230b3a0420e4168419e4ded44d13e222bbce2550beda6214025bb8f019a2c545be15338317f65e13fcd2f55881b8969ff
@@ -382,33 +382,7 @@ in a document (e.g. sourcecode annotations)</a:documentation>
382
382
  <a:documentation>Block intended to capture reviewer comments about some text in the document</a:documentation>
383
383
  <element name="review">
384
384
  <ref name="RequiredId"/>
385
- <attribute name="reviewer">
386
- <a:documentation>The party who has offered the comment</a:documentation>
387
- </attribute>
388
- <optional>
389
- <attribute name="type">
390
- <a:documentation>The type of reviewer comment</a:documentation>
391
- </attribute>
392
- </optional>
393
- <optional>
394
- <attribute name="date">
395
- <a:documentation>The date when the comment was made</a:documentation>
396
- <data type="dateTime"/>
397
- </attribute>
398
- </optional>
399
- <optional>
400
- <attribute name="from">
401
- <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
402
- If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
403
- <data type="IDREF"/>
404
- </attribute>
405
- </optional>
406
- <optional>
407
- <attribute name="to">
408
- <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
409
- <data type="IDREF"/>
410
- </attribute>
411
- </optional>
385
+ <ref name="ReviewAttributes"/>
412
386
  <oneOrMore>
413
387
  <ref name="paragraph">
414
388
  <a:documentation>Reviewer comments content</a:documentation>
@@ -416,6 +390,35 @@ If not provided, the comment applies in the vicinity of the place it has been in
416
390
  </oneOrMore>
417
391
  </element>
418
392
  </define>
393
+ <define name="ReviewAttributes">
394
+ <attribute name="reviewer">
395
+ <a:documentation>The party who has offered the comment</a:documentation>
396
+ </attribute>
397
+ <optional>
398
+ <attribute name="type">
399
+ <a:documentation>The type of reviewer comment</a:documentation>
400
+ </attribute>
401
+ </optional>
402
+ <optional>
403
+ <attribute name="date">
404
+ <a:documentation>The date when the comment was made</a:documentation>
405
+ <data type="dateTime"/>
406
+ </attribute>
407
+ </optional>
408
+ <optional>
409
+ <attribute name="from">
410
+ <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
411
+ If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
412
+ <data type="IDREF"/>
413
+ </attribute>
414
+ </optional>
415
+ <optional>
416
+ <attribute name="to">
417
+ <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
418
+ <data type="IDREF"/>
419
+ </attribute>
420
+ </optional>
421
+ </define>
419
422
  <define name="NumberingAttributes">
420
423
  <optional>
421
424
  <attribute name="unnumbered">
@@ -857,6 +860,7 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
857
860
  <define name="tr">
858
861
  <a:documentation>Sequence of cells to be displayed as a row in a table</a:documentation>
859
862
  <element name="tr">
863
+ <ref name="TrAttributes"/>
860
864
  <oneOrMore>
861
865
  <choice>
862
866
  <ref name="td">
@@ -869,6 +873,9 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
869
873
  </oneOrMore>
870
874
  </element>
871
875
  </define>
876
+ <define name="TrAttributes">
877
+ <empty/>
878
+ </define>
872
879
  <define name="tr-no-id">
873
880
  <a:documentation>Sequence of cells to be displayed as a row in a table: optional ID attributes recursively (for use in Relaton, metadata)</a:documentation>
874
881
  <element name="tr">
@@ -1694,16 +1701,22 @@ which can be bookmarks as well as block or section references</a:documentation>
1694
1701
  <a:documentation>Inline reference to a paragraph or paragraphs, appearing as a footnote.
1695
1702
  The target of a footnote is the location it is embedded in within the text</a:documentation>
1696
1703
  <element name="fn">
1697
- <attribute name="reference">
1698
- <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
1699
- </attribute>
1700
- <oneOrMore>
1701
- <ref name="paragraph">
1702
- <a:documentation>The content of the footnote</a:documentation>
1703
- </ref>
1704
- </oneOrMore>
1704
+ <ref name="FnAttributes"/>
1705
+ <ref name="FnBody"/>
1705
1706
  </element>
1706
1707
  </define>
1708
+ <define name="FnBody">
1709
+ <oneOrMore>
1710
+ <ref name="paragraph">
1711
+ <a:documentation>The content of the footnote</a:documentation>
1712
+ </ref>
1713
+ </oneOrMore>
1714
+ </define>
1715
+ <define name="FnAttributes">
1716
+ <attribute name="reference">
1717
+ <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
1718
+ </attribute>
1719
+ </define>
1707
1720
  <define name="callout">
1708
1721
  <a:documentation>Inline reference to a paragraph or paragraphs, appearing as annotation of source code</a:documentation>
1709
1722
  <element name="callout">
@@ -1,13 +1,14 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
3
- <!--
4
- Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
5
- of relaton
6
-
7
- Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
8
- (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
9
- -->
10
3
  <include href="biblio.rng">
4
+ <!-- ALERT: we cannot have comments on root element, as they intervene with https://github.com/metanorma/metanorma/issues/437 fix -->
5
+ <!--
6
+ Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
7
+ of relaton
8
+
9
+ Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
10
+ (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
11
+ -->
11
12
  <define name="BibData">
12
13
  <a:documentation>The bibliographic description of a standardisation document</a:documentation>
13
14
  <ref name="StandardBibliographicItem"/>
@@ -91,6 +92,9 @@ a standards definition organization</a:documentation>
91
92
  <a:documentation>Representation of the identifier for the standardisation document, giving its individual semantic components</a:documentation>
92
93
  </ref>
93
94
  </zeroOrMore>
95
+ <ref name="DocumentImages">
96
+ <a:documentation>Coverpage and other images to be rendered with document</a:documentation>
97
+ </ref>
94
98
  </define>
95
99
  <define name="doctype">
96
100
  <a:documentation>Classification of the standardisation document</a:documentation>
@@ -268,6 +272,32 @@ and not those document components</a:documentation>
268
272
  </optional>
269
273
  </element>
270
274
  </define>
275
+ <define name="DocumentImages">
276
+ <zeroOrMore>
277
+ <element name="coverpage-image">
278
+ <a:documentation>Images to be displayed on the coverpage of the document</a:documentation>
279
+ <ref name="image-no-id"/>
280
+ </element>
281
+ </zeroOrMore>
282
+ <zeroOrMore>
283
+ <element name="innercoverpage-image">
284
+ <a:documentation>Images to be displayed on the inner coverpage of the document</a:documentation>
285
+ <ref name="image-no-id"/>
286
+ </element>
287
+ </zeroOrMore>
288
+ <zeroOrMore>
289
+ <element name="tocside-image">
290
+ <a:documentation>Images to be displayed on the Table of Contents page of the document</a:documentation>
291
+ <ref name="image-no-id"/>
292
+ </element>
293
+ </zeroOrMore>
294
+ <zeroOrMore>
295
+ <element name="backpage-image">
296
+ <a:documentation>Images to be displayed on the backpage of the document</a:documentation>
297
+ <ref name="image-no-id"/>
298
+ </element>
299
+ </zeroOrMore>
300
+ </define>
271
301
  <define name="StandardBibliographicItem">
272
302
  <ref name="BibliographicItem"/>
273
303
  <zeroOrMore>
@@ -1,23 +1,25 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!--
3
- instantiations of this grammar may replace leaf strings
4
- with more elaborated types; e.g. title (text) replaced with
5
- title-main, title-intro, title-part; type replaced with
6
- enum.
7
-
8
- some renaming at leaf nodes is permissible
9
-
10
- obligations can change both from optional to mandatory,
11
- and from mandatory to optional; optional elements may
12
- be omitted; freely positioned alternatives may be replaced
13
- with strict ordering
14
-
15
- DO NOT introduce a namespace here. We do not want a distinct namespace
16
- for these elements, and a distinct namespace for any grammar inheriting
17
- these elements; we just want one namespace for any child grammars
18
- of this.
19
- -->
20
2
  <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">
3
+ <!--
4
+ ALERT: we cannot have comments on root element, as they intervene with https://github.com/metanorma/metanorma/issues/437 fix
5
+
6
+ Instantiations of this grammar may replace leaf strings
7
+ with more elaborated types; e.g. title (text) replaced with
8
+ title-main, title-intro, title-part; type replaced with
9
+ enum.
10
+
11
+ Some renaming at leaf nodes is permissible
12
+
13
+ Obligations can change both from optional to mandatory,
14
+ and from mandatory to optional; optional elements may
15
+ be omitted; freely positioned alternatives may be replaced
16
+ with strict ordering
17
+
18
+ DO NOT introduce a namespace here. We do not want a distinct namespace
19
+ for these elements, and a distinct namespace for any grammar inheriting
20
+ these elements; we just want one namespace for any child grammars
21
+ of this.
22
+ -->
21
23
  <!--
22
24
  https://www.myintervals.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
23
25
  iso8601date = xsd:string { pattern = "([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([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])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?" }
@@ -1241,6 +1243,11 @@ Refer to `BibliographicItem` for definitions</a:documentation>
1241
1243
  </define>
1242
1244
  <define name="formattedref">
1243
1245
  <element name="formattedref">
1246
+ <optional>
1247
+ <attribute name="format">
1248
+ <a:documentation>format of formatted reference; Metanorma assumes references are formatted as Metanorma XML</a:documentation>
1249
+ </attribute>
1250
+ </optional>
1244
1251
  <oneOrMore>
1245
1252
  <ref name="TextElement"/>
1246
1253
  </oneOrMore>
@@ -1812,6 +1819,11 @@ May be used to differentiate rendering of notes in bibliographies</a:documentati
1812
1819
  <a:documentation>Abstract of bibliographic item</a:documentation>
1813
1820
  <element name="abstract">
1814
1821
  <ref name="LocalizedStringAttributes"/>
1822
+ <optional>
1823
+ <attribute name="format">
1824
+ <a:documentation>What format the formatted abstract is in. In Metanorma, assumed to be Metanorma XML</a:documentation>
1825
+ </attribute>
1826
+ </optional>
1815
1827
  <choice>
1816
1828
  <oneOrMore>
1817
1829
  <ref name="BasicBlockNoId">
@@ -8,22 +8,11 @@ require "pathname"
8
8
  module Metanorma
9
9
  module Generic
10
10
  class Converter < Standoc::Converter
11
- XML_ROOT_TAG = "generic-standard".freeze
12
- XML_NAMESPACE = "https://www.metanorma.org/ns/generic".freeze
13
-
14
11
  register_for "generic"
15
12
 
16
- #def xml_root_tag
17
- #configuration.xml_root_tag || XML_ROOT_TAG
18
- #end
19
- #
20
- #def xml_namespace
21
- #configuration.document_namespace || XML_NAMESPACE
22
- #end
23
-
24
13
  def baselocation(loc)
25
14
  loc.nil? and return nil
26
- return loc
15
+ loc
27
16
  end
28
17
 
29
18
  def docidentifier_cleanup(xmldoc)
@@ -46,7 +35,7 @@ module Metanorma
46
35
  end
47
36
  type = @default_doctype || configuration.doctypes.keys[0]
48
37
  if !configuration.doctypes.key?(d)
49
- (node.attr("doctype") && node.attr("doctype") != "article") and # factory default
38
+ node.attr("doctype") && node.attr("doctype") != "article" and # factory default
50
39
  @log.add("Document Attributes", nil,
51
40
  "#{d} is not a legal document type: reverting to '#{type}'")
52
41
  d = type
@@ -98,11 +87,13 @@ module Metanorma
98
87
  nil, false, "#{@filename}.pdf")
99
88
  end
100
89
 
101
- def validate(doc)
102
- content_validate(doc)
103
- schema_validate(formattedstr_strip(doc.dup),
104
- baselocation(configuration.validate_rng_file) ||
105
- File.join(File.dirname(__FILE__), "generic.rng"))
90
+ def schema_location
91
+ baselocation(configuration.validate_rng_file) ||
92
+ File.join(File.dirname(__FILE__), "generic.rng")
93
+ end
94
+
95
+ def schema_file
96
+ configuration.validate_rng_file || "generic.rng"
106
97
  end
107
98
 
108
99
  def content_validate(doc)
@@ -118,7 +109,7 @@ module Metanorma
118
109
  def stage_validate(xmldoc)
119
110
  stages = configuration.stage_abbreviations&.keys || return
120
111
  stages.empty? and return
121
- stage = xmldoc&.at("//bibdata/status/stage")&.text
112
+ stage = xmldoc.at("//bibdata/status/stage")&.text
122
113
  stages.include? stage or
123
114
  @log.add("Document Attributes", nil,
124
115
  "#{stage} is not a recognised status")
@@ -150,7 +141,8 @@ module Metanorma
150
141
  def presentation_xml_converter(node)
151
142
  IsoDoc::Generic::PresentationXMLConvert
152
143
  .new(html_extract_attributes(node)
153
- .merge(output_formats: ::Metanorma::Generic::Processor.new.output_formats))
144
+ .merge(output_formats: ::Metanorma::Generic::Processor.new
145
+ .output_formats))
154
146
  end
155
147
 
156
148
  alias_method :pdf_converter, :html_converter
@@ -1,11 +1,5 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar ns='https://www.metanorma.org/ns/standoc' xmlns="http://relaxng.org/ns/structure/1.0">
3
- <!--
4
- VERSION v1.2.1
5
- Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
6
- we cannot have a new default namespace: we will end up with a grammar with two different
7
- namespaces, one for isostandard and one for csand additions. And we do not want that.
8
- -->
9
3
  <include href="biblio-standoc.rng"/>
10
4
  <include href="isodoc.rng">
11
5
  <define name="standard-document">
@@ -1,24 +1,27 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!--
3
- instantiations of this grammar may replace leaf strings
4
- with more elaborated types; e.g. title (text) replaced with
5
- title-main, title-intro, title-part; type replaced with
6
- enum.
7
-
8
- some renaming at leaf nodes is permissible
9
-
10
- obligations can change both from optional to mandatory,
11
- and from mandatory to optional; optional elements may
12
- be omitted; freely positioned alternatives may be replaced
13
- with strict ordering
14
-
15
- DO NOT introduce a namespace here. We do not want a distinct namespace
16
- for these elements, and a distinct namespace for any grammar inheriting
17
- these elements; we just want one namespace for any child grammars
18
- of this.
19
- -->
20
- <!-- VERSION v2.0.0 -->
21
2
  <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">
3
+ <!-- VERSION v2.0.3 -->
4
+
5
+ <!--
6
+ ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
7
+
8
+ instantiations of this grammar may replace leaf strings
9
+ with more elaborated types; e.g. title (text) replaced with
10
+ title-main, title-intro, title-part; type replaced with
11
+ enum.
12
+
13
+ some renaming at leaf nodes is permissible
14
+
15
+ obligations can change both from optional to mandatory,
16
+ and from mandatory to optional; optional elements may
17
+ be omitted; freely positioned alternatives may be replaced
18
+ with strict ordering
19
+
20
+ DO NOT introduce a namespace here. We do not want a distinct namespace
21
+ for these elements, and a distinct namespace for any grammar inheriting
22
+ these elements; we just want one namespace for any child grammars
23
+ of this.
24
+ -->
22
25
  <include href="reqt.rng"/>
23
26
  <include href="basicdoc.rng">
24
27
  <define name="amend">
@@ -414,6 +417,13 @@ normative or informative references, some split references into sections organiz
414
417
  </oneOrMore>
415
418
  </choice>
416
419
  </define>
420
+ <define name="TrAttributes">
421
+ <optional>
422
+ <attribute name="style">
423
+ <a:documentation>CSS style: only background-color supported</a:documentation>
424
+ </attribute>
425
+ </optional>
426
+ </define>
417
427
  <define name="table-note">
418
428
  <element name="note">
419
429
  <ref name="OptionalId"/>
@@ -476,6 +486,22 @@ gives an explicit page orientation</a:documentation>
476
486
  </define>
477
487
  </include>
478
488
  <!-- end overrides -->
489
+ <define name="FnAttributes" combine="interleave">
490
+ <optional>
491
+ <attribute name="hiddenref">
492
+ <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
493
+ This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
494
+ <data type="boolean"/>
495
+ </attribute>
496
+ </optional>
497
+ </define>
498
+ <define name="TdAttributes" combine="interleave">
499
+ <optional>
500
+ <attribute name="style">
501
+ <a:documentation>CSS style: only background-color supported</a:documentation>
502
+ </attribute>
503
+ </optional>
504
+ </define>
479
505
  <define name="NumberingAttributes" combine="interleave">
480
506
  <optional>
481
507
  <attribute name="number">
@@ -654,6 +680,13 @@ titlecase, or lowercase</a:documentation>
654
680
  </attribute>
655
681
  </optional>
656
682
  </define>
683
+ <define name="Basic-Section-Attributes" combine="interleave">
684
+ <optional>
685
+ <attribute name="obligation">
686
+ <ref name="ObligationType"/>
687
+ </attribute>
688
+ </optional>
689
+ </define>
657
690
  <define name="ObligationType">
658
691
  <a:documentation>The force of a clause in a standard document: whether it has normative or informative effect</a:documentation>
659
692
  <choice>
@@ -1168,13 +1201,6 @@ numbers</a:documentation>
1168
1201
  </attribute>
1169
1202
  </optional>
1170
1203
  </define>
1171
- <define name="Basic-Section-Attributes" combine="interleave">
1172
- <optional>
1173
- <attribute name="obligation">
1174
- <ref name="ObligationType"/>
1175
- </attribute>
1176
- </optional>
1177
- </define>
1178
1204
  <define name="reference-clause">
1179
1205
  <a:documentation>References clause with recursive nesting</a:documentation>
1180
1206
  <element name="clause">
@@ -1215,7 +1241,7 @@ numbers</a:documentation>
1215
1241
  </choice>
1216
1242
  </attribute>
1217
1243
  <attribute name="flavor">
1218
- <a:documentation>Metanorma flavor, indicating SDO whose requiremnts the realisation aligns to</a:documentation>
1244
+ <a:documentation>Metanorma flavor, indicating SDO whose requirements the realisation aligns to</a:documentation>
1219
1245
  </attribute>
1220
1246
  </define>
1221
1247
  <define name="standard-document">
@@ -1225,6 +1251,11 @@ numbers</a:documentation>
1225
1251
  <ref name="bibdata">
1226
1252
  <a:documentation>Bibliographic description of the document itself, expressed in the Relaton model</a:documentation>
1227
1253
  </ref>
1254
+ <zeroOrMore>
1255
+ <ref name="termdocsource">
1256
+ <a:documentation>Source for term definitions in the document</a:documentation>
1257
+ </ref>
1258
+ </zeroOrMore>
1228
1259
  <optional>
1229
1260
  <ref name="misccontainer">
1230
1261
  <a:documentation>Extension point for extraneous elements that need to be added to standards document as data</a:documentation>
@@ -1235,36 +1266,44 @@ numbers</a:documentation>
1235
1266
  <a:documentation>Front matter that is repeated at the start of documents issued from an SDO, with content not specific to the document</a:documentation>
1236
1267
  </ref>
1237
1268
  </optional>
1269
+ <ref name="DocumentBody"/>
1238
1270
  <optional>
1239
- <ref name="preface">
1240
- <a:documentation>Prefatory sections</a:documentation>
1241
- </ref>
1242
- </optional>
1243
- <ref name="sections">
1244
- <a:documentation>Main body of document</a:documentation>
1245
- </ref>
1246
- <zeroOrMore>
1247
- <ref name="annex">
1248
- <a:documentation>Annex sections</a:documentation>
1249
- </ref>
1250
- </zeroOrMore>
1251
- <optional>
1252
- <ref name="bibliography">
1253
- <a:documentation>Bibliographic sections</a:documentation>
1254
- </ref>
1255
- </optional>
1256
- <zeroOrMore>
1257
- <ref name="indexsect">
1258
- <a:documentation>Index of the document</a:documentation>
1259
- </ref>
1260
- </zeroOrMore>
1261
- <optional>
1262
- <ref name="colophon">
1263
- <a:documentation>Colophon or postface material</a:documentation>
1271
+ <ref name="review-container">
1272
+ <a:documentation>Annotations to the document</a:documentation>
1264
1273
  </ref>
1265
1274
  </optional>
1266
1275
  </element>
1267
1276
  </define>
1277
+ <define name="DocumentBody">
1278
+ <optional>
1279
+ <ref name="preface">
1280
+ <a:documentation>Prefatory sections</a:documentation>
1281
+ </ref>
1282
+ </optional>
1283
+ <ref name="sections">
1284
+ <a:documentation>Main body of document</a:documentation>
1285
+ </ref>
1286
+ <zeroOrMore>
1287
+ <ref name="annex">
1288
+ <a:documentation>Annex sections</a:documentation>
1289
+ </ref>
1290
+ </zeroOrMore>
1291
+ <optional>
1292
+ <ref name="bibliography">
1293
+ <a:documentation>Bibliographic sections</a:documentation>
1294
+ </ref>
1295
+ </optional>
1296
+ <zeroOrMore>
1297
+ <ref name="indexsect">
1298
+ <a:documentation>Index of the document</a:documentation>
1299
+ </ref>
1300
+ </zeroOrMore>
1301
+ <optional>
1302
+ <ref name="colophon">
1303
+ <a:documentation>Colophon or postface material</a:documentation>
1304
+ </ref>
1305
+ </optional>
1306
+ </define>
1268
1307
  <define name="misccontainer">
1269
1308
  <a:documentation>Elements added to metanorma-extension are open-ended, and constitute source data</a:documentation>
1270
1309
  <element name="metanorma-extension">
@@ -1273,6 +1312,13 @@ numbers</a:documentation>
1273
1312
  </oneOrMore>
1274
1313
  </element>
1275
1314
  </define>
1315
+ <define name="review-container">
1316
+ <element name="review-container">
1317
+ <oneOrMore>
1318
+ <ref name="review"/>
1319
+ </oneOrMore>
1320
+ </element>
1321
+ </define>
1276
1322
  <define name="preface">
1277
1323
  <element name="preface">
1278
1324
  <oneOrMore>
@@ -1572,9 +1618,7 @@ used in document amendments</a:documentation>
1572
1618
  <define name="term">
1573
1619
  <a:documentation>Terminology entry with its definition</a:documentation>
1574
1620
  <element name="term">
1575
- <ref name="OptionalId"/>
1576
- <ref name="LocalizedStringAttributes"/>
1577
- <ref name="BlockAttributes"/>
1621
+ <ref name="TermAttributes"/>
1578
1622
  <oneOrMore>
1579
1623
  <ref name="preferred">
1580
1624
  <a:documentation>One or more names under which the term being defined is canonically known</a:documentation>
@@ -1626,6 +1670,11 @@ used in document amendments</a:documentation>
1626
1670
  </ref>
1627
1671
  </element>
1628
1672
  </define>
1673
+ <define name="TermAttributes">
1674
+ <ref name="OptionalId"/>
1675
+ <ref name="LocalizedStringAttributes"/>
1676
+ <ref name="BlockAttributes"/>
1677
+ </define>
1629
1678
  <define name="preferred">
1630
1679
  <element name="preferred">
1631
1680
  <ref name="Designation"/>
@@ -2287,26 +2336,32 @@ links within an SVG file, so that the SVG file can hyperlink to anchors within t
2287
2336
  </element>
2288
2337
  </define>
2289
2338
  <define name="ul_li">
2290
- <a:documentation>Unorderd list item for standards documents</a:documentation>
2339
+ <a:documentation>Unordered list item for standards documents</a:documentation>
2291
2340
  <element name="li">
2292
2341
  <ref name="OptionalId"/>
2293
- <optional>
2294
- <attribute name="uncheckedcheckbox">
2295
- <a:documentation>Include a checkbox for the list item</a:documentation>
2296
- <data type="boolean"/>
2297
- </attribute>
2298
- </optional>
2299
- <optional>
2300
- <attribute name="checkedcheckbox">
2301
- <a:documentation>Check the checkbox for the list item</a:documentation>
2302
- <data type="boolean"/>
2303
- </attribute>
2304
- </optional>
2305
- <oneOrMore>
2306
- <ref name="BasicBlock"/>
2307
- </oneOrMore>
2342
+ <ref name="UlLiAttributes"/>
2343
+ <ref name="UlLiBody"/>
2308
2344
  </element>
2309
2345
  </define>
2346
+ <define name="UlLiBody">
2347
+ <oneOrMore>
2348
+ <ref name="BasicBlock"/>
2349
+ </oneOrMore>
2350
+ </define>
2351
+ <define name="UlLiAttributes">
2352
+ <optional>
2353
+ <attribute name="uncheckedcheckbox">
2354
+ <a:documentation>Include a checkbox for the list item</a:documentation>
2355
+ <data type="boolean"/>
2356
+ </attribute>
2357
+ </optional>
2358
+ <optional>
2359
+ <attribute name="checkedcheckbox">
2360
+ <a:documentation>Check the checkbox for the list item</a:documentation>
2361
+ <data type="boolean"/>
2362
+ </attribute>
2363
+ </optional>
2364
+ </define>
2310
2365
  <define name="floating-title">
2311
2366
  <a:documentation>A floating title, outside of the clause hierarchy of the document</a:documentation>
2312
2367
  <element name="floating-title">
@@ -1,5 +1,11 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <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">
3
+ <define name="requirement">
4
+ <element name="requirement">
5
+ <ref name="RequirementType"/>
6
+ </element>
7
+ </define>
8
+ <!-- ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437 -->
3
9
  <!--
4
10
  Presupposes isodoc.rnc, is included in it
5
11
  include "isodoc.rnc" { }
@@ -7,14 +13,9 @@
7
13
  This is the Metanorma default provisions model; it is overridden by other provisions models,
8
14
  such as Modspec
9
15
  -->
10
- <define name="requirement">
16
+ <define name="recommendation">
11
17
  <a:documentation>Specification of an attribute of a subject that is required.
12
18
  NOTE: A requirement can contain other requirements</a:documentation>
13
- <element name="requirement">
14
- <ref name="RequirementType"/>
15
- </element>
16
- </define>
17
- <define name="recommendation">
18
19
  <a:documentation>Specification of an attribute of a subject that is recommended</a:documentation>
19
20
  <element name="recommendation">
20
21
  <ref name="RequirementType"/>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Generic
3
- VERSION = "3.0.1".freeze
3
+ VERSION = "3.0.2".freeze
4
4
  end
5
5
  end
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: 3.0.1
4
+ version: 3.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-03-04 00:00:00.000000000 Z
11
+ date: 2025-04-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc