Added annotations for db.imagedata.mathml and db.imagedata.svg

diff --git a/docbook/relaxng/docbook/src/mathml.rnc b/docbook/relaxng/docbook/src/mathml.rnc
index 8a05d35138eda647c3409ce707218cbd29b90a3d..197b948fcb89ab81230d920516698ca4590cc8b9 100644 (file)
--- a/docbook/relaxng/docbook/src/mathml.rnc
+++ b/docbook/relaxng/docbook/src/mathml.rnc
@@ -35,12 +35,18 @@ namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
 db.equation.content |= db._any.mml+
+db.imageobject.content |= db.imagedata.mathml
 
-# Allow imagedata to contain MathML
+# ============================================================
 
-db.imagedata.mathml.role.attribute = attribute role { text }
+[
+   db:refname [ "imagedata" ]
+   db:refpurpose [ "A MathML expression in a media object" ]
+]
+div {
+   db.imagedata.mathml.role.attribute = attribute role { text }
 
-db.imagedata.mathml.attlist =
+   db.imagedata.mathml.attlist =
       db.imagedata.mathml.role.attribute?
     & db.common.attributes
     & attribute format { "mathml" }?
@@ -53,16 +59,17 @@ db.imagedata.mathml.attlist =
     & db.imagedata.depth.attribute?
     & db.imagedata.contentdepth.attribute?
 
-db.imagedata.mathml.info = db._info.title.forbidden
+   db.imagedata.mathml.info = db._info.title.forbidden
 
-db.imagedata.mathml =
-   element imagedata {
-      db.imagedata.mahtml.attlist,
-      db.imagedata.mathml.info,
-      db._any.mml+
-   }
+   db.imagedata.mathml =
+      element imagedata {
+         db.imagedata.attlist,
+         db.imagedata.info,
+         db._any.mml+
+      }
+}
 
-db.imageobject.content |= db.imagedata.mathml
+# ============================================================
 
 [
    db:refname [ "mml:*" ]