Renamed xhtml-basic-form.rnc to xhtml-bform.rnc; all users fixed..

diff --git a/etc/schema/xhtml-basic-form.rnc b/etc/schema/xhtml-basic-form.rnc
deleted file mode 100644 (file)
index c0a78a1..0000000
--- a/etc/schema/xhtml-basic-form.rnc
+++ /dev/null
@@ -1,63 +0,0 @@
-# Simplified Forms Module
-
-form =
-  element form {
-    form.attlist,
-    # Don't use Block.model, because this gets redefined by the
-    # legacy module.
-    Block.class+
-  }
-form.attlist =
-  Common.attrib,
-  attribute action { URI.datatype },
-  attribute method { "get" | "post" }?,
-  attribute enctype { ContentType.datatype }?
-label = element label { label.attlist, Inline.model }
-label.attlist =
-  Common.attrib,
-  attribute for { IDREF.datatype }?,
-  attribute accesskey { Character.datatype }?
-input = element input { input.attlist }
-input.attlist =
-  Common.attrib,
-  attribute type { InputType.class }?,
-  attribute name { text }?,
-  attribute value { text }?,
-  attribute checked { "checked" }?,
-  attribute size { text }?,
-  attribute maxlength { Number.datatype }?,
-  attribute src { URI.datatype }?,
-  attribute accesskey { Character.datatype }?
-InputType.class =
-  "text"
-  | "password"
-  | "checkbox"
-  | "radio"
-  | "submit"
-  | "reset"
-  | "hidden"
-select = element select { select.attlist, option+ }
-select.attlist =
-  Common.attrib,
-  attribute name { text }?,
-  attribute size { Number.datatype }?,
-  attribute multiple { "multiple" }?
-option =
-  element option {
-    Common.attrib,
-    attribute selected { "selected" }?,
-    attribute value { text }?,
-    text
-  }
-textarea = element textarea { textarea.attlist }
-textarea.attlist =
-  Common.attrib,
-  attribute name { text }?,
-  attribute rows { Number.datatype },
-  attribute cols { Number.datatype },
-  attribute accesskey { Character.datatype }?,
-  text
-Form.class = form
-Formctrl.class = input | label | select | textarea
-Block.class |= Form.class
-Inline.class |= Formctrl.class

diff --git a/etc/schema/xhtml-bform.rnc b/etc/schema/xhtml-bform.rnc
new file mode 100644 (file)
index 0000000..c0a78a1
--- /dev/null
+++ b/etc/schema/xhtml-bform.rnc
@@ -0,0 +1,63 @@
+# Simplified Forms Module
+
+form =
+  element form {
+    form.attlist,
+    # Don't use Block.model, because this gets redefined by the
+    # legacy module.
+    Block.class+
+  }
+form.attlist =
+  Common.attrib,
+  attribute action { URI.datatype },
+  attribute method { "get" | "post" }?,
+  attribute enctype { ContentType.datatype }?
+label = element label { label.attlist, Inline.model }
+label.attlist =
+  Common.attrib,
+  attribute for { IDREF.datatype }?,
+  attribute accesskey { Character.datatype }?
+input = element input { input.attlist }
+input.attlist =
+  Common.attrib,
+  attribute type { InputType.class }?,
+  attribute name { text }?,
+  attribute value { text }?,
+  attribute checked { "checked" }?,
+  attribute size { text }?,
+  attribute maxlength { Number.datatype }?,
+  attribute src { URI.datatype }?,
+  attribute accesskey { Character.datatype }?
+InputType.class =
+  "text"
+  | "password"
+  | "checkbox"
+  | "radio"
+  | "submit"
+  | "reset"
+  | "hidden"
+select = element select { select.attlist, option+ }
+select.attlist =
+  Common.attrib,
+  attribute name { text }?,
+  attribute size { Number.datatype }?,
+  attribute multiple { "multiple" }?
+option =
+  element option {
+    Common.attrib,
+    attribute selected { "selected" }?,
+    attribute value { text }?,
+    text
+  }
+textarea = element textarea { textarea.attlist }
+textarea.attlist =
+  Common.attrib,
+  attribute name { text }?,
+  attribute rows { Number.datatype },
+  attribute cols { Number.datatype },
+  attribute accesskey { Character.datatype }?,
+  text
+Form.class = form
+Formctrl.class = input | label | select | textarea
+Block.class |= Form.class
+Inline.class |= Formctrl.class

diff --git a/etc/schema/xhtml-form.rnc b/etc/schema/xhtml-form.rnc
index f5544190b012d24a44a35583a230572c1df8a18a..99a0474afbe0f1eb44d2860d460092451562e5be 100644 (file)
--- a/etc/schema/xhtml-form.rnc
+++ b/etc/schema/xhtml-form.rnc
@@ -2,7 +2,7 @@
 
 # Unlike the DTD implementation, this builds on the basic-form module
 
-include "xhtml-basic-form.rnc" {
+include "xhtml-bform.rnc" {
   select = element select { select.attlist, (option | optgroup)+ }
 }
 form.attlist &=

diff --git a/etc/schema/xhtml.rnc b/etc/schema/xhtml.rnc
index 3218cd71e5b3018bec25b6e94417d47d5d3962e9..a99f0e0e8ed2a33e605858fefa7e237e487061b7 100644 (file)
--- a/etc/schema/xhtml.rnc
+++ b/etc/schema/xhtml.rnc
@@ -22,11 +22,11 @@ include "xhtml-bdo.rnc"
 include "xhtml-pres.rnc"
 include "xhtml-edit.rnc"
 include "xhtml-applet.rnc"
-# include "xhtml-basic-form.rnc"
+# include "xhtml-bform.rnc"
 include "xhtml-form.rnc"
 include "xhtml-style.rnc"
 include "xhtml-script.rnc"
-# include "xhtml-basic-table.rnc"
+# include "xhtml-btable.rnc"
 include "xhtml-table.rnc"
 include "xhtml-csismap.rnc"
 include "xhtml-events.rnc"