From: Norman W. <nw...@us...> - 2001-11-19 12:40:30
|
Update of /cvsroot/docbook/docbook/xml In directory usw-pr-cvs1:/tmp/cvs-serv4115 Modified Files: dbhierx.mod dbpoolx.mod Log Message: Implemented RFE #456460 Index: dbhierx.mod =================================================================== RCS file: /cvsroot/docbook/docbook/xml/dbhierx.mod,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** dbhierx.mod 2001/11/13 17:53:58 1.13 --- dbhierx.mod 2001/11/19 12:40:26 1.14 *************** *** 645,652 **** <![%lotentry.attlist;[ <!ATTLIST lotentry ! srccredit CDATA #IMPLIED %pagenum.attrib; %common.attrib; - %linkend.attrib; %lotentry.role.attrib; %local.lotentry.attrib; --- 645,652 ---- <![%lotentry.attlist;[ <!ATTLIST lotentry ! %linkend.attrib; %pagenum.attrib; + srccredit CDATA #IMPLIED %common.attrib; %lotentry.role.attrib; %local.lotentry.attrib; *************** *** 818,823 **** %label.attrib; %common.attrib; - %local.partintro.attrib; %partintro.role.attrib; > <!--end of partintro.attlist-->]]> --- 818,823 ---- %label.attrib; %common.attrib; %partintro.role.attrib; + %local.partintro.attrib; > <!--end of partintro.attlist-->]]> Index: dbpoolx.mod =================================================================== RCS file: /cvsroot/docbook/docbook/xml/dbpoolx.mod,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** dbpoolx.mod 2001/11/18 19:45:32 1.25 --- dbpoolx.mod 2001/11/19 12:40:26 1.26 *************** *** 968,973 **** <!ATTLIST bibliomset relation CDATA #IMPLIED - %bibliomset.role.attrib; %common.attrib; %local.bibliomset.attrib; > --- 968,973 ---- <!ATTLIST bibliomset relation CDATA #IMPLIED %common.attrib; + %bibliomset.role.attrib; %local.bibliomset.attrib; > *************** *** 1193,1202 **** <![ %simplemsgentry.attlist; [ <!ATTLIST simplemsgentry - %common.attrib; - %simplemsgentry.role.attrib; - %local.simplemsgentry.attrib; audience CDATA #IMPLIED level CDATA #IMPLIED origin CDATA #IMPLIED > <!--end of simplemsgentry.attlist-->]]> --- 1193,1202 ---- <![ %simplemsgentry.attlist; [ <!ATTLIST simplemsgentry audience CDATA #IMPLIED level CDATA #IMPLIED origin CDATA #IMPLIED + %common.attrib; + %simplemsgentry.role.attrib; + %local.simplemsgentry.attrib; > <!--end of simplemsgentry.attlist-->]]> *************** *** 3128,3133 **** <!--Scalefit: Same as CALS scalefit--> <!ATTLIST videodata - %common.attrib; - %objectdata.attrib; width CDATA #IMPLIED depth CDATA #IMPLIED --- 3128,3131 ---- *************** *** 3138,3141 **** --- 3136,3141 ---- scalefit %yesorno.attvals; #IMPLIED + %objectdata.attrib; + %common.attrib; %videodata.role.attrib; %local.videodata.attrib; *************** *** 3157,3164 **** <![ %audiodata.attlist; [ <!ATTLIST audiodata - %common.attrib; %objectdata.attrib; ! %local.audiodata.attrib; %audiodata.role.attrib; > <!--end of audiodata.attlist-->]]> --- 3157,3164 ---- <![ %audiodata.attlist; [ <!ATTLIST audiodata %objectdata.attrib; ! %common.attrib; %audiodata.role.attrib; + %local.audiodata.attrib; > <!--end of audiodata.attlist-->]]> *************** *** 3185,3190 **** <!--Scalefit: Same as CALS scalefit--> <!ATTLIST imagedata - %common.attrib; - %objectdata.attrib; width CDATA #IMPLIED depth CDATA #IMPLIED --- 3185,3188 ---- *************** *** 3195,3200 **** scalefit %yesorno.attvals; #IMPLIED ! %local.imagedata.attrib; %imagedata.role.attrib; > <!--end of imagedata.attlist-->]]> --- 3193,3200 ---- scalefit %yesorno.attvals; #IMPLIED ! %objectdata.attrib; ! %common.attrib; %imagedata.role.attrib; + %local.imagedata.attrib; > <!--end of imagedata.attlist-->]]> *************** *** 3215,3220 **** <!ATTLIST caption %common.attrib; - %local.caption.attrib; %caption.role.attrib; > <!--end of caption.attlist-->]]> --- 3215,3220 ---- <!ATTLIST caption %common.attrib; %caption.role.attrib; + %local.caption.attrib; > <!--end of caption.attlist-->]]> *************** *** 3883,3891 **** <![%classsynopsis.attlist;[ <!ATTLIST classsynopsis %common.attrib; %classsynopsis.role.attrib; %local.classsynopsis.attrib; - language CDATA #IMPLIED - class (class|interface) "class" > <!--end of classsynopsis.attlist-->]]> --- 3883,3891 ---- <![%classsynopsis.attlist;[ <!ATTLIST classsynopsis + language CDATA #IMPLIED + class (class|interface) "class" %common.attrib; %classsynopsis.role.attrib; %local.classsynopsis.attrib; > <!--end of classsynopsis.attlist-->]]> *************** *** 4046,4052 **** <![%fieldsynopsis.attlist;[ <!ATTLIST fieldsynopsis %common.attrib; %fieldsynopsis.role.attrib; - language CDATA #IMPLIED %local.fieldsynopsis.attrib; > --- 4046,4052 ---- <![%fieldsynopsis.attlist;[ <!ATTLIST fieldsynopsis + language CDATA #IMPLIED %common.attrib; %fieldsynopsis.role.attrib; %local.fieldsynopsis.attrib; > *************** *** 4090,4096 **** <![%constructorsynopsis.attlist;[ <!ATTLIST constructorsynopsis %common.attrib; %constructorsynopsis.role.attrib; - language CDATA #IMPLIED %local.constructorsynopsis.attrib; > --- 4090,4096 ---- <![%constructorsynopsis.attlist;[ <!ATTLIST constructorsynopsis + language CDATA #IMPLIED %common.attrib; %constructorsynopsis.role.attrib; %local.constructorsynopsis.attrib; > *************** *** 4114,4120 **** <![%destructorsynopsis.attlist;[ <!ATTLIST destructorsynopsis %common.attrib; %destructorsynopsis.role.attrib; - language CDATA #IMPLIED %local.destructorsynopsis.attrib; > --- 4114,4120 ---- <![%destructorsynopsis.attlist;[ <!ATTLIST destructorsynopsis + language CDATA #IMPLIED %common.attrib; %destructorsynopsis.role.attrib; %local.destructorsynopsis.attrib; > *************** *** 4140,4146 **** <![%methodsynopsis.attlist;[ <!ATTLIST methodsynopsis %common.attrib; %methodsynopsis.role.attrib; - language CDATA #IMPLIED %local.methodsynopsis.attrib; > --- 4140,4146 ---- <![%methodsynopsis.attlist;[ <!ATTLIST methodsynopsis + language CDATA #IMPLIED %common.attrib; %methodsynopsis.role.attrib; %local.methodsynopsis.attrib; > *************** *** 4184,4190 **** <![%methodparam.attlist;[ <!ATTLIST methodparam - %common.attrib; - %methodparam.role.attrib; - %local.methodparam.attrib; choice (opt |req --- 4184,4187 ---- *************** *** 4192,4195 **** --- 4189,4195 ---- rep (norepeat |repeat) "norepeat" + %common.attrib; + %methodparam.role.attrib; + %local.methodparam.attrib; > <!--end of methodparam.attlist-->]]> *************** *** 5062,5068 **** <![%biblioid.attlist;[ <!ATTLIST biblioid - %common.attrib; class (urn|doi|isbn|issn|pubnumber|other) #IMPLIED otherclass CDATA #IMPLIED %biblioid.role.attrib; %local.biblioid.attrib; --- 5062,5068 ---- <![%biblioid.attlist;[ <!ATTLIST biblioid class (urn|doi|isbn|issn|pubnumber|other) #IMPLIED otherclass CDATA #IMPLIED + %common.attrib; %biblioid.role.attrib; %local.biblioid.attrib; *************** *** 5086,5092 **** <![%citebiblioid.attlist;[ <!ATTLIST citebiblioid - %common.attrib; class (urn|doi|isbn|issn|pubnumber|other) #IMPLIED otherclass CDATA #IMPLIED %citebiblioid.role.attrib; %local.citebiblioid.attrib; --- 5086,5092 ---- <![%citebiblioid.attlist;[ <!ATTLIST citebiblioid class (urn|doi|isbn|issn|pubnumber|other) #IMPLIED otherclass CDATA #IMPLIED + %common.attrib; %citebiblioid.role.attrib; %local.citebiblioid.attrib; *************** *** 6404,6411 **** <![ %constant.attlist; [ <!ATTLIST constant %common.attrib; %constant.role.attrib; %local.constant.attrib; - class (limit) #IMPLIED > <!--end of constant.attlist-->]]> --- 6404,6411 ---- <![ %constant.attlist; [ <!ATTLIST constant + class (limit) #IMPLIED %common.attrib; %constant.role.attrib; %local.constant.attrib; > <!--end of constant.attlist-->]]> |