metanorma-iho 1.1.2 → 1.1.4

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.
@@ -124,18 +124,6 @@ _bib)
124
124
 
125
125
  def term1(elem); end
126
126
 
127
- # KILL
128
- def termsource1(elem)
129
- elem.parent.nil? and return
130
- while elem&.next_element&.name == "termsource"
131
- elem << "; #{to_xml(elem.next_element.remove.children)}"
132
- end
133
- t = elem.at("./ancestor::xmlns:term") or return
134
- s = l10n(" [#{to_xml(elem.remove.children).strip}]")
135
- defn = t.at(ns(".//definition[last()]")) or return
136
- defn.elements.last << s
137
- end
138
-
139
127
  def termsource1(elem)
140
128
  elem.parent.nil? and return
141
129
  super
@@ -143,8 +131,8 @@ _bib)
143
131
 
144
132
  def termsource_label(elem, sources)
145
133
  elem.at("./ancestor::xmlns:term") or return
146
- elem.replace(l10n("[#{sources}]"))
147
- end
134
+ elem.replace(l10n("[#{sources}]"))
135
+ end
148
136
 
149
137
  def termcleanup(docxml)
150
138
  collapse_term docxml
@@ -162,14 +150,20 @@ _bib)
162
150
  source.remove
163
151
  end
164
152
 
165
- def clausedelim
153
+ def clausedelim
166
154
  ""
167
155
  end
168
156
 
169
- def clause(docxml)
170
- super
171
- docxml.xpath(ns("//executivesummary | //appendix")).each { |x| clause1(x) }
172
- end
157
+ def clause(docxml)
158
+ super
159
+ docxml.xpath(ns("//executivesummary | //appendix")).each do |x|
160
+ clause1(x)
161
+ end
162
+ end
163
+
164
+ def ul_label_list(_elem)
165
+ %w(&#x2022; &#x2014; &#x6f;)
166
+ end
173
167
 
174
168
  include Init
175
169
  end
@@ -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">
@@ -1,37 +1,10 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <grammar ns='https://www.metanorma.org/ns/standoc' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
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
- -->
2
+ <grammar ns='https://www.metanorma.org/ns/standoc' xmlns="http://relaxng.org/ns/structure/1.0">
9
3
  <include href="relaton-iho.rng"/>
10
4
  <include href="isodoc.rng">
11
5
  <define name="annex">
12
6
  <element name="annex">
13
- <optional>
14
- <attribute name="id">
15
- <data type="ID"/>
16
- </attribute>
17
- </optional>
18
- <optional>
19
- <attribute name="language"/>
20
- </optional>
21
- <optional>
22
- <attribute name="script"/>
23
- </optional>
24
- <optional>
25
- <attribute name="inline-header">
26
- <data type="boolean"/>
27
- </attribute>
28
- </optional>
29
- <attribute name="obligation">
30
- <choice>
31
- <value>normative</value>
32
- <value>informative</value>
33
- </choice>
34
- </attribute>
7
+ <ref name="Annex-Section-Attributes"/>
35
8
  <optional>
36
9
  <ref name="section-title"/>
37
10
  </optional>
@@ -53,32 +26,6 @@
53
26
  </zeroOrMore>
54
27
  </element>
55
28
  </define>
56
- <define name="standard-document">
57
- <element name="metanorma">
58
- <ref name="Root-Attributes"/>
59
- <ref name="bibdata"/>
60
- <zeroOrMore>
61
- <ref name="termdocsource"/>
62
- </zeroOrMore>
63
- <optional>
64
- <ref name="misccontainer"/>
65
- </optional>
66
- <optional>
67
- <ref name="boilerplate"/>
68
- </optional>
69
- <ref name="preface"/>
70
- <oneOrMore>
71
- <ref name="sections"/>
72
- </oneOrMore>
73
- <zeroOrMore>
74
- <ref name="annex"/>
75
- </zeroOrMore>
76
- <ref name="bibliography"/>
77
- <zeroOrMore>
78
- <ref name="indexsect"/>
79
- </zeroOrMore>
80
- </element>
81
- </define>
82
29
  </include>
83
30
  <define name="annex-appendix">
84
31
  <element name="appendix">
@@ -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">
@@ -33,15 +36,6 @@
33
36
  </zeroOrMore>
34
37
  </element>
35
38
  </define>
36
- <define name="fn" combine="interleave">
37
- <optional>
38
- <attribute name="hiddenref">
39
- <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
40
- This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
41
- <data type="boolean"/>
42
- </attribute>
43
- </optional>
44
- </define>
45
39
  <define name="index-primary">
46
40
  <element name="primary">
47
41
  <oneOrMore>
@@ -423,6 +417,13 @@ normative or informative references, some split references into sections organiz
423
417
  </oneOrMore>
424
418
  </choice>
425
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>
426
427
  <define name="table-note">
427
428
  <element name="note">
428
429
  <ref name="OptionalId"/>
@@ -485,6 +486,22 @@ gives an explicit page orientation</a:documentation>
485
486
  </define>
486
487
  </include>
487
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>
488
505
  <define name="NumberingAttributes" combine="interleave">
489
506
  <optional>
490
507
  <attribute name="number">
@@ -663,6 +680,13 @@ titlecase, or lowercase</a:documentation>
663
680
  </attribute>
664
681
  </optional>
665
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>
666
690
  <define name="ObligationType">
667
691
  <a:documentation>The force of a clause in a standard document: whether it has normative or informative effect</a:documentation>
668
692
  <choice>
@@ -1177,13 +1201,6 @@ numbers</a:documentation>
1177
1201
  </attribute>
1178
1202
  </optional>
1179
1203
  </define>
1180
- <define name="Basic-Section-Attributes" combine="interleave">
1181
- <optional>
1182
- <attribute name="obligation">
1183
- <ref name="ObligationType"/>
1184
- </attribute>
1185
- </optional>
1186
- </define>
1187
1204
  <define name="reference-clause">
1188
1205
  <a:documentation>References clause with recursive nesting</a:documentation>
1189
1206
  <element name="clause">
@@ -1224,7 +1241,7 @@ numbers</a:documentation>
1224
1241
  </choice>
1225
1242
  </attribute>
1226
1243
  <attribute name="flavor">
1227
- <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>
1228
1245
  </attribute>
1229
1246
  </define>
1230
1247
  <define name="standard-document">
@@ -1234,6 +1251,11 @@ numbers</a:documentation>
1234
1251
  <ref name="bibdata">
1235
1252
  <a:documentation>Bibliographic description of the document itself, expressed in the Relaton model</a:documentation>
1236
1253
  </ref>
1254
+ <zeroOrMore>
1255
+ <ref name="termdocsource">
1256
+ <a:documentation>Source for term definitions in the document</a:documentation>
1257
+ </ref>
1258
+ </zeroOrMore>
1237
1259
  <optional>
1238
1260
  <ref name="misccontainer">
1239
1261
  <a:documentation>Extension point for extraneous elements that need to be added to standards document as data</a:documentation>
@@ -1244,36 +1266,44 @@ numbers</a:documentation>
1244
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>
1245
1267
  </ref>
1246
1268
  </optional>
1269
+ <ref name="DocumentBody"/>
1247
1270
  <optional>
1248
- <ref name="preface">
1249
- <a:documentation>Prefatory sections</a:documentation>
1250
- </ref>
1251
- </optional>
1252
- <ref name="sections">
1253
- <a:documentation>Main body of document</a:documentation>
1254
- </ref>
1255
- <zeroOrMore>
1256
- <ref name="annex">
1257
- <a:documentation>Annex sections</a:documentation>
1258
- </ref>
1259
- </zeroOrMore>
1260
- <optional>
1261
- <ref name="bibliography">
1262
- <a:documentation>Bibliographic sections</a:documentation>
1263
- </ref>
1264
- </optional>
1265
- <zeroOrMore>
1266
- <ref name="indexsect">
1267
- <a:documentation>Index of the document</a:documentation>
1268
- </ref>
1269
- </zeroOrMore>
1270
- <optional>
1271
- <ref name="colophon">
1272
- <a:documentation>Colophon or postface material</a:documentation>
1271
+ <ref name="review-container">
1272
+ <a:documentation>Annotations to the document</a:documentation>
1273
1273
  </ref>
1274
1274
  </optional>
1275
1275
  </element>
1276
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>
1277
1307
  <define name="misccontainer">
1278
1308
  <a:documentation>Elements added to metanorma-extension are open-ended, and constitute source data</a:documentation>
1279
1309
  <element name="metanorma-extension">
@@ -1282,6 +1312,13 @@ numbers</a:documentation>
1282
1312
  </oneOrMore>
1283
1313
  </element>
1284
1314
  </define>
1315
+ <define name="review-container">
1316
+ <element name="review-container">
1317
+ <oneOrMore>
1318
+ <ref name="review"/>
1319
+ </oneOrMore>
1320
+ </element>
1321
+ </define>
1285
1322
  <define name="preface">
1286
1323
  <element name="preface">
1287
1324
  <oneOrMore>
@@ -1581,9 +1618,7 @@ used in document amendments</a:documentation>
1581
1618
  <define name="term">
1582
1619
  <a:documentation>Terminology entry with its definition</a:documentation>
1583
1620
  <element name="term">
1584
- <ref name="OptionalId"/>
1585
- <ref name="LocalizedStringAttributes"/>
1586
- <ref name="BlockAttributes"/>
1621
+ <ref name="TermAttributes"/>
1587
1622
  <oneOrMore>
1588
1623
  <ref name="preferred">
1589
1624
  <a:documentation>One or more names under which the term being defined is canonically known</a:documentation>
@@ -1635,6 +1670,11 @@ used in document amendments</a:documentation>
1635
1670
  </ref>
1636
1671
  </element>
1637
1672
  </define>
1673
+ <define name="TermAttributes">
1674
+ <ref name="OptionalId"/>
1675
+ <ref name="LocalizedStringAttributes"/>
1676
+ <ref name="BlockAttributes"/>
1677
+ </define>
1638
1678
  <define name="preferred">
1639
1679
  <element name="preferred">
1640
1680
  <ref name="Designation"/>
@@ -2296,26 +2336,32 @@ links within an SVG file, so that the SVG file can hyperlink to anchors within t
2296
2336
  </element>
2297
2337
  </define>
2298
2338
  <define name="ul_li">
2299
- <a:documentation>Unorderd list item for standards documents</a:documentation>
2339
+ <a:documentation>Unordered list item for standards documents</a:documentation>
2300
2340
  <element name="li">
2301
2341
  <ref name="OptionalId"/>
2302
- <optional>
2303
- <attribute name="uncheckedcheckbox">
2304
- <a:documentation>Include a checkbox for the list item</a:documentation>
2305
- <data type="boolean"/>
2306
- </attribute>
2307
- </optional>
2308
- <optional>
2309
- <attribute name="checkedcheckbox">
2310
- <a:documentation>Check the checkbox for the list item</a:documentation>
2311
- <data type="boolean"/>
2312
- </attribute>
2313
- </optional>
2314
- <oneOrMore>
2315
- <ref name="BasicBlock"/>
2316
- </oneOrMore>
2342
+ <ref name="UlLiAttributes"/>
2343
+ <ref name="UlLiBody"/>
2317
2344
  </element>
2318
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>
2319
2365
  <define name="floating-title">
2320
2366
  <a:documentation>A floating title, outside of the clause hierarchy of the document</a:documentation>
2321
2367
  <element name="floating-title">