metanorma-gb 1.1.5 → 1.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +12 -10
- data/appveyor.yml +7 -2
- data/lib/asciidoctor/gb/biblio.rng +44 -15
- data/lib/asciidoctor/gb/converter.rb +1 -1
- data/lib/asciidoctor/gb/front.rb +47 -32
- data/lib/asciidoctor/gb/gbstandard.rng +11 -147
- data/lib/asciidoctor/gb/isodoc.rng +128 -71
- data/lib/asciidoctor/gb/isostandard.rng +29 -304
- data/lib/asciidoctor/gb/reqt.rng +5 -0
- data/lib/asciidoctor/gb/section_input.rb +1 -1
- data/lib/asciidoctor/gb/validate.rb +24 -6
- data/lib/isodoc/gb/{gbhtmlrender.rb → gbbaseconvert.rb} +64 -50
- data/lib/isodoc/gb/gbhtmlconvert.rb +26 -45
- data/lib/isodoc/gb/gbwordconvert.rb +40 -51
- data/lib/isodoc/gb/metadata.rb +15 -15
- data/lib/metanorma/gb/version.rb +1 -1
- data/metanorma-gb.gemspec +3 -2
- metadata +8 -9
- data/lib/isodoc/gb/gbwordrender.rb +0 -243
|
@@ -19,27 +19,16 @@
|
|
|
19
19
|
-->
|
|
20
20
|
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
|
21
21
|
<include href="reqt.rng"/>
|
|
22
|
-
<include href="biblio.rng"
|
|
23
|
-
<define name="status">
|
|
24
|
-
<element name="status">
|
|
25
|
-
<choice>
|
|
26
|
-
<value>proposal</value>
|
|
27
|
-
<value>working_draft</value>
|
|
28
|
-
<value>committee_draft</value>
|
|
29
|
-
<value>draft_standard</value>
|
|
30
|
-
<value>final_draft</value>
|
|
31
|
-
<value>published</value>
|
|
32
|
-
<value>withdrawn</value>
|
|
33
|
-
</choice>
|
|
34
|
-
</element>
|
|
35
|
-
</define>
|
|
36
|
-
</include>
|
|
22
|
+
<include href="biblio.rng"/>
|
|
37
23
|
<start>
|
|
38
24
|
<ref name="standard-document"/>
|
|
39
25
|
</start>
|
|
40
26
|
<define name="standard-document">
|
|
41
27
|
<element name="standard-document">
|
|
42
28
|
<ref name="bibdata"/>
|
|
29
|
+
<optional>
|
|
30
|
+
<ref name="boilerplate"/>
|
|
31
|
+
</optional>
|
|
43
32
|
<optional>
|
|
44
33
|
<ref name="preface"/>
|
|
45
34
|
</optional>
|
|
@@ -64,6 +53,42 @@
|
|
|
64
53
|
</oneOrMore>
|
|
65
54
|
</element>
|
|
66
55
|
</define>
|
|
56
|
+
<define name="boilerplate">
|
|
57
|
+
<element name="boilerplate">
|
|
58
|
+
<optional>
|
|
59
|
+
<ref name="copyright-statement"/>
|
|
60
|
+
</optional>
|
|
61
|
+
<optional>
|
|
62
|
+
<ref name="license-statement"/>
|
|
63
|
+
</optional>
|
|
64
|
+
<optional>
|
|
65
|
+
<ref name="legal-statement"/>
|
|
66
|
+
</optional>
|
|
67
|
+
<optional>
|
|
68
|
+
<ref name="feedback-statement"/>
|
|
69
|
+
</optional>
|
|
70
|
+
</element>
|
|
71
|
+
</define>
|
|
72
|
+
<define name="copyright-statement">
|
|
73
|
+
<element name="copyright-statement">
|
|
74
|
+
<ref name="Content-Section"/>
|
|
75
|
+
</element>
|
|
76
|
+
</define>
|
|
77
|
+
<define name="license-statement">
|
|
78
|
+
<element name="license-statement">
|
|
79
|
+
<ref name="Content-Section"/>
|
|
80
|
+
</element>
|
|
81
|
+
</define>
|
|
82
|
+
<define name="legal-statement">
|
|
83
|
+
<element name="legal-statement">
|
|
84
|
+
<ref name="Content-Section"/>
|
|
85
|
+
</element>
|
|
86
|
+
</define>
|
|
87
|
+
<define name="feedback-statement">
|
|
88
|
+
<element name="feedback-statement">
|
|
89
|
+
<ref name="Content-Section"/>
|
|
90
|
+
</element>
|
|
91
|
+
</define>
|
|
67
92
|
<define name="sections">
|
|
68
93
|
<element name="sections">
|
|
69
94
|
<oneOrMore>
|
|
@@ -446,6 +471,11 @@
|
|
|
446
471
|
<attribute name="id">
|
|
447
472
|
<data type="ID"/>
|
|
448
473
|
</attribute>
|
|
474
|
+
<optional>
|
|
475
|
+
<attribute name="unnumbered">
|
|
476
|
+
<data type="boolean"/>
|
|
477
|
+
</attribute>
|
|
478
|
+
</optional>
|
|
449
479
|
<ref name="stem"/>
|
|
450
480
|
<optional>
|
|
451
481
|
<ref name="dl"/>
|
|
@@ -494,6 +524,11 @@
|
|
|
494
524
|
<attribute name="id">
|
|
495
525
|
<data type="ID"/>
|
|
496
526
|
</attribute>
|
|
527
|
+
<optional>
|
|
528
|
+
<attribute name="unnumbered">
|
|
529
|
+
<data type="boolean"/>
|
|
530
|
+
</attribute>
|
|
531
|
+
</optional>
|
|
497
532
|
<optional>
|
|
498
533
|
<attribute name="lang"/>
|
|
499
534
|
</optional>
|
|
@@ -533,6 +568,14 @@
|
|
|
533
568
|
<attribute name="id">
|
|
534
569
|
<data type="ID"/>
|
|
535
570
|
</attribute>
|
|
571
|
+
<optional>
|
|
572
|
+
<attribute name="unnumbered">
|
|
573
|
+
<data type="boolean"/>
|
|
574
|
+
</attribute>
|
|
575
|
+
</optional>
|
|
576
|
+
<optional>
|
|
577
|
+
<attribute name="alt"/>
|
|
578
|
+
</optional>
|
|
536
579
|
<optional>
|
|
537
580
|
<ref name="tname"/>
|
|
538
581
|
</optional>
|
|
@@ -647,6 +690,11 @@
|
|
|
647
690
|
<attribute name="id">
|
|
648
691
|
<data type="ID"/>
|
|
649
692
|
</attribute>
|
|
693
|
+
<optional>
|
|
694
|
+
<attribute name="unnumbered">
|
|
695
|
+
<data type="boolean"/>
|
|
696
|
+
</attribute>
|
|
697
|
+
</optional>
|
|
650
698
|
<oneOrMore>
|
|
651
699
|
<choice>
|
|
652
700
|
<ref name="formula"/>
|
|
@@ -690,6 +738,11 @@
|
|
|
690
738
|
<attribute name="id">
|
|
691
739
|
<data type="ID"/>
|
|
692
740
|
</attribute>
|
|
741
|
+
<optional>
|
|
742
|
+
<attribute name="unnumbered">
|
|
743
|
+
<data type="boolean"/>
|
|
744
|
+
</attribute>
|
|
745
|
+
</optional>
|
|
693
746
|
<optional>
|
|
694
747
|
<ref name="source"/>
|
|
695
748
|
</optional>
|
|
@@ -735,6 +788,20 @@
|
|
|
735
788
|
<ref name="bookmark"/>
|
|
736
789
|
</choice>
|
|
737
790
|
</define>
|
|
791
|
+
<define name="PureTextElement">
|
|
792
|
+
<choice>
|
|
793
|
+
<text/>
|
|
794
|
+
<ref name="em"/>
|
|
795
|
+
<ref name="strong"/>
|
|
796
|
+
<ref name="sub"/>
|
|
797
|
+
<ref name="sup"/>
|
|
798
|
+
<ref name="tt"/>
|
|
799
|
+
<ref name="keyword"/>
|
|
800
|
+
<ref name="strike"/>
|
|
801
|
+
<ref name="smallcap"/>
|
|
802
|
+
<ref name="br"/>
|
|
803
|
+
</choice>
|
|
804
|
+
</define>
|
|
738
805
|
<define name="source">
|
|
739
806
|
<element name="source">
|
|
740
807
|
<ref name="TypedUri"/>
|
|
@@ -742,42 +809,58 @@
|
|
|
742
809
|
</define>
|
|
743
810
|
<define name="em">
|
|
744
811
|
<element name="em">
|
|
745
|
-
<
|
|
812
|
+
<zeroOrMore>
|
|
813
|
+
<ref name="PureTextElement"/>
|
|
814
|
+
</zeroOrMore>
|
|
746
815
|
</element>
|
|
747
816
|
</define>
|
|
748
817
|
<define name="strong">
|
|
749
818
|
<element name="strong">
|
|
750
|
-
<
|
|
819
|
+
<zeroOrMore>
|
|
820
|
+
<ref name="PureTextElement"/>
|
|
821
|
+
</zeroOrMore>
|
|
751
822
|
</element>
|
|
752
823
|
</define>
|
|
753
824
|
<define name="tt">
|
|
754
825
|
<element name="tt">
|
|
755
|
-
<
|
|
826
|
+
<zeroOrMore>
|
|
827
|
+
<ref name="PureTextElement"/>
|
|
828
|
+
</zeroOrMore>
|
|
756
829
|
</element>
|
|
757
830
|
</define>
|
|
758
831
|
<define name="keyword">
|
|
759
832
|
<element name="keyword">
|
|
760
|
-
<
|
|
833
|
+
<zeroOrMore>
|
|
834
|
+
<ref name="PureTextElement"/>
|
|
835
|
+
</zeroOrMore>
|
|
761
836
|
</element>
|
|
762
837
|
</define>
|
|
763
838
|
<define name="sub">
|
|
764
839
|
<element name="sub">
|
|
765
|
-
<
|
|
840
|
+
<zeroOrMore>
|
|
841
|
+
<ref name="PureTextElement"/>
|
|
842
|
+
</zeroOrMore>
|
|
766
843
|
</element>
|
|
767
844
|
</define>
|
|
768
845
|
<define name="sup">
|
|
769
846
|
<element name="sup">
|
|
770
|
-
<
|
|
847
|
+
<zeroOrMore>
|
|
848
|
+
<ref name="PureTextElement"/>
|
|
849
|
+
</zeroOrMore>
|
|
771
850
|
</element>
|
|
772
851
|
</define>
|
|
773
852
|
<define name="strike">
|
|
774
853
|
<element name="strike">
|
|
775
|
-
<
|
|
854
|
+
<zeroOrMore>
|
|
855
|
+
<ref name="PureTextElement"/>
|
|
856
|
+
</zeroOrMore>
|
|
776
857
|
</element>
|
|
777
858
|
</define>
|
|
778
859
|
<define name="smallcap">
|
|
779
860
|
<element name="smallcap">
|
|
780
|
-
<
|
|
861
|
+
<zeroOrMore>
|
|
862
|
+
<ref name="PureTextElement"/>
|
|
863
|
+
</zeroOrMore>
|
|
781
864
|
</element>
|
|
782
865
|
</define>
|
|
783
866
|
<define name="br">
|
|
@@ -838,6 +921,9 @@
|
|
|
838
921
|
<attribute name="type">
|
|
839
922
|
<ref name="ReferenceFormat"/>
|
|
840
923
|
</attribute>
|
|
924
|
+
<optional>
|
|
925
|
+
<attribute name="alt"/>
|
|
926
|
+
</optional>
|
|
841
927
|
<text/>
|
|
842
928
|
</element>
|
|
843
929
|
</define>
|
|
@@ -1019,57 +1105,28 @@
|
|
|
1019
1105
|
</zeroOrMore>
|
|
1020
1106
|
</element>
|
|
1021
1107
|
</define>
|
|
1022
|
-
<define name="
|
|
1023
|
-
<
|
|
1024
|
-
<
|
|
1025
|
-
|
|
1026
|
-
|
|
1027
|
-
|
|
1028
|
-
<oneOrMore>
|
|
1029
|
-
<ref name="btitle"/>
|
|
1030
|
-
</oneOrMore>
|
|
1031
|
-
<optional>
|
|
1032
|
-
<ref name="formattedref"/>
|
|
1033
|
-
</optional>
|
|
1034
|
-
<zeroOrMore>
|
|
1035
|
-
<ref name="bsource"/>
|
|
1036
|
-
</zeroOrMore>
|
|
1037
|
-
<zeroOrMore>
|
|
1038
|
-
<ref name="docidentifier"/>
|
|
1039
|
-
</zeroOrMore>
|
|
1040
|
-
<optional>
|
|
1041
|
-
<ref name="docnumber"/>
|
|
1042
|
-
</optional>
|
|
1043
|
-
<zeroOrMore>
|
|
1044
|
-
<ref name="bdate"/>
|
|
1045
|
-
</zeroOrMore>
|
|
1046
|
-
<zeroOrMore>
|
|
1047
|
-
<ref name="contributor"/>
|
|
1048
|
-
</zeroOrMore>
|
|
1049
|
-
<optional>
|
|
1050
|
-
<ref name="edition"/>
|
|
1051
|
-
</optional>
|
|
1052
|
-
<optional>
|
|
1053
|
-
<ref name="version"/>
|
|
1054
|
-
</optional>
|
|
1055
|
-
<zeroOrMore>
|
|
1056
|
-
<ref name="biblionote"/>
|
|
1057
|
-
</zeroOrMore>
|
|
1058
|
-
<zeroOrMore>
|
|
1059
|
-
<ref name="language"/>
|
|
1060
|
-
</zeroOrMore>
|
|
1061
|
-
<zeroOrMore>
|
|
1062
|
-
<ref name="script"/>
|
|
1063
|
-
</zeroOrMore>
|
|
1108
|
+
<define name="ext">
|
|
1109
|
+
<element name="ext">
|
|
1110
|
+
<ref name="BibDataExtensionType"/>
|
|
1111
|
+
</element>
|
|
1112
|
+
</define>
|
|
1113
|
+
<define name="BibDataExtensionType">
|
|
1064
1114
|
<optional>
|
|
1065
|
-
<ref name="
|
|
1115
|
+
<ref name="doctype"/>
|
|
1066
1116
|
</optional>
|
|
1117
|
+
</define>
|
|
1118
|
+
<define name="doctype">
|
|
1119
|
+
<element name="doctype">
|
|
1120
|
+
<ref name="DocumentType"/>
|
|
1121
|
+
</element>
|
|
1122
|
+
</define>
|
|
1123
|
+
<define name="DocumentType">
|
|
1124
|
+
<value>document</value>
|
|
1125
|
+
</define>
|
|
1126
|
+
<define name="BibData">
|
|
1127
|
+
<ref name="BibliographicItem"/>
|
|
1067
1128
|
<optional>
|
|
1068
|
-
<ref name="
|
|
1129
|
+
<ref name="ext"/>
|
|
1069
1130
|
</optional>
|
|
1070
|
-
<ref name="copyright"/>
|
|
1071
|
-
<zeroOrMore>
|
|
1072
|
-
<ref name="docrelation"/>
|
|
1073
|
-
</zeroOrMore>
|
|
1074
1131
|
</define>
|
|
1075
1132
|
</grammar>
|
|
@@ -4,36 +4,6 @@
|
|
|
4
4
|
<start>
|
|
5
5
|
<ref name="iso-standard"/>
|
|
6
6
|
</start>
|
|
7
|
-
<define name="language">
|
|
8
|
-
<element name="language">
|
|
9
|
-
<choice>
|
|
10
|
-
<value>en</value>
|
|
11
|
-
<value>fr</value>
|
|
12
|
-
</choice>
|
|
13
|
-
</element>
|
|
14
|
-
</define>
|
|
15
|
-
<define name="script">
|
|
16
|
-
<element name="script">
|
|
17
|
-
<value>Latn</value>
|
|
18
|
-
</element>
|
|
19
|
-
</define>
|
|
20
|
-
<!-- add type to docidentifier in isodoc? -->
|
|
21
|
-
<define name="docidentifier">
|
|
22
|
-
<element name="docidentifier">
|
|
23
|
-
<optional>
|
|
24
|
-
<attribute name="type"/>
|
|
25
|
-
</optional>
|
|
26
|
-
<choice>
|
|
27
|
-
<text/>
|
|
28
|
-
<group>
|
|
29
|
-
<ref name="documentnumber"/>
|
|
30
|
-
<optional>
|
|
31
|
-
<ref name="tc-documentnumber"/>
|
|
32
|
-
</optional>
|
|
33
|
-
</group>
|
|
34
|
-
</choice>
|
|
35
|
-
</element>
|
|
36
|
-
</define>
|
|
37
7
|
<define name="organization">
|
|
38
8
|
<element name="organization">
|
|
39
9
|
<ref name="orgname"/>
|
|
@@ -63,190 +33,24 @@
|
|
|
63
33
|
</optional>
|
|
64
34
|
</element>
|
|
65
35
|
</define>
|
|
66
|
-
<define name="
|
|
67
|
-
<optional>
|
|
68
|
-
<attribute name="type">
|
|
69
|
-
<ref name="BibItemType"/>
|
|
70
|
-
</attribute>
|
|
71
|
-
</optional>
|
|
72
|
-
<optional>
|
|
73
|
-
<ref name="fetched"/>
|
|
74
|
-
</optional>
|
|
75
|
-
<choice>
|
|
76
|
-
<oneOrMore>
|
|
77
|
-
<ref name="btitle"/>
|
|
78
|
-
</oneOrMore>
|
|
79
|
-
<ref name="formattedref"/>
|
|
80
|
-
</choice>
|
|
81
|
-
<zeroOrMore>
|
|
82
|
-
<ref name="bsource"/>
|
|
83
|
-
</zeroOrMore>
|
|
84
|
-
<zeroOrMore>
|
|
85
|
-
<ref name="docidentifier"/>
|
|
86
|
-
</zeroOrMore>
|
|
87
|
-
<optional>
|
|
88
|
-
<ref name="docnumber"/>
|
|
89
|
-
</optional>
|
|
90
|
-
<zeroOrMore>
|
|
91
|
-
<ref name="bdate"/>
|
|
92
|
-
</zeroOrMore>
|
|
93
|
-
<zeroOrMore>
|
|
94
|
-
<ref name="contributor"/>
|
|
95
|
-
</zeroOrMore>
|
|
96
|
-
<optional>
|
|
97
|
-
<ref name="edition"/>
|
|
98
|
-
</optional>
|
|
99
|
-
<optional>
|
|
100
|
-
<ref name="version"/>
|
|
101
|
-
</optional>
|
|
102
|
-
<zeroOrMore>
|
|
103
|
-
<ref name="biblionote"/>
|
|
104
|
-
</zeroOrMore>
|
|
105
|
-
<zeroOrMore>
|
|
106
|
-
<ref name="language"/>
|
|
107
|
-
</zeroOrMore>
|
|
108
|
-
<zeroOrMore>
|
|
109
|
-
<ref name="script"/>
|
|
110
|
-
</zeroOrMore>
|
|
111
|
-
<zeroOrMore>
|
|
112
|
-
<ref name="abstract"/>
|
|
113
|
-
</zeroOrMore>
|
|
114
|
-
<optional>
|
|
115
|
-
<ref name="status"/>
|
|
116
|
-
</optional>
|
|
117
|
-
<optional>
|
|
118
|
-
<ref name="copyright"/>
|
|
119
|
-
</optional>
|
|
120
|
-
<zeroOrMore>
|
|
121
|
-
<ref name="docrelation"/>
|
|
122
|
-
</zeroOrMore>
|
|
123
|
-
<zeroOrMore>
|
|
124
|
-
<ref name="series"/>
|
|
125
|
-
</zeroOrMore>
|
|
126
|
-
<optional>
|
|
127
|
-
<ref name="medium"/>
|
|
128
|
-
</optional>
|
|
129
|
-
<zeroOrMore>
|
|
130
|
-
<ref name="bplace"/>
|
|
131
|
-
</zeroOrMore>
|
|
132
|
-
<zeroOrMore>
|
|
133
|
-
<ref name="extent"/>
|
|
134
|
-
</zeroOrMore>
|
|
135
|
-
<zeroOrMore>
|
|
136
|
-
<ref name="accesslocation"/>
|
|
137
|
-
</zeroOrMore>
|
|
138
|
-
<optional>
|
|
139
|
-
<ref name="bclassification"/>
|
|
140
|
-
</optional>
|
|
141
|
-
<optional>
|
|
142
|
-
<ref name="validity"/>
|
|
143
|
-
</optional>
|
|
144
|
-
<optional>
|
|
145
|
-
<ref name="editorialgroup"/>
|
|
146
|
-
</optional>
|
|
147
|
-
<zeroOrMore>
|
|
148
|
-
<ref name="ics"/>
|
|
149
|
-
</zeroOrMore>
|
|
150
|
-
<optional>
|
|
151
|
-
<ref name="allParts"/>
|
|
152
|
-
</optional>
|
|
153
|
-
</define>
|
|
154
|
-
<define name="BibData">
|
|
155
|
-
<optional>
|
|
156
|
-
<attribute name="type">
|
|
157
|
-
<ref name="BibItemType"/>
|
|
158
|
-
</attribute>
|
|
159
|
-
</optional>
|
|
160
|
-
<oneOrMore>
|
|
161
|
-
<ref name="btitle"/>
|
|
162
|
-
</oneOrMore>
|
|
163
|
-
<optional>
|
|
164
|
-
<ref name="formattedref"/>
|
|
165
|
-
</optional>
|
|
166
|
-
<zeroOrMore>
|
|
167
|
-
<ref name="bsource"/>
|
|
168
|
-
</zeroOrMore>
|
|
169
|
-
<zeroOrMore>
|
|
170
|
-
<ref name="docidentifier"/>
|
|
171
|
-
</zeroOrMore>
|
|
172
|
-
<optional>
|
|
173
|
-
<ref name="docnumber"/>
|
|
174
|
-
</optional>
|
|
175
|
-
<zeroOrMore>
|
|
176
|
-
<ref name="bdate"/>
|
|
177
|
-
</zeroOrMore>
|
|
178
|
-
<zeroOrMore>
|
|
179
|
-
<ref name="contributor"/>
|
|
180
|
-
</zeroOrMore>
|
|
181
|
-
<optional>
|
|
182
|
-
<ref name="edition"/>
|
|
183
|
-
</optional>
|
|
184
|
-
<optional>
|
|
185
|
-
<ref name="version"/>
|
|
186
|
-
</optional>
|
|
187
|
-
<zeroOrMore>
|
|
188
|
-
<ref name="biblionote"/>
|
|
189
|
-
</zeroOrMore>
|
|
190
|
-
<zeroOrMore>
|
|
191
|
-
<ref name="language"/>
|
|
192
|
-
</zeroOrMore>
|
|
193
|
-
<zeroOrMore>
|
|
194
|
-
<ref name="script"/>
|
|
195
|
-
</zeroOrMore>
|
|
196
|
-
<zeroOrMore>
|
|
197
|
-
<ref name="abstract"/>
|
|
198
|
-
</zeroOrMore>
|
|
199
|
-
<optional>
|
|
200
|
-
<ref name="status"/>
|
|
201
|
-
</optional>
|
|
202
|
-
<ref name="copyright"/>
|
|
203
|
-
<zeroOrMore>
|
|
204
|
-
<ref name="docrelation"/>
|
|
205
|
-
</zeroOrMore>
|
|
206
|
-
<zeroOrMore>
|
|
207
|
-
<ref name="series"/>
|
|
208
|
-
</zeroOrMore>
|
|
36
|
+
<define name="BibDataExtensionType">
|
|
209
37
|
<optional>
|
|
210
|
-
<ref name="
|
|
211
|
-
</optional>
|
|
212
|
-
<zeroOrMore>
|
|
213
|
-
<ref name="bplace"/>
|
|
214
|
-
</zeroOrMore>
|
|
215
|
-
<zeroOrMore>
|
|
216
|
-
<ref name="extent"/>
|
|
217
|
-
</zeroOrMore>
|
|
218
|
-
<zeroOrMore>
|
|
219
|
-
<ref name="accesslocation"/>
|
|
220
|
-
</zeroOrMore>
|
|
221
|
-
<optional>
|
|
222
|
-
<ref name="bclassification"/>
|
|
223
|
-
</optional>
|
|
224
|
-
<optional>
|
|
225
|
-
<ref name="validity"/>
|
|
38
|
+
<ref name="doctype"/>
|
|
226
39
|
</optional>
|
|
227
40
|
<ref name="editorialgroup"/>
|
|
228
41
|
<zeroOrMore>
|
|
229
42
|
<ref name="ics"/>
|
|
230
43
|
</zeroOrMore>
|
|
231
|
-
<
|
|
232
|
-
<ref name="allParts"/>
|
|
233
|
-
</optional>
|
|
44
|
+
<ref name="structuredidentifier"/>
|
|
234
45
|
</define>
|
|
235
46
|
<define name="bdate">
|
|
236
47
|
<element name="date">
|
|
237
48
|
<attribute name="type">
|
|
238
49
|
<choice>
|
|
239
|
-
<
|
|
240
|
-
<
|
|
241
|
-
<value>created</value>
|
|
242
|
-
<value>implemented</value>
|
|
243
|
-
<value>obsoleted</value>
|
|
244
|
-
<value>confirmed</value>
|
|
245
|
-
<value>updated</value>
|
|
246
|
-
<value>issued</value>
|
|
50
|
+
<ref name="BibliographicDateType"/>
|
|
51
|
+
<text/>
|
|
247
52
|
</choice>
|
|
248
53
|
</attribute>
|
|
249
|
-
<!-- ( ( bfrom, bto? ) | date_on ) -->
|
|
250
54
|
<choice>
|
|
251
55
|
<group>
|
|
252
56
|
<element name="from">
|
|
@@ -267,47 +71,6 @@
|
|
|
267
71
|
</choice>
|
|
268
72
|
</element>
|
|
269
73
|
</define>
|
|
270
|
-
<define name="biblionote">
|
|
271
|
-
<element name="note">
|
|
272
|
-
<optional>
|
|
273
|
-
<!-- Biblio date notes can be footnoted -->
|
|
274
|
-
<attribute name="reference"/>
|
|
275
|
-
</optional>
|
|
276
|
-
<ref name="FormattedString"/>
|
|
277
|
-
</element>
|
|
278
|
-
</define>
|
|
279
|
-
<define name="status">
|
|
280
|
-
<element name="status">
|
|
281
|
-
<choice>
|
|
282
|
-
<ref name="FormattedString"/>
|
|
283
|
-
<group>
|
|
284
|
-
<ref name="stage"/>
|
|
285
|
-
<optional>
|
|
286
|
-
<ref name="substage"/>
|
|
287
|
-
</optional>
|
|
288
|
-
<optional>
|
|
289
|
-
<ref name="iteration"/>
|
|
290
|
-
</optional>
|
|
291
|
-
</group>
|
|
292
|
-
</choice>
|
|
293
|
-
</element>
|
|
294
|
-
</define>
|
|
295
|
-
<define name="btitle">
|
|
296
|
-
<element name="title">
|
|
297
|
-
<choice>
|
|
298
|
-
<ref name="FormattedString"/>
|
|
299
|
-
<group>
|
|
300
|
-
<optional>
|
|
301
|
-
<ref name="title-intro"/>
|
|
302
|
-
</optional>
|
|
303
|
-
<ref name="title-main"/>
|
|
304
|
-
<optional>
|
|
305
|
-
<ref name="title-part"/>
|
|
306
|
-
</optional>
|
|
307
|
-
</group>
|
|
308
|
-
</choice>
|
|
309
|
-
</element>
|
|
310
|
-
</define>
|
|
311
74
|
<define name="sections">
|
|
312
75
|
<element name="sections">
|
|
313
76
|
<ref name="clause"/>
|
|
@@ -752,6 +515,16 @@
|
|
|
752
515
|
</optional>
|
|
753
516
|
</element>
|
|
754
517
|
</define>
|
|
518
|
+
<define name="DocumentType">
|
|
519
|
+
<choice>
|
|
520
|
+
<value>international-standard</value>
|
|
521
|
+
<value>technical-specification</value>
|
|
522
|
+
<value>technical-report</value>
|
|
523
|
+
<value>publicly-available-specification</value>
|
|
524
|
+
<value>international-workshop-agreement</value>
|
|
525
|
+
<value>guide</value>
|
|
526
|
+
</choice>
|
|
527
|
+
</define>
|
|
755
528
|
</include>
|
|
756
529
|
<!-- end overrides -->
|
|
757
530
|
<!--
|
|
@@ -764,6 +537,9 @@
|
|
|
764
537
|
<zeroOrMore>
|
|
765
538
|
<ref name="termdocsource"/>
|
|
766
539
|
</zeroOrMore>
|
|
540
|
+
<optional>
|
|
541
|
+
<ref name="boilerplate"/>
|
|
542
|
+
</optional>
|
|
767
543
|
<ref name="preface"/>
|
|
768
544
|
<oneOrMore>
|
|
769
545
|
<ref name="sections"/>
|
|
@@ -784,16 +560,6 @@
|
|
|
784
560
|
</oneOrMore>
|
|
785
561
|
</element>
|
|
786
562
|
</define>
|
|
787
|
-
<define name="BibItemType" combine="choice">
|
|
788
|
-
<choice>
|
|
789
|
-
<value>international-standard</value>
|
|
790
|
-
<value>technical-specification</value>
|
|
791
|
-
<value>technical-report</value>
|
|
792
|
-
<value>publicly-available-specification</value>
|
|
793
|
-
<value>international-workshop-agreement</value>
|
|
794
|
-
<value>guide</value>
|
|
795
|
-
</choice>
|
|
796
|
-
</define>
|
|
797
563
|
<define name="editorialgroup">
|
|
798
564
|
<element name="editorialgroup">
|
|
799
565
|
<oneOrMore>
|
|
@@ -825,38 +591,17 @@
|
|
|
825
591
|
<ref name="Content-Section"/>
|
|
826
592
|
</element>
|
|
827
593
|
</define>
|
|
828
|
-
<define name="
|
|
829
|
-
<element name="
|
|
830
|
-
<
|
|
831
|
-
<
|
|
832
|
-
|
|
833
|
-
|
|
834
|
-
<
|
|
835
|
-
<
|
|
836
|
-
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
<value>95</value>
|
|
840
|
-
</choice>
|
|
841
|
-
</element>
|
|
842
|
-
</define>
|
|
843
|
-
<define name="substage">
|
|
844
|
-
<element name="substage">
|
|
845
|
-
<choice>
|
|
846
|
-
<value>00</value>
|
|
847
|
-
<value>20</value>
|
|
848
|
-
<value>60</value>
|
|
849
|
-
<value>90</value>
|
|
850
|
-
<value>92</value>
|
|
851
|
-
<value>93</value>
|
|
852
|
-
<value>98</value>
|
|
853
|
-
<value>99</value>
|
|
854
|
-
</choice>
|
|
855
|
-
</element>
|
|
856
|
-
</define>
|
|
857
|
-
<define name="iteration">
|
|
858
|
-
<element name="iteration">
|
|
859
|
-
<data type="int"/>
|
|
594
|
+
<define name="structuredidentifier">
|
|
595
|
+
<element name="structuredidentifier">
|
|
596
|
+
<optional>
|
|
597
|
+
<attribute name="type"/>
|
|
598
|
+
</optional>
|
|
599
|
+
<group>
|
|
600
|
+
<ref name="documentnumber"/>
|
|
601
|
+
<optional>
|
|
602
|
+
<ref name="tc-documentnumber"/>
|
|
603
|
+
</optional>
|
|
604
|
+
</group>
|
|
860
605
|
</element>
|
|
861
606
|
</define>
|
|
862
607
|
<define name="documentnumber">
|
|
@@ -910,26 +655,6 @@
|
|
|
910
655
|
<text/>
|
|
911
656
|
</element>
|
|
912
657
|
</define>
|
|
913
|
-
<define name="title-intro">
|
|
914
|
-
<element name="title-intro">
|
|
915
|
-
<ref name="FormattedString"/>
|
|
916
|
-
</element>
|
|
917
|
-
</define>
|
|
918
|
-
<define name="title-main">
|
|
919
|
-
<element name="title-main">
|
|
920
|
-
<ref name="FormattedString"/>
|
|
921
|
-
</element>
|
|
922
|
-
</define>
|
|
923
|
-
<define name="title-part">
|
|
924
|
-
<element name="title-part">
|
|
925
|
-
<ref name="FormattedString"/>
|
|
926
|
-
</element>
|
|
927
|
-
</define>
|
|
928
|
-
<define name="allParts">
|
|
929
|
-
<element name="allparts">
|
|
930
|
-
<data type="boolean"/>
|
|
931
|
-
</element>
|
|
932
|
-
</define>
|
|
933
658
|
<define name="clause-hanging-paragraph-with-footnote">
|
|
934
659
|
<element name="clause">
|
|
935
660
|
<optional>
|