- From: CVS User jkosek <cvsmail@w3.org>
- Date: Wed, 03 Apr 2013 16:14:24 +0000
- To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory gil:/tmp/cvs-serv12944/schemas
Modified Files:
its20-types.rnc its20-types.rng its20.rnc its20.rng
Log Message:
Update schema to reflect changes made during LC period
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2013/03/22 15:08:06 1.17
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2013/04/03 16:14:24 1.18
@@ -79,35 +79,30 @@
## that case they MUST be delimited by quotation marks.
its-domainMapping.type = string
-its-disambigGranularity.type =
- "lexical-concept"
- |
- "ontology-concept"
- |
- "entity"
+its-taConfidence.type = its-confidence.type
-its-disambigConfidence.type = its-confidence.type
+its-taClassPointer.type = its-relative-selector.type
-its-disambigClassPointer.type = its-relative-selector.type
+its-taClassRefPointer.type = its-relative-selector.type
-its-disambigClassRefPointer.type = its-relative-selector.type
+its-taClassRef.type = xsd:anyURI
-its-disambigClassRef.type = xsd:anyURI
+its-taIdentRef.type = xsd:anyURI
-its-disambigIdentRef.type = xsd:anyURI
+its-taIdent.type = string
-its-disambigIdent.type = string
+its-taSource.type = string
-its-disambigSource.type = string
+its-taIdentPointer.type = its-relative-selector.type
-its-disambigIdentPointer.type = its-relative-selector.type
+its-taIdentRefPointer.type = its-relative-selector.type
-its-disambigIdentRefPointer.type = its-relative-selector.type
-
-its-disambigSourcePointer.type = its-relative-selector.type
+its-taSourcePointer.type = its-relative-selector.type
its-localeFilterList.type = string
+its-localeFilterType.type = "include" | "exclude"
+
its-provenanceRecordsRef.type = xsd:anyURI
its-person.type = string
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rng 2013/03/22 15:08:06 1.14
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rng 2013/04/03 16:14:24 1.15
@@ -102,46 +102,45 @@
that case they MUST be delimited by quotation marks.</a:documentation>
<data type="string" datatypeLibrary=""/>
</define>
- <define name="its-disambigGranularity.type">
- <choice>
- <value>lexical-concept</value>
- <value>ontology-concept</value>
- <value>entity</value>
- </choice>
- </define>
- <define name="its-disambigConfidence.type">
+ <define name="its-taConfidence.type">
<ref name="its-confidence.type"/>
</define>
- <define name="its-disambigClassPointer.type">
+ <define name="its-taClassPointer.type">
<ref name="its-relative-selector.type"/>
</define>
- <define name="its-disambigClassRefPointer.type">
+ <define name="its-taClassRefPointer.type">
<ref name="its-relative-selector.type"/>
</define>
- <define name="its-disambigClassRef.type">
+ <define name="its-taClassRef.type">
<data type="anyURI"/>
</define>
- <define name="its-disambigIdentRef.type">
+ <define name="its-taIdentRef.type">
<data type="anyURI"/>
</define>
- <define name="its-disambigIdent.type">
+ <define name="its-taIdent.type">
<data type="string" datatypeLibrary=""/>
</define>
- <define name="its-disambigSource.type">
+ <define name="its-taSource.type">
<data type="string" datatypeLibrary=""/>
</define>
- <define name="its-disambigIdentPointer.type">
+ <define name="its-taIdentPointer.type">
<ref name="its-relative-selector.type"/>
</define>
- <define name="its-disambigIdentRefPointer.type">
+ <define name="its-taIdentRefPointer.type">
<ref name="its-relative-selector.type"/>
</define>
- <define name="its-disambigSourcePointer.type">
+ <define name="its-taSourcePointer.type">
<ref name="its-relative-selector.type"/>
</define>
<define name="its-localeFilterList.type">
<data type="string" datatypeLibrary=""/>
</define>
+ <define name="its-localeFilterType.type">
+ <choice>
+ <value>include</value>
+ <value>exclude</value>
+ </choice>
+ </define>
<define name="its-provenanceRecordsRef.type">
<data type="anyURI"/>
</define>
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2013/03/29 18:17:26 1.18
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2013/04/03 16:14:24 1.19
@@ -33,27 +33,27 @@
its-attribute.domainMapping = attribute its:domainMapping { its-domainMapping.type }
its-attribute.domainMapping.nons = attribute domainMapping { its-domainMapping.type }
-its-attribute.disambigGranularity = attribute its:disambigGranularity { its-disambigGranularity.type }
-its-attribute.disambigGranularity.nons = attribute disambigGranularity { its-disambigGranularity.type }
+its-attribute.taConfidence = attribute its:taConfidence { its-taConfidence.type }
+its-attribute.taConfidence.nons = attribute taConfidence { its-taConfidence.type }
-its-attribute.disambigConfidence = attribute its:disambigConfidence { its-disambigConfidence.type }
-its-attribute.disambigConfidence.nons = attribute disambigConfidence { its-disambigConfidence.type }
+its-attribute.taClassRef = attribute its:taClassRef { its-taClassRef.type }
+its-attribute.taClassRef.nons = attribute taClassRef { its-taClassRef.type }
-its-attribute.disambigClassRef = attribute its:disambigClassRef { its-disambigClassRef.type }
-its-attribute.disambigClassRef.nons = attribute disambigClassRef { its-disambigClassRef.type }
+its-attribute.taIdent = attribute its:taIdent { its-taIdent.type }
+its-attribute.taIdent.nons = attribute taIdent { its-taIdent.type }
-its-attribute.disambigIdent = attribute its:disambigIdent { its-disambigIdent.type }
-its-attribute.disambigIdent.nons = attribute disambigIdent { its-disambigIdent.type }
+its-attribute.taIdentRef = attribute its:taIdentRef { its-taIdentRef.type }
+its-attribute.taIdentRef.nons = attribute taIdentRef { its-taIdentRef.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.taSource = attribute its:taSource { its-taSource.type }
+its-attribute.taSource.nons = attribute taSource { its-taSource.type }
its-attribute.localeFilterList = attribute its:localeFilterList { its-localeFilterList.type }
its-attribute.localeFilterList.nons = attribute localeFilterList { its-localeFilterList.type }
+its-attribute.localeFilterType = attribute its:localeFilterType { its-localeFilterType.type }
+its-attribute.localeFilterType.nons = attribute localeFilterType { its-localeFilterType.type }
+
its-attribute.person = attribute its:person { its-person.type }
its-attribute.person.nons = attribute person { its-person.type }
@@ -177,7 +177,7 @@
| its-langRule
| its-withinTextRule
| its-domainRule
- | its-disambiguationRule
+ | its-textAnalysisRule
| its-localeFilterRule
| its-provRule
| its-locQualityIssueRule
@@ -209,10 +209,9 @@
((its-attribute.locNote | its-attribute.locNoteRef), its-attribute.locNoteType?)? &
(its-attribute.term, its-attribute.termInfoRef?, its-attribute.termConfidence?)? &
its-attribute.withinText? &
- its-attribute.disambigConfidence? &
- its-attribute.disambigGranularity? &
- its-attribute.disambigClassRef? &
- ((its-attribute.disambigSource, its-attribute.disambigIdent) | its-attribute.disambigIdentRef)? &
+ its-attribute.taConfidence? &
+ its-attribute.taClassRef? &
+ ((its-attribute.taSource, its-attribute.taIdent) | its-attribute.taIdentRef)? &
its-attribute.localeFilterList? &
((
(its-attribute.person | its-attribute.personRef )? &
@@ -240,10 +239,9 @@
((its-attribute.locNote.nons | its-attribute.locNoteRef.nons), its-attribute.locNoteType.nons?)? &
(its-attribute.term.nons, its-attribute.termInfoRef.nons?, its-attribute.termConfidence.nons?)? &
its-attribute.withinText.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.taConfidence.nons? &
+ its-attribute.taClassRef.nons? &
+ ((its-attribute.taSource.nons, its-attribute.taIdent.nons) | its-attribute.taIdentRef.nons)? &
its-attribute.localeFilterList.nons? &
((
(its-attribute.person.nons | its-attribute.personRef.nons )? &
@@ -410,25 +408,22 @@
its-attribute.domainPointer.nons = attribute domainPointer { its-relative-selector.type }
-its-disambiguationRule =
+its-textAnalysisRule =
## Rule about the Disambiguation data category
- element disambiguationRule {
- its-disambiguationRule.content, its-disambiguationRule.attributes
+ element textAnalysisRule {
+ its-textAnalysisRule.content, its-textAnalysisRule.attributes
}
-its-disambiguationRule.content = empty
-its-disambiguationRule.attributes =
+its-textAnalysisRule.content = empty
+its-textAnalysisRule.attributes =
its-attribute.selector,
- its-attribute.disambigGranularity.nons?,
- its-attribute.disambigSource.nons?,
- (its-attribute.disambigClassPointer.nons | its-attribute.disambigClassRefPointer.nons)?,
- ((its-attribute.disambigSourcePointer.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.disambigSourcePointer.nons = attribute disambigSourcePointer { its-disambigSourcePointer.type }
-its-attribute.disambigIdentRefPointer.nons = attribute disambigIdentRefPointer { its-disambigIdentRefPointer.type }
+ its-attribute.taClassRefPointer.nons?,
+ ((its-attribute.taSourcePointer.nons, its-attribute.taIdentPointer.nons) | its-attribute.taIdentRefPointer.nons)?
+
+its-attribute.taClassRefPointer.nons = attribute taClassRefPointer { its-taClassRefPointer.type }
+its-attribute.taIdentPointer.nons = attribute taIdentPointer { its-taIdentPointer.type }
+its-attribute.taSourcePointer.nons = attribute taSourcePointer { its-taSourcePointer.type }
+its-attribute.taIdentRefPointer.nons = attribute taIdentRefPointer { its-taIdentRefPointer.type }
its-localeFilterRule =
## Rule about the LocaleFilter data category
@@ -439,7 +434,8 @@
its-localeFilterRule.content = empty
its-localeFilterRule.attributes =
its-attribute.selector,
- its-attribute.localeFilterList.nons
+ its-attribute.localeFilterList.nons,
+ its-attribute.localeFilterType.nons?
its-provRule =
## Rule about the Provenance data category
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2013/03/29 18:17:26 1.15
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2013/04/03 16:14:24 1.16
@@ -101,64 +101,54 @@
<ref name="its-domainMapping.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigGranularity">
- <attribute name="its:disambigGranularity">
- <ref name="its-disambigGranularity.type"/>
+ <define name="its-attribute.taConfidence">
+ <attribute name="its:taConfidence">
+ <ref name="its-taConfidence.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigGranularity.nons">
- <attribute name="disambigGranularity">
- <ref name="its-disambigGranularity.type"/>
+ <define name="its-attribute.taConfidence.nons">
+ <attribute name="taConfidence">
+ <ref name="its-taConfidence.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigConfidence">
- <attribute name="its:disambigConfidence">
- <ref name="its-disambigConfidence.type"/>
+ <define name="its-attribute.taClassRef">
+ <attribute name="its:taClassRef">
+ <ref name="its-taClassRef.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigConfidence.nons">
- <attribute name="disambigConfidence">
- <ref name="its-disambigConfidence.type"/>
+ <define name="its-attribute.taClassRef.nons">
+ <attribute name="taClassRef">
+ <ref name="its-taClassRef.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigClassRef">
- <attribute name="its:disambigClassRef">
- <ref name="its-disambigClassRef.type"/>
+ <define name="its-attribute.taIdent">
+ <attribute name="its:taIdent">
+ <ref name="its-taIdent.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigClassRef.nons">
- <attribute name="disambigClassRef">
- <ref name="its-disambigClassRef.type"/>
+ <define name="its-attribute.taIdent.nons">
+ <attribute name="taIdent">
+ <ref name="its-taIdent.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigIdent">
- <attribute name="its:disambigIdent">
- <ref name="its-disambigIdent.type"/>
+ <define name="its-attribute.taIdentRef">
+ <attribute name="its:taIdentRef">
+ <ref name="its-taIdentRef.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigIdent.nons">
- <attribute name="disambigIdent">
- <ref name="its-disambigIdent.type"/>
+ <define name="its-attribute.taIdentRef.nons">
+ <attribute name="taIdentRef">
+ <ref name="its-taIdentRef.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigIdentRef">
- <attribute name="its:disambigIdentRef">
- <ref name="its-disambigIdentRef.type"/>
+ <define name="its-attribute.taSource">
+ <attribute name="its:taSource">
+ <ref name="its-taSource.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigIdentRef.nons">
- <attribute name="disambigIdentRef">
- <ref name="its-disambigIdentRef.type"/>
- </attribute>
- </define>
- <define name="its-attribute.disambigSource">
- <attribute name="its:disambigSource">
- <ref name="its-disambigSource.type"/>
- </attribute>
- </define>
- <define name="its-attribute.disambigSource.nons">
- <attribute name="disambigSource">
- <ref name="its-disambigSource.type"/>
+ <define name="its-attribute.taSource.nons">
+ <attribute name="taSource">
+ <ref name="its-taSource.type"/>
</attribute>
</define>
<define name="its-attribute.localeFilterList">
@@ -171,6 +161,16 @@
<ref name="its-localeFilterList.type"/>
</attribute>
</define>
+ <define name="its-attribute.localeFilterType">
+ <attribute name="its:localeFilterType">
+ <ref name="its-localeFilterType.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.localeFilterType.nons">
+ <attribute name="localeFilterType">
+ <ref name="its-localeFilterType.type"/>
+ </attribute>
+ </define>
<define name="its-attribute.person">
<attribute name="its:person">
<ref name="its-person.type"/>
@@ -539,7 +539,7 @@
<ref name="its-langRule"/>
<ref name="its-withinTextRule"/>
<ref name="its-domainRule"/>
- <ref name="its-disambiguationRule"/>
+ <ref name="its-textAnalysisRule"/>
<ref name="its-localeFilterRule"/>
<ref name="its-provRule"/>
<ref name="its-locQualityIssueRule"/>
@@ -610,21 +610,18 @@
<ref name="its-attribute.withinText"/>
</optional>
<optional>
- <ref name="its-attribute.disambigConfidence"/>
+ <ref name="its-attribute.taConfidence"/>
</optional>
<optional>
- <ref name="its-attribute.disambigGranularity"/>
- </optional>
- <optional>
- <ref name="its-attribute.disambigClassRef"/>
+ <ref name="its-attribute.taClassRef"/>
</optional>
<optional>
<choice>
<group>
- <ref name="its-attribute.disambigSource"/>
- <ref name="its-attribute.disambigIdent"/>
+ <ref name="its-attribute.taSource"/>
+ <ref name="its-attribute.taIdent"/>
</group>
- <ref name="its-attribute.disambigIdentRef"/>
+ <ref name="its-attribute.taIdentRef"/>
</choice>
</optional>
<optional>
@@ -767,21 +764,18 @@
<ref name="its-attribute.withinText.nons"/>
</optional>
<optional>
- <ref name="its-attribute.disambigConfidence.nons"/>
- </optional>
- <optional>
- <ref name="its-attribute.disambigGranularity.nons"/>
+ <ref name="its-attribute.taConfidence.nons"/>
</optional>
<optional>
- <ref name="its-attribute.disambigClassRef.nons"/>
+ <ref name="its-attribute.taClassRef.nons"/>
</optional>
<optional>
<choice>
<group>
- <ref name="its-attribute.disambigSource.nons"/>
- <ref name="its-attribute.disambigIdent.nons"/>
+ <ref name="its-attribute.taSource.nons"/>
+ <ref name="its-attribute.taIdent.nons"/>
</group>
- <ref name="its-attribute.disambigIdentRef.nons"/>
+ <ref name="its-attribute.taIdentRef.nons"/>
</choice>
</optional>
<optional>
@@ -1184,63 +1178,49 @@
<ref name="its-relative-selector.type"/>
</attribute>
</define>
- <define name="its-disambiguationRule">
- <element name="disambiguationRule">
+ <define name="its-textAnalysisRule">
+ <element name="textAnalysisRule">
<a:documentation>Rule about the Disambiguation data category</a:documentation>
- <ref name="its-disambiguationRule.content"/>
- <ref name="its-disambiguationRule.attributes"/>
+ <ref name="its-textAnalysisRule.content"/>
+ <ref name="its-textAnalysisRule.attributes"/>
</element>
</define>
- <define name="its-disambiguationRule.content">
+ <define name="its-textAnalysisRule.content">
<empty/>
</define>
- <define name="its-disambiguationRule.attributes">
+ <define name="its-textAnalysisRule.attributes">
<ref name="its-attribute.selector"/>
<optional>
- <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"/>
- </choice>
+ <ref name="its-attribute.taClassRefPointer.nons"/>
</optional>
<optional>
<choice>
<group>
- <ref name="its-attribute.disambigSourcePointer.nons"/>
- <ref name="its-attribute.disambigIdentPointer.nons"/>
+ <ref name="its-attribute.taSourcePointer.nons"/>
+ <ref name="its-attribute.taIdentPointer.nons"/>
</group>
- <ref name="its-attribute.disambigIdentRefPointer.nons"/>
+ <ref name="its-attribute.taIdentRefPointer.nons"/>
</choice>
</optional>
</define>
- <define name="its-attribute.disambigClassPointer.nons">
- <attribute name="disambigClassPointer">
- <ref name="its-disambigClassPointer.type"/>
- </attribute>
- </define>
- <define name="its-attribute.disambigClassRefPointer.nons">
- <attribute name="disambigClassRefPointer">
- <ref name="its-disambigClassRefPointer.type"/>
+ <define name="its-attribute.taClassRefPointer.nons">
+ <attribute name="taClassRefPointer">
+ <ref name="its-taClassRefPointer.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigIdentPointer.nons">
- <attribute name="disambigIdentPointer">
- <ref name="its-disambigIdentPointer.type"/>
+ <define name="its-attribute.taIdentPointer.nons">
+ <attribute name="taIdentPointer">
+ <ref name="its-taIdentPointer.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigSourcePointer.nons">
- <attribute name="disambigSourcePointer">
- <ref name="its-disambigSourcePointer.type"/>
+ <define name="its-attribute.taSourcePointer.nons">
+ <attribute name="taSourcePointer">
+ <ref name="its-taSourcePointer.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigIdentRefPointer.nons">
- <attribute name="disambigIdentRefPointer">
- <ref name="its-disambigIdentRefPointer.type"/>
+ <define name="its-attribute.taIdentRefPointer.nons">
+ <attribute name="taIdentRefPointer">
+ <ref name="its-taIdentRefPointer.type"/>
</attribute>
</define>
<define name="its-localeFilterRule">
@@ -1256,6 +1236,9 @@
<define name="its-localeFilterRule.attributes">
<ref name="its-attribute.selector"/>
<ref name="its-attribute.localeFilterList.nons"/>
+ <optional>
+ <ref name="its-attribute.localeFilterType.nons"/>
+ </optional>
</define>
<define name="its-provRule">
<element name="provRule">
Received on Wednesday, 3 April 2013 16:14:30 UTC