Use the DTD compatibility annotations to set the default values for xlink:type attributes

diff --git a/docbook/relaxng/src/pool.rnc b/docbook/relaxng/src/pool.rnc
index 753096f8cb65c69bf5a045d7686d8c0a5ac285de..921e0bba16458cffb64fdad6f2f80070ba5ed21c 100644 (file)
--- a/docbook/relaxng/src/pool.rnc
+++ b/docbook/relaxng/src/pool.rnc
@@ -60,6 +60,7 @@ namespace rng  = "http://relaxng.org/ns/structure/1.0"
 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 dtd = "http://relaxng.org/ns/compatibility/annotations/1.0"
 namespace xlink = "http://www.w3.org/1999/xlink"
 default namespace = "http://docbook.org/docbook-ng"
 
@@ -88,7 +89,7 @@ db.linkends.attribute = attribute linkends { xsd:IDREFS }
 
 db.href.attribute =
    attribute xlink:href { text }
- & attribute xlink:type { "simple" }?
+ & [ dtd:defaultValue="simple" ] attribute xlink:type { "simple" }?
  & attribute xlink:role { xsd:anyURI }?
  & attribute xlink:arcrole { xsd:anyURI }?
  & attribute xlink:title { text }?

diff --git a/docbook/relaxng/src/xlink.rnc b/docbook/relaxng/src/xlink.rnc
index e3d139c6255d51e1e601469fde2552d9fd289371..370ff215ad4434e86c7eb4628255adbdbe9ef893 100644 (file)
--- a/docbook/relaxng/src/xlink.rnc
+++ b/docbook/relaxng/src/xlink.rnc
@@ -15,6 +15,7 @@ namespace rng  = "http://relaxng.org/ns/structure/1.0"
 namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 namespace xlink = "http://www.w3.org/1999/xlink"
+namespace dtd = "http://relaxng.org/ns/compatibility/annotations/1.0"
 default namespace = "http://docbook.org/docbook-ng"
 
 db.info.elements |= db.extendedlink
@@ -32,7 +33,7 @@ div {
    db.extendedlink.attlist =
       db.extendedlink.role.attribute?
     & db.common.attributes
-    & attribute xlink:type { "extended" }?
+    & [ dtd:defaultValue="extended" ] attribute xlink:type { "extended" }?
     & attribute xlink:role { xsd:anyURI }?
     & attribute xlink:title { text }?
 
@@ -56,7 +57,7 @@ div {
    db.locator.attlist =
       db.locator.role.attribute?
     & db.common.attributes
-    & attribute xlink:type { "locator" }?
+    & [ dtd:defaultValue="locator" ] attribute xlink:type { "locator" }?
     & attribute xlink:href { text }
     & attribute xlink:role { xsd:anyURI }?
     & attribute xlink:title { text }?
@@ -82,7 +83,7 @@ div {
    db.arc.attlist =
       db.arc.role.attribute?
     & db.common.attributes
-    & attribute xlink:type { "arc" }?
+    & [ dtd:defaultValue="arc" ] attribute xlink:type { "arc" }?
     & attribute xlink:arcrole { xsd:anyURI }?
     & attribute xlink:title { text }?
     & attribute xlink:show { "new" | "replace" | "embed" | "other" }?