- From: CVS User jkosek <cvsmail@w3.org>
- Date: Tue, 27 Nov 2012 11:34:11 +0000
- To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory gil:/tmp/cvs-serv1562
Modified Files:
its20-html5.rnc its20-types.rnc its20.rnc
Log Message:
Just backup in a middle of edits
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-html5.rnc 2012/10/08 14:30:47 1.1
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-html5.rnc 2012/11/27 11:34:11 1.2
@@ -10,6 +10,8 @@
its-attribute.term.html = attribute its-term { its-term.type }
+its-attribute.termConfidence.html = attribute its-term-confidence { its-termConfidence.type }
+
its-attribute-withinText.html = attribute its-within-text { its-withinText.type }
its-attribute.domainMapping.html = attribute its-domain-mapping { its-domainMapping.type }
@@ -50,9 +52,11 @@
its-attribute.storageEncoding.html = attribute its-storage-encoding { its-storageEncoding.type }
+its-attribute.toolsRef.html = attribute its-tools-ref { its-toolsRef.type }
+
its-html-attributes =
((its-attribute.locNote.html | its-attribute.locNoteRef.html), its-attribute.locNoteType.html?)? &
- (its-attribute.term.html, its-attribute.termInfoRef.html?)? &
+ (its-attribute.term.html, its-attribute.termInfoRef.html?, its-attribute.termConfidence.html?)? &
its-attribute-withinText.html? &
its-attribute.entityTypeSourceRef.html? &
its-attribute.entityTypeRef.html? &
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/10/08 14:30:47 1.2
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/11/27 11:34:11 1.3
@@ -8,6 +8,8 @@
its-absolute-selector.type = string
its-relative-selector.type = string
+its-confidence.type = xsd:decimal { minInclusive = "0" maxInclusive = "1" }
+
## The Translate data category information to be attached to the current node.
its-translate.type =
## The nodes need to be translated.
@@ -38,6 +40,8 @@
## The value 'no' means that this is not a term.
"no"
+its-termConfidence.type = its-confidence.type
+
## The text direction for the context.
its-dir.type =
## Left-to-right text.
@@ -68,39 +72,87 @@
## that case they MUST be delimited by quotation marks.
its-domainMapping.type = string
-its-entityTypeSourceRef.type = xsd:anyURI
-
-its-entityTypeSourcePointer.type = its-relative-selector.type
-
-its-entityTypeSourceRefPointer.type = its-relative-selector.type
-
-its-entityTypeRef.type = xsd:anyURI
-
-its-entityTypePointer.type = its-relative-selector.type
-
-its-entityTypeRefPointer.type = its-relative-selector.type
-
-its-disambigType.type =
+its-disambigGranularity.type =
"lexicalConcept"
|
"ontologyConcept"
|
"entity"
-its-disambigSourceRef.type = xsd:anyURI
+its-disambigConfidence.type = its-confidence.type
-its-disambigSourcePointer.type = its-relative-selector.type
+its-disambigClassPointer.type = its-relative-selector.type
-its-disambigSourceRefPointer.type = its-relative-selector.type
+its-disambigClassRefPointer.type = its-relative-selector.type
+
+its-disambigClassRef.type = xsd:anyURI
its-disambigIdentRef.type = xsd:anyURI
+its-disambigIdent.type = xsd:string
+
+its-disambigSource.type = xsd:string
+
its-disambigIdentPointer.type = its-relative-selector.type
-its-disambigIdentRefPointer = its-relative-selector.type
+its-disambigIdentRefPointer.type = its-relative-selector.type
its-localeFilterList.type = string
+its-provenanceRecordsRefPointer.type = its-relative-selector.type
+
+its-personPointer.type = its-relative-selector.type
+
+its-person.type = xsd:string
+
+its-personRefPointer.type = its-relative-selector.type
+
+its-personRef.type = xsd:anyURI
+
+its-orgPointer.type = its-relative-selector.type
+
+its-org.type = xsd:string
+
+its-orgRefPointer.type = its-relative-selector.type
+
+its-orgRef.type = xsd:anyURI
+
+its-toolPointer.type = its-relative-selector.type
+
+its-tool.type = xsd:string
+
+its-toolRefPointer.type = its-relative-selector.type
+
+its-toolRef.type = xsd:anyURI
+
+its-revPersonPointer.type = its-relative-selector.type
+
+its-revPerson.type = xsd:string
+
+its-revPersonRefPointer.type = its-relative-selector.type
+
+its-revPersonRef.type = xsd:anyURI
+
+its-revOrgPointer.type = its-relative-selector.type
+
+its-revOrg.type = xsd:string
+
+its-revOrgRefPointer.type = its-relative-selector.type
+
+its-revOrgRef.type = xsd:anyURI
+
+its-revToolPointer.type = its-relative-selector.type
+
+its-revTool.type = xsd:string
+
+its-revToolRefPointer.type = its-relative-selector.type
+
+its-revToolRef.type = xsd:anyURI
+
+its-provRefPointer.type = its-relative-selector.type
+
+its-provRef.type = xsd:anyURI
+
its-externalResourceRefPointer.type = its-relative-selector.type
its-targetPointer.type = its-relative-selector.type
@@ -163,3 +215,5 @@
its-storageEncoding.type = string
its-storageEncodingPointer.type = its-relative-selector.type
+
+its-toolsRef.type = string
\ No newline at end of file
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/10/09 11:45:27 1.5
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/11/27 11:34:11 1.6
@@ -24,30 +24,75 @@
its-attribute.term = attribute its:term { its-term.type }
its-attribute.term.nons = attribute term { its-term.type }
+its-attribute.termConfidence = attribute its:termConfidence { its-termConfidence.type }
+its-attribute.termConfidence.nons = attribute termConfidence { its-termConfidence.type }
+
its-attribute.withinText = attribute its:withinText { its-withinText.type }
its-attribute.withinText.nons = attribute withinText { its-withinText.type }
its-attribute.domainMapping = attribute its:domainMapping { its-domainMapping.type }
its-attribute.domainMapping.nons = attribute domainMapping { its-domainMapping.type }
-its-attribute.entityTypeSourceRef = attribute its:entityTypeSourceRef { its-entityTypeSourceRef.type }
-its-attribute.entityTypeSourceRef.nons = attribute entityTypeSourceRef { its-entityTypeSourceRef.type }
+its-attribute.disambigGranularity = attribute its:disambigGranularity { its-disambigGranularity.type }
+its-attribute.disambigGranularity.nons = attribute disambigGranularity { its-disambigGranularity.type }
-its-attribute.entityTypeRef = attribute its:entityTypeRef { its-entityTypeRef.type }
-its-attribute.entityTypeRef.nons = attribute entityTypeRef { its-entityTypeRef.type }
+its-attribute.disambigConfidence = attribute its:disambigConfidence { its-disambigConfidence.type }
+its-attribute.disambigConfidence.nons = attribute disambigConfidence { its-disambigConfidence.type }
-its-attribute.disambigType = attribute its:disambigType { its-disambigType.type }
-its-attribute.disambigType.nons = attribute disambigType { its-disambigType.type }
+its-attribute.disambigClassRef = attribute its:disambigClassRef { its-disambigClassRef.type }
+its-attribute.disambigClassRef.nons = attribute disambigClassRef { its-disambigClassRef.type }
-its-attribute.disambigSourceRef = attribute its:disambigSourceRef { its-disambigSourceRef.type }
-its-attribute.disambigSourceRef.nons = attribute disambigSourceRef { its-disambigSourceRef.type }
+its-attribute.disambigIdent = attribute its:disambigIdent { its-disambigIdent.type }
+its-attribute.disambigIdent.nons = attribute disambigIdent { its-disambigIdent.type }
its-attribute.disambigIdentRef = attribute its:disambigIdentRef { its-disambigIdentRef.type }
its-attribute.disambigIdentRef.nons = attribute disambigIdentRef { its-disambigIdentRef.type }
+its-attribute.disambigSource = attribute its:disambigSource { its-disambigSource.type }
+its-attribute.disambigSource.nons = attribute disambigSource { its-disambigSource.type }
+
its-attribute.localeFilterList = attribute its:localeFilterList { its-localeFilterList.type }
its-attribute.localeFilterList.nons = attribute localeFilterList { its-localeFilterList.type }
+its-attribute.person = attribute its:person { its-person.type }
+its-attribute.person.nons = attribute person { its-person.type }
+
+its-attribute.personRef = attribute its:personRef { its-personRef.type }
+its-attribute.personRef.nons = attribute personRef { its-personRef.type }
+
+its-attribute.org = attribute its:org { its-org.type }
+its-attribute.org.nons = attribute org { its-org.type }
+
+its-attribute.orgRef = attribute its:orgRef { its-orgRef.type }
+its-attribute.orgRef.nons = attribute orgRef { its-orgRef.type }
+
+its-attribute.tool = attribute its:tool { its-tool.type }
+its-attribute.tool.nons = attribute tool { its-tool.type }
+
+its-attribute.toolRef = attribute its:toolRef { its-toolRef.type }
+its-attribute.toolRef.nons = attribute toolRef { its-toolRef.type }
+
+its-attribute.revPerson = attribute its:revPerson { its-revPerson.type }
+its-attribute.revPerson.nons = attribute revPerson { its-revPerson.type }
+
+its-attribute.revPersonRef = attribute its:revPersonRef { its-revPersonRef.type }
+its-attribute.revPersonRef.nons = attribute revPersonRef { its-revPersonRef.type }
+
+its-attribute.revOrg = attribute its:revOrg { its-revOrg.type }
+its-attribute.revOrg.nons = attribute revOrg { its-revOrg.type }
+
+its-attribute.revOrgRef = attribute its:revOrgRef { its-revOrgRef.type }
+its-attribute.revOrgRef.nons = attribute revOrgRef { its-revOrgRef.type }
+
+its-attribute.revTool = attribute its:revTool { its-revTool.type }
+its-attribute.revTool.nons = attribute revTool { its-revTool.type }
+
+its-attribute.revToolRef = attribute its:revToolRef { its-revToolRef.type }
+its-attribute.revToolRef.nons = attribute revToolRef { its-revToolRef.type }
+
+its-attribute.provRef = attribute its:provRef { its-provRef.type }
+its-attribute.provRef.nons = attribute provRef { its-provRef.type }
+
its-attribute.locQualityIssuesRef = attribute its:locQualityIssuesRef { its-locQualityIssuesRef.type }
its-attribute.locQualityIssuesRef.nons = attribute locQualityIssuesRef { its-locQualityIssuesRef.type }
@@ -84,6 +129,8 @@
its-attribute.storageEncoding = attribute its:storageEncoding { its-storageEncoding.type }
its-attribute.storageEncoding.nons = attribute storageEncoding { its-storageEncoding.type }
+its-attribute.toolsRef = attribute its:toolsRef { its-toolsRef.type }
+
its-attribute.version = attribute its:version { its-version.type }
its-attribute.version.nons = attribute version { its-version.type }
@@ -135,13 +182,12 @@
its-attribute.translate? &
its-attribute.dir? &
((its-attribute.locNote | its-attribute.locNoteRef), its-attribute.locNoteType?)? &
- (its-attribute.term, its-attribute.termInfoRef?)? &
+ (its-attribute.term, its-attribute.termInfoRef?, its-attribute.termConfidence?)? &
its-attribute.withinText? &
- its-attribute.entityTypeSourceRef? &
- its-attribute.entityTypeRef? &
- its-attribute.disambigType? &
- its-attribute.disambigSourceRef? &
- its-attribute.disambigIdentRef? &
+ its-attribute.disambigConfidence? &
+ its-attribute.disambigGranularity? &
+ its-attribute.disambigClassRef? &
+ ((its-attribute.disambigSource, its-attribute.disambigIdent) | its-attribute.disambigIdentRef)? &
its-attribute.localeFilterList? &
(its-attribute.locQualityIssuesRef
|
@@ -152,19 +198,19 @@
)? &
((its-attribute.locQualityPrecisScore | its-attribute.locQualityPrecisVote), its-attribute.locQualityPrecisThreshold?, its-attribute.locQualityPrecisProfileRef?)? &
its-attribute.allowedCharacters? &
- (its-attribute.storageSize, its-attribute.storageEncoding?)?
+ (its-attribute.storageSize, its-attribute.storageEncoding?)? &
+ its-attribute.toolsRef
its-local.nons.attributes =
its-attribute.translate.nons? &
its-attribute.dir.nons? &
((its-attribute.locNote.nons | its-attribute.locNoteRef.nons), its-attribute.locNoteType.nons?)? &
- (its-attribute.term.nons, its-attribute.termInfoRef.nons?)? &
+ (its-attribute.term.nons, its-attribute.termInfoRef.nons?, its-attribute.termConfidence.nons?)? &
its-attribute.withinText.nons? &
- its-attribute.entityTypeSourceRef.nons? &
- its-attribute.entityTypeRef.nons? &
- its-attribute.disambigType.nons? &
- its-attribute.disambigSourceRef.nons? &
- its-attribute.disambigIdentRef.nons? &
+ its-attribute.disambigConfidence.nons? &
+ its-attribute.disambigGranularity.nons? &
+ its-attribute.disambigClassRef.nons? &
+ ((its-attribute.disambigSource.nons, its-attribute.disambigIdent.nons) | its-attribute.disambigIdentRef.nons)? &
its-attribute.localeFilterList.nons? &
(its-attribute.locQualityIssuesRef.nons
|
@@ -264,6 +310,7 @@
## Ruby markup.
element ruby { its-ruby.content, its-ruby.attributes }
+# FIXME: Allow nested ruby as in HTML5
its-ruby.content =
((text | its-span)+,
(its-rt | (its-rp, its-rt, its-rp)))+
@@ -331,28 +378,14 @@
its-disambiguationRule.content = empty
its-disambiguationRule.attributes =
its-attribute.selector,
- its-attribute.entityTypeSourceRef.nons?,
- its-attribute.entityTypeSourcePointer.nons?,
- its-attribute.entityTypeSourceRefPointer.nons?,
- its-attribute.entityTypeRef.nons?,
- its-attribute.entityTypePointer.nons?,
- its-attribute.entityTypeRefPointer.nons?,
- its-attribute.disambigType.nons?,
- its-attribute.disambigSourceRef.nons?,
- its-attribute.disambigSourcePointer.nons?,
- its-attribute.disambigSourceRefPointer.nons?,
- its-attribute.disambigIdentRef.nons?,
- its-attribute.disambigIdentPointer.nons?,
- its-attribute.disambigIdentRefPointer.nons?
-
-its-attribute.entityTypeSourcePointer.nons = attribute entityTypeSourcePointer { its-relative-selector.type }
-its-attribute.entityTypeSourceRefPointer.nons = attribute entityTypeSourceRefPointer { its-relative-selector.type }
-its-attribute.entityTypePointer.nons = attribute entityTypePointer { its-relative-selector.type }
-its-attribute.entityTypeRefPointer.nons = attribute entityTypeRefPointer { its-relative-selector.type }
-its-attribute.disambigSourcePointer.nons = attribute disambigSourcePointer { its-relative-selector.type }
-its-attribute.disambigSourceRefPointer.nons = attribute disambigSourceRefPointer { its-relative-selector.type }
-its-attribute.disambigIdentPointer.nons = attribute disambigIdentPointer { its-relative-selector.type }
-its-attribute.disambigIdentRefPointer.nons = attribute disambigIdentRefPointer { its-relative-selector.type }
+ its-attribute.disambigGranularity.nons?,
+ (its-attribute.disambigClassPointer.nons | its-attribute.disambigClassRefPointer.nons)?,
+ (its-attribute.disambigIdentPointer.nons | its-attribute.disambigIdentRefPointer.nons)?
+
+its-attribute.disambigClassPointer.nons = attribute disambigClassPointer { its-disambigClassPointer.type }
+its-attribute.disambigClassRefPointer.nons = attribute disambigClassRefPointer { its-disambigClassRefPointer.type }
+its-attribute.disambigIdentPointer.nons = attribute disambigIdentPointer { its-disambigIdentPointer.type }
+its-attribute.disambigIdentRefPointer.nons = attribute disambigIdentRefPointer { its-disambigIdentRefPointer.type }
its-localeFilterRule =
## Rule about the LocaleFilter data category.
@@ -456,3 +489,8 @@
its-attribute.storageSizePointer.nons = attribute storageSizePointer { its-relative-selector.type }
its-attribute.storageEncodingPointer.nons = attribute storageEncodingPointer { its-relative-selector.type }
+
+its-standoff = its-provenanceRecord
+
+its-provenanceRecord = element its:provenanceRecord { empty } #FIXME
+
Received on Tuesday, 27 November 2012 11:34:13 UTC