relaton-calconnect 1.6.0 → 1.9.0
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 +4 -4
- data/.github/workflows/rake.yml +36 -0
- data/.rubocop.yml +1 -1
- data/README.adoc +1 -5
- data/grammars/basicdoc.rng +165 -20
- data/grammars/biblio.rng +5 -6
- data/grammars/csd.rng +10 -1
- data/grammars/isodoc.rng +546 -59
- data/grammars/reqt.rng +31 -2
- data/lib/relaton_calconnect/cc_bibliographic_item.rb +7 -0
- data/lib/relaton_calconnect/cc_bibliography.rb +6 -10
- data/lib/relaton_calconnect/hash_converter.rb +11 -0
- data/lib/relaton_calconnect/hit_collection.rb +3 -3
- data/lib/relaton_calconnect/processor.rb +1 -2
- data/lib/relaton_calconnect/technical_committee.rb +8 -0
- data/lib/relaton_calconnect/version.rb +1 -1
- data/lib/relaton_calconnect/xml_parser.rb +14 -1
- data/lib/relaton_calconnect.rb +1 -0
- data/relaton_calconnect.gemspec +2 -4
- metadata +8 -37
- data/.github/workflows/macos.yml +0 -34
- data/.github/workflows/ubuntu.yml +0 -33
- data/.github/workflows/windows.yml +0 -35
data/grammars/csd.rng
CHANGED
|
@@ -73,6 +73,9 @@
|
|
|
73
73
|
<optional>
|
|
74
74
|
<ref name="doctype"/>
|
|
75
75
|
</optional>
|
|
76
|
+
<optional>
|
|
77
|
+
<ref name="docsubtype"/>
|
|
78
|
+
</optional>
|
|
76
79
|
<ref name="editorialgroup"/>
|
|
77
80
|
<zeroOrMore>
|
|
78
81
|
<ref name="ics"/>
|
|
@@ -86,7 +89,7 @@
|
|
|
86
89
|
</element>
|
|
87
90
|
</define>
|
|
88
91
|
<define name="technical-committee">
|
|
89
|
-
<element name="
|
|
92
|
+
<element name="committee">
|
|
90
93
|
<optional>
|
|
91
94
|
<attribute name="type"/>
|
|
92
95
|
</optional>
|
|
@@ -107,6 +110,9 @@
|
|
|
107
110
|
<zeroOrMore>
|
|
108
111
|
<ref name="termdocsource"/>
|
|
109
112
|
</zeroOrMore>
|
|
113
|
+
<optional>
|
|
114
|
+
<ref name="misccontainer"/>
|
|
115
|
+
</optional>
|
|
110
116
|
<optional>
|
|
111
117
|
<ref name="boilerplate"/>
|
|
112
118
|
</optional>
|
|
@@ -118,6 +124,9 @@
|
|
|
118
124
|
<ref name="annex"/>
|
|
119
125
|
</zeroOrMore>
|
|
120
126
|
<ref name="bibliography"/>
|
|
127
|
+
<zeroOrMore>
|
|
128
|
+
<ref name="indexsect"/>
|
|
129
|
+
</zeroOrMore>
|
|
121
130
|
</element>
|
|
122
131
|
</define>
|
|
123
132
|
</grammar>
|
data/grammars/isodoc.rng
CHANGED
|
@@ -24,6 +24,14 @@
|
|
|
24
24
|
<start>
|
|
25
25
|
<ref name="standard-document"/>
|
|
26
26
|
</start>
|
|
27
|
+
<define name="doctype">
|
|
28
|
+
<element name="doctype">
|
|
29
|
+
<optional>
|
|
30
|
+
<attribute name="abbreviation"/>
|
|
31
|
+
</optional>
|
|
32
|
+
<ref name="DocumentType"/>
|
|
33
|
+
</element>
|
|
34
|
+
</define>
|
|
27
35
|
<define name="hyperlink">
|
|
28
36
|
<element name="link">
|
|
29
37
|
<attribute name="target">
|
|
@@ -37,6 +45,11 @@
|
|
|
37
45
|
<optional>
|
|
38
46
|
<attribute name="alt"/>
|
|
39
47
|
</optional>
|
|
48
|
+
<optional>
|
|
49
|
+
<attribute name="updatetype">
|
|
50
|
+
<data type="boolean"/>
|
|
51
|
+
</attribute>
|
|
52
|
+
</optional>
|
|
40
53
|
<text/>
|
|
41
54
|
</element>
|
|
42
55
|
</define>
|
|
@@ -47,6 +60,13 @@
|
|
|
47
60
|
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
48
61
|
</data>
|
|
49
62
|
</attribute>
|
|
63
|
+
<optional>
|
|
64
|
+
<attribute name="to">
|
|
65
|
+
<data type="string">
|
|
66
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
67
|
+
</data>
|
|
68
|
+
</attribute>
|
|
69
|
+
</optional>
|
|
50
70
|
<optional>
|
|
51
71
|
<attribute name="type">
|
|
52
72
|
<ref name="ReferenceFormat"/>
|
|
@@ -71,6 +91,35 @@
|
|
|
71
91
|
<text/>
|
|
72
92
|
</element>
|
|
73
93
|
</define>
|
|
94
|
+
<define name="erefType">
|
|
95
|
+
<optional>
|
|
96
|
+
<attribute name="normative">
|
|
97
|
+
<data type="boolean"/>
|
|
98
|
+
</attribute>
|
|
99
|
+
</optional>
|
|
100
|
+
<attribute name="citeas"/>
|
|
101
|
+
<attribute name="type">
|
|
102
|
+
<ref name="ReferenceFormat"/>
|
|
103
|
+
</attribute>
|
|
104
|
+
<optional>
|
|
105
|
+
<attribute name="alt"/>
|
|
106
|
+
</optional>
|
|
107
|
+
<optional>
|
|
108
|
+
<attribute name="case">
|
|
109
|
+
<choice>
|
|
110
|
+
<value>capital</value>
|
|
111
|
+
<value>lowercase</value>
|
|
112
|
+
</choice>
|
|
113
|
+
</attribute>
|
|
114
|
+
</optional>
|
|
115
|
+
<optional>
|
|
116
|
+
<attribute name="droploc">
|
|
117
|
+
<data type="boolean"/>
|
|
118
|
+
</attribute>
|
|
119
|
+
</optional>
|
|
120
|
+
<ref name="CitationType"/>
|
|
121
|
+
<text/>
|
|
122
|
+
</define>
|
|
74
123
|
<define name="ul">
|
|
75
124
|
<element name="ul">
|
|
76
125
|
<attribute name="id">
|
|
@@ -87,7 +136,7 @@
|
|
|
87
136
|
</attribute>
|
|
88
137
|
</optional>
|
|
89
138
|
<oneOrMore>
|
|
90
|
-
<ref name="
|
|
139
|
+
<ref name="ul_li"/>
|
|
91
140
|
</oneOrMore>
|
|
92
141
|
<zeroOrMore>
|
|
93
142
|
<ref name="note"/>
|
|
@@ -141,6 +190,11 @@
|
|
|
141
190
|
<data type="boolean"/>
|
|
142
191
|
</attribute>
|
|
143
192
|
</optional>
|
|
193
|
+
<optional>
|
|
194
|
+
<attribute name="key">
|
|
195
|
+
<data type="boolean"/>
|
|
196
|
+
</attribute>
|
|
197
|
+
</optional>
|
|
144
198
|
<oneOrMore>
|
|
145
199
|
<ref name="dt"/>
|
|
146
200
|
<ref name="dd"/>
|
|
@@ -150,6 +204,18 @@
|
|
|
150
204
|
</zeroOrMore>
|
|
151
205
|
</element>
|
|
152
206
|
</define>
|
|
207
|
+
<define name="dt">
|
|
208
|
+
<element name="dt">
|
|
209
|
+
<optional>
|
|
210
|
+
<attribute name="id">
|
|
211
|
+
<data type="ID"/>
|
|
212
|
+
</attribute>
|
|
213
|
+
</optional>
|
|
214
|
+
<zeroOrMore>
|
|
215
|
+
<ref name="TextElement"/>
|
|
216
|
+
</zeroOrMore>
|
|
217
|
+
</element>
|
|
218
|
+
</define>
|
|
153
219
|
<define name="example">
|
|
154
220
|
<element name="example">
|
|
155
221
|
<attribute name="id">
|
|
@@ -233,6 +299,12 @@
|
|
|
233
299
|
<data type="boolean"/>
|
|
234
300
|
</attribute>
|
|
235
301
|
</optional>
|
|
302
|
+
<optional>
|
|
303
|
+
<attribute name="width"/>
|
|
304
|
+
</optional>
|
|
305
|
+
<optional>
|
|
306
|
+
<ref name="colgroup"/>
|
|
307
|
+
</optional>
|
|
236
308
|
<optional>
|
|
237
309
|
<ref name="tname"/>
|
|
238
310
|
</optional>
|
|
@@ -488,6 +560,9 @@
|
|
|
488
560
|
</define>
|
|
489
561
|
<define name="BibDataExtensionType">
|
|
490
562
|
<ref name="doctype"/>
|
|
563
|
+
<optional>
|
|
564
|
+
<ref name="docsubtype"/>
|
|
565
|
+
</optional>
|
|
491
566
|
<optional>
|
|
492
567
|
<ref name="editorialgroup"/>
|
|
493
568
|
</optional>
|
|
@@ -749,15 +824,177 @@
|
|
|
749
824
|
<ref name="paragraph"/>
|
|
750
825
|
</element>
|
|
751
826
|
</define>
|
|
827
|
+
<define name="em">
|
|
828
|
+
<element name="em">
|
|
829
|
+
<zeroOrMore>
|
|
830
|
+
<choice>
|
|
831
|
+
<ref name="PureTextElement"/>
|
|
832
|
+
<ref name="stem"/>
|
|
833
|
+
<ref name="index"/>
|
|
834
|
+
</choice>
|
|
835
|
+
</zeroOrMore>
|
|
836
|
+
</element>
|
|
837
|
+
</define>
|
|
838
|
+
<define name="strong">
|
|
839
|
+
<element name="strong">
|
|
840
|
+
<zeroOrMore>
|
|
841
|
+
<choice>
|
|
842
|
+
<ref name="PureTextElement"/>
|
|
843
|
+
<ref name="stem"/>
|
|
844
|
+
<ref name="index"/>
|
|
845
|
+
</choice>
|
|
846
|
+
</zeroOrMore>
|
|
847
|
+
</element>
|
|
848
|
+
</define>
|
|
849
|
+
<define name="tt">
|
|
850
|
+
<element name="tt">
|
|
851
|
+
<zeroOrMore>
|
|
852
|
+
<choice>
|
|
853
|
+
<ref name="PureTextElement"/>
|
|
854
|
+
<ref name="index"/>
|
|
855
|
+
</choice>
|
|
856
|
+
</zeroOrMore>
|
|
857
|
+
</element>
|
|
858
|
+
</define>
|
|
859
|
+
<define name="keyword">
|
|
860
|
+
<element name="keyword">
|
|
861
|
+
<zeroOrMore>
|
|
862
|
+
<choice>
|
|
863
|
+
<ref name="PureTextElement"/>
|
|
864
|
+
<ref name="index"/>
|
|
865
|
+
</choice>
|
|
866
|
+
</zeroOrMore>
|
|
867
|
+
</element>
|
|
868
|
+
</define>
|
|
869
|
+
<define name="strike">
|
|
870
|
+
<element name="strike">
|
|
871
|
+
<zeroOrMore>
|
|
872
|
+
<choice>
|
|
873
|
+
<ref name="PureTextElement"/>
|
|
874
|
+
<ref name="index"/>
|
|
875
|
+
</choice>
|
|
876
|
+
</zeroOrMore>
|
|
877
|
+
</element>
|
|
878
|
+
</define>
|
|
879
|
+
<define name="underline">
|
|
880
|
+
<element name="underline">
|
|
881
|
+
<zeroOrMore>
|
|
882
|
+
<choice>
|
|
883
|
+
<ref name="PureTextElement"/>
|
|
884
|
+
<ref name="index"/>
|
|
885
|
+
</choice>
|
|
886
|
+
</zeroOrMore>
|
|
887
|
+
</element>
|
|
888
|
+
</define>
|
|
889
|
+
<define name="smallcap">
|
|
890
|
+
<element name="smallcap">
|
|
891
|
+
<zeroOrMore>
|
|
892
|
+
<choice>
|
|
893
|
+
<ref name="PureTextElement"/>
|
|
894
|
+
<ref name="index"/>
|
|
895
|
+
</choice>
|
|
896
|
+
</zeroOrMore>
|
|
897
|
+
</element>
|
|
898
|
+
</define>
|
|
899
|
+
<define name="pagebreak">
|
|
900
|
+
<element name="pagebreak">
|
|
901
|
+
<optional>
|
|
902
|
+
<attribute name="orientation">
|
|
903
|
+
<choice>
|
|
904
|
+
<value>landscape</value>
|
|
905
|
+
<value>portrait</value>
|
|
906
|
+
</choice>
|
|
907
|
+
</attribute>
|
|
908
|
+
</optional>
|
|
909
|
+
</element>
|
|
910
|
+
</define>
|
|
752
911
|
</include>
|
|
753
912
|
<!-- end overrides -->
|
|
913
|
+
<define name="docsubtype">
|
|
914
|
+
<element name="subdoctype">
|
|
915
|
+
<ref name="DocumentSubtype"/>
|
|
916
|
+
</element>
|
|
917
|
+
</define>
|
|
918
|
+
<define name="DocumentSubtype">
|
|
919
|
+
<text/>
|
|
920
|
+
</define>
|
|
921
|
+
<define name="colgroup">
|
|
922
|
+
<element name="colgroup">
|
|
923
|
+
<oneOrMore>
|
|
924
|
+
<ref name="col"/>
|
|
925
|
+
</oneOrMore>
|
|
926
|
+
</element>
|
|
927
|
+
</define>
|
|
928
|
+
<define name="col">
|
|
929
|
+
<element name="col">
|
|
930
|
+
<attribute name="width"/>
|
|
931
|
+
</element>
|
|
932
|
+
</define>
|
|
933
|
+
<define name="BibItemType" combine="choice">
|
|
934
|
+
<value>internal</value>
|
|
935
|
+
</define>
|
|
754
936
|
<define name="TextElement" combine="choice">
|
|
755
|
-
<
|
|
937
|
+
<choice>
|
|
938
|
+
<ref name="concept"/>
|
|
939
|
+
<ref name="add"/>
|
|
940
|
+
<ref name="del"/>
|
|
941
|
+
</choice>
|
|
942
|
+
</define>
|
|
943
|
+
<define name="add">
|
|
944
|
+
<element name="add">
|
|
945
|
+
<choice>
|
|
946
|
+
<ref name="PureTextElement"/>
|
|
947
|
+
<ref name="eref"/>
|
|
948
|
+
<ref name="stem"/>
|
|
949
|
+
<ref name="keyword"/>
|
|
950
|
+
<ref name="xref"/>
|
|
951
|
+
<ref name="hyperlink"/>
|
|
952
|
+
</choice>
|
|
953
|
+
</element>
|
|
954
|
+
</define>
|
|
955
|
+
<define name="del">
|
|
956
|
+
<element name="del">
|
|
957
|
+
<choice>
|
|
958
|
+
<ref name="PureTextElement"/>
|
|
959
|
+
<ref name="eref"/>
|
|
960
|
+
<ref name="stem"/>
|
|
961
|
+
<ref name="keyword"/>
|
|
962
|
+
<ref name="xref"/>
|
|
963
|
+
<ref name="hyperlink"/>
|
|
964
|
+
</choice>
|
|
965
|
+
</element>
|
|
756
966
|
</define>
|
|
757
967
|
<define name="concept">
|
|
758
968
|
<element name="concept">
|
|
759
969
|
<optional>
|
|
760
|
-
<attribute name="
|
|
970
|
+
<attribute name="ital">
|
|
971
|
+
<data type="boolean"/>
|
|
972
|
+
</attribute>
|
|
973
|
+
</optional>
|
|
974
|
+
<optional>
|
|
975
|
+
<attribute name="ref">
|
|
976
|
+
<data type="boolean"/>
|
|
977
|
+
</attribute>
|
|
978
|
+
</optional>
|
|
979
|
+
<optional>
|
|
980
|
+
<element name="refterm">
|
|
981
|
+
<zeroOrMore>
|
|
982
|
+
<choice>
|
|
983
|
+
<ref name="PureTextElement"/>
|
|
984
|
+
<ref name="stem"/>
|
|
985
|
+
</choice>
|
|
986
|
+
</zeroOrMore>
|
|
987
|
+
</element>
|
|
988
|
+
</optional>
|
|
989
|
+
<optional>
|
|
990
|
+
<element name="renderterm">
|
|
991
|
+
<zeroOrMore>
|
|
992
|
+
<choice>
|
|
993
|
+
<ref name="PureTextElement"/>
|
|
994
|
+
<ref name="stem"/>
|
|
995
|
+
</choice>
|
|
996
|
+
</zeroOrMore>
|
|
997
|
+
</element>
|
|
761
998
|
</optional>
|
|
762
999
|
<choice>
|
|
763
1000
|
<ref name="eref"/>
|
|
@@ -771,8 +1008,175 @@
|
|
|
771
1008
|
<ref name="requirement"/>
|
|
772
1009
|
<ref name="recommendation"/>
|
|
773
1010
|
<ref name="permission"/>
|
|
1011
|
+
<ref name="imagemap"/>
|
|
1012
|
+
<ref name="svgmap"/>
|
|
1013
|
+
<ref name="inputform"/>
|
|
1014
|
+
</choice>
|
|
1015
|
+
</define>
|
|
1016
|
+
<define name="inputform">
|
|
1017
|
+
<element name="form">
|
|
1018
|
+
<attribute name="id">
|
|
1019
|
+
<data type="ID"/>
|
|
1020
|
+
</attribute>
|
|
1021
|
+
<attribute name="name"/>
|
|
1022
|
+
<attribute name="action"/>
|
|
1023
|
+
<optional>
|
|
1024
|
+
<attribute name="class"/>
|
|
1025
|
+
</optional>
|
|
1026
|
+
<zeroOrMore>
|
|
1027
|
+
<choice>
|
|
1028
|
+
<ref name="TextElement"/>
|
|
1029
|
+
<ref name="FormInput"/>
|
|
1030
|
+
</choice>
|
|
1031
|
+
</zeroOrMore>
|
|
1032
|
+
</element>
|
|
1033
|
+
</define>
|
|
1034
|
+
<define name="FormInput">
|
|
1035
|
+
<choice>
|
|
1036
|
+
<ref name="input"/>
|
|
1037
|
+
<ref name="formlabel"/>
|
|
1038
|
+
<ref name="select"/>
|
|
1039
|
+
<ref name="textarea"/>
|
|
1040
|
+
</choice>
|
|
1041
|
+
</define>
|
|
1042
|
+
<define name="InputType">
|
|
1043
|
+
<choice>
|
|
1044
|
+
<value>button</value>
|
|
1045
|
+
<value>checkbox</value>
|
|
1046
|
+
<value>date</value>
|
|
1047
|
+
<value>file</value>
|
|
1048
|
+
<value>password</value>
|
|
1049
|
+
<value>radio</value>
|
|
1050
|
+
<value>submit</value>
|
|
1051
|
+
<value>text</value>
|
|
774
1052
|
</choice>
|
|
775
1053
|
</define>
|
|
1054
|
+
<define name="input">
|
|
1055
|
+
<element name="input">
|
|
1056
|
+
<attribute name="type">
|
|
1057
|
+
<ref name="InputType"/>
|
|
1058
|
+
</attribute>
|
|
1059
|
+
<optional>
|
|
1060
|
+
<attribute name="checked">
|
|
1061
|
+
<data type="boolean"/>
|
|
1062
|
+
</attribute>
|
|
1063
|
+
</optional>
|
|
1064
|
+
<optional>
|
|
1065
|
+
<attribute name="disabled">
|
|
1066
|
+
<data type="boolean"/>
|
|
1067
|
+
</attribute>
|
|
1068
|
+
</optional>
|
|
1069
|
+
<optional>
|
|
1070
|
+
<attribute name="readonly">
|
|
1071
|
+
<data type="boolean"/>
|
|
1072
|
+
</attribute>
|
|
1073
|
+
</optional>
|
|
1074
|
+
<optional>
|
|
1075
|
+
<attribute name="maxlength">
|
|
1076
|
+
<data type="int"/>
|
|
1077
|
+
</attribute>
|
|
1078
|
+
</optional>
|
|
1079
|
+
<optional>
|
|
1080
|
+
<attribute name="minlength">
|
|
1081
|
+
<data type="int"/>
|
|
1082
|
+
</attribute>
|
|
1083
|
+
</optional>
|
|
1084
|
+
<optional>
|
|
1085
|
+
<attribute name="name"/>
|
|
1086
|
+
</optional>
|
|
1087
|
+
<optional>
|
|
1088
|
+
<attribute name="value"/>
|
|
1089
|
+
</optional>
|
|
1090
|
+
<optional>
|
|
1091
|
+
<attribute name="id">
|
|
1092
|
+
<data type="ID"/>
|
|
1093
|
+
</attribute>
|
|
1094
|
+
</optional>
|
|
1095
|
+
</element>
|
|
1096
|
+
</define>
|
|
1097
|
+
<define name="formlabel">
|
|
1098
|
+
<element name="label">
|
|
1099
|
+
<attribute name="for">
|
|
1100
|
+
<data type="IDREF"/>
|
|
1101
|
+
</attribute>
|
|
1102
|
+
<zeroOrMore>
|
|
1103
|
+
<ref name="PureTextElement"/>
|
|
1104
|
+
</zeroOrMore>
|
|
1105
|
+
</element>
|
|
1106
|
+
</define>
|
|
1107
|
+
<define name="select">
|
|
1108
|
+
<element name="select">
|
|
1109
|
+
<optional>
|
|
1110
|
+
<attribute name="name"/>
|
|
1111
|
+
</optional>
|
|
1112
|
+
<optional>
|
|
1113
|
+
<attribute name="value"/>
|
|
1114
|
+
</optional>
|
|
1115
|
+
<optional>
|
|
1116
|
+
<attribute name="id">
|
|
1117
|
+
<data type="ID"/>
|
|
1118
|
+
</attribute>
|
|
1119
|
+
</optional>
|
|
1120
|
+
<optional>
|
|
1121
|
+
<attribute name="disabled">
|
|
1122
|
+
<data type="boolean"/>
|
|
1123
|
+
</attribute>
|
|
1124
|
+
</optional>
|
|
1125
|
+
<optional>
|
|
1126
|
+
<attribute name="multiple">
|
|
1127
|
+
<data type="boolean"/>
|
|
1128
|
+
</attribute>
|
|
1129
|
+
</optional>
|
|
1130
|
+
<optional>
|
|
1131
|
+
<attribute name="size">
|
|
1132
|
+
<data type="int"/>
|
|
1133
|
+
</attribute>
|
|
1134
|
+
</optional>
|
|
1135
|
+
<oneOrMore>
|
|
1136
|
+
<ref name="option"/>
|
|
1137
|
+
</oneOrMore>
|
|
1138
|
+
</element>
|
|
1139
|
+
</define>
|
|
1140
|
+
<define name="option">
|
|
1141
|
+
<element name="option">
|
|
1142
|
+
<optional>
|
|
1143
|
+
<attribute name="disabled">
|
|
1144
|
+
<data type="boolean"/>
|
|
1145
|
+
</attribute>
|
|
1146
|
+
</optional>
|
|
1147
|
+
<optional>
|
|
1148
|
+
<attribute name="value"/>
|
|
1149
|
+
</optional>
|
|
1150
|
+
<zeroOrMore>
|
|
1151
|
+
<ref name="PureTextElement"/>
|
|
1152
|
+
</zeroOrMore>
|
|
1153
|
+
</element>
|
|
1154
|
+
</define>
|
|
1155
|
+
<define name="textarea">
|
|
1156
|
+
<element name="textarea">
|
|
1157
|
+
<optional>
|
|
1158
|
+
<attribute name="name"/>
|
|
1159
|
+
</optional>
|
|
1160
|
+
<optional>
|
|
1161
|
+
<attribute name="value"/>
|
|
1162
|
+
</optional>
|
|
1163
|
+
<optional>
|
|
1164
|
+
<attribute name="id">
|
|
1165
|
+
<data type="ID"/>
|
|
1166
|
+
</attribute>
|
|
1167
|
+
</optional>
|
|
1168
|
+
<optional>
|
|
1169
|
+
<attribute name="rows">
|
|
1170
|
+
<data type="int"/>
|
|
1171
|
+
</attribute>
|
|
1172
|
+
</optional>
|
|
1173
|
+
<optional>
|
|
1174
|
+
<attribute name="cols">
|
|
1175
|
+
<data type="int"/>
|
|
1176
|
+
</attribute>
|
|
1177
|
+
</optional>
|
|
1178
|
+
</element>
|
|
1179
|
+
</define>
|
|
776
1180
|
<define name="bibliography">
|
|
777
1181
|
<element name="bibliography">
|
|
778
1182
|
<oneOrMore>
|
|
@@ -801,6 +1205,9 @@
|
|
|
801
1205
|
<data type="boolean"/>
|
|
802
1206
|
</attribute>
|
|
803
1207
|
</optional>
|
|
1208
|
+
<optional>
|
|
1209
|
+
<attribute name="number"/>
|
|
1210
|
+
</optional>
|
|
804
1211
|
<optional>
|
|
805
1212
|
<attribute name="obligation">
|
|
806
1213
|
<choice>
|
|
@@ -842,13 +1249,17 @@
|
|
|
842
1249
|
</define>
|
|
843
1250
|
<define name="IsoWorkgroup">
|
|
844
1251
|
<optional>
|
|
845
|
-
<attribute name="number"
|
|
846
|
-
<data type="int"/>
|
|
847
|
-
</attribute>
|
|
1252
|
+
<attribute name="number"/>
|
|
848
1253
|
</optional>
|
|
849
1254
|
<optional>
|
|
850
1255
|
<attribute name="type"/>
|
|
851
1256
|
</optional>
|
|
1257
|
+
<optional>
|
|
1258
|
+
<attribute name="identifier"/>
|
|
1259
|
+
</optional>
|
|
1260
|
+
<optional>
|
|
1261
|
+
<attribute name="prefix"/>
|
|
1262
|
+
</optional>
|
|
852
1263
|
<text/>
|
|
853
1264
|
</define>
|
|
854
1265
|
<define name="ics">
|
|
@@ -856,9 +1267,11 @@
|
|
|
856
1267
|
<element name="code">
|
|
857
1268
|
<text/>
|
|
858
1269
|
</element>
|
|
859
|
-
<
|
|
860
|
-
<text
|
|
861
|
-
|
|
1270
|
+
<optional>
|
|
1271
|
+
<element name="text">
|
|
1272
|
+
<text/>
|
|
1273
|
+
</element>
|
|
1274
|
+
</optional>
|
|
862
1275
|
</element>
|
|
863
1276
|
</define>
|
|
864
1277
|
<define name="standard-document">
|
|
@@ -871,6 +1284,9 @@
|
|
|
871
1284
|
</choice>
|
|
872
1285
|
</attribute>
|
|
873
1286
|
<ref name="bibdata"/>
|
|
1287
|
+
<optional>
|
|
1288
|
+
<ref name="misccontainer"/>
|
|
1289
|
+
</optional>
|
|
874
1290
|
<optional>
|
|
875
1291
|
<ref name="boilerplate"/>
|
|
876
1292
|
</optional>
|
|
@@ -881,11 +1297,21 @@
|
|
|
881
1297
|
<zeroOrMore>
|
|
882
1298
|
<ref name="annex"/>
|
|
883
1299
|
</zeroOrMore>
|
|
1300
|
+
<optional>
|
|
1301
|
+
<ref name="bibliography"/>
|
|
1302
|
+
</optional>
|
|
884
1303
|
<zeroOrMore>
|
|
885
|
-
<ref name="
|
|
1304
|
+
<ref name="indexsect"/>
|
|
886
1305
|
</zeroOrMore>
|
|
887
1306
|
</element>
|
|
888
1307
|
</define>
|
|
1308
|
+
<define name="misccontainer">
|
|
1309
|
+
<element name="misc-container">
|
|
1310
|
+
<oneOrMore>
|
|
1311
|
+
<ref name="AnyElement"/>
|
|
1312
|
+
</oneOrMore>
|
|
1313
|
+
</element>
|
|
1314
|
+
</define>
|
|
889
1315
|
<define name="preface">
|
|
890
1316
|
<element name="preface">
|
|
891
1317
|
<oneOrMore>
|
|
@@ -909,6 +1335,11 @@
|
|
|
909
1335
|
<ref name="Content-Section"/>
|
|
910
1336
|
</element>
|
|
911
1337
|
</define>
|
|
1338
|
+
<define name="indexsect">
|
|
1339
|
+
<element name="indexsect">
|
|
1340
|
+
<ref name="Content-Section"/>
|
|
1341
|
+
</element>
|
|
1342
|
+
</define>
|
|
912
1343
|
<define name="boilerplate">
|
|
913
1344
|
<element name="boilerplate">
|
|
914
1345
|
<optional>
|
|
@@ -1028,6 +1459,9 @@
|
|
|
1028
1459
|
</choice>
|
|
1029
1460
|
</attribute>
|
|
1030
1461
|
</optional>
|
|
1462
|
+
<optional>
|
|
1463
|
+
<attribute name="number"/>
|
|
1464
|
+
</optional>
|
|
1031
1465
|
<optional>
|
|
1032
1466
|
<attribute name="type"/>
|
|
1033
1467
|
</optional>
|
|
@@ -1081,29 +1515,32 @@
|
|
|
1081
1515
|
<optional>
|
|
1082
1516
|
<attribute name="type"/>
|
|
1083
1517
|
</optional>
|
|
1518
|
+
<optional>
|
|
1519
|
+
<attribute name="number"/>
|
|
1520
|
+
</optional>
|
|
1084
1521
|
<optional>
|
|
1085
1522
|
<ref name="section-title"/>
|
|
1086
1523
|
</optional>
|
|
1087
|
-
<
|
|
1524
|
+
<choice>
|
|
1088
1525
|
<choice>
|
|
1089
1526
|
<group>
|
|
1090
|
-
<
|
|
1527
|
+
<oneOrMore>
|
|
1091
1528
|
<ref name="BasicBlock"/>
|
|
1092
|
-
</
|
|
1529
|
+
</oneOrMore>
|
|
1093
1530
|
<zeroOrMore>
|
|
1094
1531
|
<ref name="note"/>
|
|
1095
1532
|
</zeroOrMore>
|
|
1096
1533
|
</group>
|
|
1097
1534
|
<ref name="amend"/>
|
|
1098
1535
|
</choice>
|
|
1099
|
-
<
|
|
1536
|
+
<oneOrMore>
|
|
1100
1537
|
<choice>
|
|
1101
1538
|
<ref name="clause-subsection"/>
|
|
1102
1539
|
<ref name="terms"/>
|
|
1103
1540
|
<ref name="definitions"/>
|
|
1104
1541
|
</choice>
|
|
1105
|
-
</
|
|
1106
|
-
</
|
|
1542
|
+
</oneOrMore>
|
|
1543
|
+
</choice>
|
|
1107
1544
|
</define>
|
|
1108
1545
|
<define name="Annex-Section">
|
|
1109
1546
|
<optional>
|
|
@@ -1164,49 +1601,7 @@
|
|
|
1164
1601
|
</define>
|
|
1165
1602
|
<define name="annex">
|
|
1166
1603
|
<element name="annex">
|
|
1167
|
-
<
|
|
1168
|
-
<attribute name="id">
|
|
1169
|
-
<data type="ID"/>
|
|
1170
|
-
</attribute>
|
|
1171
|
-
</optional>
|
|
1172
|
-
<optional>
|
|
1173
|
-
<attribute name="language"/>
|
|
1174
|
-
</optional>
|
|
1175
|
-
<optional>
|
|
1176
|
-
<attribute name="script"/>
|
|
1177
|
-
</optional>
|
|
1178
|
-
<optional>
|
|
1179
|
-
<attribute name="inline-header">
|
|
1180
|
-
<data type="boolean"/>
|
|
1181
|
-
</attribute>
|
|
1182
|
-
</optional>
|
|
1183
|
-
<attribute name="obligation">
|
|
1184
|
-
<choice>
|
|
1185
|
-
<value>normative</value>
|
|
1186
|
-
<value>informative</value>
|
|
1187
|
-
</choice>
|
|
1188
|
-
</attribute>
|
|
1189
|
-
<optional>
|
|
1190
|
-
<ref name="section-title"/>
|
|
1191
|
-
</optional>
|
|
1192
|
-
<group>
|
|
1193
|
-
<group>
|
|
1194
|
-
<zeroOrMore>
|
|
1195
|
-
<ref name="BasicBlock"/>
|
|
1196
|
-
</zeroOrMore>
|
|
1197
|
-
<zeroOrMore>
|
|
1198
|
-
<ref name="note"/>
|
|
1199
|
-
</zeroOrMore>
|
|
1200
|
-
</group>
|
|
1201
|
-
<zeroOrMore>
|
|
1202
|
-
<choice>
|
|
1203
|
-
<ref name="annex-subsection"/>
|
|
1204
|
-
<ref name="terms"/>
|
|
1205
|
-
<ref name="definitions"/>
|
|
1206
|
-
<ref name="references"/>
|
|
1207
|
-
</choice>
|
|
1208
|
-
</zeroOrMore>
|
|
1209
|
-
</group>
|
|
1604
|
+
<ref name="Annex-Section"/>
|
|
1210
1605
|
</element>
|
|
1211
1606
|
</define>
|
|
1212
1607
|
<define name="terms">
|
|
@@ -1225,6 +1620,9 @@
|
|
|
1225
1620
|
<optional>
|
|
1226
1621
|
<attribute name="type"/>
|
|
1227
1622
|
</optional>
|
|
1623
|
+
<optional>
|
|
1624
|
+
<attribute name="number"/>
|
|
1625
|
+
</optional>
|
|
1228
1626
|
<optional>
|
|
1229
1627
|
<attribute name="obligation">
|
|
1230
1628
|
<choice>
|
|
@@ -1553,6 +1951,7 @@
|
|
|
1553
1951
|
<value>add</value>
|
|
1554
1952
|
<value>modify</value>
|
|
1555
1953
|
<value>delete</value>
|
|
1954
|
+
<value>replace</value>
|
|
1556
1955
|
</choice>
|
|
1557
1956
|
</attribute>
|
|
1558
1957
|
<optional>
|
|
@@ -1583,6 +1982,11 @@
|
|
|
1583
1982
|
</optional>
|
|
1584
1983
|
<optional>
|
|
1585
1984
|
<element name="newcontent">
|
|
1985
|
+
<optional>
|
|
1986
|
+
<attribute name="id">
|
|
1987
|
+
<data type="ID"/>
|
|
1988
|
+
</attribute>
|
|
1989
|
+
</optional>
|
|
1586
1990
|
<zeroOrMore>
|
|
1587
1991
|
<ref name="BasicBlock"/>
|
|
1588
1992
|
</zeroOrMore>
|
|
@@ -1616,4 +2020,87 @@
|
|
|
1616
2020
|
<text/>
|
|
1617
2021
|
</element>
|
|
1618
2022
|
</define>
|
|
2023
|
+
<define name="imagemap">
|
|
2024
|
+
<element name="imagemap">
|
|
2025
|
+
<ref name="figure"/>
|
|
2026
|
+
<zeroOrMore>
|
|
2027
|
+
<element name="area">
|
|
2028
|
+
<attribute name="type">
|
|
2029
|
+
<choice>
|
|
2030
|
+
<value>rect</value>
|
|
2031
|
+
<value>circle</value>
|
|
2032
|
+
<value>ellipse</value>
|
|
2033
|
+
<value>poly</value>
|
|
2034
|
+
</choice>
|
|
2035
|
+
</attribute>
|
|
2036
|
+
<choice>
|
|
2037
|
+
<ref name="xref"/>
|
|
2038
|
+
<ref name="hyperlink"/>
|
|
2039
|
+
<ref name="eref"/>
|
|
2040
|
+
</choice>
|
|
2041
|
+
<oneOrMore>
|
|
2042
|
+
<element name="coords">
|
|
2043
|
+
<attribute name="x">
|
|
2044
|
+
<data type="float"/>
|
|
2045
|
+
</attribute>
|
|
2046
|
+
<attribute name="y">
|
|
2047
|
+
<data type="float"/>
|
|
2048
|
+
</attribute>
|
|
2049
|
+
</element>
|
|
2050
|
+
</oneOrMore>
|
|
2051
|
+
<optional>
|
|
2052
|
+
<element name="radius">
|
|
2053
|
+
<attribute name="x">
|
|
2054
|
+
<data type="float"/>
|
|
2055
|
+
</attribute>
|
|
2056
|
+
<optional>
|
|
2057
|
+
<attribute name="y">
|
|
2058
|
+
<data type="float"/>
|
|
2059
|
+
</attribute>
|
|
2060
|
+
</optional>
|
|
2061
|
+
</element>
|
|
2062
|
+
</optional>
|
|
2063
|
+
</element>
|
|
2064
|
+
</zeroOrMore>
|
|
2065
|
+
</element>
|
|
2066
|
+
</define>
|
|
2067
|
+
<define name="svgmap">
|
|
2068
|
+
<element name="svgmap">
|
|
2069
|
+
<ref name="figure"/>
|
|
2070
|
+
<zeroOrMore>
|
|
2071
|
+
<element name="target">
|
|
2072
|
+
<attribute name="href">
|
|
2073
|
+
<data type="anyURI"/>
|
|
2074
|
+
</attribute>
|
|
2075
|
+
<choice>
|
|
2076
|
+
<ref name="xref"/>
|
|
2077
|
+
<ref name="hyperlink"/>
|
|
2078
|
+
<ref name="eref"/>
|
|
2079
|
+
</choice>
|
|
2080
|
+
</element>
|
|
2081
|
+
</zeroOrMore>
|
|
2082
|
+
</element>
|
|
2083
|
+
</define>
|
|
2084
|
+
<define name="ul_li">
|
|
2085
|
+
<element name="li">
|
|
2086
|
+
<optional>
|
|
2087
|
+
<attribute name="id">
|
|
2088
|
+
<data type="ID"/>
|
|
2089
|
+
</attribute>
|
|
2090
|
+
</optional>
|
|
2091
|
+
<optional>
|
|
2092
|
+
<attribute name="uncheckedcheckbox">
|
|
2093
|
+
<data type="boolean"/>
|
|
2094
|
+
</attribute>
|
|
2095
|
+
</optional>
|
|
2096
|
+
<optional>
|
|
2097
|
+
<attribute name="checkedcheckbox">
|
|
2098
|
+
<data type="boolean"/>
|
|
2099
|
+
</attribute>
|
|
2100
|
+
</optional>
|
|
2101
|
+
<oneOrMore>
|
|
2102
|
+
<ref name="BasicBlock"/>
|
|
2103
|
+
</oneOrMore>
|
|
2104
|
+
</element>
|
|
2105
|
+
</define>
|
|
1619
2106
|
</grammar>
|