- From: CVS User jkosek <cvsmail@w3.org>
- Date: Mon, 17 Dec 2012 15:48:02 +0000
- To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory gil:/tmp/cvs-serv23377
Modified Files:
its20-types.rnc its20-types.rng its20.rnc its20.rng
Log Message:
Added missing optionality
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/12/04 21:37:48 1.14
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/12/17 15:48:02 1.15
@@ -108,7 +108,7 @@
its-localeFilterList.type = string
-its-provenanceRecordsRefPointer.type = its-relative-selector.type
+its-provenanceRecordsRef.type = xsd:anyURI
its-person.type = string
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rng 2012/12/04 21:37:48 1.11
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rng 2012/12/17 15:48:02 1.12
@@ -142,8 +142,8 @@
<define name="its-localeFilterList.type">
<data type="string" datatypeLibrary=""/>
</define>
- <define name="its-provenanceRecordsRefPointer.type">
- <ref name="its-relative-selector.type"/>
+ <define name="its-provenanceRecordsRef.type">
+ <data type="anyURI"/>
</define>
<define name="its-person.type">
<data type="string" datatypeLibrary=""/>
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/12/13 16:27:10 1.16
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/12/17 15:48:02 1.17
@@ -93,8 +93,8 @@
its-attribute.provRef = attribute its:provRef { its-provRef.type }
its-attribute.provRef.nons = attribute provRef { its-provRef.type }
-its-attribute.provenanceRecordsRef = attribute its:provenanceRecordsRef { its-provenanceRecordsRefPointer.type }
-its-attribute.provenanceRecordsRef.nons = attribute provenanceRecordsRef { its-provenanceRecordsRefPointer.type }
+its-attribute.provenanceRecordsRef = attribute its:provenanceRecordsRef { its-provenanceRecordsRef.type }
+its-attribute.provenanceRecordsRef.nons = attribute provenanceRecordsRef { its-provenanceRecordsRef.type }
its-attribute.locQualityIssuesRef = attribute its:locQualityIssuesRef { its-locQualityIssuesRef.type }
its-attribute.locQualityIssuesRef.nons = attribute locQualityIssuesRef { its-locQualityIssuesRef.type }
@@ -261,7 +261,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?)? &
its-attribute.annotatorsRef.nons?
its-span =
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2012/12/13 16:27:10 1.13
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2012/12/17 15:48:02 1.14
@@ -303,12 +303,12 @@
</define>
<define name="its-attribute.provenanceRecordsRef">
<attribute name="its:provenanceRecordsRef">
- <ref name="its-provenanceRecordsRefPointer.type"/>
+ <ref name="its-provenanceRecordsRef.type"/>
</attribute>
</define>
<define name="its-attribute.provenanceRecordsRef.nons">
<attribute name="provenanceRecordsRef">
- <ref name="its-provenanceRecordsRefPointer.type"/>
+ <ref name="its-provenanceRecordsRef.type"/>
</attribute>
</define>
<define name="its-attribute.locQualityIssuesRef">
@@ -882,7 +882,9 @@
</optional>
<optional>
<ref name="its-attribute.storageSize.nons"/>
- <ref name="its-attribute.storageEncoding.nons"/>
+ <optional>
+ <ref name="its-attribute.storageEncoding.nons"/>
+ </optional>
<optional>
<ref name="its-attribute.lineBreakType"/>
</optional>
@@ -1365,35 +1367,31 @@
</define>
<define name="its-locQualityIssueRule.attributes">
<ref name="its-attribute.selector"/>
- <group>
- <choice>
- <group>
- <choice>
+ <choice>
+ <choice>
<ref name="its-attribute.locQualityIssuesRef.nons"/>
<ref name="its-attribute.locQualityIssuesRefPointer.nons"/>
</choice>
- </group>
- <group>
- <interleave>
+ <group>
+ <interleave>
+ <optional>
+ <ref name="its-attribute.locQualityIssueType.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.locQualityIssueComment.nons"/>
+ </optional>
+ </interleave>
<optional>
- <ref name="its-attribute.locQualityIssueType.nons"/>
+ <ref name="its-attribute.locQualityIssueSeverity.nons"/>
</optional>
<optional>
- <ref name="its-attribute.locQualityIssueComment.nons"/>
+ <ref name="its-attribute.locQualityIssueProfileRef.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>
+ <optional>
+ <ref name="its-attribute.locQualityIssueEnabled.nons"/>
+ </optional>
+ </group>
</choice>
- </group>
</define>
<define name="its-attribute.locQualityIssuesRefPointer.nons">
<attribute name="locQualityIssuesRefPointer">
Received on Monday, 17 December 2012 15:48:08 UTC