[docbook-checkins] CVS: docbook/relaxng/docbook/src pool.rnc,1.27,1.28

[Norman W. <nw...@us...>]

Update of /cvsroot/docbook/docbook/relaxng/docbook/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23613

Modified Files:
	pool.rnc 
Log Message:
Added attribute default values per Jan 2006 telcon

Index: pool.rnc
===================================================================
RCS file: /cvsroot/docbook/docbook/relaxng/docbook/src/pool.rnc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -U2 -r1.27 -r1.28
--- pool.rnc	27 Jan 2006 21:37:17 -0000	1.27
+++ pool.rnc	29 Jan 2006 21:22:40 -0000	1.28
@@ -35,4 +35,5 @@
 namespace xlink = "http://www.w3.org/1999/xlink"
 namespace html = "http://www.w3.org/1999/xhtml"
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 default namespace = "http://docbook.org/ns/docbook"
 
@@ -1981,6 +1982,17 @@
    db.simplelist.role.attribute = attribute role { text }
 
-   db.simplelist.type.enumeration = "horiz" | "vert" | "inline"
+   db.simplelist.type.enumeration =
+   ## A tabular presentation in row-major order.
+   "horiz"
+ | ## A tabular presentation in column-major order.
+   "vert"
+ | ## An inline presentation, usually a comma-delimited list.
+   "inline"
+
    db.simplelist.type.attribute =
+      [
+         a:defaultValue="vert"
+         db:refpurpose [ "Specifies the type of list presentation." ]
+      ]
       attribute type { db.simplelist.type.enumeration }
 
@@ -2741,9 +2753,38 @@
 # ======================================================================
 
-db.rep.enumeration = "norepeat" | "repeat"
-db.rep.attribute = attribute rep { db.rep.enumeration }
+db.rep.enumeration =
+   ## Can not be repeated.
+   "norepeat"
+ | ## Can be repeated.
+   "repeat"
 
-db.choice.enumeration = "opt" | "plain" | "req"
-db.choice.attribute = attribute choice { db.choice.enumeration }
+db.rep.attribute =
+   [
+      a:defaultValue="norepeat"
+      db:refpurpose [ "Indicates whether or not repetition is possible." ]
+   ]
+   attribute rep { db.rep.enumeration }
+
+db.choice.enumeration =
+   ## Formatted to indicate that it is optional.
+   "opt"
+ | ## Formatted without indication.
+   "plain"
+ | ## Formatted to indicate that it is required.
+   "req"
+
+db.choice.opt.attribute =
+   [
+      a:defaultValue="opt"
+      db:refpurpose [ "Indicates optionality." ]
+   ]
+   attribute choice { db.choice.enumeration }
+
+db.choice.req.attribute =
+   [
+      a:defaultValue="req"
+      db:refpurpose [ "Indicates optionality." ]
+   ]
+   attribute choice { db.choice.enumeration }
 
 # ======================================================================
@@ -2762,5 +2803,5 @@
     & db.common.linking.attributes
     & db.rep.attribute?
-    & db.choice.attribute?
+    & db.choice.opt.attribute?
 
    db.arg =
@@ -2791,5 +2832,5 @@
     & db.common.linking.attributes
     & db.rep.attribute?
-    & db.choice.attribute?
+    & db.choice.opt.attribute?
 
    db.group =
@@ -3032,9 +3073,23 @@
    db.paramdef.role.attribute = attribute role { text }
 
+   db.paramdef.choice.enumeration =
+      ## Formatted to indicate that it is optional.
+      "opt"
+    | ## Formatted to indicate that it is required.
+      "req"
+
+   db.paramdef.choice.attribute =
+      [
+         a:defaultValue="opt"
+         db:refpurpose [ "Indicates optionality." ]
+      ]
+      attribute choice { db.paramdefl.choice.enumeration }
+
+
    db.paramdef.attlist =
       db.paramdef.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
-    & db.choice.attribute?
+    & db.paramdef.choice.attribute?
 
    db.paramdef =
@@ -3423,5 +3478,5 @@
     & db.common.linking.attributes
     & db.rep.attribute?
-    & db.choice.attribute?
+    & db.choice.req.attribute?
 
    db.methodparam =