Move bibliorelation type attribute into a PE so that it can be expanded the way we...

diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index 3820b0b4f8d0e731e3e7e28a5fa13198f0ef5929..3c92ba71b96a161abe9c2aa53f4f78ec4fb1e4f6 100644 (file)
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -5248,18 +5248,9 @@ in the text (no (0) value, the default)
 <![%bibliorelation.module;[
 <!ENTITY % local.bibliorelation.attrib "">
 <!ENTITY % local.bibliorelation.types "">
-<!ENTITY % bibliorelation.role.attrib "%role.attrib;">
-
-<!ENTITY % bibliorelation.element "INCLUDE">
-<![%bibliorelation.element;[
-<!ELEMENT bibliorelation %ho; (%docinfo.char.mix;)*>
-<!--end of bibliorelation.element-->]]>
 
-<!ENTITY % bibliorelation.attlist "INCLUDE">
-<![%bibliorelation.attlist;[
-<!ATTLIST bibliorelation
-               %biblio.class.attrib;
-                type     (isversionof
+<!ENTITY % bibliorelation.type.attrib
+                "type    (isversionof
                          |hasversion
                          |isreplacedby
                          |replaces
@@ -5274,6 +5265,20 @@ in the text (no (0) value, the default)
                          |other
                          %local.bibliorelation.types;)       #IMPLIED
                othertype       CDATA   #IMPLIED
+">
+
+<!ENTITY % bibliorelation.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliorelation.element "INCLUDE">
+<![%bibliorelation.element;[
+<!ELEMENT bibliorelation %ho; (%docinfo.char.mix;)*>
+<!--end of bibliorelation.element-->]]>
+
+<!ENTITY % bibliorelation.attlist "INCLUDE">
+<![%bibliorelation.attlist;[
+<!ATTLIST bibliorelation
+               %biblio.class.attrib;
+               %bibliorelation.type.attrib;
                %common.attrib;
                %bibliorelation.role.attrib;
                %local.bibliorelation.attrib;