[docbook-checkins] CVS: docbook/xml dbpoolx.mod,1.15,1.16 dbhierx.mod,1.10,1.11

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

Update of /cvsroot/docbook/docbook/xml
In directory usw-pr-cvs1:/tmp/cvs-serv5948

Modified Files:
	dbpoolx.mod dbhierx.mod 
Log Message:
Implemented RFE #436072

Index: dbpoolx.mod
===================================================================
RCS file: /cvsroot/docbook/docbook/xml/dbpoolx.mod,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** dbpoolx.mod	2001/11/09 15:41:33	1.15
--- dbpoolx.mod	2001/11/09 15:51:52	1.16
***************
*** 855,858 ****
--- 855,865 ----
  		%local.bibliocomponent.mix;">
  
+ <!-- I don't think this is well placed, but it needs to be here because of -->
+ <!-- the reference to bibliocomponent.mix -->
+ <!ENTITY % local.info.class "">
+ <!ENTITY % info.class
+ 		"(graphic | mediaobject | legalnotice | modespec
+ 		| subjectset | keywordset | itermset | %bibliocomponent.mix;)+">
+ 
  <!ENTITY % biblioentry.module "INCLUDE">
  <![%biblioentry.module;[
***************
*** 904,909 ****
  <!ENTITY % articleinfo.element "INCLUDE">
  <![%articleinfo.element;[
! <!ELEMENT articleinfo %ho; ((graphic | mediaobject | legalnotice | modespec
! 	| subjectset | keywordset | itermset | %bibliocomponent.mix;)+)
  	%beginpage.exclusion;>
  <!--end of articleinfo.element-->]]>
--- 911,915 ----
  <!ENTITY % articleinfo.element "INCLUDE">
  <![%articleinfo.element;[
! <!ELEMENT articleinfo %ho; ((%info.class;)+)
  	%beginpage.exclusion;>
  <!--end of articleinfo.element-->]]>
***************
*** 1597,1602 ****
  <!ENTITY % sidebarinfo.element "INCLUDE">
  <![ %sidebarinfo.element; [
! <!ELEMENT sidebarinfo %ho; ((graphic | mediaobject | legalnotice | modespec
! 	| subjectset | keywordset | itermset | %bibliocomponent.mix;)+)
  	%beginpage.exclusion;>
  <!--end of sidebarinfo.element-->]]>
--- 1603,1607 ----
  <!ENTITY % sidebarinfo.element "INCLUDE">
  <![ %sidebarinfo.element; [
! <!ELEMENT sidebarinfo %ho; ((%info.class;)+)
  	%beginpage.exclusion;>
  <!--end of sidebarinfo.element-->]]>
***************
*** 3072,3077 ****
  <!ENTITY % objectinfo.element "INCLUDE">
  <![ %objectinfo.element; [
! <!ELEMENT objectinfo %ho; ((graphic | mediaobject | legalnotice | modespec
! 	| subjectset | keywordset | itermset | %bibliocomponent.mix;)+)
  	%beginpage.exclusion;>
  <!--end of objectinfo.element-->]]>
--- 3077,3081 ----
  <!ENTITY % objectinfo.element "INCLUDE">
  <![ %objectinfo.element; [
! <!ELEMENT objectinfo %ho; ((%info.class;)+)
  	%beginpage.exclusion;>
  <!--end of objectinfo.element-->]]>

Index: dbhierx.mod
===================================================================
RCS file: /cvsroot/docbook/docbook/xml/dbhierx.mod,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** dbhierx.mod	2001/11/09 15:09:53	1.10
--- dbhierx.mod	2001/11/09 15:51:52	1.11
***************
*** 233,239 ****
  <!ENTITY % setinfo.element "INCLUDE">
  <![%setinfo.element;[
! <!ELEMENT setinfo %ho; ((graphic | mediaobject
!         | legalnotice | modespec | subjectset
! 	| keywordset | itermset | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of setinfo.element-->]]>
--- 233,237 ----
  <!ENTITY % setinfo.element "INCLUDE">
  <![%setinfo.element;[
! <!ELEMENT setinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of setinfo.element-->]]>
***************
*** 301,307 ****
  <!ENTITY % bookinfo.element "INCLUDE">
  <![%bookinfo.element;[
! <!ELEMENT bookinfo %ho; ((graphic | mediaobject
!         | legalnotice | modespec | subjectset
! 	| keywordset | itermset | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of bookinfo.element-->]]>
--- 299,303 ----
  <!ENTITY % bookinfo.element "INCLUDE">
  <![%bookinfo.element;[
! <!ELEMENT bookinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of bookinfo.element-->]]>
***************
*** 838,845 ****
  <!ENTITY % appendixinfo.element "INCLUDE">
  <![ %appendixinfo.element; [
! <!ELEMENT appendixinfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of appendixinfo.element-->]]>
--- 834,838 ----
  <!ENTITY % appendixinfo.element "INCLUDE">
  <![ %appendixinfo.element; [
! <!ELEMENT appendixinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of appendixinfo.element-->]]>
***************
*** 862,869 ****
  <!ENTITY % bibliographyinfo.element "INCLUDE">
  <![ %bibliographyinfo.element; [
! <!ELEMENT bibliographyinfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of bibliographyinfo.element-->]]>
--- 855,859 ----
  <!ENTITY % bibliographyinfo.element "INCLUDE">
  <![ %bibliographyinfo.element; [
! <!ELEMENT bibliographyinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of bibliographyinfo.element-->]]>
***************
*** 886,893 ****
  <!ENTITY % chapterinfo.element "INCLUDE">
  <![ %chapterinfo.element; [
! <!ELEMENT chapterinfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of chapterinfo.element-->]]>
--- 876,880 ----
  <!ENTITY % chapterinfo.element "INCLUDE">
  <![ %chapterinfo.element; [
! <!ELEMENT chapterinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of chapterinfo.element-->]]>
***************
*** 910,917 ****
  <!ENTITY % glossaryinfo.element "INCLUDE">
  <![ %glossaryinfo.element; [
! <!ELEMENT glossaryinfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of glossaryinfo.element-->]]>
--- 897,901 ----
  <!ENTITY % glossaryinfo.element "INCLUDE">
  <![ %glossaryinfo.element; [
! <!ELEMENT glossaryinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of glossaryinfo.element-->]]>
***************
*** 934,941 ****
  <!ENTITY % indexinfo.element "INCLUDE">
  <![ %indexinfo.element; [
! <!ELEMENT indexinfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)>
  <!--end of indexinfo.element-->]]>
  
--- 918,922 ----
  <!ENTITY % indexinfo.element "INCLUDE">
  <![ %indexinfo.element; [
! <!ELEMENT indexinfo %ho; ((%info.class;)+)>
  <!--end of indexinfo.element-->]]>
  
***************
*** 957,964 ****
  <!ENTITY % setindexinfo.element "INCLUDE">
  <![ %setindexinfo.element; [
! <!ELEMENT setindexinfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of setindexinfo.element-->]]>
--- 938,942 ----
  <!ENTITY % setindexinfo.element "INCLUDE">
  <![ %setindexinfo.element; [
! <!ELEMENT setindexinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of setindexinfo.element-->]]>
***************
*** 981,988 ****
  <!ENTITY % partinfo.element "INCLUDE">
  <![ %partinfo.element; [
! <!ELEMENT partinfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of partinfo.element-->]]>
--- 959,963 ----
  <!ENTITY % partinfo.element "INCLUDE">
  <![ %partinfo.element; [
! <!ELEMENT partinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of partinfo.element-->]]>
***************
*** 1005,1012 ****
  <!ENTITY % prefaceinfo.element "INCLUDE">
  <![ %prefaceinfo.element; [
! <!ELEMENT prefaceinfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of prefaceinfo.element-->]]>
--- 980,984 ----
  <!ENTITY % prefaceinfo.element "INCLUDE">
  <![ %prefaceinfo.element; [
! <!ELEMENT prefaceinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of prefaceinfo.element-->]]>
***************
*** 1029,1036 ****
  <!ENTITY % refentryinfo.element "INCLUDE">
  <![ %refentryinfo.element; [
! <!ELEMENT refentryinfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of refentryinfo.element-->]]>
--- 1001,1005 ----
  <!ENTITY % refentryinfo.element "INCLUDE">
  <![ %refentryinfo.element; [
! <!ELEMENT refentryinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of refentryinfo.element-->]]>
***************
*** 1053,1060 ****
  <!ENTITY % refsectioninfo.element "INCLUDE">
  <![ %refsectioninfo.element; [
! <!ELEMENT refsectioninfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of refsectioninfo.element-->]]>
--- 1022,1026 ----
  <!ENTITY % refsectioninfo.element "INCLUDE">
  <![ %refsectioninfo.element; [
! <!ELEMENT refsectioninfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of refsectioninfo.element-->]]>
***************
*** 1077,1084 ****
  <!ENTITY % refsect1info.element "INCLUDE">
  <![ %refsect1info.element; [
! <!ELEMENT refsect1info %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of refsect1info.element-->]]>
--- 1043,1047 ----
  <!ENTITY % refsect1info.element "INCLUDE">
  <![ %refsect1info.element; [
! <!ELEMENT refsect1info %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of refsect1info.element-->]]>
***************
*** 1101,1108 ****
  <!ENTITY % refsect2info.element "INCLUDE">
  <![ %refsect2info.element; [
! <!ELEMENT refsect2info %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of refsect2info.element-->]]>
--- 1064,1068 ----
  <!ENTITY % refsect2info.element "INCLUDE">
  <![ %refsect2info.element; [
! <!ELEMENT refsect2info %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of refsect2info.element-->]]>
***************
*** 1125,1132 ****
  <!ENTITY % refsect3info.element "INCLUDE">
  <![ %refsect3info.element; [
! <!ELEMENT refsect3info %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of refsect3info.element-->]]>
--- 1085,1089 ----
  <!ENTITY % refsect3info.element "INCLUDE">
  <![ %refsect3info.element; [
! <!ELEMENT refsect3info %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of refsect3info.element-->]]>
***************
*** 1149,1156 ****
  <!ENTITY % refsynopsisdivinfo.element "INCLUDE">
  <![ %refsynopsisdivinfo.element; [
! <!ELEMENT refsynopsisdivinfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of refsynopsisdivinfo.element-->]]>
--- 1106,1110 ----
  <!ENTITY % refsynopsisdivinfo.element "INCLUDE">
  <![ %refsynopsisdivinfo.element; [
! <!ELEMENT refsynopsisdivinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of refsynopsisdivinfo.element-->]]>
***************
*** 1173,1180 ****
  <!ENTITY % referenceinfo.element "INCLUDE">
  <![ %referenceinfo.element; [
! <!ELEMENT referenceinfo %ho; ((graphic | mediaobject
! 		| legalnotice | modespec
! 		| subjectset | keywordset | itermset
!                 | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of referenceinfo.element-->]]>
--- 1127,1131 ----
  <!ENTITY % referenceinfo.element "INCLUDE">
  <![ %referenceinfo.element; [
! <!ELEMENT referenceinfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of referenceinfo.element-->]]>
***************
*** 1195,1200 ****
  <!ENTITY % sect1info.element "INCLUDE">
  <![%sect1info.element;[
! <!ELEMENT sect1info %ho; ((graphic | mediaobject | legalnotice | modespec
! 	| subjectset | keywordset | itermset | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of sect1info.element-->]]>
--- 1146,1150 ----
  <!ENTITY % sect1info.element "INCLUDE">
  <![%sect1info.element;[
! <!ELEMENT sect1info %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of sect1info.element-->]]>
***************
*** 1214,1219 ****
  <!ENTITY % sect2info.element "INCLUDE">
  <![%sect2info.element;[
! <!ELEMENT sect2info %ho; ((graphic | mediaobject | legalnotice | modespec
! 	| subjectset | keywordset | itermset | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of sect2info.element-->]]>
--- 1164,1168 ----
  <!ENTITY % sect2info.element "INCLUDE">
  <![%sect2info.element;[
! <!ELEMENT sect2info %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of sect2info.element-->]]>
***************
*** 1233,1238 ****
  <!ENTITY % sect3info.element "INCLUDE">
  <![%sect3info.element;[
! <!ELEMENT sect3info %ho; ((graphic | mediaobject | legalnotice | modespec
! 	| subjectset | keywordset | itermset | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of sect3info.element-->]]>
--- 1182,1186 ----
  <!ENTITY % sect3info.element "INCLUDE">
  <![%sect3info.element;[
! <!ELEMENT sect3info %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of sect3info.element-->]]>
***************
*** 1252,1257 ****
  <!ENTITY % sect4info.element "INCLUDE">
  <![%sect4info.element;[
! <!ELEMENT sect4info %ho; ((graphic | mediaobject | legalnotice | modespec
! 	| subjectset | keywordset | itermset | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of sect4info.element-->]]>
--- 1200,1204 ----
  <!ENTITY % sect4info.element "INCLUDE">
  <![%sect4info.element;[
! <!ELEMENT sect4info %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of sect4info.element-->]]>
***************
*** 1271,1276 ****
  <!ENTITY % sect5info.element "INCLUDE">
  <![%sect5info.element;[
! <!ELEMENT sect5info %ho; ((graphic | mediaobject | legalnotice | modespec
! 	| subjectset | keywordset | itermset | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of sect5info.element-->]]>
--- 1218,1222 ----
  <!ENTITY % sect5info.element "INCLUDE">
  <![%sect5info.element;[
! <!ELEMENT sect5info %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of sect5info.element-->]]>
***************
*** 1326,1331 ****
  <!ENTITY % sectioninfo.element "INCLUDE">
  <![ %sectioninfo.element; [
! <!ELEMENT sectioninfo %ho; ((graphic | mediaobject | legalnotice | modespec
! 	| subjectset | keywordset | itermset | %bibliocomponent.mix;)+)
  		%beginpage.exclusion;>
  <!--end of sectioninfo.element-->]]>
--- 1272,1276 ----
  <!ENTITY % sectioninfo.element "INCLUDE">
  <![ %sectioninfo.element; [
! <!ELEMENT sectioninfo %ho; ((%info.class;)+)
  		%beginpage.exclusion;>
  <!--end of sectioninfo.element-->]]>