Allow imageobjectco in mediaobject; remove mediaobjectco

diff --git a/docbook/relaxng/src/callouts.rnc b/docbook/relaxng/src/callouts.rnc
index fba44e56f1a1e946e1ebbd47a8c2e8735e6edcaf..cec728013404aa29ac72289a60cb1caf9287d597 100644 (file)
--- a/docbook/relaxng/src/callouts.rnc
+++ b/docbook/relaxng/src/callouts.rnc
@@ -21,8 +21,6 @@ publishing.inlines |= db.coref
 list.blocks |= db.calloutlist
 verbatim.blocks |= db.programlistingco
 verbatim.blocks |= db.screenco
-graphic.blocks |= db.mediaobjectco
-screenshot.block |= db.mediaobjectco
 computeroutput.inlines |= db.co
 verbatim.inlines |= db.co
 prompt.inlines |= db.co
@@ -31,6 +29,8 @@ computeroutput.inlines |= db.co
 userinput.inlines |= db.co
 replaceable.inlines |= db.co
 
+mediaobject.content |= db.imageobjectco
+
 # ======================================================================
 
 ctrl:other-attribute [ name="area.units.attrib"
@@ -248,35 +248,6 @@ div {
 
 # ======================================================================
 
-[
-   db:refname [ "mediaobjectco" ]
-   db:refpurpose [ "" ]
-]
-div {
-
-   local.mediaobjectco.attributes = empty
-
-   mediaobjectco.role.attribute = attribute role { text }
-
-   mediaobjectco.attlist =
-      mediaobjectco.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.mediaobjectco.attributes
-
-   mediaobjectco.info = docbook.info.titleforbidden
-
-   db.mediaobjectco =
-      element mediaobjectco {
-         mediaobjectco.attlist,
-         mediaobjectco.info,
-         db.imageobjectco,
-         (db.imageobjectco | db.textobject)*
-      }
-}
-
-# ======================================================================
-
 [
    db:refname [ "imageobjectco" ]
    db:refpurpose [ "" ]
@@ -298,7 +269,7 @@ div {
    db.imageobjectco =
       element imageobjectco {
          imageobjectco.attlist,
-         imageobjectco.info?,
+         imageobjectco.info,
          db.areaspec,
          db.imageobject,
          db.calloutlist*