Skip to content

Commit ab4b1a4

Browse files
handrewshandrews
authored
Merge pull request #408 from handrews/ifmt
Internationalized formats
2 parents e4b2e95 + 211ab4d commit ab4b1a4

File tree

1 file changed

+83
-42
lines changed

1 file changed

+83
-42
lines changed

‎jsonschema-validation.xml

Lines changed: 83 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
<!ENTITY RFC2673 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.2673.xml">
88
<!ENTITY RFC3339 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.3339.xml">
99
<!ENTITY RFC3986 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.3986.xml">
10+
<!ENTITY RFC3987 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.3987.xml">
1011
<!ENTITY RFC4291 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.4291.xml">
1112
<!ENTITY RFC5322 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.5322.xml">
13+
<!ENTITY RFC5890 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.5890.xml">
14+
<!ENTITY RFC5891 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.5891.xml">
15+
<!ENTITY RFC6531 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6531.xml">
1216
<!ENTITY RFC6570 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6570.xml">
1317
<!ENTITY RFC6901 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6901.xml">
1418
<!ENTITY RFC7159 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.7159.xml">
@@ -950,68 +954,97 @@
950954
</t>
951955
</section>
952956

953-
<section title="email">
957+
<section title="Email addresses">
954958
<t>
955-
This attribute applies to string instances.
956-
</t>
957-
<t>
958-
A string instance is valid against this attribute if it is a valid
959-
Internet email address as defined by <xref target="RFC5322">RFC 5322,
960-
section 3.4.1</xref>.
961-
</t>
962-
</section>
963-
<section title="hostname">
964-
<t>
965-
This attribute applies to string instances.
966-
</t>
967-
<t>
968-
A string instance is valid against this attribute if it is a valid
969-
representation for an Internet host name, as defined by <xref
970-
target="RFC1034">RFC 1034, section 3.1</xref>.
971-
</t>
972-
</section>
973-
974-
<section title="ipv4">
975-
<t>
976-
This attribute applies to string instances.
959+
These attributes apply to string instances.
977960
</t>
978961
<t>
979-
A string instance is valid against this attribute if it is a valid
980-
representation of an IPv4 address according to the "dotted-quad" ABNF
981-
syntax as defined in <xref target="RFC2673">RFC 2673, section
982-
3.2</xref>.
962+
A string instance is valid against these attributes if it is a valid
963+
Internet email address as follows:
964+
<list style="hanging">
965+
<t hangText="email">
966+
As defined by <xref target="RFC5322">RFC 5322, section 3.4.1</xref>.
967+
</t>
968+
<t hangText="idn-email">
969+
As defined by <xref target="RFC6531">RFC 6531</xref>
970+
</t>
971+
</list>
972+
Note that all strings valid against the "email" attribute are also
973+
valid against the "idn-email" attribute.
983974
</t>
984975
</section>
985-
986-
<section title="ipv6">
976+
<section title="Hostnames">
987977
<t>
988-
This attribute applies to string instances.
978+
These attributes apply to string instances.
989979
</t>
990980
<t>
991-
A string instance is valid against this attribute if it is a valid
992-
representation of an IPv6 address as defined in
993-
<xref target="RFC4291">RFC 4291, section 2.2</xref>.
981+
A string instance is valid against these attributes if it is a valid
982+
representation for an Internet hostname as follows:
983+
<list style="hanging">
984+
<t hangText="hostname">
985+
As defined by <xref target="RFC1034">RFC 1034, section 3.1</xref>,
986+
including host names produced using the Punycode algorithm
987+
specified in <xref target="RFC5891">RFC 5891, section 4.4</xref>.
988+
</t>
989+
<t hangText="idn-hostname">
990+
As defined by either RFC 1034 as for hostname, or an
991+
internationalized hostname as defined by
992+
<xref target="RFC5890">RFC 5890, section 2.3.2.3</xref>.
993+
</t>
994+
</list>
995+
Note that all strings valid against the "hostname" attribute are also
996+
valid against the "idn-hostname" attribute.
994997
</t>
995998
</section>
996999

997-
<section title="uri">
1000+
<section title="IP addresses">
9981001
<t>
999-
This attribute applies to string instances.
1002+
These attributes apply to string instances.
10001003
</t>
10011004
<t>
1002-
A string instance is valid against this attribute if it is a valid URI,
1003-
according to <xref target="RFC3986"/>.
1005+
A string instance is valid against these attributes if it is a valid
1006+
representation of an IP address as follows:
1007+
<list style="hanging">
1008+
<t hangText="ipv4">
1009+
An IPv4 address according to the "dotted-quad" ABNF
1010+
syntax as defined in
1011+
<xref target="RFC2673">RFC 2673, section 3.2</xref>.
1012+
</t>
1013+
<t hangText="ipv6">
1014+
An IPv6 address as defined in
1015+
<xref target="RFC4291">RFC 4291, section 2.2</xref>.
1016+
</t>
1017+
</list>
10041018
</t>
10051019
</section>
10061020

1007-
<section title="uri-reference">
1021+
<section title="Resource identifiers">
10081022
<t>
1009-
This attribute applies to string instances.
1023+
These attributes apply to string instances.
10101024
</t>
10111025
<t>
1012-
A string instance is valid against this attribute if it is a valid URI
1013-
Reference (either a URI or a relative-reference),
1014-
according to <xref target="RFC3986"/>.
1026+
<list style="hanging">
1027+
<t hangText="uri">
1028+
A string instance is valid against this attribute if it is
1029+
a valid URI, according to <xref target="RFC3986"/>.
1030+
</t>
1031+
<t hangText="uri-reference">
1032+
A string instance is valid against this attribute if it is a valid URI
1033+
Reference (either a URI or a relative-reference),
1034+
according to <xref target="RFC3986"/>.
1035+
</t>
1036+
<t hangText="iri">
1037+
A string instance is valid against this attribute if it is
1038+
a valid IRI, according to <xref target="RFC3987"/>.
1039+
</t>
1040+
<t hangText="iri-reference">
1041+
A string instance is valid against this attribute if it is a valid IRI
1042+
Reference (either an IRI or a relative-reference),
1043+
according to <xref target="RFC3987"/>.
1044+
</t>
1045+
</list>
1046+
Note that all valid URIs are valid IRIs, and all valid URI References are
1047+
also valid IRI References.
10151048
</t>
10161049
</section>
10171050

@@ -1023,6 +1056,10 @@
10231056
A string instance is valid against this attribute if it is a valid URI Template
10241057
(of any level), according to <xref target="RFC6570"/>.
10251058
</t>
1059+
<t>
1060+
Note that URI Templates may be used for IRIs; there is no separate
1061+
IRI Template specification.
1062+
</t>
10261063
</section>
10271064

10281065
<section title="json-pointer">
@@ -1209,8 +1246,12 @@
12091246
&RFC2673;
12101247
&RFC3339;
12111248
&RFC3986;
1249+
&RFC3987;
12121250
&RFC4291;
1251+
&RFC5890;
1252+
&RFC5891;
12131253
&RFC6570;
1254+
&RFC6531;
12141255
&RFC6901;
12151256
&RFC7159;
12161257
&RFC5322;

0 commit comments

Comments
 (0)