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

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

Modified Files:
	its20.rnc its20.rng 
Log Message:
Small schema fixes

--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc	2013/04/03 16:14:24	1.19
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc	2013/04/04 09:13:17	1.20
@@ -212,7 +212,7 @@
   its-attribute.taConfidence? &
   its-attribute.taClassRef? &
   ((its-attribute.taSource, its-attribute.taIdent) | its-attribute.taIdentRef)? &
-  its-attribute.localeFilterList? &
+  (its-attribute.localeFilterList, its-attribute.localeFilterType?)? &
   ((
    (its-attribute.person | its-attribute.personRef )? &
    (its-attribute.org | its-attribute.orgRef )? &
@@ -242,7 +242,7 @@
   its-attribute.taConfidence.nons? &
   its-attribute.taClassRef.nons? &
   ((its-attribute.taSource.nons, its-attribute.taIdent.nons) | its-attribute.taIdentRef.nons)? &
-  its-attribute.localeFilterList.nons? &
+  (its-attribute.localeFilterList.nons, its-attribute.localeFilterType.nons?)? &
   ((
    (its-attribute.person.nons | its-attribute.personRef.nons )? &
    (its-attribute.org.nons | its-attribute.orgRef.nons )? &
@@ -259,7 +259,7 @@
   (((its-attribute.locQualityRatingScore.nons, its-attribute.locQualityRatingScoreThreshold.nons?) | (its-attribute.locQualityRatingVote.nons, its-attribute.locQualityRatingVoteThreshold.nons?)), its-attribute.locQualityRatingProfileRef.nons?)? &
   its-attribute.mtConfidence.nons? &
   its-attribute.allowedCharacters.nons? &
-  (its-attribute.storageSize.nons, its-attribute.storageEncoding.nons?, its-attribute.lineBreakType?)? &
+  (its-attribute.storageSize.nons, its-attribute.storageEncoding.nons?, its-attribute.lineBreakType.nons?)? &
   its-attribute.annotatorsRef.nons?
 
 its-span =
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng	2013/04/03 16:14:24	1.16
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng	2013/04/04 09:13:17	1.17
@@ -626,6 +626,9 @@
       </optional>
       <optional>
         <ref name="its-attribute.localeFilterList"/>
+        <optional>
+          <ref name="its-attribute.localeFilterType"/>
+        </optional>
       </optional>
       <optional>
         <choice>
@@ -780,6 +783,9 @@
       </optional>
       <optional>
         <ref name="its-attribute.localeFilterList.nons"/>
+        <optional>
+          <ref name="its-attribute.localeFilterType.nons"/>
+        </optional>
       </optional>
       <optional>
         <choice>
@@ -880,7 +886,7 @@
           <ref name="its-attribute.storageEncoding.nons"/>
         </optional>
         <optional>
-          <ref name="its-attribute.lineBreakType"/>
+          <ref name="its-attribute.lineBreakType.nons"/>
         </optional>
       </optional>
       <optional>

Received on Thursday, 4 April 2013 09:13:32 UTC