From ee71d96c83ec86aeb0227f259c03ed3752cc04b3 Mon Sep 17 00:00:00 2001
From: Peter Harris <pharris@opentext.com>
Date: Thu, 11 Apr 2013 09:52:57 -0400
Subject: Allow multiple <enumref> in a <bitcase>

Signed-off-by: Peter Harris <pharris@opentext.com>
---
 doc/xml-xcb.txt | 13 +++++++++----
 src/xcb.xsd     |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/doc/xml-xcb.txt b/doc/xml-xcb.txt
index 7057727..cf6d14e 100644
--- a/doc/xml-xcb.txt
+++ b/doc/xml-xcb.txt
@@ -229,13 +229,18 @@ enum; the value is restricted to one of the constants named in the enum.
   <switch> instead for new protocol definitions.
 
 <switch name="identifier"> switch expression
-    <bitcase> bitcase expression, fields </bitcase> </switch>
+    <bitcase> bitcase expression(s), fields </bitcase> </switch>
 
   This element represents conditional inclusion of fields. It can be viewed
   as sequence of multiple ifs: if ( switch expression & bitcase expression )
-  is equal to bitcase expression, bitcase fields are included in structure.
-  It can be used only as the last field of structure. New protocol definitions
-  should prefer to use this instead of <valueparam>.
+  is non-zero, bitcase fields are included in structure.  It can be used only
+  as the last field of a structure.
+
+  When a bitcase includes multiple <enumref> clauses, the contents of the
+  bitcase are only present once regardless of the number of bitcase expressions
+  that match.
+
+  New protocol definitions should prefer to use this instead of <valueparam>.
 
 Expressions
 -----------
diff --git a/src/xcb.xsd b/src/xcb.xsd
index cfa90c9..4ef269e 100644
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -59,7 +59,7 @@ authorization from the authors.
   <xsd:complexType name="caseexpr">
     <xsd:sequence>
       <!-- case expression: -->
-      <xsd:group ref="expression" minOccurs="1" maxOccurs="1" />
+      <xsd:group ref="expression" minOccurs="1" maxOccurs="unbounded" />
       <!-- match -->
       <xsd:group ref="fields" minOccurs="1" maxOccurs="unbounded" />
       <xsd:choice>
-- 
cgit v1.2.3