[docbook-checkins] CVS: docbook/relaxng/docbook/src htmlform.rnc,1.3,1.4

[Norman W. <nw...@us...>]

Update of /cvsroot/docbook/docbook/relaxng/docbook/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30267

Modified Files:
	htmlform.rnc 
Log Message:
Fix action attribute; add enctype and accept attributes; support fieldset

Index: htmlform.rnc
===================================================================
RCS file: /cvsroot/docbook/docbook/relaxng/docbook/src/htmlform.rnc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -U2 -r1.3 -r1.4
--- htmlform.rnc	21 Apr 2005 11:40:01 -0000	1.3
+++ htmlform.rnc	21 Apr 2005 12:10:15 -0000	1.4
@@ -19,5 +19,11 @@
 
 db.extension.blocks |= db.html.form
-db.extension.inlines |= db.html.input | db.html.button | db.html.label | db.html.select | db.html.textarea
+db.extension.inlines |=
+   db.html.input
+ | db.html.button
+ | db.html.label
+ | db.html.select
+ | db.html.textarea
+ | db.html.fieldset
 
 # ======================================================================
@@ -35,4 +41,7 @@
     & attribute onsubmit { text }?
     & attribute onreset { text }?
+    & attribute enctype { text }?
+    & attribute accept { text }?
+    & attribute accept-charset { text }?
 
    db.html.form =
@@ -44,5 +53,6 @@
           | db.html.label
           | db.html.select
-          | db.html.textarea )+
+          | db.html.textarea
+          | db.html.fieldset)+
       }
 }
@@ -52,5 +62,5 @@
 [
    db:refname [ "html:input" ]
-   db:refpurpose [ "" ]
+   db:refpurpose [ "An input element in an HTML form" ]
 ]
 div {
@@ -97,5 +107,5 @@
 [
    db:refname [ "html:button" ]
-   db:refpurpose [ "" ]
+   db:refpurpose [ "A button in an HTML form" ]
 ]
 div {
@@ -123,5 +133,5 @@
 [
    db:refname [ "html:label" ]
-   db:refpurpose [ "" ]
+   db:refpurpose [ "A label in an HTML form" ]
 ]
 div {
@@ -144,5 +154,5 @@
 [
    db:refname [ "html:select" ]
-   db:refpurpose [ "" ]
+   db:refpurpose [ "A select element in an HTML form" ]
 ]
 div {
@@ -170,5 +180,5 @@
 [
    db:refname [ "html:option" ]
-   db:refpurpose [ "" ]
+   db:refpurpose [ "An option element in an HTML form" ]
 ]
 div {
@@ -191,5 +201,5 @@
 [
    db:refname [ "html:textarea" ]
-   db:refpurpose [ "" ]
+   db:refpurpose [ "A textarea element in an HTML form" ]
 ]
 div {
@@ -215,2 +225,46 @@
       }
 }
+
+# ======================================================================
+
+[
+   db:refname [ "html:fieldset" ]
+   db:refpurpose [ "A fieldset element in an HTML form" ]
+]
+div {
+
+   db.html.fieldset.attlist =
+      db.html.attrs
+
+   db.html.fieldset =
+      element html:fieldset {
+         db.html.fieldset.attlist,
+         db.html.legend?,
+         (db.all.blocks
+          | db.html.input
+          | db.html.button
+          | db.html.label
+          | db.html.select
+          | db.html.textarea
+          | db.html.fieldset)+
+      }
+}
+
+# ======================================================================
+
+[
+   db:refname [ "html:legend" ]
+   db:refpurpose [ "A legend in an HTML form fieldset" ]
+]
+div {
+
+   db.html.legend.attlist =
+      db.html.attrs
+    & attribute accesskey { text }?
+
+   db.html.legend =
+      element html:legend {
+         db.html.legend.attlist,
+         db.all.inlines*
+      }
+}