- From: CVS User jkosek <cvsmail@w3.org>
- Date: Tue, 07 May 2013 13:23:07 +0000
- To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory gil:/tmp/cvs-serv27122
Modified Files:
its20.rnc its20.rng
Log Message:
Minor schema fixes
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2013/04/29 07:23:01 1.23
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2013/05/07 13:23:07 1.24
@@ -213,8 +213,8 @@
(its-attribute.term, its-attribute.termInfoRef?, its-attribute.termConfidence?)? &
its-attribute.withinText? &
(its-attribute.taConfidence? &
- (its-attribute.taClassRef |
- ((its-attribute.taSource, its-attribute.taIdent) | its-attribute.taIdentRef))+)? &
+ (its-attribute.taClassRef? &
+ ((its-attribute.taSource, its-attribute.taIdent) | its-attribute.taIdentRef)?))? &
(its-attribute.localeFilterList, its-attribute.localeFilterType?)? &
((
(its-attribute.person | its-attribute.personRef )? &
@@ -228,7 +228,7 @@
its-attribute.provenanceRecordsRef)? &
(its-attribute.locQualityIssuesRef
|
- ((its-attribute.locQualityIssueType | its-attribute.locQualityIssueComment)+ & its-attribute.locQualityIssueSeverity? & its-attribute.locQualityIssueProfileRef? & its-attribute.locQualityIssueEnabled?)
+ ((its-attribute.locQualityIssueType? & its-attribute.locQualityIssueComment?) & its-attribute.locQualityIssueSeverity? & its-attribute.locQualityIssueProfileRef? & its-attribute.locQualityIssueEnabled?)
)? &
(((its-attribute.locQualityRatingScore, its-attribute.locQualityRatingScoreThreshold?) | (its-attribute.locQualityRatingVote, its-attribute.locQualityRatingVoteThreshold?)), its-attribute.locQualityRatingProfileRef?)? &
its-attribute.mtConfidence? &
@@ -243,8 +243,8 @@
(its-attribute.term.nons, its-attribute.termInfoRef.nons?, its-attribute.termConfidence.nons?)? &
its-attribute.withinText.nons? &
(its-attribute.taConfidence.nons? &
- (its-attribute.taClassRef.nons |
- ((its-attribute.taSource.nons, its-attribute.taIdent.nons) | its-attribute.taIdentRef.nons))+)? &
+ (its-attribute.taClassRef.nons? &
+ ((its-attribute.taSource.nons, its-attribute.taIdent.nons) | its-attribute.taIdentRef.nons)?))? &
(its-attribute.localeFilterList.nons, its-attribute.localeFilterType.nons?)? &
((
(its-attribute.person.nons | its-attribute.personRef.nons )? &
@@ -254,10 +254,10 @@
(its-attribute.revOrg.nons | its-attribute.revOrgRef.nons )? &
(its-attribute.revTool.nons | its-attribute.revToolRef.nons )? &
its-attribute.provRef.nons?)
- | its-attribute.provenanceRecordsRef)? &
+ | its-attribute.provenanceRecordsRef.nons)? &
(its-attribute.locQualityIssuesRef.nons
|
- ((its-attribute.locQualityIssueType.nons | its-attribute.locQualityIssueComment.nons)+ & its-attribute.locQualityIssueSeverity.nons? & its-attribute.locQualityIssueProfileRef.nons? & its-attribute.locQualityIssueEnabled.nons?)
+ ((its-attribute.locQualityIssueType.nons? & its-attribute.locQualityIssueComment.nons?) & its-attribute.locQualityIssueSeverity.nons? & its-attribute.locQualityIssueProfileRef.nons? & its-attribute.locQualityIssueEnabled.nons?)
)? &
(((its-attribute.locQualityRatingScore.nons, its-attribute.locQualityRatingScoreThreshold.nons?) | (its-attribute.locQualityRatingVote.nons, its-attribute.locQualityRatingVoteThreshold.nons?)), its-attribute.locQualityRatingProfileRef.nons?)? &
its-attribute.mtConfidence.nons? &
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2013/04/29 07:23:01 1.20
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2013/05/07 13:23:07 1.21
@@ -632,9 +632,11 @@
<optional>
<ref name="its-attribute.taConfidence"/>
</optional>
- <oneOrMore>
- <choice>
+ <interleave>
+ <optional>
<ref name="its-attribute.taClassRef"/>
+ </optional>
+ <optional>
<choice>
<group>
<ref name="its-attribute.taSource"/>
@@ -642,8 +644,8 @@
</group>
<ref name="its-attribute.taIdentRef"/>
</choice>
- </choice>
- </oneOrMore>
+ </optional>
+ </interleave>
</interleave>
</optional>
<optional>
@@ -702,12 +704,14 @@
<choice>
<ref name="its-attribute.locQualityIssuesRef"/>
<interleave>
- <oneOrMore>
- <choice>
+ <interleave>
+ <optional>
<ref name="its-attribute.locQualityIssueType"/>
+ </optional>
+ <optional>
<ref name="its-attribute.locQualityIssueComment"/>
- </choice>
- </oneOrMore>
+ </optional>
+ </interleave>
<optional>
<ref name="its-attribute.locQualityIssueSeverity"/>
</optional>
@@ -793,9 +797,11 @@
<optional>
<ref name="its-attribute.taConfidence.nons"/>
</optional>
- <oneOrMore>
- <choice>
+ <interleave>
+ <optional>
<ref name="its-attribute.taClassRef.nons"/>
+ </optional>
+ <optional>
<choice>
<group>
<ref name="its-attribute.taSource.nons"/>
@@ -803,8 +809,8 @@
</group>
<ref name="its-attribute.taIdentRef.nons"/>
</choice>
- </choice>
- </oneOrMore>
+ </optional>
+ </interleave>
</interleave>
</optional>
<optional>
@@ -856,19 +862,21 @@
<ref name="its-attribute.provRef.nons"/>
</optional>
</interleave>
- <ref name="its-attribute.provenanceRecordsRef"/>
+ <ref name="its-attribute.provenanceRecordsRef.nons"/>
</choice>
</optional>
<optional>
<choice>
<ref name="its-attribute.locQualityIssuesRef.nons"/>
<interleave>
- <oneOrMore>
- <choice>
+ <interleave>
+ <optional>
<ref name="its-attribute.locQualityIssueType.nons"/>
+ </optional>
+ <optional>
<ref name="its-attribute.locQualityIssueComment.nons"/>
- </choice>
- </oneOrMore>
+ </optional>
+ </interleave>
<optional>
<ref name="its-attribute.locQualityIssueSeverity.nons"/>
</optional>
Received on Tuesday, 7 May 2013 13:23:09 UTC