From c5d91dfcddcb8001c43d0a40730fdb98663de667 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Wed, 26 May 2004 13:03:43 +0000
Subject: [PATCH] Fixed db._any to be any other namespace; cleanup of patterns
 for mediaobject and equation for extensibility, added property element

---
 docbook/relaxng/src/pool.rnc | 49 ++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/docbook/relaxng/src/pool.rnc b/docbook/relaxng/src/pool.rnc
index 8c0b5d864..e5e468f17 100644
--- a/docbook/relaxng/src/pool.rnc
+++ b/docbook/relaxng/src/pool.rnc
@@ -63,7 +63,7 @@ default namespace = "http://docbook.org/docbook-ng"
 
 # ======================================================================
 
-db._any           = element * { db._any.attribute*, (text | db._any)* }
+db._any           = element * - db:* { db._any.attribute*, (text, db._any)* }
 db._any.attribute = attribute * { text }
 
 # ======================================================================
@@ -221,6 +221,7 @@ db.technical.inlines =
  | db.option
  | db.optional
  | db.package
+ | db.property
 
 db.error.inlines =
    db.errorcode
@@ -1825,7 +1826,7 @@ div {
 
 # ======================================================================
 
-db.mediaobject.contentmodel =
+db.mediaobject.content =
    db.videoobject | db.audioobject | db.imageobject | db.textobject
 
 # ======================================================================
@@ -1849,7 +1850,7 @@ div {
       element mediaobject {
          db.mediaobject.attlist,
          db.mediaobject.info,
-         db.mediaobject.contentmodel+
+         db.mediaobject.content+
       }
 }
 
@@ -1874,7 +1875,7 @@ div {
       element inlinemediaobject {
          db.inlinemediaobject.attlist,
          db.inlinemediaobject.info,
-         db.mediaobject.contentmodel+
+         db.mediaobject.content+
       }
 }
 
@@ -1930,6 +1931,10 @@ div {
 
 # ======================================================================
 
+db.imageobject.content = db.imagedata
+
+# ======================================================================
+
 [
    db:refname [ "imageobject" ]
    db:refpurpose [ "" ]
@@ -1949,7 +1954,7 @@ div {
       element imageobject {
          db.imageobject.attlist,
          db.imageobject.info,
-         db.imagedata
+         db.imageobject.content
       }
 }
 
@@ -2092,7 +2097,7 @@ div {
 
 # ======================================================================
 
-db.equation.contentmodel = db.mediaobject+
+db.equation.content = db.mediaobject
 
 # ======================================================================
 
@@ -2119,7 +2124,7 @@ div {
       element equation {
          db.equation.attlist,
          db.equation.info,
-         db.equation.contentmodel
+         db.equation.content+
       }
 }
 
@@ -2144,16 +2149,12 @@ div {
       element informalequation {
          db.informalequation.attlist,
          db.informalequation.info,
-         db.equation.contentmodel
+         db.equation.content+
       }
 }
 
 # ======================================================================
 
-db.inlineequation.contentmodel = db.inlinemediaobject+
-
-# ======================================================================
-
 [
    db:refname [ "inlineequation" ]
    db:refpurpose [ "" ]
@@ -2170,7 +2171,7 @@ div {
    db.inlineequation =
       element inlineequation {
          db.inlineequation.attlist,
-         db.inlineequation.contentmodel
+         db.equation.content+
       }
 }
 
@@ -5385,6 +5386,28 @@ div {
 
 # ======================================================================
 
+[
+   db:refname [ "property" ]
+   db:refpurpose [ "" ]
+]
+div {
+
+   db.property.role.attribute = attribute role { text }
+
+   db.property.attlist =
+      db.property.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+
+   db.property =
+      element property {
+         db.property.attlist,
+         db.all.inlines*
+      }
+}
+
+# ======================================================================
+
 [
    db:refname [ "parameter" ]
    db:refpurpose [ "" ]
-- 
2.40.0