- From: CVS User fsasaki <cvsmail@w3.org>
- Date: Fri, 30 Nov 2012 19:19:26 +0000
- To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory gil:/tmp/cvs-serv30938/schemas
Modified Files:
its20-types.rnc its20-types.rng its20.rnc its20.rng
Log Message:
added disambigSourcePointer to disambigation global, following the pattern at http://lists.w3.org/Archives/Public/public-multilingualweb-lt/2012Nov/0264.html . Also tried to update the schema, may need a check
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/11/30 14:18:51 1.9
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/11/30 19:19:26 1.10
@@ -98,6 +98,8 @@
its-disambigIdentRefPointer.type = its-relative-selector.type
+its-disambigSourcePointer.type = its-relative-selector.type
+
its-localeFilterList.type = string
its-provenanceRecordsRefPointer.type = its-relative-selector.type
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rng 2012/11/30 14:18:51 1.6
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rng 2012/11/30 19:19:26 1.7
@@ -132,6 +132,9 @@
<define name="its-disambigIdentRefPointer.type">
<ref name="its-relative-selector.type"/>
</define>
+ <define name="its-disambigSourcePointer.type">
+ <ref name="its-relative-selector.type"/>
+ </define>
<define name="its-localeFilterList.type">
<data type="string" datatypeLibrary=""/>
</define>
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/11/30 08:23:39 1.11
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/11/30 19:19:26 1.12
@@ -416,11 +416,12 @@
its-attribute.disambigGranularity.nons?,
its-attribute.disambigSource.nons?,
(its-attribute.disambigClassPointer.nons | its-attribute.disambigClassRefPointer.nons)?,
- (its-attribute.disambigIdentPointer.nons | its-attribute.disambigIdentRefPointer.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-localeFilterRule =
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2012/11/30 08:23:39 1.8
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2012/11/30 19:19:26 1.9
@@ -1205,7 +1205,10 @@
</optional>
<optional>
<choice>
- <ref name="its-attribute.disambigIdentPointer.nons"/>
+ <group>
+ <ref name="its-attribute.disambigSourcePointer.nons"/>
+ <ref name="its-attribute.disambigIdentPointer.nons"/>
+ </group>
<ref name="its-attribute.disambigIdentRefPointer.nons"/>
</choice>
</optional>
@@ -1225,6 +1228,11 @@
<ref name="its-disambigIdentPointer.type"/>
</attribute>
</define>
+ <define name="its-attribute.disambigSourcePointer.nons">
+ <attribute name="disambigSourcePointer">
+ <ref name="its-disambigSourcePointer.type"/>
+ </attribute>
+ </define>
<define name="its-attribute.disambigIdentRefPointer.nons">
<attribute name="disambigIdentRefPointer">
<ref name="its-disambigIdentRefPointer.type"/>
Received on Friday, 30 November 2012 19:19:29 UTC