relaton-w3c 1.9.6 → 1.11.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: db2d2cf6329e829e43950fbf7ecee8086f7568797fea42040e3a0cefd5e3029a
4
- data.tar.gz: 2c28c079df6d7d84deeb38abfb8aff9dc358786caa6b07f0a06bd39e46be0ad1
3
+ metadata.gz: 4ce3bb960545ad6330d96829be3142732ba1c756e24b0e339ca52a094d7c9447
4
+ data.tar.gz: 8659ebfc94938514ca01a3f202f8b70fe4926268eedf7cc8cb83ef521eda5c8a
5
5
  SHA512:
6
- metadata.gz: dfdf8eea72bfbbe5e02309d7cc86e4b1d392d3d636797faaf9550d1e293bad3dee26c162a1f180f1f6815f87643198e2a3a26fced9e32786f948b10b06ea782c
7
- data.tar.gz: fc0d81a938cc8dda2a20779504a37e26b326a4889b31be42de788f773291f75686c67a13b644c092b03b00de7a57fb9032945d9c8e00a5d127689e4d584fe3f7
6
+ metadata.gz: 5620a3934fd79f4307489fc8c8129cf8f3c601aa71e3ef0ca568db8ced117bdc2260b392f8711c80f605930fa8fcc5a7f4b0fdf2cd72b551a7747d5bff902ce2
7
+ data.tar.gz: 71deae107a6f79a4633822855cdf70f4f6e693601f96bbb5f323642cdb78b8f686057793f8483dd012c1ea530adcce8d1d1ab405b8faae30d94a7e1c71def229
@@ -1,38 +1,38 @@
1
- <?xml version="1.0" encoding='UTF-8'?>
2
- <reference anchor="W3C.P3P" taret="http://www.w3.org/TR/P3P/">
3
- <front>
4
- <title>The Platform for Privacy Preferences 1.0 (P3P1.0) Specification</title>
5
- <author initials="M." surname="Marchiori" fullname="Massimo Marchiori">
6
- <organization abbrev="W3C">World Wide Web Consortium</organization>
7
- <address>
8
- <email>massimo@w3.or</email>
9
- </address>
10
- </author>
11
- <author initials="L." surname="Cranor" fullname="Lorrie Cranor">
12
- <organization>AT&amp;T</organization>
13
- <address>
14
- <url>http://lorrie.cranor.or/</url>
15
- </address>
16
- </author>
17
- <author initials="M." surname="Lanheinrich" fullname="Marc Langheinrich">
18
- <organization>ETH Zurich</organization>
19
- <address>
20
- <url>http://www.inf.ethz.ch/~lanhein/</url>
21
- </address>
22
- </author>
23
- <author initials="M." surname="Presler-Marshall" fullname="Martin Presler-Marshall">
24
- <organization>IBM</organization>
25
- <address>
26
- <email>mpresler@us.ibm.com</email>
27
- </address>
28
- </author>
29
- <author initials="J." surname="Reale" fullname="Joseph Reagle">
30
- <organization>W3C</organization>
31
- <address>
32
- <url>http://www.w3.or/People/Reagle/Overview.html</url>
33
- </address>
34
- </author>
35
- <date day="16" month="April" year="2002"/>
36
- </front>
37
- <seriesInfo name="W3C Recommendation" value="REC-PICS-services"/>
38
- </reference>
1
+ <?xml version="1.0" encoding='UTF-8'?>
2
+ <reference anchor="W3C.P3P" taret="http://www.w3.org/TR/P3P/">
3
+ <front>
4
+ <title>The Platform for Privacy Preferences 1.0 (P3P1.0) Specification</title>
5
+ <author initials="M." surname="Marchiori" fullname="Massimo Marchiori">
6
+ <organization abbrev="W3C">World Wide Web Consortium</organization>
7
+ <address>
8
+ <email>massimo@w3.or</email>
9
+ </address>
10
+ </author>
11
+ <author initials="L." surname="Cranor" fullname="Lorrie Cranor">
12
+ <organization>AT&amp;T</organization>
13
+ <address>
14
+ <url>http://lorrie.cranor.or/</url>
15
+ </address>
16
+ </author>
17
+ <author initials="M." surname="Lanheinrich" fullname="Marc Langheinrich">
18
+ <organization>ETH Zurich</organization>
19
+ <address>
20
+ <url>http://www.inf.ethz.ch/~lanhein/</url>
21
+ </address>
22
+ </author>
23
+ <author initials="M." surname="Presler-Marshall" fullname="Martin Presler-Marshall">
24
+ <organization>IBM</organization>
25
+ <address>
26
+ <email>mpresler@us.ibm.com</email>
27
+ </address>
28
+ </author>
29
+ <author initials="J." surname="Reale" fullname="Joseph Reagle">
30
+ <organization>W3C</organization>
31
+ <address>
32
+ <url>http://www.w3.or/People/Reagle/Overview.html</url>
33
+ </address>
34
+ </author>
35
+ <date day="16" month="April" year="2002"/>
36
+ </front>
37
+ <seriesInfo name="W3C Recommendation" value="REC-PICS-services"/>
38
+ </reference>
@@ -173,9 +173,11 @@
173
173
  <data type="dateTime"/>
174
174
  </attribute>
175
175
  </optional>
176
- <attribute name="from">
177
- <data type="IDREF"/>
178
- </attribute>
176
+ <optional>
177
+ <attribute name="from">
178
+ <data type="IDREF"/>
179
+ </attribute>
180
+ </optional>
179
181
  <optional>
180
182
  <attribute name="to">
181
183
  <data type="IDREF"/>
@@ -624,6 +626,9 @@
624
626
  <choice>
625
627
  <ref name="PureTextElement"/>
626
628
  <ref name="stem"/>
629
+ <ref name="eref"/>
630
+ <ref name="xref"/>
631
+ <ref name="hyperlink"/>
627
632
  </choice>
628
633
  </zeroOrMore>
629
634
  </element>
@@ -634,6 +639,9 @@
634
639
  <choice>
635
640
  <ref name="PureTextElement"/>
636
641
  <ref name="stem"/>
642
+ <ref name="eref"/>
643
+ <ref name="xref"/>
644
+ <ref name="hyperlink"/>
637
645
  </choice>
638
646
  </zeroOrMore>
639
647
  </element>
@@ -641,7 +649,12 @@
641
649
  <define name="tt">
642
650
  <element name="tt">
643
651
  <zeroOrMore>
644
- <ref name="PureTextElement"/>
652
+ <choice>
653
+ <ref name="PureTextElement"/>
654
+ <ref name="eref"/>
655
+ <ref name="xref"/>
656
+ <ref name="hyperlink"/>
657
+ </choice>
645
658
  </zeroOrMore>
646
659
  </element>
647
660
  </define>
@@ -822,7 +835,9 @@
822
835
  <attribute name="alt"/>
823
836
  </optional>
824
837
  <ref name="CitationType"/>
825
- <text/>
838
+ <oneOrMore>
839
+ <ref name="PureTextElement"/>
840
+ </oneOrMore>
826
841
  </define>
827
842
  <define name="hyperlink">
828
843
  <element name="link">
@@ -835,7 +850,9 @@
835
850
  <optional>
836
851
  <attribute name="alt"/>
837
852
  </optional>
838
- <text/>
853
+ <oneOrMore>
854
+ <ref name="PureTextElement"/>
855
+ </oneOrMore>
839
856
  </element>
840
857
  </define>
841
858
  <define name="xref">
@@ -849,7 +866,9 @@
849
866
  <optional>
850
867
  <attribute name="alt"/>
851
868
  </optional>
852
- <text/>
869
+ <oneOrMore>
870
+ <ref name="PureTextElement"/>
871
+ </oneOrMore>
853
872
  </element>
854
873
  </define>
855
874
  <define name="fn">
data/grammars/biblio.rng CHANGED
@@ -209,9 +209,6 @@
209
209
  <zeroOrMore>
210
210
  <ref name="contact"/>
211
211
  </zeroOrMore>
212
- <zeroOrMore>
213
- <ref name="uri"/>
214
- </zeroOrMore>
215
212
  </element>
216
213
  </define>
217
214
  <define name="fullname">
@@ -401,9 +398,9 @@
401
398
  <choice>
402
399
  <!-- iso191606 TODO -->
403
400
  <group>
404
- <oneOrMore>
401
+ <zeroOrMore>
405
402
  <ref name="street"/>
406
- </oneOrMore>
403
+ </zeroOrMore>
407
404
  <ref name="city"/>
408
405
  <optional>
409
406
  <ref name="state"/>
@@ -680,6 +677,9 @@
680
677
  <zeroOrMore>
681
678
  <ref name="extent"/>
682
679
  </zeroOrMore>
680
+ <optional>
681
+ <ref name="bibliographic_size"/>
682
+ </optional>
683
683
  <zeroOrMore>
684
684
  <ref name="accesslocation"/>
685
685
  </zeroOrMore>
@@ -828,6 +828,11 @@
828
828
  <optional>
829
829
  <attribute name="scope"/>
830
830
  </optional>
831
+ <optional>
832
+ <attribute name="primary">
833
+ <data type="boolean"/>
834
+ </attribute>
835
+ </optional>
831
836
  <text/>
832
837
  </element>
833
838
  </define>
@@ -920,9 +925,29 @@
920
925
  <text/>
921
926
  </element>
922
927
  </define>
928
+ <define name="sizevalue">
929
+ <element name="value">
930
+ <attribute name="type"/>
931
+ <text/>
932
+ </element>
933
+ </define>
934
+ <define name="bibliographic_size">
935
+ <element name="size">
936
+ <oneOrMore>
937
+ <ref name="sizevalue"/>
938
+ </oneOrMore>
939
+ </element>
940
+ </define>
923
941
  <define name="extent">
924
942
  <element name="extent">
925
- <ref name="BibItemLocality"/>
943
+ <choice>
944
+ <zeroOrMore>
945
+ <ref name="locality"/>
946
+ </zeroOrMore>
947
+ <zeroOrMore>
948
+ <ref name="localityStack"/>
949
+ </zeroOrMore>
950
+ </choice>
926
951
  </element>
927
952
  </define>
928
953
  <define name="series">