Improve definition of db._any

diff --git a/docbook/relaxng/docbook/src/mathml.rnc b/docbook/relaxng/docbook/src/mathml.rnc
index daea726cf587904130bfec86f86e37ae66ffb670..ddcab204664b6932c9f5924e81a914993c780d7b 100644 (file)
--- a/docbook/relaxng/docbook/src/mathml.rnc
+++ b/docbook/relaxng/docbook/src/mathml.rnc
@@ -25,10 +25,7 @@ db.equation.content |= db._any.mml
 ]
 div {
 
-  db._any.mml =
-    element mml:* {
-      db._any.attribute*,
-      (text | db._any)*
-    }
+   db._any.mml =
+      element mml:* { db._any }
 
 }

diff --git a/docbook/relaxng/docbook/src/pool.rnc b/docbook/relaxng/docbook/src/pool.rnc
index 3c42727b7150da984fb497655466874e0e91e9fc..2ecf2078c8169651f53ed9a30ab00fe2a42fe3eb 100644 (file)
--- a/docbook/relaxng/docbook/src/pool.rnc
+++ b/docbook/relaxng/docbook/src/pool.rnc
@@ -16,6 +16,7 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 namespace dbx = "http://sourceforge.net/projects/docbook/defguide/schema/extra-markup"
 namespace xlink = "http://www.w3.org/1999/xlink"
+namespace html = "http://www.w3.org/1999/xhtml"
 default namespace = "http://docbook.org/docbook-ng"
 
 # ======================================================================
@@ -26,8 +27,8 @@ default namespace = "http://docbook.org/docbook-ng"
 ]
 div {
 
-  db._any           = element * - db:* { db._any.attribute*, (text, db._any)* }
-  db._any.attribute = attribute * { text }
+   db._any =
+      element * - (db:* | html:*) { (attribute * { text } | text | db._any)* }
 
 }
 

diff --git a/docbook/relaxng/docbook/src/svg.rnc b/docbook/relaxng/docbook/src/svg.rnc
index 1e14130d10a38d8994cf99d1a57e0b62bcc46e5c..4dd56468fdbd4ce3a82c830990d3de11e4d2a3f7 100644 (file)
--- a/docbook/relaxng/docbook/src/svg.rnc
+++ b/docbook/relaxng/docbook/src/svg.rnc
@@ -25,10 +25,8 @@ db.imageobject.content |= db._any.svg
 ]
 div {
 
-  db._any.svg =
-    element svg:* {
-      db._any.attribute*,
-      (text | db._any)*
-    }
+   db._any.svg =
+      element svg:* { db._any }
+
 }