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

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

Modified Files:
	its20-html5-types.rnc its20-html5.rnc 
Log Message:
Updates to HTML5 schema

--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-html5-types.rnc	2012/12/26 18:21:13	1.1
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-html5-types.rnc	2013/04/04 13:45:36	1.2
@@ -21,7 +21,7 @@
 
 datatypes w = "http://whattf.org/datatype-draft"
 
-its-confidence.type = xsd:decimal { minInclusive = "0" maxInclusive = "1" }
+its-confidence.type = xsd:double { minInclusive = "0" maxInclusive = "1" }
 
 its-locNote.type = string
 
@@ -63,25 +63,20 @@
 ## that case they MUST be delimited by quotation marks.
 its-domainMapping.type = string
 
-its-disambigGranularity.type =
-  w:string "lexical-concept" 
-  | 
-  w:string "ontology-concept"
-  | 
-  w:string "entity"
+its-taConfidence.type = its-confidence.type
 
-its-disambigConfidence.type = its-confidence.type
+its-taClassRef.type = w:iri-ref
 
-its-disambigClassRef.type = w:iri-ref
+its-taIdentRef.type = w:iri-ref
 
-its-disambigIdentRef.type = w:iri-ref
+its-taIdent.type = string
 
-its-disambigIdent.type = string
-
-its-disambigSource.type = string
+its-taSource.type = string
 
 its-localeFilterList.type = string
 
+its-localeFilterType.type = w:string "include" | w:string "exclude"
+
 its-person.type = string
 
 its-personRef.type = w:iri-ref
@@ -122,22 +117,22 @@
   w:string "locale-specific-content" | w:string "locale-violation" | w:string "style" |
   w:string "characters" | w:string "misspelling" | w:string "typographical" | w:string "formatting" |
   w:string "inconsistent-entities" | w:string "numbers" | w:string "markup" | w:string "pattern-problem" |
-  w:string "whitespace" | w:string "internationalization" | w:string "length" | w:string "uncategorized" |
+  w:string "whitespace" | w:string "internationalization" | w:string "length" | w:string "non-conformance" | w:string "uncategorized" |
   w:string "other"
 
 its-locQualityIssueComment.type = string
 
-its-locQualityIssueSeverity.type =  xsd:decimal { minInclusive = "0" maxInclusive = "100" } 
+its-locQualityIssueSeverity.type =  xsd:double { minInclusive = "0" maxInclusive = "100" } 
 
 its-locQualityIssueProfileRef.type = w:iri-ref
 
 its-locQualityIssueEnabled.type = w:string "yes" | w:string "no"
 
-its-locQualityRatingScore.type = xsd:decimal { minInclusive = "0" maxInclusive = "100" } 
+its-locQualityRatingScore.type = xsd:double { minInclusive = "0" maxInclusive = "100" } 
 
 its-locQualityRatingVote.type = xsd:integer
 
-its-locQualityRatingScoreThreshold.type = xsd:decimal { minInclusive = "0" maxInclusive = "100" }
+its-locQualityRatingScoreThreshold.type = xsd:double { minInclusive = "0" maxInclusive = "100" }
 
 its-locQualityRatingVoteThreshold.type = xsd:integer
 
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-html5.rnc	2012/12/26 18:21:13	1.3
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-html5.rnc	2013/04/04 13:45:36	1.4
@@ -37,20 +37,20 @@
 
 its-attribute.domainMapping.html = attribute its-domain-mapping { its-domainMapping.type }
 
-its-attribute.disambigGranularity.html = attribute its-disambig-granularity { its-disambigGranularity.type } 
+its-attribute.taConfidence.html = attribute its-ta-confidence { its-taConfidence.type }
 
-its-attribute.disambigConfidence.html = attribute its-disambig-confidence { its-disambigConfidence.type }
+its-attribute.taClassRef.html = attribute its-ta-class-ref { its-taClassRef.type }
 
-its-attribute.disambigClassRef.html = attribute its-disambig-class-ref { its-disambigClassRef.type }
+its-attribute.taIdent.html = attribute its-ta-ident { its-taIdent.type }
 
-its-attribute.disambigIdent.html = attribute its-disambig-ident { its-disambigIdent.type }
+its-attribute.taIdentRef.html = attribute its-ta-ident-ref { its-taIdentRef.type }
 
-its-attribute.disambigIdentRef.html = attribute its-disambig-ident-ref { its-disambigIdentRef.type }
-
-its-attribute.disambigSource.html = attribute its-disambig-source { its-disambigSource.type }
+its-attribute.taSource.html = attribute its-ta-source { its-taSource.type }
 
 its-attribute.localeFilterList.html = attribute its-locale-filter-list { its-localeFilterList.type }
 
+its-attribute.localeFilterType.html = attribute its-locale-filter-type { its-localeFilterType.type }
+
 its-attribute.person.html = attribute its-person { its-person.type }
 
 its-attribute.personRef.html = attribute its-person-ref { its-personRef.type }
@@ -117,11 +117,10 @@
   ((its-attribute.locNote.html | its-attribute.locNoteRef.html), its-attribute.locNoteType.html?)? &
   (its-attribute.term.html, its-attribute.termInfoRef.html?, its-attribute.termConfidence.html?)? &
   its-attribute.withinText.html? &
-  its-attribute.disambigConfidence.html? &
-  its-attribute.disambigGranularity.html? &
-  its-attribute.disambigClassRef.html? &
-  ((its-attribute.disambigSource.html, its-attribute.disambigIdent.html) | its-attribute.disambigIdentRef.html)? &
-  its-attribute.localeFilterList.html? &
+  its-attribute.taConfidence.html? &
+  its-attribute.taClassRef.html? &
+  ((its-attribute.taSource.html, its-attribute.taIdent.html) | its-attribute.taIdentRef.html)? &
+  (its-attribute.localeFilterList.html, its-attribute.localeFilterType.html?)? &
   ((
    (its-attribute.person.html | its-attribute.personRef.html )? &
    (its-attribute.org.html | its-attribute.orgRef.html )? &

Received on Thursday, 4 April 2013 13:45:41 UTC