relaton-nist 0.8.2 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/grammars/basicdoc.rng +12 -55
  3. data/grammars/biblio.rng +109 -44
  4. data/grammars/isodoc.rng +575 -28
  5. data/grammars/isostandard.rng +137 -472
  6. data/grammars/nist.rng +98 -139
  7. data/lib/relaton_nist/nist_bibliography.rb +18 -14
  8. data/lib/relaton_nist/scrapper.rb +8 -8
  9. data/lib/relaton_nist/version.rb +1 -1
  10. data/relaton_nist.gemspec +2 -2
  11. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 805836254764292ed3a420817f46d40e53514dcea92ce8f806aa2b0723332da8
4
- data.tar.gz: 31d8735c928d99d28ea3c09802beb22553848d74fd111c616d8b530eff695629
3
+ metadata.gz: 2f8ebd25c3d58d4680e06a0e3deea8771165830e754b8bdba7efa33e11438ae9
4
+ data.tar.gz: 49039dee4164341953e7d3f4b0c886f25a568987e88d63656057dbb4733cb30c
5
5
  SHA512:
6
- metadata.gz: 9395ced7ec09e9fdb1d7d4474af0f10bde4da961f0152ff5321403a04358062698363a3ecdf3b16e2986cc25ab99a0df1f047c0277a6d33d40f1fda9edd8a98a
7
- data.tar.gz: 16fbec11a1da3c7deb5bd87428456c43d9ed77001b3a52aa376315c58898181c7fbcc10acfedac46e1651790e17ac64c66aca0e9c454715185e747a0ebf21a5d
6
+ metadata.gz: 6e5021613582dfbd5ae9ece8a805d436e86e917f0041d6d6584f6955fd6f7c6b52c6e9e93ba3ed821f6adfc4d7789001eabcbe06863a82ec29b89f681b4ac87f
7
+ data.tar.gz: a2ad1bffcbfe3bc948d63d3b0d9ffc2b287a344fa6baf9f62e4fc672dc8b3bdacd4ff3c5ef669cf1325dbf5c4a994a468fbcc187624353d00dc84e2a67fa19ff
data/grammars/basicdoc.rng CHANGED
@@ -1,9 +1,9 @@
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"/>
3
4
  <start>
4
5
  <ref name="document"/>
5
6
  </start>
6
- <include href="biblio.rng" />
7
7
  <define name="document">
8
8
  <element name="document">
9
9
  <optional>
@@ -42,12 +42,6 @@
42
42
  <data type="ID"/>
43
43
  </attribute>
44
44
  </optional>
45
- <optional>
46
- <attribute name="language"/>
47
- </optional>
48
- <optional>
49
- <attribute name="script"/>
50
- </optional>
51
45
  <optional>
52
46
  <ref name="section-title"/>
53
47
  </optional>
@@ -194,14 +188,6 @@
194
188
  <data type="boolean"/>
195
189
  </attribute>
196
190
  </optional>
197
- <optional>
198
- <attribute name="subsequence"/>
199
- </optional>
200
- <optional>
201
- <attribute name="inequality">
202
- <data type="boolean"/>
203
- </attribute>
204
- </optional>
205
191
  <ref name="stem"/>
206
192
  <optional>
207
193
  <ref name="dl"/>
@@ -255,9 +241,6 @@
255
241
  <data type="boolean"/>
256
242
  </attribute>
257
243
  </optional>
258
- <optional>
259
- <attribute name="subsequence"/>
260
- </optional>
261
244
  <optional>
262
245
  <attribute name="lang"/>
263
246
  </optional>
@@ -302,15 +285,9 @@
302
285
  <data type="boolean"/>
303
286
  </attribute>
304
287
  </optional>
305
- <optional>
306
- <attribute name="subsequence"/>
307
- </optional>
308
288
  <optional>
309
289
  <attribute name="alt"/>
310
290
  </optional>
311
- <optional>
312
- <attribute name="summary"/>
313
- </optional>
314
291
  <optional>
315
292
  <attribute name="uri">
316
293
  <data type="anyURI"/>
@@ -336,9 +313,12 @@
336
313
  </define>
337
314
  <define name="tname">
338
315
  <element name="name">
339
- <oneOrMore>
340
- <ref name="PureTextElement"/>
341
- </oneOrMore>
316
+ <text/>
317
+ </element>
318
+ </define>
319
+ <define name="tclass">
320
+ <element name="name">
321
+ <text/>
342
322
  </element>
343
323
  </define>
344
324
  <define name="thead">
@@ -437,12 +417,6 @@
437
417
  <data type="boolean"/>
438
418
  </attribute>
439
419
  </optional>
440
- <optional>
441
- <attribute name="subsequence"/>
442
- </optional>
443
- <optional>
444
- <ref name="tname"/>
445
- </optional>
446
420
  <oneOrMore>
447
421
  <choice>
448
422
  <ref name="formula"/>
@@ -506,26 +480,18 @@
506
480
  <data type="boolean"/>
507
481
  </attribute>
508
482
  </optional>
509
- <optional>
510
- <attribute name="subsequence"/>
511
- </optional>
512
- <optional>
513
- <attribute name="class"/>
514
- </optional>
515
483
  <optional>
516
484
  <ref name="source"/>
517
485
  </optional>
518
486
  <optional>
519
487
  <ref name="tname"/>
520
488
  </optional>
489
+ <optional>
490
+ <ref name="tclass"/>
491
+ </optional>
521
492
  <choice>
522
493
  <ref name="image"/>
523
- <ref name="video"/>
524
- <ref name="audio"/>
525
494
  <ref name="pre"/>
526
- <oneOrMore>
527
- <ref name="paragraph-with-footnote"/>
528
- </oneOrMore>
529
495
  <zeroOrMore>
530
496
  <ref name="figure"/>
531
497
  </zeroOrMore>
@@ -812,9 +778,6 @@
812
778
  <optional>
813
779
  <attribute name="alt"/>
814
780
  </optional>
815
- <optional>
816
- <attribute name="title"/>
817
- </optional>
818
781
  <optional>
819
782
  <attribute name="longdesc">
820
783
  <data type="anyURI"/>
@@ -823,7 +786,7 @@
823
786
  </element>
824
787
  </define>
825
788
  <define name="video">
826
- <element name="video">
789
+ <element name="image">
827
790
  <attribute name="id">
828
791
  <data type="ID"/>
829
792
  </attribute>
@@ -853,9 +816,6 @@
853
816
  <optional>
854
817
  <attribute name="alt"/>
855
818
  </optional>
856
- <optional>
857
- <attribute name="title"/>
858
- </optional>
859
819
  <optional>
860
820
  <attribute name="longdesc">
861
821
  <data type="anyURI"/>
@@ -867,7 +827,7 @@
867
827
  </element>
868
828
  </define>
869
829
  <define name="audio">
870
- <element name="audio">
830
+ <element name="image">
871
831
  <attribute name="id">
872
832
  <data type="ID"/>
873
833
  </attribute>
@@ -881,9 +841,6 @@
881
841
  <optional>
882
842
  <attribute name="alt"/>
883
843
  </optional>
884
- <optional>
885
- <attribute name="title"/>
886
- </optional>
887
844
  <optional>
888
845
  <attribute name="longdesc">
889
846
  <data type="anyURI"/>
data/grammars/biblio.rng CHANGED
@@ -49,11 +49,17 @@
49
49
  </define>
50
50
  <define name="stage">
51
51
  <element name="stage">
52
+ <optional>
53
+ <attribute name="abbreviation"/>
54
+ </optional>
52
55
  <text/>
53
56
  </element>
54
57
  </define>
55
58
  <define name="substage">
56
59
  <element name="substage">
60
+ <optional>
61
+ <attribute name="abbreviation"/>
62
+ </optional>
57
63
  <text/>
58
64
  </element>
59
65
  </define>
@@ -452,9 +458,14 @@
452
458
  <attribute name="bibitemid">
453
459
  <data type="IDREF"/>
454
460
  </attribute>
455
- <zeroOrMore>
456
- <ref name="locality"/>
457
- </zeroOrMore>
461
+ <choice>
462
+ <zeroOrMore>
463
+ <ref name="locality"/>
464
+ </zeroOrMore>
465
+ <zeroOrMore>
466
+ <ref name="localityStack"/>
467
+ </zeroOrMore>
468
+ </choice>
458
469
  <optional>
459
470
  <ref name="date"/>
460
471
  </optional>
@@ -469,6 +480,25 @@
469
480
  <ref name="BibItemLocality"/>
470
481
  </element>
471
482
  </define>
483
+ <define name="localityStack">
484
+ <element name="localityStack">
485
+ <zeroOrMore>
486
+ <ref name="locality"/>
487
+ </zeroOrMore>
488
+ </element>
489
+ </define>
490
+ <define name="sourceLocality">
491
+ <element name="sourceLocality">
492
+ <ref name="BibItemLocality"/>
493
+ </element>
494
+ </define>
495
+ <define name="sourceLocalityStack">
496
+ <element name="sourceLocalityStack">
497
+ <zeroOrMore>
498
+ <ref name="sourceLocality"/>
499
+ </zeroOrMore>
500
+ </element>
501
+ </define>
472
502
  <define name="BibItemLocality">
473
503
  <attribute name="type">
474
504
  <ref name="LocalityType"/>
@@ -703,21 +733,11 @@
703
733
  </define>
704
734
  <define name="TypedTitleString">
705
735
  <optional>
706
- <attribute name="type">
707
- <ref name="TitleType"/>
708
- </attribute>
736
+ <attribute name="type"/>
709
737
  </optional>
710
738
  <ref name="FormattedString"/>
711
739
  </define>
712
- <define name="TitleType">
713
- <choice>
714
- <value>alternative</value>
715
- <value>original</value>
716
- <value>unofficial</value>
717
- <value>subtitle</value>
718
- <value>main</value>
719
- </choice>
720
- </define>
740
+ <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
721
741
  <define name="TypedUri">
722
742
  <optional>
723
743
  <attribute name="type"/>
@@ -747,6 +767,8 @@
747
767
  <value>unchanged</value>
748
768
  <value>circulated</value>
749
769
  <value>adapted</value>
770
+ <value>vote-started</value>
771
+ <value>vote-ended</value>
750
772
  </choice>
751
773
  </define>
752
774
  <define name="bdate">
@@ -999,38 +1021,63 @@
999
1021
  </define>
1000
1022
  <define name="DocRelationType">
1001
1023
  <choice>
1002
- <value>obsoletes</value>
1003
- <value>obsoletedBy</value>
1004
- <value>supersedes</value>
1005
- <value>supersededBy</value>
1006
- <value>updates</value>
1007
- <value>updatedBy</value>
1008
- <value>complements</value>
1009
- <value>derivedFrom</value>
1010
- <value>translatedFrom</value>
1011
- <value>hasTranslation</value>
1012
- <value>adoptedFrom</value>
1013
- <value>equivalent</value>
1014
- <value>identical</value>
1015
- <value>nonequivalent</value>
1016
- <value>includedIn</value>
1017
1024
  <value>includes</value>
1018
- <value>instance</value>
1019
- <value>instanceOf</value>
1020
- <value>partOf</value>
1025
+ <value>includedIn</value>
1021
1026
  <value>hasPart</value>
1022
- <value>hasDraft</value>
1023
- <value>draftOf</value>
1027
+ <value>partOf</value>
1024
1028
  <value>merges</value>
1029
+ <value>mergedInto</value>
1025
1030
  <value>splits</value>
1026
- <value>amends</value>
1027
- <value>amendedBy</value>
1028
- <value>corrects</value>
1029
- <value>correctedBy</value>
1030
- <value>revises</value>
1031
- <value>revisedBy</value>
1031
+ <value>splitInto</value>
1032
+ <value>instance</value>
1033
+ <value>hasInstance</value>
1034
+ <value>exemplarOf</value>
1035
+ <value>hasExemplar</value>
1036
+ <value>manifestationOf</value>
1037
+ <value>hasManifestation</value>
1038
+ <value>reproductionOf</value>
1039
+ <value>hasReproduction</value>
1040
+ <value>reprintOf</value>
1041
+ <value>hasReprint</value>
1042
+ <value>expressionOf</value>
1043
+ <value>hasExpression</value>
1044
+ <value>translatedFrom</value>
1045
+ <value>hasTranslation</value>
1046
+ <value>arrangementOf</value>
1047
+ <value>hasArrangement</value>
1048
+ <value>abridgementOf</value>
1049
+ <value>hasAbridgement</value>
1050
+ <value>annotationOf</value>
1051
+ <value>hasAnnotation</value>
1052
+ <value>draftOf</value>
1053
+ <value>hasDraft</value>
1054
+ <value>editionOf</value>
1055
+ <value>hasEdition</value>
1056
+ <value>updates</value>
1057
+ <value>updatedBy</value>
1058
+ <value>derivedFrom</value>
1059
+ <value>derives</value>
1032
1060
  <value>describes</value>
1033
1061
  <value>describedBy</value>
1062
+ <value>catalogues</value>
1063
+ <value>cataloguedBy</value>
1064
+ <value>hasSuccessor</value>
1065
+ <value>successorOf</value>
1066
+ <value>adaptedFrom</value>
1067
+ <value>hasAdaptation</value>
1068
+ <value>adoptedFrom</value>
1069
+ <value>adoptedAs</value>
1070
+ <value>reviewOf</value>
1071
+ <value>hasReview</value>
1072
+ <value>commentaryOf</value>
1073
+ <value>hasCommentary</value>
1074
+ <value>related</value>
1075
+ <value>complements</value>
1076
+ <value>complementOf</value>
1077
+ <value>obsoletes</value>
1078
+ <value>obsoletedBy</value>
1079
+ <value>cited</value>
1080
+ <value>isCitedIn</value>
1034
1081
  </choice>
1035
1082
  </define>
1036
1083
  <define name="docrelation">
@@ -1038,12 +1085,30 @@
1038
1085
  <attribute name="type">
1039
1086
  <ref name="DocRelationType"/>
1040
1087
  </attribute>
1088
+ <optional>
1089
+ <element name="description">
1090
+ <ref name="FormattedString"/>
1091
+ </element>
1092
+ </optional>
1041
1093
  <element name="bibitem">
1042
1094
  <ref name="BibliographicItem"/>
1043
1095
  </element>
1044
- <zeroOrMore>
1045
- <ref name="locality"/>
1046
- </zeroOrMore>
1096
+ <choice>
1097
+ <zeroOrMore>
1098
+ <ref name="locality"/>
1099
+ </zeroOrMore>
1100
+ <zeroOrMore>
1101
+ <ref name="localityStack"/>
1102
+ </zeroOrMore>
1103
+ </choice>
1104
+ <choice>
1105
+ <zeroOrMore>
1106
+ <ref name="sourceLocality"/>
1107
+ </zeroOrMore>
1108
+ <zeroOrMore>
1109
+ <ref name="sourceLocalityStack"/>
1110
+ </zeroOrMore>
1111
+ </choice>
1047
1112
  </element>
1048
1113
  </define>
1049
1114
  <define name="version">
data/grammars/isodoc.rng CHANGED
@@ -24,21 +24,91 @@
24
24
  <start>
25
25
  <ref name="standard-document"/>
26
26
  </start>
27
+ <define name="hyperlink">
28
+ <element name="link">
29
+ <attribute name="target">
30
+ <data type="anyURI"/>
31
+ </attribute>
32
+ <optional>
33
+ <attribute name="type">
34
+ <ref name="ReferenceFormat"/>
35
+ </attribute>
36
+ </optional>
37
+ <optional>
38
+ <attribute name="alt"/>
39
+ </optional>
40
+ <text/>
41
+ </element>
42
+ </define>
43
+ <define name="xref">
44
+ <element name="xref">
45
+ <attribute name="target">
46
+ <data type="IDREF"/>
47
+ </attribute>
48
+ <optional>
49
+ <attribute name="type">
50
+ <ref name="ReferenceFormat"/>
51
+ </attribute>
52
+ </optional>
53
+ <optional>
54
+ <attribute name="alt"/>
55
+ </optional>
56
+ <text/>
57
+ </element>
58
+ </define>
59
+ <define name="example">
60
+ <element name="example">
61
+ <attribute name="id">
62
+ <data type="ID"/>
63
+ </attribute>
64
+ <optional>
65
+ <attribute name="unnumbered">
66
+ <data type="boolean"/>
67
+ </attribute>
68
+ </optional>
69
+ <optional>
70
+ <attribute name="subsequence"/>
71
+ </optional>
72
+ <optional>
73
+ <ref name="tname"/>
74
+ </optional>
75
+ <oneOrMore>
76
+ <choice>
77
+ <ref name="formula"/>
78
+ <ref name="ul"/>
79
+ <ref name="ol"/>
80
+ <ref name="dl"/>
81
+ <ref name="quote"/>
82
+ <ref name="sourcecode"/>
83
+ <ref name="paragraph-with-footnote"/>
84
+ <ref name="figure"/>
85
+ </choice>
86
+ </oneOrMore>
87
+ <zeroOrMore>
88
+ <ref name="note"/>
89
+ </zeroOrMore>
90
+ </element>
91
+ </define>
27
92
  <define name="BibDataExtensionType">
28
93
  <ref name="doctype"/>
94
+ <optional>
95
+ <ref name="editorialgroup"/>
96
+ </optional>
97
+ <zeroOrMore>
98
+ <ref name="ics"/>
99
+ </zeroOrMore>
29
100
  <zeroOrMore>
30
101
  <ref name="structuredidentifier"/>
31
102
  </zeroOrMore>
32
103
  </define>
33
- <define name="TitleType">
34
- <text/>
35
- </define>
104
+ <!-- TitleType = text -->
36
105
  <define name="sections">
37
106
  <element name="sections">
38
107
  <oneOrMore>
39
108
  <choice>
40
109
  <ref name="clause"/>
41
110
  <ref name="terms"/>
111
+ <ref name="term-clause"/>
42
112
  <ref name="definitions"/>
43
113
  </choice>
44
114
  </oneOrMore>
@@ -51,21 +121,303 @@
51
121
  <data type="ID"/>
52
122
  </attribute>
53
123
  </optional>
124
+ <optional>
125
+ <attribute name="obligation">
126
+ <choice>
127
+ <value>normative</value>
128
+ <value>informative</value>
129
+ </choice>
130
+ </attribute>
131
+ </optional>
132
+ <attribute name="normative">
133
+ <data type="boolean"/>
134
+ </attribute>
54
135
  <optional>
55
136
  <ref name="section-title"/>
56
137
  </optional>
57
138
  <zeroOrMore>
58
139
  <ref name="BasicBlock"/>
59
140
  </zeroOrMore>
141
+ <zeroOrMore>
142
+ <ref name="note"/>
143
+ </zeroOrMore>
60
144
  <zeroOrMore>
61
145
  <ref name="bibitem"/>
62
146
  <zeroOrMore>
63
147
  <ref name="note"/>
64
148
  </zeroOrMore>
65
149
  </zeroOrMore>
150
+ <zeroOrMore>
151
+ <ref name="references"/>
152
+ </zeroOrMore>
153
+ </element>
154
+ </define>
155
+ <define name="note">
156
+ <element name="note">
157
+ <attribute name="id">
158
+ <data type="ID"/>
159
+ </attribute>
160
+ <oneOrMore>
161
+ <choice>
162
+ <ref name="paragraph"/>
163
+ <ref name="ul"/>
164
+ <ref name="ol"/>
165
+ <ref name="dl"/>
166
+ <ref name="formula"/>
167
+ </choice>
168
+ </oneOrMore>
169
+ </element>
170
+ </define>
171
+ <define name="Basic-Section">
172
+ <optional>
173
+ <attribute name="id">
174
+ <data type="ID"/>
175
+ </attribute>
176
+ </optional>
177
+ <optional>
178
+ <attribute name="language"/>
179
+ </optional>
180
+ <optional>
181
+ <attribute name="script"/>
182
+ </optional>
183
+ <optional>
184
+ <attribute name="obligation">
185
+ <choice>
186
+ <value>normative</value>
187
+ <value>informative</value>
188
+ </choice>
189
+ </attribute>
190
+ </optional>
191
+ <optional>
192
+ <ref name="section-title"/>
193
+ </optional>
194
+ <group>
195
+ <oneOrMore>
196
+ <ref name="BasicBlock"/>
197
+ </oneOrMore>
198
+ <zeroOrMore>
199
+ <ref name="note"/>
200
+ </zeroOrMore>
201
+ </group>
202
+ </define>
203
+ <define name="li">
204
+ <element name="li">
205
+ <group>
206
+ <optional>
207
+ <attribute name="id">
208
+ <data type="ID"/>
209
+ </attribute>
210
+ </optional>
211
+ <oneOrMore>
212
+ <ref name="BasicBlock"/>
213
+ </oneOrMore>
214
+ </group>
215
+ <!-- exclude figures? -->
216
+ </element>
217
+ </define>
218
+ <define name="dd">
219
+ <element name="dd">
220
+ <zeroOrMore>
221
+ <!-- exclude figures? -->
222
+ <ref name="BasicBlock"/>
223
+ </zeroOrMore>
224
+ </element>
225
+ </define>
226
+ <define name="thead">
227
+ <element name="thead">
228
+ <oneOrMore>
229
+ <ref name="tr"/>
230
+ </oneOrMore>
231
+ </element>
232
+ </define>
233
+ <define name="td">
234
+ <element name="td">
235
+ <optional>
236
+ <attribute name="colspan"/>
237
+ </optional>
238
+ <optional>
239
+ <attribute name="rowspan"/>
240
+ </optional>
241
+ <optional>
242
+ <attribute name="align">
243
+ <choice>
244
+ <value>left</value>
245
+ <value>right</value>
246
+ <value>center</value>
247
+ </choice>
248
+ </attribute>
249
+ </optional>
250
+ <choice>
251
+ <zeroOrMore>
252
+ <choice>
253
+ <ref name="TextElement"/>
254
+ <ref name="fn"/>
255
+ </choice>
256
+ </zeroOrMore>
257
+ <oneOrMore>
258
+ <choice>
259
+ <ref name="paragraph-with-footnote"/>
260
+ <ref name="dl"/>
261
+ <ref name="ul"/>
262
+ <ref name="ol"/>
263
+ <ref name="figure"/>
264
+ </choice>
265
+ </oneOrMore>
266
+ </choice>
267
+ </element>
268
+ </define>
269
+ <define name="th">
270
+ <element name="th">
271
+ <optional>
272
+ <attribute name="colspan"/>
273
+ </optional>
274
+ <optional>
275
+ <attribute name="rowspan"/>
276
+ </optional>
277
+ <optional>
278
+ <attribute name="align">
279
+ <choice>
280
+ <value>left</value>
281
+ <value>right</value>
282
+ <value>center</value>
283
+ </choice>
284
+ </attribute>
285
+ </optional>
286
+ <choice>
287
+ <zeroOrMore>
288
+ <choice>
289
+ <ref name="TextElement"/>
290
+ <ref name="fn"/>
291
+ </choice>
292
+ </zeroOrMore>
293
+ <oneOrMore>
294
+ <ref name="paragraph-with-footnote"/>
295
+ </oneOrMore>
296
+ </choice>
297
+ </element>
298
+ </define>
299
+ <define name="table-note">
300
+ <element name="note">
301
+ <optional>
302
+ <attribute name="id">
303
+ <data type="ID"/>
304
+ </attribute>
305
+ </optional>
306
+ <ref name="paragraph"/>
66
307
  </element>
67
308
  </define>
68
309
  </include>
310
+ <!-- end overrides -->
311
+ <define name="TextElement" combine="choice">
312
+ <ref name="concept"/>
313
+ </define>
314
+ <define name="concept">
315
+ <element name="concept">
316
+ <optional>
317
+ <attribute name="term"/>
318
+ </optional>
319
+ <choice>
320
+ <ref name="eref"/>
321
+ <ref name="xref"/>
322
+ <ref name="termref"/>
323
+ </choice>
324
+ </element>
325
+ </define>
326
+ <define name="BasicBlock" combine="choice">
327
+ <choice>
328
+ <ref name="requirement"/>
329
+ <ref name="recommendation"/>
330
+ <ref name="permission"/>
331
+ </choice>
332
+ </define>
333
+ <define name="bibliography">
334
+ <element name="bibliography">
335
+ <oneOrMore>
336
+ <choice>
337
+ <ref name="references"/>
338
+ <ref name="reference-clause"/>
339
+ </choice>
340
+ </oneOrMore>
341
+ </element>
342
+ </define>
343
+ <define name="reference-clause">
344
+ <element name="clause">
345
+ <optional>
346
+ <attribute name="id">
347
+ <data type="ID"/>
348
+ </attribute>
349
+ </optional>
350
+ <optional>
351
+ <attribute name="language"/>
352
+ </optional>
353
+ <optional>
354
+ <attribute name="script"/>
355
+ </optional>
356
+ <optional>
357
+ <attribute name="inline-header">
358
+ <data type="boolean"/>
359
+ </attribute>
360
+ </optional>
361
+ <optional>
362
+ <attribute name="obligation">
363
+ <choice>
364
+ <value>normative</value>
365
+ <value>informative</value>
366
+ </choice>
367
+ </attribute>
368
+ </optional>
369
+ <optional>
370
+ <ref name="section-title"/>
371
+ </optional>
372
+ <zeroOrMore>
373
+ <ref name="BasicBlock"/>
374
+ </zeroOrMore>
375
+ <zeroOrMore>
376
+ <ref name="note"/>
377
+ </zeroOrMore>
378
+ <choice>
379
+ <oneOrMore>
380
+ <ref name="reference-clause"/>
381
+ </oneOrMore>
382
+ <zeroOrMore>
383
+ <ref name="references"/>
384
+ </zeroOrMore>
385
+ </choice>
386
+ </element>
387
+ </define>
388
+ <define name="editorialgroup">
389
+ <element name="editorialgroup">
390
+ <oneOrMore>
391
+ <ref name="technical-committee"/>
392
+ </oneOrMore>
393
+ </element>
394
+ </define>
395
+ <define name="technical-committee">
396
+ <element name="technical-committee">
397
+ <ref name="IsoWorkgroup"/>
398
+ </element>
399
+ </define>
400
+ <define name="IsoWorkgroup">
401
+ <optional>
402
+ <attribute name="number">
403
+ <data type="int"/>
404
+ </attribute>
405
+ </optional>
406
+ <optional>
407
+ <attribute name="type"/>
408
+ </optional>
409
+ <text/>
410
+ </define>
411
+ <define name="ics">
412
+ <element name="ics">
413
+ <element name="code">
414
+ <text/>
415
+ </element>
416
+ <element name="text">
417
+ <text/>
418
+ </element>
419
+ </element>
420
+ </define>
69
421
  <define name="standard-document">
70
422
  <element name="standard-document">
71
423
  <ref name="bibdata"/>
@@ -89,7 +441,7 @@
89
441
  <oneOrMore>
90
442
  <choice>
91
443
  <ref name="content"/>
92
- <ref name="abstract"/>
444
+ <ref name="preface_abstract"/>
93
445
  <ref name="foreword"/>
94
446
  <ref name="introduction"/>
95
447
  <ref name="acknowledgements"/>
@@ -156,6 +508,14 @@
156
508
  <optional>
157
509
  <attribute name="script"/>
158
510
  </optional>
511
+ <optional>
512
+ <attribute name="obligation">
513
+ <choice>
514
+ <value>normative</value>
515
+ <value>informative</value>
516
+ </choice>
517
+ </attribute>
518
+ </optional>
159
519
  <optional>
160
520
  <ref name="section-title"/>
161
521
  </optional>
@@ -163,6 +523,9 @@
163
523
  <zeroOrMore>
164
524
  <ref name="BasicBlock"/>
165
525
  </zeroOrMore>
526
+ <zeroOrMore>
527
+ <ref name="note"/>
528
+ </zeroOrMore>
166
529
  <ref name="dl"/>
167
530
  </oneOrMore>
168
531
  </element>
@@ -202,22 +565,35 @@
202
565
  <optional>
203
566
  <attribute name="script"/>
204
567
  </optional>
568
+ <optional>
569
+ <attribute name="inline-header">
570
+ <data type="boolean"/>
571
+ </attribute>
572
+ </optional>
573
+ <optional>
574
+ <attribute name="obligation">
575
+ <choice>
576
+ <value>normative</value>
577
+ <value>informative</value>
578
+ </choice>
579
+ </attribute>
580
+ </optional>
205
581
  <optional>
206
582
  <ref name="section-title"/>
207
583
  </optional>
208
- <choice>
584
+ <group>
209
585
  <group>
210
- <optional>
586
+ <zeroOrMore>
211
587
  <ref name="BasicBlock"/>
212
- </optional>
588
+ </zeroOrMore>
213
589
  <zeroOrMore>
214
590
  <ref name="note"/>
215
591
  </zeroOrMore>
216
592
  </group>
217
- <oneOrMore>
593
+ <zeroOrMore>
218
594
  <ref name="content-subsection"/>
219
- </oneOrMore>
220
- </choice>
595
+ </zeroOrMore>
596
+ </group>
221
597
  </define>
222
598
  <define name="clause">
223
599
  <element name="clause">
@@ -239,32 +615,97 @@
239
615
  <optional>
240
616
  <attribute name="script"/>
241
617
  </optional>
618
+ <optional>
619
+ <attribute name="inline-header">
620
+ <data type="boolean"/>
621
+ </attribute>
622
+ </optional>
623
+ <optional>
624
+ <attribute name="obligation">
625
+ <choice>
626
+ <value>normative</value>
627
+ <value>informative</value>
628
+ </choice>
629
+ </attribute>
630
+ </optional>
242
631
  <optional>
243
632
  <ref name="section-title"/>
244
633
  </optional>
245
- <choice>
634
+ <group>
246
635
  <group>
247
- <optional>
636
+ <zeroOrMore>
248
637
  <ref name="BasicBlock"/>
249
- </optional>
638
+ </zeroOrMore>
250
639
  <zeroOrMore>
251
640
  <ref name="note"/>
252
641
  </zeroOrMore>
253
642
  </group>
254
- <oneOrMore>
643
+ <zeroOrMore>
255
644
  <choice>
256
645
  <ref name="clause-subsection"/>
257
646
  <ref name="terms"/>
258
647
  <ref name="definitions"/>
259
648
  </choice>
260
- </oneOrMore>
261
- </choice>
649
+ </zeroOrMore>
650
+ </group>
651
+ </define>
652
+ <define name="Annex-Section">
653
+ <optional>
654
+ <attribute name="id">
655
+ <data type="ID"/>
656
+ </attribute>
657
+ </optional>
658
+ <optional>
659
+ <attribute name="language"/>
660
+ </optional>
661
+ <optional>
662
+ <attribute name="script"/>
663
+ </optional>
664
+ <optional>
665
+ <attribute name="inline-header">
666
+ <data type="boolean"/>
667
+ </attribute>
668
+ </optional>
669
+ <optional>
670
+ <attribute name="obligation">
671
+ <choice>
672
+ <value>normative</value>
673
+ <value>informative</value>
674
+ </choice>
675
+ </attribute>
676
+ </optional>
677
+ <optional>
678
+ <ref name="section-title"/>
679
+ </optional>
680
+ <group>
681
+ <group>
682
+ <zeroOrMore>
683
+ <ref name="BasicBlock"/>
684
+ </zeroOrMore>
685
+ <zeroOrMore>
686
+ <ref name="note"/>
687
+ </zeroOrMore>
688
+ </group>
689
+ <zeroOrMore>
690
+ <choice>
691
+ <ref name="annex-subsection"/>
692
+ <ref name="terms"/>
693
+ <ref name="definitions"/>
694
+ <ref name="references"/>
695
+ </choice>
696
+ </zeroOrMore>
697
+ </group>
262
698
  </define>
263
699
  <define name="clause-subsection">
264
700
  <element name="clause">
265
701
  <ref name="Clause-Section"/>
266
702
  </element>
267
703
  </define>
704
+ <define name="annex-subsection">
705
+ <element name="clause">
706
+ <ref name="Annex-Section"/>
707
+ </element>
708
+ </define>
268
709
  <define name="annex">
269
710
  <element name="annex">
270
711
  <optional>
@@ -278,6 +719,11 @@
278
719
  <optional>
279
720
  <attribute name="script"/>
280
721
  </optional>
722
+ <optional>
723
+ <attribute name="inline-header">
724
+ <data type="boolean"/>
725
+ </attribute>
726
+ </optional>
281
727
  <attribute name="obligation">
282
728
  <choice>
283
729
  <value>normative</value>
@@ -287,19 +733,24 @@
287
733
  <optional>
288
734
  <ref name="section-title"/>
289
735
  </optional>
290
- <choice>
736
+ <group>
291
737
  <group>
292
- <optional>
738
+ <zeroOrMore>
293
739
  <ref name="BasicBlock"/>
294
- </optional>
740
+ </zeroOrMore>
295
741
  <zeroOrMore>
296
742
  <ref name="note"/>
297
743
  </zeroOrMore>
298
744
  </group>
299
- <oneOrMore>
300
- <ref name="clause-subsection"/>
301
- </oneOrMore>
302
- </choice>
745
+ <zeroOrMore>
746
+ <choice>
747
+ <ref name="annex-subsection"/>
748
+ <ref name="terms"/>
749
+ <ref name="definitions"/>
750
+ <ref name="references"/>
751
+ </choice>
752
+ </zeroOrMore>
753
+ </group>
303
754
  </element>
304
755
  </define>
305
756
  <define name="terms">
@@ -315,12 +766,36 @@
315
766
  <optional>
316
767
  <attribute name="script"/>
317
768
  </optional>
769
+ <optional>
770
+ <attribute name="obligation">
771
+ <choice>
772
+ <value>normative</value>
773
+ <value>informative</value>
774
+ </choice>
775
+ </attribute>
776
+ </optional>
777
+ <optional>
778
+ <ref name="section-title"/>
779
+ </optional>
318
780
  <zeroOrMore>
319
781
  <ref name="BasicBlock"/>
320
782
  </zeroOrMore>
321
- <oneOrMore>
322
- <ref name="term"/>
323
- </oneOrMore>
783
+ <zeroOrMore>
784
+ <ref name="note"/>
785
+ </zeroOrMore>
786
+ <choice>
787
+ <oneOrMore>
788
+ <ref name="term"/>
789
+ </oneOrMore>
790
+ <group>
791
+ <zeroOrMore>
792
+ <ref name="terms"/>
793
+ </zeroOrMore>
794
+ <optional>
795
+ <ref name="definitions"/>
796
+ </optional>
797
+ </group>
798
+ </choice>
324
799
  </element>
325
800
  </define>
326
801
  <define name="term">
@@ -413,7 +888,13 @@
413
888
  </define>
414
889
  <define name="definition">
415
890
  <element name="definition">
416
- <ref name="paragraph"/>
891
+ <oneOrMore>
892
+ <choice>
893
+ <ref name="paragraph"/>
894
+ <ref name="figure"/>
895
+ <ref name="formula"/>
896
+ </choice>
897
+ </oneOrMore>
417
898
  </element>
418
899
  </define>
419
900
  <define name="termnote">
@@ -448,7 +929,10 @@
448
929
  </define>
449
930
  <define name="origin">
450
931
  <element name="origin">
451
- <ref name="erefType"/>
932
+ <choice>
933
+ <ref name="erefType"/>
934
+ <ref name="termref"/>
935
+ </choice>
452
936
  </element>
453
937
  </define>
454
938
  <define name="modification">
@@ -456,6 +940,15 @@
456
940
  <ref name="paragraph"/>
457
941
  </element>
458
942
  </define>
943
+ <define name="termref">
944
+ <element name="termref">
945
+ <attribute name="base"/>
946
+ <attribute name="target"/>
947
+ <optional>
948
+ <text/>
949
+ </optional>
950
+ </element>
951
+ </define>
459
952
  <define name="structuredidentifier">
460
953
  <element name="structuredidentifier">
461
954
  <optional>
@@ -511,4 +1004,58 @@
511
1004
  </optional>
512
1005
  </element>
513
1006
  </define>
1007
+ <define name="preface_abstract">
1008
+ <element name="abstract">
1009
+ <ref name="Basic-Section"/>
1010
+ </element>
1011
+ </define>
1012
+ <define name="term-clause">
1013
+ <element name="clause">
1014
+ <optional>
1015
+ <attribute name="id">
1016
+ <data type="ID"/>
1017
+ </attribute>
1018
+ </optional>
1019
+ <optional>
1020
+ <attribute name="language"/>
1021
+ </optional>
1022
+ <optional>
1023
+ <attribute name="script"/>
1024
+ </optional>
1025
+ <optional>
1026
+ <attribute name="inline-header">
1027
+ <data type="boolean"/>
1028
+ </attribute>
1029
+ </optional>
1030
+ <optional>
1031
+ <attribute name="obligation">
1032
+ <choice>
1033
+ <value>normative</value>
1034
+ <value>informative</value>
1035
+ </choice>
1036
+ </attribute>
1037
+ </optional>
1038
+ <optional>
1039
+ <ref name="section-title"/>
1040
+ </optional>
1041
+ <zeroOrMore>
1042
+ <ref name="BasicBlock"/>
1043
+ </zeroOrMore>
1044
+ <zeroOrMore>
1045
+ <ref name="note"/>
1046
+ </zeroOrMore>
1047
+ <zeroOrMore>
1048
+ <choice>
1049
+ <ref name="term-clause"/>
1050
+ <ref name="terms"/>
1051
+ <ref name="definitions"/>
1052
+ </choice>
1053
+ </zeroOrMore>
1054
+ </element>
1055
+ </define>
1056
+ <define name="termdocsource">
1057
+ <element name="termdocsource">
1058
+ <ref name="CitationType"/>
1059
+ </element>
1060
+ </define>
514
1061
  </grammar>