From d4a505509a5ca3215c14a245d2b11de2581f23de Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 12 Jul 2007 12:37:44 +0000
Subject: [PATCH] Refactored the 'common attributes extension pattern' a bit

---
 docbook/relaxng/docbook/src/pool.rnc | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/docbook/relaxng/docbook/src/pool.rnc b/docbook/relaxng/docbook/src/pool.rnc
index b19d76670..97e0eb73f 100644
--- a/docbook/relaxng/docbook/src/pool.rnc
+++ b/docbook/relaxng/docbook/src/pool.rnc
@@ -335,11 +335,8 @@ db.dir.attribute =
    ]
    attribute dir { db.dir.enumeration }
 
-db.common.extension.attributes = empty
-
-db.common.attributes =
-   db.xml.id.attribute?
- & db.version.attribute?
+db.common.base.attributes =
+   db.version.attribute?
  & db.xml.lang.attribute?
  & db.xml.base.attribute?
  & db.remap.attribute?
@@ -349,17 +346,13 @@ db.common.attributes =
  & db.effectivity.attributes
  & db.common.extension.attributes
 
+db.common.attributes =
+   db.xml.id.attribute?
+ & db.common.base.attributes
+
 db.common.idreq.attributes =
    db.xml.id.attribute
- & db.version.attribute?
- & db.xml.lang.attribute?
- & db.xml.base.attribute?
- & db.remap.attribute?
- & db.xreflabel.attribute?
- & db.revisionflag.attribute?
- & db.dir.attribute?
- & db.effectivity.attributes
- & db.common.extension.attributes
+ & db.common.base.attributes
 
 db.common.linking.attributes =
    (db.linkend.attribute | db.href.attributes)?
-- 
2.40.0