From: Norman Walsh Date: Thu, 12 Jan 2006 21:49:02 +0000 (+0000) Subject: Fix bug #1380477: allow area to inherit from areaset X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63fb9d7bf9bbd231c112e8e2598cb48ca65efb15;p=docbook-dsssl Fix bug #1380477: allow area to inherit from areaset --- diff --git a/docbook/relaxng/docbook/src/callouts.rnc b/docbook/relaxng/docbook/src/callouts.rnc index 903e83f07..1ebddcd38 100644 --- a/docbook/relaxng/docbook/src/callouts.rnc +++ b/docbook/relaxng/docbook/src/callouts.rnc @@ -197,6 +197,29 @@ div { # ====================================================================== +[ + db:refname [ "area" ] + db:refpurpose [ "A region defined for a Callout in a graphic or code example" ] +] +div { + # The only difference is that xml:id is optional + db.area.inareaset.attlist = + db.area.role.attribute? + & db.common.attributes + & db.area.units.attribute + & (db.area.linkends.attribute | db.href.attribute)? + & db.area.label.attribute? + & db.area.coords.attribute + + db.area.inareaset = + element area { + db.area.inareaset.attlist, + db.alt? + } +} + +# ====================================================================== + [ db:refname [ "areaset" ] db:refpurpose [ "A set of related areas in a graphic or code example" ] @@ -204,18 +227,20 @@ div { div { db.areaset.role.attribute = attribute role { text } + db.areaset.linkends.attribute = attribute linkends { xsd:IDREFS } db.areaset.label.attribute = attribute label { text } db.areaset.attlist = db.areaset.role.attribute? & db.common.idreq.attributes & db.area.units.attribute + & (db.areaset.linkends.attribute | db.href.attribute)? & db.areaset.label.attribute? db.areaset = element areaset { db.areaset.attlist, - db.area+ + db.area.inareaset+ } }