- From: CVS User jkosek <cvsmail@w3.org>
- Date: Wed, 28 Nov 2012 16:53:10 +0000
- To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory gil:/tmp/cvs-serv20669
Modified Files:
its20-types.rnc its20-types.rng its20.rnc its20.rng
Log Message:
Schemas now should reflect current state of things, even those not captured by spec. Only XML is now supported, HTML will be added later. Also comments and tidying will be needed.
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/11/28 10:38:47 1.6
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/11/28 16:53:10 1.7
@@ -165,21 +165,15 @@
its-locQualityIssueEnabled.type = "yes" | "no"
-its-locQualityPrecisScore.type = xsd:decimal { minInclusive = "0" maxInclusive = "100" }
+its-locQualityRatingScore.type = xsd:decimal { minInclusive = "0" maxInclusive = "1" }
-its-locQualityPrecisScorePointer.type = its-relative-selector.type
+its-locQualityRatingVote.type = xsd:integer
-its-locQualityPrecisVote.type = xsd:integer
+its-locQualityRatingScoreThreshold.type = xsd:decimal { minInclusive = "0" maxInclusive = "1" }
-its-locQualityPrecisVotePointer.type = its-relative-selector.type
+its-locQualityRatingVoteThreshold.type = xsd:integer
-its-locQualityPrecisThreshold.type = xsd:integer
-
-its-locQualityPrecisThresholdPointer.type = its-relative-selector.type
-
-its-locQualityPrecisProfileRef.type = xsd:anyURI
-
-its-locQualityPrecisProfileRefPointer.type = its-relative-selector.type
+its-locQualityRatingProfileRef.type = xsd:anyURI
its-mtConfidence.type = its-confidence.type
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rng 2012/11/28 10:38:47 1.3
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rng 2012/11/28 16:53:10 1.4
@@ -258,33 +258,27 @@
<value>no</value>
</choice>
</define>
- <define name="its-locQualityPrecisScore.type">
+ <define name="its-locQualityRatingScore.type">
<data type="decimal">
<param name="minInclusive">0</param>
- <param name="maxInclusive">100</param>
+ <param name="maxInclusive">1</param>
</data>
</define>
- <define name="its-locQualityPrecisScorePointer.type">
- <ref name="its-relative-selector.type"/>
- </define>
- <define name="its-locQualityPrecisVote.type">
+ <define name="its-locQualityRatingVote.type">
<data type="integer"/>
</define>
- <define name="its-locQualityPrecisVotePointer.type">
- <ref name="its-relative-selector.type"/>
+ <define name="its-locQualityRatingScoreThreshold.type">
+ <data type="decimal">
+ <param name="minInclusive">0</param>
+ <param name="maxInclusive">1</param>
+ </data>
</define>
- <define name="its-locQualityPrecisThreshold.type">
+ <define name="its-locQualityRatingVoteThreshold.type">
<data type="integer"/>
</define>
- <define name="its-locQualityPrecisThresholdPointer.type">
- <ref name="its-relative-selector.type"/>
- </define>
- <define name="its-locQualityPrecisProfileRef.type">
+ <define name="its-locQualityRatingProfileRef.type">
<data type="anyURI"/>
</define>
- <define name="its-locQualityPrecisProfileRefPointer.type">
- <ref name="its-relative-selector.type"/>
- </define>
<define name="its-mtConfidence.type">
<ref name="its-confidence.type"/>
</define>
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/11/28 10:38:47 1.9
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/11/28 16:53:10 1.10
@@ -114,17 +114,20 @@
its-attribute.locQualityIssueEnabled = attribute its:locQualityIssueEnabled { its-locQualityIssueEnabled.type }
its-attribute.locQualityIssueEnabled.nons = attribute locQualityIssueEnabled { its-locQualityIssueEnabled.type }
-its-attribute.locQualityPrecisScore = attribute its:locQualityPrecisScore { its-locQualityPrecisScore.type }
-its-attribute.locQualityPrecisScore.nons = attribute locQualityPrecisScore { its-locQualityPrecisScore.type }
+its-attribute.locQualityRatingScore = attribute its:locQualityRatingScore { its-locQualityRatingScore.type }
+its-attribute.locQualityRatingScore.nons = attribute locQualityRatingScore { its-locQualityRatingScore.type }
-its-attribute.locQualityPrecisVote = attribute its:locQualityPrecisVote { its-locQualityPrecisVote.type }
-its-attribute.locQualityPrecisVote.nons = attribute locQualityPrecisVote { its-locQualityPrecisVote.type }
+its-attribute.locQualityRatingVote = attribute its:locQualityRatingVote { its-locQualityRatingVote.type }
+its-attribute.locQualityRatingVote.nons = attribute locQualityRatingVote { its-locQualityRatingVote.type }
-its-attribute.locQualityPrecisThreshold = attribute its:locQualityPrecisThreshold { its-locQualityPrecisThreshold.type }
-its-attribute.locQualityPrecisThreshold.nons = attribute locQualityPrecisThreshold { its-locQualityPrecisThreshold.type }
+its-attribute.locQualityRatingScoreThreshold = attribute its:locQualityRatingScoreThreshold { its-locQualityRatingScoreThreshold.type }
+its-attribute.locQualityRatingScoreThreshold.nons = attribute locQualityRatingScoreThreshold { its-locQualityRatingScoreThreshold.type }
-its-attribute.locQualityPrecisProfileRef = attribute its:locQualityPrecisProfileRef { its-locQualityPrecisProfileRef.type }
-its-attribute.locQualityPrecisProfileRef.nons = attribute locQualityPrecisProfileRef { its-locQualityPrecisProfileRef.type }
+its-attribute.locQualityRatingVoteThreshold = attribute its:locQualityRatingVoteThreshold { its-locQualityRatingVoteThreshold.type }
+its-attribute.locQualityRatingVoteThreshold.nons = attribute locQualityRatingVoteThreshold { its-locQualityRatingVoteThreshold.type }
+
+its-attribute.locQualityRatingProfileRef = attribute its:locQualityRatingProfileRef { its-locQualityRatingProfileRef.type }
+its-attribute.locQualityRatingProfileRef.nons = attribute locQualityRatingProfileRef { its-locQualityRatingProfileRef.type }
its-attribute.mtConfidence = attribute its:mtConfidence { its-mtConfidence.type }
its-attribute.mtConfidence.nons = attribute mtConfidence { its-mtConfidence.type }
@@ -218,7 +221,7 @@
|
(its-attribute.locQualityIssueType? & its-attribute.locQualityIssueComment? & its-attribute.locQualityIssueSeverity? & its-attribute.locQualityIssueProfileRef? & its-attribute.locQualityIssueEnabled?)
)? &
- ((its-attribute.locQualityPrecisScore | its-attribute.locQualityPrecisVote), its-attribute.locQualityPrecisThreshold?, its-attribute.locQualityPrecisProfileRef?)? &
+ (((its-attribute.locQualityRatingScore, its-attribute.locQualityRatingScoreThreshold?) | (its-attribute.locQualityRatingVote, its-attribute.locQualityRatingVoteThreshold?)), its-attribute.locQualityRatingProfileRef?)? &
its-attribute.mtConfidence? &
its-attribute.allowedCharacters? &
(its-attribute.storageSize, its-attribute.storageEncoding?, its-attribute.lineBreakType?)? &
@@ -248,7 +251,7 @@
|
(its-attribute.locQualityIssueType.nons? & its-attribute.locQualityIssueComment.nons? & its-attribute.locQualityIssueSeverity.nons? & its-attribute.locQualityIssueProfileRef.nons? & its-attribute.locQualityIssueEnabled.nons?)
)? &
- ((its-attribute.locQualityPrecisScore.nons | its-attribute.locQualityPrecisVote.nons), its-attribute.locQualityPrecisThreshold.nons?, its-attribute.locQualityPrecisProfileRef.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? &
its-attribute.allowedCharacters.nons? &
(its-attribute.storageSize.nons, its-attribute.storageEncoding.nons, its-attribute.lineBreakType?)? &
@@ -410,6 +413,7 @@
its-disambiguationRule.attributes =
its-attribute.selector,
its-attribute.disambigGranularity.nons?,
+ its-attribute.disambigSource.nons?,
(its-attribute.disambigClassPointer.nons | its-attribute.disambigClassRefPointer.nons)?,
(its-attribute.disambigIdentPointer.nons | its-attribute.disambigIdentRefPointer.nons)?
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2012/11/28 10:38:47 1.6
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2012/11/28 16:53:10 1.7
@@ -371,44 +371,54 @@
<ref name="its-locQualityIssueEnabled.type"/>
</attribute>
</define>
- <define name="its-attribute.locQualityPrecisScore">
- <attribute name="its:locQualityPrecisScore">
- <ref name="its-locQualityPrecisScore.type"/>
+ <define name="its-attribute.locQualityRatingScore">
+ <attribute name="its:locQualityRatingScore">
+ <ref name="its-locQualityRatingScore.type"/>
</attribute>
</define>
- <define name="its-attribute.locQualityPrecisScore.nons">
- <attribute name="locQualityPrecisScore">
- <ref name="its-locQualityPrecisScore.type"/>
+ <define name="its-attribute.locQualityRatingScore.nons">
+ <attribute name="locQualityRatingScore">
+ <ref name="its-locQualityRatingScore.type"/>
</attribute>
</define>
- <define name="its-attribute.locQualityPrecisVote">
- <attribute name="its:locQualityPrecisVote">
- <ref name="its-locQualityPrecisVote.type"/>
+ <define name="its-attribute.locQualityRatingVote">
+ <attribute name="its:locQualityRatingVote">
+ <ref name="its-locQualityRatingVote.type"/>
</attribute>
</define>
- <define name="its-attribute.locQualityPrecisVote.nons">
- <attribute name="locQualityPrecisVote">
- <ref name="its-locQualityPrecisVote.type"/>
+ <define name="its-attribute.locQualityRatingVote.nons">
+ <attribute name="locQualityRatingVote">
+ <ref name="its-locQualityRatingVote.type"/>
</attribute>
</define>
- <define name="its-attribute.locQualityPrecisThreshold">
- <attribute name="its:locQualityPrecisThreshold">
- <ref name="its-locQualityPrecisThreshold.type"/>
+ <define name="its-attribute.locQualityRatingScoreThreshold">
+ <attribute name="its:locQualityRatingScoreThreshold">
+ <ref name="its-locQualityRatingScoreThreshold.type"/>
</attribute>
</define>
- <define name="its-attribute.locQualityPrecisThreshold.nons">
- <attribute name="locQualityPrecisThreshold">
- <ref name="its-locQualityPrecisThreshold.type"/>
+ <define name="its-attribute.locQualityRatingScoreThreshold.nons">
+ <attribute name="locQualityRatingScoreThreshold">
+ <ref name="its-locQualityRatingScoreThreshold.type"/>
</attribute>
</define>
- <define name="its-attribute.locQualityPrecisProfileRef">
- <attribute name="its:locQualityPrecisProfileRef">
- <ref name="its-locQualityPrecisProfileRef.type"/>
+ <define name="its-attribute.locQualityRatingVoteThreshold">
+ <attribute name="its:locQualityRatingVoteThreshold">
+ <ref name="its-locQualityRatingVoteThreshold.type"/>
</attribute>
</define>
- <define name="its-attribute.locQualityPrecisProfileRef.nons">
- <attribute name="locQualityPrecisProfileRef">
- <ref name="its-locQualityPrecisProfileRef.type"/>
+ <define name="its-attribute.locQualityRatingVoteThreshold.nons">
+ <attribute name="locQualityRatingVoteThreshold">
+ <ref name="its-locQualityRatingVoteThreshold.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.locQualityRatingProfileRef">
+ <attribute name="its:locQualityRatingProfileRef">
+ <ref name="its-locQualityRatingProfileRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.locQualityRatingProfileRef.nons">
+ <attribute name="locQualityRatingProfileRef">
+ <ref name="its-locQualityRatingProfileRef.type"/>
</attribute>
</define>
<define name="its-attribute.mtConfidence">
@@ -686,14 +696,21 @@
</optional>
<optional>
<choice>
- <ref name="its-attribute.locQualityPrecisScore"/>
- <ref name="its-attribute.locQualityPrecisVote"/>
+ <group>
+ <ref name="its-attribute.locQualityRatingScore"/>
+ <optional>
+ <ref name="its-attribute.locQualityRatingScoreThreshold"/>
+ </optional>
+ </group>
+ <group>
+ <ref name="its-attribute.locQualityRatingVote"/>
+ <optional>
+ <ref name="its-attribute.locQualityRatingVoteThreshold"/>
+ </optional>
+ </group>
</choice>
<optional>
- <ref name="its-attribute.locQualityPrecisThreshold"/>
- </optional>
- <optional>
- <ref name="its-attribute.locQualityPrecisProfileRef"/>
+ <ref name="its-attribute.locQualityRatingProfileRef"/>
</optional>
</optional>
<optional>
@@ -836,14 +853,21 @@
</optional>
<optional>
<choice>
- <ref name="its-attribute.locQualityPrecisScore.nons"/>
- <ref name="its-attribute.locQualityPrecisVote.nons"/>
+ <group>
+ <ref name="its-attribute.locQualityRatingScore.nons"/>
+ <optional>
+ <ref name="its-attribute.locQualityRatingScoreThreshold.nons"/>
+ </optional>
+ </group>
+ <group>
+ <ref name="its-attribute.locQualityRatingVote.nons"/>
+ <optional>
+ <ref name="its-attribute.locQualityRatingVoteThreshold.nons"/>
+ </optional>
+ </group>
</choice>
<optional>
- <ref name="its-attribute.locQualityPrecisThreshold.nons"/>
- </optional>
- <optional>
- <ref name="its-attribute.locQualityPrecisProfileRef.nons"/>
+ <ref name="its-attribute.locQualityRatingProfileRef.nons"/>
</optional>
</optional>
<optional>
@@ -1170,6 +1194,9 @@
<ref name="its-attribute.disambigGranularity.nons"/>
</optional>
<optional>
+ <ref name="its-attribute.disambigSource.nons"/>
+ </optional>
+ <optional>
<choice>
<ref name="its-attribute.disambigClassPointer.nons"/>
<ref name="its-attribute.disambigClassRefPointer.nons"/>
@@ -1347,7 +1374,7 @@
<ref name="its-attribute.locQualityIssueProfileRef.nons"/>
</optional>
<optional>
- <ref name="its-attribute.locQualityIssueEnabled"/>
+ <ref name="its-attribute.locQualityIssueEnabled.nons"/>
</optional>
</define>
<define name="its-attribute.locQualityIssuesRefPointer.nons">
Received on Wednesday, 28 November 2012 16:53:15 UTC