commit 1bf33b4b3954cc7e8958d90c0dd02c1a108871d6

Author: Andrew Beekhof <andrew@beekhof.net>

Date:   Fri Aug 23 13:27:48 2013 +1000

    Fix: xml: Location constraints are allowed to specify a role

diff --git a/xml/constraints-1.1.rng b/xml/constraints-1.1.rng

index e224600..425b54c 100644

--- a/xml/constraints-1.1.rng

+++ b/xml/constraints-1.1.rng

@@ -20,13 +20,13 @@

     <element name="rsc_location">

       <attribute name="id"><data type="ID"/></attribute>

       <attribute name="rsc"><data type="IDREF"/></attribute>

+      <optional>

+	<attribute name="role">

+	  <ref name="attribute-roles"/>

+	</attribute>

+      </optional>

       <choice>

 	<group>

-	  <optional>

-	    <attribute name="role">

-	      <ref name="attribute-roles"/>

-	    </attribute>

-	  </optional>

 	  <choice>

 	    <attribute name="domain"><data type="IDREF"/></attribute>

 	    <group>

diff --git a/xml/constraints-1.2.rng b/xml/constraints-1.2.rng

index f3af61f..221140c 100644

--- a/xml/constraints-1.2.rng

+++ b/xml/constraints-1.2.rng

@@ -20,6 +20,11 @@

     <element name="rsc_location">

       <attribute name="id"><data type="ID"/></attribute>

       <attribute name="rsc"><data type="IDREF"/></attribute>

+      <optional>

+	<attribute name="role">

+	  <ref name="attribute-roles"/>

+	</attribute>

+      </optional>

       <choice>

 	<group>

 	  <externalRef href="score.rng"/>