its20 CVS commit

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

Modified Files:
	its20.html its20.odd 
Log Message:
Updated Disambiguation examples.

Index: its20.odd
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/its20.odd,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- its20.odd	16 Oct 2012 13:17:07 -0000	1.186
+++ its20.odd	16 Oct 2012 14:01:19 -0000	1.187
@@ -3232,8 +3232,8 @@
 								a URI for the disambiguation target.</item>
 						</list>
 						<exemplum xml:id="EX-disambiguation-global-1">
-							<head>Usage of <att>entityTypeSourceRef</att>, <att>enttiyTypeRef</att>, <att>disambigSourceRef</att>,
-								<att>disambigIdentRef</att> for both entity and word sense disambiguation.</head>
+							<head>Usage of <att>disambigClassRef</att>, <att>disambigGranularity</att>, <att>disambigIdentRef</att>,
+								<att>disambigSource</att> and <att>disambigIdent</att> for both entity and word sense disambiguation.</head>
 							<egXML xmlns="http://www.tei-c.org/ns/Examples"
 								target="examples/xml/EX-disambiguation-global-1.xml"/>
 						</exemplum>
@@ -3261,8 +3261,8 @@
 							<item>Using <att>disambigIdentRef</att> using a URI for the disambiguation target</item>
 						</list>
 						<exemplum xml:id="EX-disambiguation-html5-local-1">
-							<head>Local mixed usage of <att>entityTypeSourceRef</att>, <att>enttiyTypeRef</att>,
-								<att>disambigSourceRef</att>, <att>disambigIdentRef</att> in HTML.</head>
+							<head>Local mixed usage of Usage of <att>disambigClassRef</att>, <att>disambigGranularity</att>, 
+								and <att>disambigIdentRef</att> in HTML.</head>
 							<egXML xmlns="http://www.tei-c.org/ns/Examples" type="html5"
 								target="examples/html5/EX-disambiguation-html5-local-1.html"/>
 						</exemplum>

Index: its20.html
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/its20.html,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- its20.html	16 Oct 2012 13:17:07 -0000	1.189
+++ its20.html	16 Oct 2012 14:01:19 -0000	1.190
@@ -2162,27 +2162,25 @@
 										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 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>entityTypeSourceRef</code>, <code>enttiyTypeRef</code>, <code>disambigSourceRef</code>,
-								<code>disambigIdentRef</code> for both entity and word sense disambiguation.</div><div class="exampleInner"><pre xml:space="preserve">
+								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">
 &lt;text
   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’]"
-    entityTypeSourceRef="http:/nerd.eurecom.fr/ontology"
-    entityTypeRef="http:/nerd.eurecom.fr/ontology#Place"
-    disambigType="entity"
-    disambigSourceRef="http://dbpedia.org/"
-    disambigIdentRef="http://dbpedia.org/resource/Dublin"/&gt;
+    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’]"
-    disambigType="lexicalConcept"
-    disambigSourceRef="http://www.w3.org/2006/03/wn/wn20/rdf/wordnet-synset.rdf"
-    disambigIdentRef="http://www.w3.org/2006/03/wn/wn20/instances/worsense-capital-noun-3"/&gt;
+    selector="/text/body/p/[@id='capital']"
+    its:disambigGranularity="lexicalConcept"
+    its:disambigSource="Wordnet3.0"
+    its:disambigIdent="301467919"/&gt;
  &lt;/its:rules&gt;
  &lt;body&gt;
   &lt;p&gt;
-   &lt;span id="dublin"&gt;Dublin&lt;/span&gt; is the &lt;span id="capital"&gt;capital of Ireland&lt;/span&gt;.&lt;/p&gt;
+   &lt;span id="dublin"&gt;Dublin&lt;/span&gt; is the &lt;span id="capital"&gt;capital&lt;/span&gt; of Ireland.&lt;/p&gt;
  &lt;/body&gt;
 &lt;/text&gt;</pre></div><p>[Source file: <a href="examples/xml/EX-disambiguation-global-1.xml" shape="rect">examples/xml/EX-disambiguation-global-1.xml</a>]</p></div><p id="disambiguation-local">LOCAL: The following local markup is
 							available for the <a href="#Disambiguation" shape="rect">Disambiguation</a>
@@ -2192,24 +2190,16 @@
 								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
-								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 <code>entityTypeSourceRef</code>, <code>enttiyTypeRef</code>,
-								<code>disambigSourceRef</code>, <code>disambigIdentRef</code> in HTML.</div><div class="exampleInner"><pre xml:space="preserve">&lt;!DOCTYPE html&gt;&#xD;
+								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;
   &lt;head&gt;
    &lt;meta charset=utf-8&gt;
-   &lt;title&gt;Entity: Local Test&lt;/title&gt;
+   &lt;title&gt;Disambiguation: Local Test&lt;/title&gt;
   &lt;/head&gt;
   &lt;body&gt;
    &lt;p&gt;
-    &lt;span
-      its-disambig-ident-ref=http://dbpedia.org/resource/Dublin
-      its-disambig-source-ref=http://dbpedia.org/
-      its-disambig-type=entity
-      its-entity-type-ident-ref=http:/nerd.eurecom.fr/ontology#Place
-      its-entity-type-source-ref=http://nerd.eurecom.fr/ontology&gt;Dublin&lt;/span&gt; is the &lt;span
-      its-disambig-ident-ref=http://www.w3.org/2006/03/wn/wn20/instances/worsense-capital-noun-3
-      its-disambig-source-ref=http://www.w3.org/2006/03/wn/wn20/rdf/wordnet-synset.rdf
-      its-disambig-type=lexicalConcept&gt;capital&lt;/span&gt; of Ireland.&lt;/p&gt;
+    &lt;span its-disambig-class-ref=http://nerd.eurecom.fr/ontology#Place its-disambig-granularity=entity its-disambig-ident-ref=http://dbpedia.org/resource/Dublin&gt;Dublin&lt;/span&gt; is the &lt;span its-disambig-granularity=lexicalConcept its-disambig-ident=301467919 its-disambig-source=Wordnet3.0&gt;capital&lt;/span&gt; of Ireland.&lt;/p&gt;
   &lt;/body&gt;
  &lt;/html&gt;</pre></div><p>[Source file: <a href="examples/html5/EX-disambiguation-html5-local-1.html" shape="rect">examples/html5/EX-disambiguation-html5-local-1.html</a>]</p></div><div class="note"><p class="prefix"><b>Note:</b></p><p>For referring to <code>disambigClassRef</code> values, implementors are encouraged to use an existing
 								repository of entity types as long as they satisfy their requirements. For example, 

Received on Tuesday, 16 October 2012 14:01:26 UTC