- 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
In directory gil:/tmp/cvs-serv30938
Modified Files:
its20.html its20.odd
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/its20.html 2012/11/30 18:25:14 1.288
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/its20.html 2012/11/30 19:19:25 1.289
@@ -52,8 +52,8 @@
</div>
<div class="toc2">5.3 <a href="#selectors" shape="rect">Query Language of Selectors</a><div class="toc3">5.3.1 <a href="#queryLanguage" shape="rect">Choosing Query Language</a></div>
<div class="toc3">5.3.2 <a href="#d0e2071" shape="rect">XPath 1.0</a></div>
-<div class="toc3">5.3.3 <a href="#d0e2262" shape="rect">CSS Selectors</a></div>
-<div class="toc3">5.3.4 <a href="#d0e2301" shape="rect">Additional query languages</a></div>
+<div class="toc3">5.3.3 <a href="#d0e2265" shape="rect">CSS Selectors</a></div>
+<div class="toc3">5.3.4 <a href="#d0e2304" shape="rect">Additional query languages</a></div>
<div class="toc3">5.3.5 <a href="#its-param" shape="rect">Variables in selectors</a></div>
</div>
<div class="toc2">5.4 <a href="#link-external-rules" shape="rect">Link to External Rules</a></div>
@@ -941,7 +941,7 @@
attribute.</p><p id="pointer-attributes-list">The following attributes point to existing
information: <code class="its-attr-markup">allowedCharactersPointer</code>, <code class="its-attr-markup">disambigClassPointer</code>,
<code class="its-attr-markup">disambigClassRefPointer</code>, <code class="its-attr-markup">disambigIdentPointer</code>,
- <code class="its-attr-markup">disambigIdentRefPointer</code>, <code class="its-attr-markup">domainPointer</code>,
+ <code class="its-attr-markup">disambigIdentRefPointer</code>, <code class="its-attr-markup">disambigSourcePointer</code>, <code class="its-attr-markup">domainPointer</code>,
<code class="its-attr-markup">externalResourceRefPointer</code>, <code class="its-attr-markup">langPointer</code>,
<code class="its-attr-markup">locNotePointer</code>, <code class="its-attr-markup">locNoteRefPointer</code>,
<code class="its-attr-markup">locQualityIssuesRefPointer</code>, <code class="its-attr-markup">provenanceRecordsRefPointer</code>,
@@ -951,18 +951,18 @@
with the following changes:</p><ul><li><p>Nodes selected by the expression in the <code class="its-attr-markup">selector</code> attribute form the
current node list.</p></li><li><p>Context node comes from the current node list.</p></li><li><p>The context position comes from the position of the current node in the current
node list; the first position is 1.</p></li><li><p>The context size comes from the size of the current node list.</p></li></ul></div></div><div class="div3">
-<h4><a href="#contents" shape="rect"><img src="images/topOfPage.gif" align="right" height="26" width="26" title="Go to the table of contents." alt="Go to the table of contents."/></a><a name="d0e2262" id="d0e2262" shape="rect"/>5.3.3 CSS Selectors</h4><div class="note"><p class="prefix"><b>Note:</b></p><p id="css-selectors-feature-at-risk">As of writing the working group has no
+<h4><a href="#contents" shape="rect"><img src="images/topOfPage.gif" align="right" height="26" width="26" title="Go to the table of contents." alt="Go to the table of contents."/></a><a name="d0e2265" id="d0e2265" shape="rect"/>5.3.3 CSS Selectors</h4><div class="note"><p class="prefix"><b>Note:</b></p><p id="css-selectors-feature-at-risk">As of writing the working group has no
implememtation commitment for CSS selectors. If this doesn't change CSS selectors
will be marked as feature at risk for the candidate recommendation draft.</p></div><p>CSS Selectors are identified by <code>css</code> value in <code class="its-attr-markup">queryLanguage</code>
attribute.</p><div class="div4">
-<h5><a name="d0e2276" id="d0e2276" shape="rect"/>5.3.3.1Absolute selector</h5><p>Absolute selector <a href="#rfc-keywords" shape="rect">MUST</a> be interpreted as selector
+<h5><a name="d0e2279" id="d0e2279" shape="rect"/>5.3.3.1Absolute selector</h5><p>Absolute selector <a href="#rfc-keywords" shape="rect">MUST</a> be interpreted as selector
as defined in <a href="#css3-selectors" shape="rect">Selectors Level 3</a>. Both simple
selectors and groups of selectors can be used.</p></div><div class="div4">
-<h5><a name="d0e2287" id="d0e2287" shape="rect"/>5.3.3.2Relative selector</h5><p>Relative selector <a href="#rfc-keywords" shape="rect">MUST</a> be interpreted as selector
+<h5><a name="d0e2290" id="d0e2290" shape="rect"/>5.3.3.2Relative selector</h5><p>Relative selector <a href="#rfc-keywords" shape="rect">MUST</a> be interpreted as selector
as defined in <a href="#css3-selectors" shape="rect">Selectors Level 3</a>. Selector is not
evaluated against the complete document tree but only against subtrees rooted at
nodes selected by selector in the <code class="its-attr-markup">selector</code> attribute.</p></div></div><div class="div3">
-<h4><a href="#contents" shape="rect"><img src="images/topOfPage.gif" align="right" height="26" width="26" title="Go to the table of contents." alt="Go to the table of contents."/></a><a name="d0e2301" id="d0e2301" shape="rect"/>5.3.4 Additional query languages</h4><p>ITS processors <a href="#rfc-keywords" shape="rect">MAY</a> support additional query
+<h4><a href="#contents" shape="rect"><img src="images/topOfPage.gif" align="right" height="26" width="26" title="Go to the table of contents." alt="Go to the table of contents."/></a><a name="d0e2304" id="d0e2304" shape="rect"/>5.3.4 Additional query languages</h4><p>ITS processors <a href="#rfc-keywords" shape="rect">MAY</a> support additional query
languages. For each additional query language processor <a href="#rfc-keywords" shape="rect">MUST</a> define:</p><ul><li><p>identifier of query language used in <code class="its-attr-markup">queryLanguage</code>;</p></li><li><p>rules for evaluating absolute selector to collection of nodes;</p></li><li><p>rules for evaluating relative selector to collection of nodes.</p></li></ul><p>Future versions of this specification <a href="#rfc-keywords" shape="rect">MAY</a> define
additional query languages. The following query language identifiers are reserved:
<code>xpath</code>, <code>css</code>, <code>xpath2</code>, <code>xpath3</code>,
@@ -2109,15 +2109,13 @@
contains the following:</p><ul><li><p>A required <code class="its-attr-markup">selector</code> attribute that contains an <a href="#selectors" shape="rect">absolute selector</a> which selects the nodes to which this
rule applies.</p></li><li><p>An optional <code class="its-attr-markup">disambigGranularity</code> attribute that contains a string,
specifying the granularity level of the disambiguation. The value <a href="#rfc2119" shape="rect">MUST</a> be one of the following identifiers:
- "lexicalConcept", "ontologyConcept", or "entity". The
+ "lexicalConcept", "ontologyConcept", or "entity". The
default value is "entity".</p></li><li><p>At least one of the following: </p><ul><li><p>To specify the target type class, exactly one of the following: </p><ul><li><p>A <code class="its-attr-markup">disambigClassPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a> pointing to a node
- specifying the type of entity or concept class behind the
- selector.</p></li><li><p>A <code class="its-attr-markup">disambigClassRefPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a> pointing to a node that
- holds an IRI that specifies the type of entity or concept class behind the
- selector.</p></li></ul></li><li><p>To specify the target identity, exactly one of the following: </p><ul><li><p>A <code class="its-attr-markup">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 class="its-attr-markup">disambigIdentRefPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a> pointing to a node that
- holds an IRI that represents a unique identifier for the disambiguation
- target.</p></li></ul></li></ul></li></ul><p>For an example, see <a href="#EX-disambiguation-html5-rdfa-companion-document" shape="rect">Example 59</a>.</p><p id="disambiguation-local">LOCAL: The following local markup is available for the
+ specifying the type of entity or concept class behind the
+ selector.</p></li><li><p>A <code class="its-attr-markup">disambigClassRefPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a> pointing to a node that
+ holds an IRI that specifies the type of entity or concept class behind the
+ selector.</p></li></ul></li><li><p>To specify the target identity, exactly one of the following: </p><ul><li><p>When using the addressing <a href="#disambiguation-use-cases" shape="rect">mode 1</a>:</p><ul><li><p>A <code class="its-attr-markup">disambigSourcePointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a> to a node that holds the string representing the disambiguation identifier collection source.</p></li><li><p>A <code class="its-attr-markup">disambigIdentPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a> to a node that holds the string, representing the disambiguation identifier for the disambiguation target that is valid within the specified disambiguation source.</p></li></ul></li><li><p>When using the addressing <a href="#disambiguation-use-cases" shape="rect">mode 2</a>:</p><ul><li><p>
+ A <code class="its-attr-markup">disambigIdentRefPointer</code> attribute that contains a <a href="#selectors" shape="rect">relative selector</a> pointing to a node that holds an IRI that represents a unique identifier for the disambiguation target.</p></li></ul></li></ul></li></ul></li></ul><p>For an example, see <a href="#EX-disambiguation-html5-rdfa-companion-document" shape="rect">Example 59</a>.</p><p id="disambiguation-local">LOCAL: The following local markup is available for the
<a href="#Disambiguation" shape="rect">Disambiguation</a> data category:</p><ul><li><p>An optional <code class="its-attr-markup">disambigConfidence</code> attribute with the value of a
rational number in the interval 0 to 1 (inclusive). The value follows the <a href="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#decimal" shape="rect">XML Schema
decimal data type</a> with the constraining facets <a href="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#rf-minInclusive" shape="rect">minInclusive</a> set to 0 and <a href="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#rf-maxInclusive" shape="rect">maxInclusive</a> set to 1. <code class="its-attr-markup">disambigConfidence</code> represents the
@@ -4720,7 +4718,10 @@
<strong class="hl-tag" style="color: #000096"></optional></strong>
<strong class="hl-tag" style="color: #000096"><optional></strong>
<strong class="hl-tag" style="color: #000096"><choice></strong>
- <strong class="hl-tag" style="color: #000096"><ref</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-attribute.disambigIdentPointer.nons"</span><strong class="hl-tag" style="color: #000096">/></strong>
+ <strong class="hl-tag" style="color: #000096"><group></strong>
+ <strong class="hl-tag" style="color: #000096"><ref</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-attribute.disambigSourcePointer.nons"</span><strong class="hl-tag" style="color: #000096">/></strong>
+ <strong class="hl-tag" style="color: #000096"><ref</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-attribute.disambigIdentPointer.nons"</span><strong class="hl-tag" style="color: #000096">/></strong>
+ <strong class="hl-tag" style="color: #000096"></group></strong>
<strong class="hl-tag" style="color: #000096"><ref</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-attribute.disambigIdentRefPointer.nons"</span><strong class="hl-tag" style="color: #000096">/></strong>
<strong class="hl-tag" style="color: #000096"></choice></strong>
<strong class="hl-tag" style="color: #000096"></optional></strong>
@@ -4740,6 +4741,11 @@
<strong class="hl-tag" style="color: #000096"><ref</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-disambigIdentPointer.type"</span><strong class="hl-tag" style="color: #000096">/></strong>
<strong class="hl-tag" style="color: #000096"></attribute></strong>
<strong class="hl-tag" style="color: #000096"></define></strong>
+ <strong class="hl-tag" style="color: #000096"><define</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-attribute.disambigSourcePointer.nons"</span><strong class="hl-tag" style="color: #000096">></strong>
+ <strong class="hl-tag" style="color: #000096"><attribute</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"disambigSourcePointer"</span><strong class="hl-tag" style="color: #000096">></strong>
+ <strong class="hl-tag" style="color: #000096"><ref</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-disambigSourcePointer.type"</span><strong class="hl-tag" style="color: #000096">/></strong>
+ <strong class="hl-tag" style="color: #000096"></attribute></strong>
+ <strong class="hl-tag" style="color: #000096"></define></strong>
<strong class="hl-tag" style="color: #000096"><define</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-attribute.disambigIdentRefPointer.nons"</span><strong class="hl-tag" style="color: #000096">></strong>
<strong class="hl-tag" style="color: #000096"><attribute</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"disambigIdentRefPointer"</span><strong class="hl-tag" style="color: #000096">></strong>
<strong class="hl-tag" style="color: #000096"><ref</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-disambigIdentRefPointer.type"</span><strong class="hl-tag" style="color: #000096">/></strong>
@@ -5207,6 +5213,9 @@
<strong class="hl-tag" style="color: #000096"><define</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-disambigIdentRefPointer.type"</span><strong class="hl-tag" style="color: #000096">></strong>
<strong class="hl-tag" style="color: #000096"><ref</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-relative-selector.type"</span><strong class="hl-tag" style="color: #000096">/></strong>
<strong class="hl-tag" style="color: #000096"></define></strong>
+ <strong class="hl-tag" style="color: #000096"><define</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-disambigSourcePointer.type"</span><strong class="hl-tag" style="color: #000096">></strong>
+ <strong class="hl-tag" style="color: #000096"><ref</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-relative-selector.type"</span><strong class="hl-tag" style="color: #000096">/></strong>
+ <strong class="hl-tag" style="color: #000096"></define></strong>
<strong class="hl-tag" style="color: #000096"><define</strong> <span class="hl-attribute" style="color: #F5844C">name</span>=<span class="hl-value" style="color: #993300">"its-localeFilterList.type"</span><strong class="hl-tag" style="color: #000096">></strong>
<strong class="hl-tag" style="color: #000096"><data</strong> <span class="hl-attribute" style="color: #F5844C">type</span>=<span class="hl-value" style="color: #993300">"string"</span> <span class="hl-attribute" style="color: #F5844C">datatypeLibrary</span>=<span class="hl-value" style="color: #993300">""</span><strong class="hl-tag" style="color: #000096">/></strong>
<strong class="hl-tag" style="color: #000096"></define></strong>
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/its20.odd 2012/11/30 18:25:14 1.288
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/its20.odd 2012/11/30 19:19:26 1.289
@@ -1354,7 +1354,7 @@
<p xml:id="pointer-attributes-list">The following attributes point to existing
information: <att>allowedCharactersPointer</att>, <att>disambigClassPointer</att>,
<att>disambigClassRefPointer</att>, <att>disambigIdentPointer</att>,
- <att>disambigIdentRefPointer</att>, <att>domainPointer</att>,
+ <att>disambigIdentRefPointer</att>, <att>disambigSourcePointer</att>, <att>domainPointer</att>,
<att>externalResourceRefPointer</att>, <att>langPointer</att>,
<att>locNotePointer</att>, <att>locNoteRefPointer</att>,
<att>locQualityIssuesRefPointer</att>, <att>provenanceRecordsRefPointer</att>,
@@ -3179,36 +3179,37 @@
contains the following:</p>
<list type="unordered">
<item>A required <att>selector</att> attribute that contains an <ref
- target="#selectors">absolute selector</ref> which selects the nodes to which this
+ target="#selectors">absolute selector</ref> which selects the nodes to which this
rule applies.</item>
<item>An optional <att>disambigGranularity</att> attribute that contains a string,
specifying the granularity level of the disambiguation. The value <ref
target="#rfc2119">MUST</ref> be one of the following identifiers:
- <val>lexicalConcept</val>, <val>ontologyConcept</val>, or <val>entity</val>. The
+ <val>lexicalConcept</val>, <val>ontologyConcept</val>, or <val>entity</val>. The
default value is <val>entity</val>.</item>
<item><p>At least one of the following: </p><list>
- <item><p>To specify the target type class, exactly one of the following: </p><list>
- <item><p>A <att>disambigClassPointer</att> attribute that contains a <ref
- target="#selectors">relative selector</ref> pointing to a node
- specifying the type of entity or concept class behind the
- selector.</p></item>
- <item><p>A <att>disambigClassRefPointer</att> attribute that contains a <ref
- target="#selectors">relative selector</ref> pointing to a node that
- holds an IRI that specifies the type of entity or concept class behind the
- selector.</p></item>
- </list>
- </item>
- <item><p>To specify the target identity, exactly one of the following: </p><list>
+ <item><p>To specify the target type class, exactly one of the following: </p><list>
+ <item><p>A <att>disambigClassPointer</att> attribute that contains a <ref
+ target="#selectors">relative selector</ref> pointing to a node
+ specifying the type of entity or concept class behind the
+ selector.</p></item>
+ <item><p>A <att>disambigClassRefPointer</att> attribute that contains a <ref
+ target="#selectors">relative selector</ref> pointing to a node that
+ holds an IRI that specifies the type of entity or concept class behind the
+ selector.</p></item>
+ </list>
+ </item>
+ <item><p>To specify the target identity, exactly one of the following: </p>
+ <list><item><p>When using the addressing <ref target="#disambiguation-use-cases">mode 1</ref>:</p>
+ <list><item><p>A <att>disambigSourcePointer</att> attribute that contains a <ref target="#selectors">relative selector</ref> to a node that holds the string representing the disambiguation identifier collection source.</p></item>
<item><p>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.</p></item>
- <item><p>A <att>disambigIdentRefPointer</att> attribute that contains a <ref
- target="#selectors">relative selector</ref> pointing to a node that
- holds an IRI that represents a unique identifier for the disambiguation
- target.</p></item>
+ target="#selectors">relative selector</ref> to a node that holds the string, representing the disambiguation identifier for the disambiguation target that is valid within the specified disambiguation source.</p></item></list></item>
+ <item><p>When using the addressing <ref target="#disambiguation-use-cases">mode 2</ref>:</p><list><item><p>
+ A <att>disambigIdentRefPointer</att> attribute that contains a <ref target="#selectors">relative selector</ref> pointing to a node that holds an IRI that represents a unique identifier for the disambiguation target.</p></item>
</list>
- </item>
- </list>
+ </item>
+ </list>
+ </item>
+ </list>
</item>
</list>
<p>For an example, see <ptr type="exref"
Received on Friday, 30 November 2012 19:19:29 UTC