- From: Yves Savourel via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 30 Oct 2012 18:58:46 +0000
- To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20
In directory hutz:/tmp/cvs-serv494
Modified Files:
its20.html its20.odd
Log Message:
Updated Domain value algorithm
Index: its20.odd
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/its20.odd,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- its20.odd 30 Oct 2012 14:19:24 -0000 1.211
+++ its20.odd 30 Oct 2012 18:58:44 -0000 1.212
@@ -2993,57 +2993,48 @@
is no default.</p>
<p>The information provided by this data category is a comma-separated list of one or more values which is obtained by applying the following algorithm:</p>
- <list type="ordered">
- <item>Set the initial value of the resulting string as a empty string.</item>
- <item>Get the list of nodes resulting of the evaluation of the <att>domainPointer</att> attribute.</item>
- <item>For each node:
- <list type="ordered">
- <item>If the node value contains a COMMA (U+002C):
- <list type="ordered">
- <item>Split the node value into separate strings using the COMMA (U+002C) as separator.</item>
- <item>For each string:
- <list type="ordered">
- <item>Trim the leading and trailing white spaces of the string.</item>
- <item>Check if there is a mapping for the string:
- <list type="ordered">
- <item>If one is found:
- <list type="ordered" >
- <item>Add the corresponding value to the result string.</item>
- </list>
- </item>
- <item>Otherwise (if no mapping is found):
- <list type="ordered" >
- <item>Add the string to the result string.</item>
- </list>
- </item>
+ <list type="simple">
+ <item>STEP 1: Set the initial value of the resulting string as a empty string.</item>
+ <item>STEP 2: Get the list of nodes resulting of the evaluation of the <att>domainPointer</att> attribute.</item>
+ <item>STEP 3: For each node:
+ <list>
+ <item>STEP 3-1: If the node value contains a COMMA (U+002C):
+ <list>
+ <item>STEP 3-1-1: Split the node value into separate strings using the COMMA (U+002C) as separator.</item>
+ <item>STEP 3-1-2: For each string:
+ <list>
+ <item>STEP 3-1-2-1: Trim the leading and trailing white spaces of the string.</item>
+ <item>STEP 3-1-2-2: If the first character of the value is an APOSTROPHE (U+0027) or a QUOTATION MARK (U+0022): Remove it.</item>
+ <item>STEP 3-1-2-3: If the last character of the value is an APOSTROPHE (U+0027) or a QUOTATION MARK (U+0022): Remove it.</item>
+ <item>STEP 3-1-2-4: If the value is empty: Go to STEP 3-1-2.</item>
+ <item>STEP 3-1-2-5: Check if there is a mapping for the string:
+ <list>
+ <item>STEP 3-1-2-5-1. If a mapping is found: Add the corresponding value to the result string.</item>
+ <item>STEP 3-1-2-5-2. Else (if no mapping is found): Add the string to the result string.</item>
</list>
</item>
</list>
</item>
</list>
</item>
- <item>If the node value does not contain a COMMA (U+002C):
- <list type="ordered">
- <item>Trim the leading and trailing white spaces of the string.</item>
- <item>Check if there is a mapping for the string:
- <list type="ordered">
- <item>If one if found:
- <list type="ordered" >
- <item>Add the corresponding value to the result string.</item>
- </list>
- </item>
- <item>Otherwise (if no mapping is found):
- <list type="ordered" >
- <item>Add the string to the result string.</item>
- </list>
- </item>
+ <item>STEP 3-2: Else (if the node value does not contain a COMMA (U+002C)):
+ <list>
+ <item>STEP 3-2-1: Trim the leading and trailing white spaces of the string.</item>
+ <item>STEP 3-2-2: If the first character of the value is an APOSTROPHE (U+0027) or a QUOTATION MARK (U+0022): Remove it.</item>
+ <item>STEP 3-2-3: If the last character of the value is an APOSTROPHE (U+0027) or a QUOTATION MARK (U+0022): Remove it.</item>
+ <item>STEP 3-2-4: If the value is empty: Go to STEP 3.</item>
+ <item>STEP 3-2-5: Check if there is a mapping for the string:
+ <list>
+ <item>STEP 3-2-5-1: If a mapping is found: Add the corresponding value to the result string.</item>
+ <item>STEP 3-2-5-2: Else (if no mapping is found): Add the string to the result string.</item>
</list>
</item>
</list>
</item>
</list>
</item>
- <item>Return the resulting string.</item>
+ <item>STEP 4: Remove duplicated values in the resulting string.</item>
+ <item>STEP 5: Return the resulting string.</item>
</list>
<p xml:id="domain-global">GLOBAL: The <gi>domainRule</gi> element contains
the following:</p>
@@ -3062,7 +3053,7 @@
to a single right part. The values in the left or the right part of
the mapping may contain spaces; in that case they <ref
target="#rfc-keywords">MUST</ref> be delimited by quotation
- marks, that is pairs of APOSTROPHE (Unicode code point U+0027) or
+ marks, that is pairs of APOSTROPHE (U+0027) or
QUOTATION MARK (U+0022).</item>
</list>
<note>
Index: its20.html
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/its20.html,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- its20.html 30 Oct 2012 14:19:24 -0000 1.213
+++ its20.html 30 Oct 2012 18:58:44 -0000 1.214
@@ -206,48 +206,48 @@
identification.</p><div class="exampleOuter"><div class="exampleHeader"><a name="d0e333" id="d0e333" shape="rect"/>Example 1: Document with partially translatable content</div><p>In this document it is difficult to distinguish between those
<code>string</code> elements that are translatable and those that
are not. Only the addition of an explicit flag could resolve the
- issue.</p><div class="exampleInner"><pre xml:space="preserve"><strong class="hl-tag" style="color: #000096"><resources></strong>
- <strong class="hl-tag" style="color: #000096"><section</strong> <span class="hl-attribute" style="color: #F5844C">id</span>=<span class="hl-value" style="color: #993300">"Homepage"</span><strong class="hl-tag" style="color: #000096">></strong>
- <strong class="hl-tag" style="color: #000096"><arguments></strong>
- <strong class="hl-tag" style="color: #000096"><string></strong>page<strong class="hl-tag" style="color: #000096"></string></strong>
- <strong class="hl-tag" style="color: #000096"><string></strong>childlist<strong class="hl-tag" style="color: #000096"></string></strong>
- <strong class="hl-tag" style="color: #000096"></arguments></strong>
- <strong class="hl-tag" style="color: #000096"><variables></strong>
- <strong class="hl-tag" style="color: #000096"><string></strong>POLICY<strong class="hl-tag" style="color: #000096"></string></strong>
[...3188 lines suppressed...]
- <strong class="hl-tag" style="color: #000096"><namespace</strong> <span class="hl-attribute" style="color: #F5844C">ns</span>=<span class="hl-value" style="color: #993300">"http://www.w3.org/2005/11/its"</span> <span class="hl-attribute" style="color: #F5844C">match</span>=<span class="hl-value" style="color: #993300">"attributes"</span><strong class="hl-tag" style="color: #000096">></strong>
- <strong class="hl-tag" style="color: #000096"><validate</strong> <span class="hl-attribute" style="color: #F5844C">schema</span>=<span class="hl-value" style="color: #993300">"its20-attributes.rng"</span><strong class="hl-tag" style="color: #000096">/></strong>
- <strong class="hl-tag" style="color: #000096"></namespace></strong>
- <strong class="hl-tag" style="color: #000096"><anyNamespace></strong>
- <strong class="hl-tag" style="color: #000096"><allow/></strong>
- <strong class="hl-tag" style="color: #000096"></anyNamespace></strong>
+ during validation against this NVDL document/schema.</p><div class="exampleOuter"><div class="exampleHeader"><a name="d0e10071" id="d0e10071" shape="rect"/>Example 106: NVDL schema for ITS</div><div class="exampleInner"><pre xml:space="preserve"><span class="hl-directive" style="color: maroon"><?xml version="1.0" encoding="UTF-8"?></span>
+<strong class="hl-tag" style="color: #000096"><rules</strong> <span class="hl-attribute" style="color: #F5844C">xmlns</span>=<span class="hl-value" style="color: #993300">"http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"</span><strong class="hl-tag" style="color: #000096">></strong>
+ <strong class="hl-tag" style="color: #000096"><namespace</strong> <span class="hl-attribute" style="color: #F5844C">ns</span>=<span class="hl-value" style="color: #993300">"http://www.w3.org/2005/11/its"</span><strong class="hl-tag" style="color: #000096">></strong>
+ <strong class="hl-tag" style="color: #000096"><validate</strong> <span class="hl-attribute" style="color: #F5844C">schema</span>=<span class="hl-value" style="color: #993300">"its20-elements.rng"</span><strong class="hl-tag" style="color: #000096">/></strong> 
+ <strong class="hl-tag" style="color: #000096"></namespace></strong>
+ <strong class="hl-tag" style="color: #000096"><namespace</strong> <span class="hl-attribute" style="color: #F5844C">ns</span>=<span class="hl-value" style="color: #993300">"http://www.w3.org/2005/11/its"</span> <span class="hl-attribute" style="color: #F5844C">match</span>=<span class="hl-value" style="color: #993300">"attributes"</span><strong class="hl-tag" style="color: #000096">></strong>
+ <strong class="hl-tag" style="color: #000096"><validate</strong> <span class="hl-attribute" style="color: #F5844C">schema</span>=<span class="hl-value" style="color: #993300">"its20-attributes.rng"</span><strong class="hl-tag" style="color: #000096">/></strong>
+ <strong class="hl-tag" style="color: #000096"></namespace></strong>
+ <strong class="hl-tag" style="color: #000096"><anyNamespace></strong>
+ <strong class="hl-tag" style="color: #000096"><allow/></strong>
+ <strong class="hl-tag" style="color: #000096"></anyNamespace></strong>
<strong class="hl-tag" style="color: #000096"></rules></strong></pre></div><p>[Source file: <a href="schemas/its20.nvdl" shape="rect">schemas/its20.nvdl</a>]</p></div><p>The NVDL schema depends on the following two schemas:</p><ul><li><p>
<a href="schemas/its20-elements.rng" shape="rect">RELAX NG schema for ITS elements</a>
</p></li><li><p>
Received on Tuesday, 30 October 2012 18:58:52 UTC