CVS WWW/International/multilingualweb/lt/drafts/its20/schemas

Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory gil:/tmp/cvs-serv7610/schemas

Modified Files:
	its20.rnc its20.rng 
Log Message:
implemented potential resolution to issue-62

--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc	2012/12/04 21:37:48	1.15
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc	2012/12/13 16:27:10	1.16
@@ -518,11 +518,11 @@
   its-attribute.selector,
   ((its-attribute.locQualityIssuesRef.nons | its-attribute.locQualityIssuesRefPointer.nons)
    |
-   (its-attribute.locQualityIssueType.nons? & its-attribute.locQualityIssueComment.nons?)
-  ),
+   ((its-attribute.locQualityIssueType.nons? & its-attribute.locQualityIssueComment.nons?)
+  ,
   its-attribute.locQualityIssueSeverity.nons?,
   its-attribute.locQualityIssueProfileRef.nons?,
-  its-attribute.locQualityIssueEnabled.nons?
+  its-attribute.locQualityIssueEnabled.nons?))
 
 its-attribute.locQualityIssuesRefPointer.nons = attribute locQualityIssuesRefPointer { its-relative-selector.type }
 
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng	2012/12/04 21:37:48	1.12
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng	2012/12/13 16:27:10	1.13
@@ -1365,11 +1365,15 @@
   </define>
   <define name="its-locQualityIssueRule.attributes">
     <ref name="its-attribute.selector"/>
-    <choice>
-      <choice>
+    <group>
+     <choice>
+      <group>
+       <choice>
         <ref name="its-attribute.locQualityIssuesRef.nons"/>
         <ref name="its-attribute.locQualityIssuesRefPointer.nons"/>
       </choice>
+      </group>
+       <group>
       <interleave>
         <optional>
           <ref name="its-attribute.locQualityIssueType.nons"/>
@@ -1378,16 +1382,18 @@
           <ref name="its-attribute.locQualityIssueComment.nons"/>
         </optional>
       </interleave>
+      <optional>
+        <ref name="its-attribute.locQualityIssueSeverity.nons"/>
+      </optional>
+      <optional>
+        <ref name="its-attribute.locQualityIssueProfileRef.nons"/>
+      </optional>
+      <optional>
+        <ref name="its-attribute.locQualityIssueEnabled.nons"/>
+      </optional>
+       </group>
     </choice>
-    <optional>
-      <ref name="its-attribute.locQualityIssueSeverity.nons"/>
-    </optional>
-    <optional>
-      <ref name="its-attribute.locQualityIssueProfileRef.nons"/>
-    </optional>
-    <optional>
-      <ref name="its-attribute.locQualityIssueEnabled.nons"/>
-    </optional>
+   </group>   
   </define>
   <define name="its-attribute.locQualityIssuesRefPointer.nons">
     <attribute name="locQualityIssuesRefPointer">

Received on Thursday, 13 December 2012 16:27:13 UTC