From: Norman Walsh <ndw@nwalsh.com>
Date: Wed, 14 Dec 2005 12:25:40 +0000 (+0000)
Subject: Where svg:* or mml:* are allowed, allow svg:*+ or mml:*+ respectively
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfbd2384e5b05bd4ca8bddeb4df63f7b04b15906;p=docbook-dsssl

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 b46b98711..d4d31f224 100644
--- 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 51efd8863..c9724ca0a 100644
--- 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)*
+      }
 
 }