From b44ec0b00289a5537f8710753ed4bdf95a10cfc4 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 25 Sep 2010 02:07:52 +0200
Subject: [PATCH] html5-syntax: substitute
 datatypeLibrary="http://whattf.org/datatype-draft"

complete validation is no longer ensured :-(
---
 html5-syntax/applications.rng   |  2 +-
 html5-syntax/block.rng          |  2 +-
 html5-syntax/common.rng         | 62 ++++++++++++++++-----------------
 html5-syntax/core-scripting.rng |  2 +-
 html5-syntax/data.rng           |  2 +-
 html5-syntax/embed.rng          |  8 ++---
 html5-syntax/form-datatypes.rng | 20 +++++------
 html5-syntax/media.rng          |  2 +-
 html5-syntax/meta.rng           |  2 +-
 html5-syntax/microdata.rng      |  2 +-
 html5-syntax/tables.rng         |  2 +-
 html5-syntax/web-forms.rng      |  2 +-
 html5-syntax/web-forms2.rng     |  2 +-
 13 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/html5-syntax/applications.rng b/html5-syntax/applications.rng
index 016f8c67c..22a5a2fa6 100644
--- a/html5-syntax/applications.rng
+++ b/html5-syntax/applications.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- ##################################################################### -->
   <define name="common.attrs.interact" combine="interleave">
     <a:documentation> RELAX NG Schema for HTML 5: Web Application Features              #</a:documentation>
diff --git a/html5-syntax/block.rng b/html5-syntax/block.rng
index 1869112b2..fc83d7d60 100644
--- a/html5-syntax/block.rng
+++ b/html5-syntax/block.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- ##################################################################### -->
   <define name="p.elem">
     <a:documentation> RELAX NG Schema for HTML 5: Basic Prose Markup                    #</a:documentation>
diff --git a/html5-syntax/common.rng b/html5-syntax/common.rng
index 41de53834..cde27b873 100644
--- a/html5-syntax/common.rng
+++ b/html5-syntax/common.rng
@@ -199,8 +199,8 @@
   <define name="common.attrs.dir">
     <attribute name="dir">
       <choice>
-        <value type="string" datatypeLibrary="http://whattf.org/datatype-draft">ltr</value>
-        <value type="string" datatypeLibrary="http://whattf.org/datatype-draft">rtl</value>
+        <value type="string">ltr</value>
+        <value type="string">rtl</value>
       </choice>
     </attribute>
   </define>
@@ -290,10 +290,10 @@
     </list>
   </define>
   <define name="common.data.browsing-context">
-    <data type="browsing-context" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="string"/>
   </define>
   <define name="common.data.browsing-context-or-keyword">
-    <data type="browsing-context-or-keyword" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="string"/>
   </define>
   <!--
     		xsd:string {
@@ -302,7 +302,7 @@
   -->
   <define name="common.data.id">
     <a:documentation>IDs and IDREFs</a:documentation>
-    <data type="ID" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="ID"/>
   </define>
   <!--
     		xsd:string {
@@ -310,17 +310,17 @@
     		}
   -->
   <define name="common.data.idref">
-    <data type="IDREF" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="IDREF"/>
   </define>
   <define name="common.data.idrefs">
-    <data type="IDREFS" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="IDREFS"/>
   </define>
   <define name="common.data.name">
-    <data type="ID" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="ID"/>
   </define>
   <!-- FIXME -->
   <define name="common.data.hash-name">
-    <data type="hash-name" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="string"/>
   </define>
   <!--
     		xsd:string {
@@ -329,7 +329,7 @@
   -->
   <define name="common.data.integer">
     <a:documentation>Numerical</a:documentation>
-    <data type="integer" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="integer"/>
   </define>
   <!--
     		xsd:string {
@@ -337,7 +337,7 @@
     		}
   -->
   <define name="common.data.integer.positive">
-    <data type="integer-positive" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="positiveInteger"/>
   </define>
   <!--
     		xsd:string {
@@ -345,7 +345,7 @@
     		}
   -->
   <define name="common.data.integer.non-negative">
-    <data type="integer-non-negative" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="nonNegativeInteger"/>
   </define>
   <!--
     		xsd:string {
@@ -359,7 +359,7 @@
     		}
   -->
   <define name="common.data.float">
-    <data type="float" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="float"/>
   </define>
   <!--
     		xsd:string {
@@ -367,7 +367,7 @@
     		}
   -->
   <define name="common.data.float.positive">
-    <data type="float-positive" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="float"/>
   </define>
   <!--
     		xsd:string {
@@ -375,7 +375,7 @@
     		}
   -->
   <define name="common.data.float.non-negative">
-    <data type="float-non-negative" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="float"/>
   </define>
   <!--
     		xsd:string {
@@ -384,27 +384,27 @@
   -->
   <define name="common.data.datetime">
     <a:documentation>Temporal</a:documentation>
-    <data type="datetime-tz" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="dateTime"/>
   </define>
   <define name="common.data.date-or-time">
-    <data type="date-or-time" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="date"/>
   </define>
   <define name="common.data.uri">
     <a:documentation>IRIs</a:documentation>
     <choice>
-      <value type="string" datatypeLibrary="http://whattf.org/datatype-draft"/>
-      <data type="iri-ref" datatypeLibrary="http://whattf.org/datatype-draft"/>
+      <value type="string"/>
+      <data type="anyURI"/>
     </choice>
   </define>
   <define name="common.data.uris">
     <list>
       <zeroOrMore>
-        <data type="iri-ref" datatypeLibrary="http://whattf.org/datatype-draft"/>
+        <data type="anyURI"/>
       </zeroOrMore>
     </list>
   </define>
   <define name="common.data.uri.absolute">
-    <data type="iri" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="anyURI"/>
   </define>
   <define name="common.data.sizes">
     <a:documentation>&lt;link type='icon'&gt; sizes</a:documentation>
@@ -419,18 +419,18 @@
   </define>
   <define name="common.data.mimetype">
     <a:documentation>MIME types</a:documentation>
-    <data type="mime-type" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="string"/>
   </define>
   <define name="common.data.charset">
     <a:documentation>Encodings</a:documentation>
-    <data type="charset" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="string"/>
   </define>
   <define name="common.data.meta-charset">
-    <data type="meta-charset" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="string"/>
   </define>
   <define name="common.data.refresh">
     <a:documentation>Refresh</a:documentation>
-    <data type="refresh" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="string"/>
   </define>
   <define name="common.data.default-style">
     <a:documentation>Default style</a:documentation>
@@ -439,26 +439,26 @@
   <!-- 		w:default-style -->
   <define name="common.data.mediaquery">
     <a:documentation>Media Queries</a:documentation>
-    <data type="media-query" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="string"/>
   </define>
   <define name="common.data.langcode">
     <a:documentation>Language Codes</a:documentation>
     <choice>
-      <value type="string" datatypeLibrary="http://whattf.org/datatype-draft"/>
-      <data type="language" datatypeLibrary="http://whattf.org/datatype-draft"/>
+      <value type="string"/>
+      <data type="language"/>
     </choice>
   </define>
   <define name="common.data.keylabellist">
     <a:documentation>List of Key Labels</a:documentation>
-    <data type="keylabellist" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="anyType"/>
   </define>
   <define name="common.data.microdata-identifier">
     <a:documentation>Microdata Identifier</a:documentation>
-    <data type="microdata-identifier" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="string"/>
   </define>
   <define name="common.data.zero">
     <a:documentation>Zero</a:documentation>
-    <data type="zero" datatypeLibrary="http://whattf.org/datatype-draft"/>
+    <data type="anyType"/>
   </define>
   <!-- ##################################################################### -->
   <!-- ##################################################################### -->
diff --git a/html5-syntax/core-scripting.rng b/html5-syntax/core-scripting.rng
index f2f8a1212..eb05b639a 100644
--- a/html5-syntax/core-scripting.rng
+++ b/html5-syntax/core-scripting.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- ##################################################################### -->
   <define name="script.elem.embedded">
     <a:documentation> RELAX NG Schema for HTML 5: Core Scripting                        #</a:documentation>
diff --git a/html5-syntax/data.rng b/html5-syntax/data.rng
index 0555c69d5..b04dcbc05 100644
--- a/html5-syntax/data.rng
+++ b/html5-syntax/data.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- ##################################################################### -->
   <define name="time.elem">
     <a:documentation> RELAX NG Schema for HTML 5: Static Data Markup                    #</a:documentation>
diff --git a/html5-syntax/embed.rng b/html5-syntax/embed.rng
index 395a31ddb..8e52ae167 100644
--- a/html5-syntax/embed.rng
+++ b/html5-syntax/embed.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- ##################################################################### -->
   <define name="img.elem">
     <a:documentation> RELAX NG Schema for HTML 5: Embedded Content                      #</a:documentation>
@@ -922,7 +922,7 @@ Image Maps</a:documentation>
   </define>
   <define name="area.attrs.coords.rect">
     <attribute name="coords">
-      <data type="rectangle"/>
+      <data type="token"/>
       <!--
         				xsd:token {
         					pattern = "-?[0-9]+,-?[0-9]+,-?[0-9]+,-?[0-9]+"
@@ -937,7 +937,7 @@ Image Maps</a:documentation>
   </define>
   <define name="area.attrs.coords.circle">
     <attribute name="coords">
-      <data type="circle"/>
+      <data type="token"/>
       <!--
         				xsd:token {
         					pattern = "-?[0-9]+,-?[0-9]+,[0-9]+"
@@ -952,7 +952,7 @@ Image Maps</a:documentation>
   </define>
   <define name="area.attrs.coords.poly">
     <attribute name="coords">
-      <data type="polyline"/>
+      <data type="token"/>
       <!--
         				xsd:token {
         					pattern = "-?[0-9]+,-?[0-9]+,-?[0-9]+,-?[0-9]+,-?[0-9]+,-?[0-9]+(,-?[0-9]+,-?[0-9]+)*"
diff --git a/html5-syntax/form-datatypes.rng b/html5-syntax/form-datatypes.rng
index e3d4acd8d..1ab508c91 100644
--- a/html5-syntax/form-datatypes.rng
+++ b/html5-syntax/form-datatypes.rng
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!-- ##################################################################### -->
   <define name="form.data.mimetypelist">
     <a:documentation> RELAX NG Schema for HTML 5: Datatypes related to forms            #</a:documentation>
     <!-- ##################################################################### -->
     <a:documentation>MIME types</a:documentation>
-    <data type="mime-type-list"/>
+    <data type="string"/>
   </define>
   <define name="form.data.charsetlist">
-    <data type="string" datatypeLibrary=""/>
+    <data type="string"/>
   </define>
   <!--
     FIXME should be a "a space- and/or comma-delimited 
@@ -16,34 +16,34 @@
   -->
   <define name="form.data.pattern">
     <a:documentation>ECMAScript Regular Expression</a:documentation>
-    <data type="pattern"/>
+    <data type="string"/>
   </define>
   <define name="form.data.datetime-local">
     <a:documentation>Temporal</a:documentation>
-    <data type="datetime-local"/>
+    <data type="dateTime"/>
   </define>
   <define name="form.data.date">
     <data type="date"/>
   </define>
   <define name="form.data.month">
-    <data type="month"/>
+    <data type="short"/>
   </define>
   <define name="form.data.week">
-    <data type="week"/>
+    <data type="short"/>
   </define>
   <define name="form.data.time">
     <data type="time"/>
   </define>
   <define name="form.data.emailaddress">
     <a:documentation>Email</a:documentation>
-    <data type="email-address"/>
+    <data type="string"/>
   </define>
   <define name="form.data.emailaddresslist">
-    <data type="email-address-list"/>
+    <data type="anyType"/>
   </define>
   <define name="form.data.color">
     <a:documentation>Color</a:documentation>
-    <data type="color"/>
+    <data type="token"/>
   </define>
 </grammar>
 <!--
diff --git a/html5-syntax/media.rng b/html5-syntax/media.rng
index ad15d6e2d..bd6b84684 100644
--- a/html5-syntax/media.rng
+++ b/html5-syntax/media.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- ##################################################################### -->
   <!-- src not included -->
   <define name="media.attrs">
diff --git a/html5-syntax/meta.rng b/html5-syntax/meta.rng
index ef74fa0d8..bb1f97f91 100644
--- a/html5-syntax/meta.rng
+++ b/html5-syntax/meta.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- ##################################################################### -->
   <define name="html.elem">
     <a:documentation> RELAX NG Schema for HTML 5: Global Structure &amp; Metadata          #</a:documentation>
diff --git a/html5-syntax/microdata.rng b/html5-syntax/microdata.rng
index 222b4191a..e1cfd41b5 100644
--- a/html5-syntax/microdata.rng
+++ b/html5-syntax/microdata.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- ##################################################################### -->
   <!-- ##################################################################### -->
   <define name="common.attrs.microdata">
diff --git a/html5-syntax/tables.rng b/html5-syntax/tables.rng
index c6d8e4371..1f643d515 100644
--- a/html5-syntax/tables.rng
+++ b/html5-syntax/tables.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- ##################################################################### -->
   <define name="tables.attrs.alignment">
     <a:documentation> RELAX NG Schema for HTML 5: Tables                                #</a:documentation>
diff --git a/html5-syntax/web-forms.rng b/html5-syntax/web-forms.rng
index 0fba118a9..e5012b125 100644
--- a/html5-syntax/web-forms.rng
+++ b/html5-syntax/web-forms.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- ##################################################################### -->
   <define name="common-form.attrs">
     <a:documentation> RELAX NG Schema for HTML 5: Web Forms 1.0 markup                  #</a:documentation>
diff --git a/html5-syntax/web-forms2.rng b/html5-syntax/web-forms2.rng
index 65966c2b7..21aee685a 100644
--- a/html5-syntax/web-forms2.rng
+++ b/html5-syntax/web-forms2.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://whattf.org/datatype-draft">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- ##################################################################### -->
   <define name="common-form.attrs" combine="interleave">
     <a:documentation> RELAX NG Schema for HTML 5: Web Forms 2.0 markup                  #</a:documentation>