Where svg:* or mml:* are allowed, allow svg:*+ or mml:*+ respectively

diff --git a/docbook/relaxng/docbook/src/mathml.rnc b/docbook/relaxng/docbook/src/mathml.rnc
index b46b987110b48b80161e26fc063f5d2036aa0ea8..d4d31f224a71898683ca9ed25c759d3129dad7ae 100644 (file)
--- a/docbook/relaxng/docbook/src/mathml.rnc
+++ b/docbook/relaxng/docbook/src/mathml.rnc
@@ -34,7 +34,7 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
-db.equation.content |= db._any.mml
+db.equation.content |= db._any.mml+
 
 [
    db:refname [ "mml:*" ]
@@ -43,6 +43,9 @@ db.equation.content |= db._any.mml
 div {
 
    db._any.mml =
-      element mml:* { db._any }
+      element mml:* {
+         attribute * { text }*,
+         (text | db._any)*
+      }
 
 }

diff --git a/docbook/relaxng/docbook/src/svg.rnc b/docbook/relaxng/docbook/src/svg.rnc
index 51efd886397968c4ccf0d9e26c54a0fd413ca6a6..c9724ca0ab36cffe6e915a9c70284a79aca1798c 100644 (file)
--- a/docbook/relaxng/docbook/src/svg.rnc
+++ b/docbook/relaxng/docbook/src/svg.rnc
@@ -34,7 +34,7 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
-db.imageobject.content |= db._any.svg
+db.imageobject.content |= db._any.svg+
 
 [
    db:refname [ "svg:*" ]
@@ -43,7 +43,10 @@ db.imageobject.content |= db._any.svg
 div {
 
    db._any.svg =
-      element svg:* { db._any }
+      element svg:* {
+         attribute * { text }*,
+         (text | db._any)*
+      }
 
 }