From a68ccb08929688195b7707f72a76998f71d608f0 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 16 Sep 2004 15:17:19 +0000
Subject: [PATCH] Support HTML forms in more places per the proposal adopted at
 the 15 Sep 2004 TC meeting

---
 docbook/xml/dbhierx.mod |  7 ++-----
 docbook/xml/dbpoolx.mod | 33 ++++++++++++++++++++++-----------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/docbook/xml/dbhierx.mod b/docbook/xml/dbhierx.mod
index 3e972d413..0973e19a7 100644
--- a/docbook/xml/dbhierx.mod
+++ b/docbook/xml/dbhierx.mod
@@ -103,10 +103,6 @@
 <!-- ...................................................................... -->
 <!-- Entities for element mixtures ........................................ -->
 
-<!-- The DocBook TC may produce an official forms module for DocBook. -->
-<!-- This PE provides the hook by which it can be inserted into the DTD. -->
-<!ENTITY % forms.hook "">
-
 <!ENTITY % local.divcomponent.mix "">
 <!ENTITY % divcomponent.mix
 		"%list.class;		|%admon.class;
@@ -126,7 +122,8 @@
 		|%formal.class;		|%compound.class;
 		|%genobj.class;		|%descobj.class;
 		|%ndxterm.class;        |beginpage
-		%local.refcomponent.mix;">
+		%forms.hook;
+                %local.refcomponent.mix;">
 
 <!ENTITY % local.indexdivcomponent.mix "">
 <!ENTITY % indexdivcomponent.mix
diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index afce004f3..4c961d09e 100644
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -60,6 +60,13 @@
      of DocBook.
 -->
 
+<!-- ...................................................................... -->
+<!-- Forms entities ....................................................... -->
+<!-- These PEs provide the hook by which the forms module can be inserted   -->
+<!-- into the DTD. -->
+<!ENTITY % forminlines.hook "">
+<!ENTITY % forms.hook "">
+
 <!-- ...................................................................... -->
 <!-- General-purpose semantics entities ................................... -->
 
@@ -248,7 +255,8 @@ f. Just BlockQuote; no other informal objects.
 		|%formal.class;		|%compound.class;
 		|%genobj.class;		|%descobj.class;
 		|%ndxterm.class;        |beginpage
-		%local.component.mix;">
+		%forms.hook;
+                %local.component.mix;">
 
 <!ENTITY % local.sidebar.mix "">
 <!ENTITY % sidebar.mix
@@ -258,7 +266,8 @@ f. Just BlockQuote; no other informal objects.
 		|%formal.class;		|procedure
 		|%genobj.class;
 		|%ndxterm.class;        |beginpage
-		%local.sidebar.mix;">
+		%forms.hook;
+                %local.sidebar.mix;">
 
 <!ENTITY % local.qandaset.mix "">
 <!ENTITY % qandaset.mix
@@ -268,7 +277,8 @@ f. Just BlockQuote; no other informal objects.
 		|%formal.class;		|procedure
 		|%genobj.class;
 		|%ndxterm.class;
-		%local.qandaset.mix;">
+		%forms.hook;
+                %local.qandaset.mix;">
 
 <!ENTITY % local.revdescription.mix "">
 <!ENTITY % revdescription.mix
@@ -293,7 +303,8 @@ f. Just BlockQuote; no other informal objects.
 		|%linespecific.class;	|%synop.class;
 		|%para.class;		|%informal.class;
 		|%ndxterm.class;        |beginpage
-		%local.example.mix;">
+		%forms.hook;
+                %local.example.mix;">
 
 <!ENTITY % local.highlights.mix "">
 <!ENTITY % highlights.mix
@@ -320,20 +331,23 @@ f. Just BlockQuote; no other informal objects.
 		|%formal.class;		|procedure|sidebar
 		|anchor|bridgehead|remark
 		|%ndxterm.class;        |beginpage
-		%local.admon.mix;">
+		%forms.hook;
+                %local.admon.mix;">
 
 <!ENTITY % local.figure.mix "">
 <!ENTITY % figure.mix
 		"%linespecific.class;	|%synop.class;
 					|%informal.class;
 		|%ndxterm.class;        |beginpage
-		%local.figure.mix;">
+		%forms.hook;
+                %local.figure.mix;">
 
 <!ENTITY % local.tabentry.mix "">
 <!ENTITY % tabentry.mix
 		"%list.class;		|%admon.class;
 		|%linespecific.class;
 		|%para.class;		|graphic|mediaobject
+		%forms.hook;
 		%local.tabentry.mix;">
 
 <!ENTITY % local.glossdef.mix "">
@@ -372,7 +386,8 @@ f. Just BlockQuote; no other informal objects.
 		|%para.class;		|%informal.class;
 		|%genobj.class;		|%descobj.class;
 		|%ndxterm.class;        |beginpage
-		%local.listpreamble.mix;">
+		%forms.hook;
+                %local.listpreamble.mix;">
 
 <!-- Character-level mixtures ............................................. -->
 
@@ -432,10 +447,6 @@ c. Just Emphasis and Trademark; no other word elements.
 d. Just Acronym, Emphasis, and Trademark; no other word elements.
 -->
 
-<!-- The DocBook TC may produce an official forms module for DocBook. -->
-<!-- This PE provides the hook by which it can be inserted into the DTD. -->
-<!ENTITY % forminlines.hook "">
-
 <!ENTITY % local.para.char.mix "">
 <!ENTITY % para.char.mix
 		"#PCDATA
-- 
2.40.0