its20 CVS commit

Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20
In directory hutz:/tmp/cvs-serv23247

Modified Files:
	its20.html its20.odd 
Log Message:
Editing of disambiguation, see  http://lists.w3.org/Archives/Public/public-multilingualweb-lt/2012Oct/0212.html thread

Index: its20.odd
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/its20.odd,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- its20.odd	16 Oct 2012 14:01:19 -0000	1.187
+++ its20.odd	16 Oct 2012 23:07:51 -0000	1.188
@@ -3195,12 +3195,12 @@
 							<item>A required <att>selector</att> attribute. It contains an <ref
 									target="#selectors">absolute selector</ref> which selects the
 								nodes to which this rule applies.</item>
-							<item>None of exactly one of the following:
+							<item>None or exactly one of the following:
 								<list>
-									<item>A <att>disambigClassRef</att> attribute that contains a URI, specifying the type class of the concept
-										or entity behind the selector.</item>
 									<item>A <att>disambigClassPointer</att> attribute that contains a <ref target="#selectors">relative selector</ref>
 										pointing to a node specifying the entity type class behind the selector.</item>
+									<item>A <att>disambigClassRef</att> attribute that contains a URI, specifying the type class of the concept
+										or entity behind the selector.</item>
 									<item>A <att>disambigClassRefPointer</att> attribute that contains a <ref target="#selectors">relative selector</ref>
 										pointing to a node that holds a URI that specifies the entity type class behind the selector.</item>
 								</list>
@@ -3210,21 +3210,21 @@
 								<code>lexicalConcept</code>, <code>ontologyConcept</code>, or <code>entity</code>.</item>
 							<item>An optional <att>disambigSource</att> attribute. It contains a string representing the disambiguation
 								identifier collection source.</item>
-							<item>None of exactly one of the following:
+							<item>None or exactly one of the following:
 								<list>
 									<item>A <att>disambigIdent</att> attribute. It contains a string that represents the disambiguation 
 										identifier for the disambiguation target that is valid within the specified Disambiguation Source.</item>
 									<item>A <att>disambigIdentRef</att> attribute. It contains an URI that represents a unique identifier
 										for the disambiguation target.</item>
-									<item>A <att>disambigIdentPointer</att> attribute. It contains a <ref target="#selectors">relative selector</ref>
+									<item>A <att>disambigIdentPointer</att> attribute that contains a <ref target="#selectors">relative selector</ref>
 										pointing to a node that represents a unique identifier for the disambiguation target.</item>
-									<item>a <att>disambigIdentRefPointer</att> attribute. It contains a <ref target="#selectors">relative selector</ref>
+									<item>a <att>disambigIdentRefPointer</att> attribute that contains a <ref target="#selectors">relative selector</ref>
 										pointing to a node that holds a URI that represents a unique identifier for the disambiguation target.</item>
 								</list>
 							</item>
 						</list>
-						<p>When using a disambiguation rule, the user <ref target="#rfc2119">MUST</ref> use one of the use cases for disambiguation:
-							specifying the target type,	or specifying the target identity.
+						<note type="ed">Below will need a test case in the test suite.</note>
+						<p xml:id="disambiguation-use-cases">When using a disambiguation rule, the user <ref target="#rfc2119">MUST</ref> use one of the use cases for disambiguation: specifying the target type,	or specifying the target identity.
 							For the latter, the user <ref target="#rfc2119">MUST</ref> use only one of the two addressing modes:</p>
 						<list>
 							<item>Using <att>disambigSource</att> and <att>disambigIdent</att> to specify the collection and the identifier itself.</item>
@@ -3254,7 +3254,7 @@
 							<item>An optional <att>disambigIdentRef</att> attribute. It contains a URI that represents a unique 
 								identifier for the disambiguation target.</item>
 						</list>
-						<p>The user <ref target="#rfc2119">MUST</ref> use only one of the two addressing modes for disambiguation:</p>
+						<p>The user <ref target="#rfc2119">MUST</ref> use only one of the two addressing modes for "target identity" disambiguation:</p>
 						<list>
 							<item>Using <att>disambigSource</att> and <att>disambigIdent</att> to specify the collection
 								and the identifier itself.</item>

Index: its20.html
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/its20.html,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- its20.html	16 Oct 2012 14:01:19 -0000	1.190
+++ its20.html	16 Oct 2012 23:07:51 -0000	1.191
@@ -2148,19 +2148,18 @@
 							information applies to the textual content of the element. There is no
 							inheritance. The entity type follows inheritance rules.</p><span class="editor-note">[Ed. note: The two sentences above seem contradictory.]</span><p id="disambiguation-global">GLOBAL: The <code>disambiguationRule</code>
 							element contains the following:</p><ul><li><p>A required <code>selector</code> attribute. It contains an <a href="#selectors" shape="rect">absolute selector</a> which selects the
-								nodes to which this rule applies.</p></li><li><p>None of exactly one of the following:
-								<ul><li><p>A <code>disambigClassRef</code> attribute that contains a URI, specifying the type class of the concept
-										or entity behind the selector.</p></li><li><p>A <code>disambigClassPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a>
-										pointing to a node specifying the entity type class behind the selector.</p></li><li><p>A <code>disambigClassRefPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a>
+								nodes to which this rule applies.</p></li><li><p>None or exactly one of the following:
+								<ul><li><p>A <code>disambigClassPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a>
+										pointing to a node specifying the entity type class behind the selector.</p></li><li><p>A <code>disambigClassRef</code> attribute that contains a URI, specifying the type class of the concept
+										or entity behind the selector.</p></li><li><p>A <code>disambigClassRefPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a>
 										pointing to a node that holds a URI that specifies the entity type class behind the selector.</p></li></ul></p></li><li><p>An optional <code>disambigGranularity</code> attribute that contains a string, specifying the granularity 
 								level of the disambiguation. The value can be one of the following identifiers: <code>lexicalConcept</code>, <code>ontologyConcept</code>, or <code>entity</code>.</p></li><li><p>An optional <code>disambigSource</code> attribute. It contains a string representing the disambiguation
-								identifier collection source.</p></li><li><p>None of exactly one of the following:
+								identifier collection source.</p></li><li><p>None or exactly one of the following:
 								<ul><li><p>A <code>disambigIdent</code> attribute. It contains a string that represents the disambiguation 
 										identifier for the disambiguation target that is valid within the specified Disambiguation Source.</p></li><li><p>A <code>disambigIdentRef</code> attribute. It contains an URI that represents a unique identifier
-										for the disambiguation target.</p></li><li><p>A <code>disambigIdentPointer</code> attribute. It contains a <a href="#selectors" shape="rect">relative selector</a>
-										pointing to a node that represents a unique identifier for the disambiguation target.</p></li><li><p>a <code>disambigIdentRefPointer</code> attribute. It contains a <a href="#selectors" shape="rect">relative selector</a>
-										pointing to a node that holds a URI that represents a unique identifier for the disambiguation target.</p></li></ul></p></li></ul><p>When using a disambiguation rule, the user <a href="#rfc2119" shape="rect">MUST</a> use one of the use cases for disambiguation:
-							specifying the target type,	or specifying the target identity.
+										for the disambiguation target.</p></li><li><p>A <code>disambigIdentPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a>
+										pointing to a node that represents a unique identifier for the disambiguation target.</p></li><li><p>a <code>disambigIdentRefPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a>
+										pointing to a node that holds a URI that represents a unique identifier for the disambiguation target.</p></li></ul></p></li></ul><span class="editor-note">[Ed. note: Below will need a test case in the test suite.]</span><p id="disambiguation-use-cases">When using a disambiguation rule, the user <a href="#rfc2119" shape="rect">MUST</a> use one of the use cases for disambiguation: specifying the target type,	or specifying the target identity.
 							For the latter, the user <a href="#rfc2119" shape="rect">MUST</a> use only one of the two addressing modes:</p><ul><li><p>Using <code>disambigSource</code> and <code>disambigIdent</code> to specify the collection and the identifier itself.</p></li><li><p>Using one of <code>disambigIdentRef</code>, <code>disambigIdentPointer</code> or <code>disambigIdentRefPointer</code> using
 								a URI for the disambiguation target.</p></li></ul><div class="exampleOuter"><div class="exampleHeader"><a name="EX-disambiguation-global-1" id="EX-disambiguation-global-1" shape="rect"/>Example 52: Usage of <code>disambigClassRef</code>, <code>disambigGranularity</code>, <code>disambigIdentRef</code>,
 								<code>disambigSource</code> and <code>disambigIdent</code> for both entity and word sense disambiguation.</div><div class="exampleInner"><pre xml:space="preserve">
@@ -2168,12 +2167,12 @@
   xmlns:its="http://www.w3.org/2005/11/its" &gt;
  &lt;its:rules version="2.0"&gt;
   &lt;its:disambiguationRule
-    selector="/text/body/p/[@id='dublin']"
+    selector="/text/body/p/*[@id='dublin']"
     its:disambigClassRef="http:/nerd.eurecom.fr/ontology#Place"
     its:disambigGranularity="entity"
     its:disambigIdentRef="http://dbpedia.org/resource/Dublin"/&gt;
   &lt;its:disambiguationRule
-    selector="/text/body/p/[@id='capital']"
+    selector="/text/body/p/*[@id='capital']"
     its:disambigGranularity="lexicalConcept"
     its:disambigSource="Wordnet3.0"
     its:disambigIdent="301467919"/&gt;
@@ -2189,7 +2188,7 @@
 								granularity level of the disambiguation. The value can be one of the following identifiers: <code>lexicalConcept</code>, <code>ontologyConcept</code>, or <code>entity</code></p></li><li><p>An optional <code>disambigSource</code> attribute. It contains a string representing the 
 								disambiguation identifier collection source.</p></li><li><p>An optional <code>disambigIdent</code> attribute. It contains a string, representing the 
 								disambiguation identifier for the disambiguation target that is valid within the specified Disambiguation Source.</p></li><li><p>An optional <code>disambigIdentRef</code> attribute. It contains a URI that represents a unique 
-								identifier for the disambiguation target.</p></li></ul><p>The user <a href="#rfc2119" shape="rect">MUST</a> use only one of the two addressing modes for disambiguation:</p><ul><li><p>Using <code>disambigSource</code> and <code>disambigIdent</code> to specify the collection
+								identifier for the disambiguation target.</p></li></ul><p>The user <a href="#rfc2119" shape="rect">MUST</a> use only one of the two addressing modes for "target identity" disambiguation:</p><ul><li><p>Using <code>disambigSource</code> and <code>disambigIdent</code> to specify the collection
 								and the identifier itself.</p></li><li><p>Using <code>disambigIdentRef</code> using a URI for the disambiguation target</p></li></ul><div class="exampleOuter"><div class="exampleHeader"><a name="EX-disambiguation-html5-local-1" id="EX-disambiguation-html5-local-1" shape="rect"/>Example 53: Local mixed usage of Usage of <code>disambigClassRef</code>, <code>disambigGranularity</code>, 
 								and <code>disambigIdentRef</code> in HTML.</div><div class="exampleInner"><pre xml:space="preserve">&lt;!DOCTYPE html&gt;&#xD;
  &lt;html lang=en&gt;
@@ -3702,7 +3701,7 @@
             <em>This section is informative.</em>
          </p><p>Several constraints of ITS markup cannot be validated with ITS schemas. The
 					following <a title="Rule-based validation&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;-- Schematron" href="#schematron" shape="rect">[Schematron]</a> document allows for
-					validating some of these constraints.</p><div class="exampleOuter"><div class="exampleHeader"><a name="d3e9219" id="d3e9219" shape="rect"/>Example 97: Testing constraints in ITS markup</div><div class="exampleInner"><pre xml:space="preserve">
+					validating some of these constraints.</p><div class="exampleOuter"><div class="exampleHeader"><a name="d3e9222" id="d3e9222" shape="rect"/>Example 97: Testing constraints in ITS markup</div><div class="exampleInner"><pre xml:space="preserve">
 &lt;sch:schema
   xmlns:sch="http://www.ascc.net/xml/schematron" &gt;
 &lt;!-- Schematron document to test constraints for global and local ITS markup.
@@ -3770,7 +3769,7 @@
          </p><p>The following <a title="Namespace-based Validation&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Dispatching Language (NVDL)" href="#nvdl" shape="rect">[NVDL]</a> document allows validation of
 					ITS markup which has been added to a host vocabulary. Only ITS elements and
 					attributes are checked. Elements and attributes of host language are ignored
-					during validation against this NVDL document/schema.</p><div class="exampleOuter"><div class="exampleHeader"><a name="d3e9241" id="d3e9241" shape="rect"/>Example 98: NVDL schema for ITS</div><div class="exampleInner"><pre xml:space="preserve">
+					during validation against this NVDL document/schema.</p><div class="exampleOuter"><div class="exampleHeader"><a name="d3e9244" id="d3e9244" shape="rect"/>Example 98: NVDL schema for ITS</div><div class="exampleInner"><pre xml:space="preserve">
 &lt;nvdl:rules
   xmlns:nvdl="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0" &gt;
  &lt;nvdl:namespace ns="http://www.w3.org/2005/11/its"&gt;

Received on Tuesday, 16 October 2012 23:07:55 UTC