Reorganized a few patterns

diff --git a/docbook/relaxng/docbook/dbforms/htmlform.rnc b/docbook/relaxng/docbook/dbforms/htmlform.rnc
index 5ed245000f528cd1eacd61761353a5b0ad54a815..9714c0d657a2ecbca66bd362a89109f5726fcd41 100644 (file)
--- a/docbook/relaxng/docbook/dbforms/htmlform.rnc
+++ b/docbook/relaxng/docbook/dbforms/htmlform.rnc
@@ -34,8 +34,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
-db.extension.blocks |= db.html.form
-db.extension.inlines |=
+db.htmlform.blocks = db.html.form
+db.htmlform.inlines =
    db.html.input
  | db.html.button
  | db.html.label
@@ -43,6 +43,9 @@ db.extension.inlines |=
  | db.html.textarea
  | db.html.fieldset
 
+db.extension.blocks |= db.htmlform.blocks
+db.extension.inlines |= db.htmlform.inlines
+
 # ======================================================================
 
 db.html.onfocus.attribute =