RFE #1708032: Fix pattern naming inconsistency with db.href.attribute*s*

diff --git a/docbook/relaxng/docbook/src/callouts.rnc b/docbook/relaxng/docbook/src/callouts.rnc
index 74edcb152f0f977abcdfec2743b4018250d17937..ab27dc8be9004a9a5f65749025d6092f78c812ed 100644 (file)
--- a/docbook/relaxng/docbook/src/callouts.rnc
+++ b/docbook/relaxng/docbook/src/callouts.rnc
@@ -214,7 +214,7 @@ div {
       db.area.role.attribute?
     & db.common.idreq.attributes
     & db.area.units.attribute
-    & (db.area.linkends.attribute | db.href.attribute)?
+    & (db.area.linkends.attribute | db.href.attributes)?
     & db.area.label.attribute?
     & db.area.coords.attribute
 
@@ -237,7 +237,7 @@ div {
       db.area.role.attribute?
     & db.common.attributes
     & db.area.units.attribute
-    & (db.area.linkends.attribute | db.href.attribute)?
+    & (db.area.linkends.attribute | db.href.attributes)?
     & db.area.label.attribute?
     & db.area.coords.attribute
 
@@ -264,7 +264,7 @@ div {
       db.areaset.role.attribute?
     & db.common.idreq.attributes
     & db.area.units.attribute
-    & (db.areaset.linkends.attribute | db.href.attribute)?
+    & (db.areaset.linkends.attribute | db.href.attributes)?
     & db.areaset.label.attribute?
 
    db.areaset =

diff --git a/docbook/relaxng/docbook/src/pool.rnc b/docbook/relaxng/docbook/src/pool.rnc
index 70ad09ee56cd21c10e84deebd3ec0cdc7d186e38..227f1f613103c116262481e2991e98d058079c60 100644 (file)
--- a/docbook/relaxng/docbook/src/pool.rnc
+++ b/docbook/relaxng/docbook/src/pool.rnc
@@ -250,7 +250,7 @@ db.xlink.actuate.attribute =
    ]
    attribute xlink:actuate { db.xlink.actuate.enumeration }
 
-db.href.attribute =
+db.href.attributes =
    db.xlink.href.attribute
  & db.xlink.type.attribute?
  & db.xlink.role.attribute?
@@ -358,10 +358,10 @@ db.common.idreq.attributes =
  & db.effectivity.attributes
 
 db.common.linking.attributes =
-   (db.linkend.attribute | db.href.attribute)?
+   (db.linkend.attribute | db.href.attributes)?
 
 db.common.req.linking.attributes =
-   db.linkend.attribute | db.href.attribute
+   db.linkend.attribute | db.href.attributes
 
 db.common.data.attributes =
    [