minor cleanup
authorMarcos Caceres <w3c@marcosc.com>
Fri, 17 Feb 2012 00:02:43 +0000
changeset 19 ffc510095c3d
parent 18 147a01c97f9c
child 21 14bed86f202e
minor cleanup
splashscreen/Overview.html
splashscreen/Overview.src.html
--- a/splashscreen/Overview.html	Thu Feb 16 23:43:40 2012 +0000
+++ b/splashscreen/Overview.html	Fri Feb 17 00:02:43 2012 +0000
@@ -67,7 +67,7 @@
    <li><a href=#the-width-attribute><span class=secno>7.2 </span>The <code>width</code> attribute</a></li>
    <li><a href=#the-height-attribute><span class=secno>7.3 </span>The <code>height</code> attribute </a></li></ol></li>
  <li><a href=#the-default-splash-screen><span class=secno>8 </span>The default splash screen</a></li>
- <li><a href=#finding-the-splash-screen><span class=secno>9 </span>Finding the splash screen</a>
+ <li><a href=#finding-the-splash-screens><span class=secno>9 </span>Finding the splash screens</a>
   <ol>
    <li><a href=#processing-splash-elements><span class=secno>9.1 </span>Processing splash elements</a></li>
    <li><a class="no-num done" href=#locate-the-default-splash-screen-file>Locate the default splash screen file</a></li></ol></li>
@@ -169,14 +169,16 @@
 </tbody></table>
 <p>It is <em class=ct>optional</em> for a <a href=#product-ua>user agent</a> to <span title=supported>support</span> the <span title="media type">media types</span> listed in the <a href=#default-splash-screen-table>default splash-screen table</a>.</p>
 <p class=note> At the time of writing, there is limited support on devices for displaying SVG as a splash screen. We recommend you include a splash screen in one of more of the other formats listed in the <a href=#default-splash-screen-table>default splash-screen table</a>.</p>
-<h2 id=finding-the-splash-screen><span class=secno>9 </span>Finding the splash screen</h2>
-<p> A user agent behaves as if the <a href=#splash-file-defaults-table>splash file defaults table</a> had been defined as part of the <a href=http://www.w3.org/TR/widgets/#table-of-configuration-defaults>Table of Configuration Defaults</a> in <a href=http://dev.w3.org/2006/waf/widgets/#step-3--set-the-configuration-defaults>Step 3</a> of the <cite>Widget Packaging</cite> specification.</p>
+<h2 id=finding-the-splash-screens><span class=secno>9 </span>Finding the splash screens</h2>
+<p>TODO: write how to hook into processing algorithm. </p>
+<h3 id=processing-splash-elements><span class=secno>9.1 </span>Processing splash elements</h3>
+<p>A user agent behaves as if the <a href=#splash-file-defaults-table>splash file defaults table</a> had been defined as part of the <a href=http://www.w3.org/TR/widgets/#table-of-configuration-defaults>Table of Configuration Defaults</a> in <a href=http://dev.w3.org/2006/waf/widgets/#step-3--set-the-configuration-defaults>Step 3</a> of the <cite>Widget Packaging</cite> specification.</p>
 <table class=simple style="border: 1px solid black" summary="The configuration defaults that a user agent must set prior to instantiation.">
   <caption>
-  <dfn id=splash-file-defaults-table>Splash file defaults table</dfn>
+    <dfn id=splash-file-defaults-table>Splash file defaults table</dfn>
   </caption>
   <thead>
-          <tr>
+    <tr>
       <th scope=col>Variable</th>
       <th scope=col>Type</th>
       <th scope=col>Default Value</th>
@@ -185,38 +187,42 @@
   </thead>
   <tbody>
     <tr>
-      <th scope=row><dfn id=dfn-access-request-list><var>splash files</var></dfn></th>
+      <th scope=row><dfn id=dfn-access-request-list><var>splashscreens</var></dfn></th>
       <td>List</td>
       <td><code>null</code></td>
       <td><a href=http://dev.w3.org/2006/waf/widgets/#step-7--process-the-configuration-docume>Step 7</a></td>
     </tr>
   </tbody>
 </table>
-<p>For each spluser agent MUST run the <span>steps to process the <code>splash</code> element</span> at 
-  the appropriate point in the <a href=http://dev.w3.org/2006/waf/widgets/#algorithm-to-process-a-configuration-doc>algorithm to process a
-configuration document</a>: the appropriate point is . </p>
-<p>Thirdly, if no splash screen file was found by running  the <span>steps to locate the splash screen file</span>, the user agent MUST attempt to locate </p>
-<h3 id=processing-splash-elements><span class=secno>9.1 </span>Processing splash elements</h3>
-<p>The <dfn id=steps-to-process-splash-elments>steps to process splash elments </dfn> is given by the following algorithm: </p>
+<p>The <dfn id=steps-to-process-splash-elments>steps to process splash elments </dfn> is given by the following algorithm:</p>
 <ol>
-  <li>
-    <p>If the <code>splash</code> element does not have a <code>src</code> attribute, then terminate this algorithm. </p>
+  <li><p>For each <code>splash</code> element in tree order:</p>  
+    <ol>
+      <li>
+        <p>If the <code>splash</code> element does not have a <code>src</code> attribute, then terminate this algorithm. </p>
+      </li>
+      <li>Let <var>path</var> be the result of applying the <a href=http://www.w3.org/TR/widgets/#rule-for-getting-a-single-attribute-value-0>rule for getting a
+        single attribute value</a> to the <code title="icon src">src</code> attribute of this <code title="icon element">splash</code> element. If <var>path</var> is
+        not a <a href=http://www.w3.org/TR/widgets/#valid-path>valid path</a> or is an empty string, then terminate this algorithm. </li>
+      <li>
+        <p>  Let <var title="">file</var> be the result of applying the <a href=http://www.w3.org/TR/widgets/#rule-for-finding-a-file-within-a-widget-package-0>rule for
+          
+          finding a file within a widget package</a> to <var>path</var>. If <var title="">file</var> is not a <a href=http://www.w3.org/TR/widgets/#processable-file>processable file</a>, as
+          determined by applying the <a href=http://www.w3.org/TR/widgets/#rule-for-identifying-the-media-type-of-a-file-0>rule for identifying the media type of a
+            file</a>, then terminate this algorithm.
+        </p>
+      </li>
+      <li>
+        <p>If the <code>height</code> attribute is used, then let <var> height</var> be the result of applying the <a href=http://www.w3.org/TR/widgets/#rule-for-parsing-a-non-negative-integer-0>rule for parsing a non-negative integer</a> to the attribute's value. If the<var> height</var> is not <a href=http://www.w3.org/TR/widgets/#in-error>in error</a> and greater than 0, then <a href=http://www.w3.org/TR/widgets/#associate>associate</a> the <var>height</var> with <var>file</var>. Otherwise, the <code>height</code> attribute is <a href=http://www.w3.org/TR/widgets/#in-error>in error</a> and the <a href=http://www.w3.org/TR/widgets/#user-agent>user agent</a> <em>MUST</em> <a href=http://www.w3.org/TR/widgets/#ignore>ignore</a> the <code>height</code> attribute.</p>
+      </li>
+      <li>
+        <p>If the <code>width</code> attribute is used, then let <var> width</var> be the result of applying the <a href=http://www.w3.org/TR/widgets/#rule-for-parsing-a-non-negative-integer-0>rule for parsing a non-negative integer</a> to the attribute's value. If the <var>width</var> is not <a href=http://www.w3.org/TR/widgets/#in-error>in error</a> and greater than 0, then <a href=http://www.w3.org/TR/widgets/#associate>associate</a> the <var>width</var> with <var>file</var>. Otherwise, the <code>width</code> attribute is <a href=http://www.w3.org/TR/widgets/#in-error>in error</a> and the <a href=http://www.w3.org/TR/widgets/#user-agent>user agent</a> <em>MUST</em> <a href=http://www.w3.org/TR/widgets/#ignore>ignore</a> the <code>width</code> attribute.</p>
+      </li>
+      <li>
+        <p>Add <var>file</var> and any <a href=http://www.w3.org/TR/widgets/#associate title=associate>associated</a>  <var>width</var> and/or <var>height</var> to the list of <a href=#dfn-access-request-list><var>splashscreens</var></a>.</p>
+      </li>
+    </ol>
   </li>
-  <li>
-    <p>Let <var>path</var> be the result of applying the <a href=http://www.w3.org/TR/widgets/#rule-for-getting-a-single-attribute-value-0>rule for getting a
-      single attribute value</a> to the <code title="icon src">src</code> attribute of this <code title="icon element">splash</code> element. If <var>path</var> is
-      not a <a href=http://www.w3.org/TR/widgets/#valid-path>valid path</a> or is an empty string, then terminate this algorithm. </p>
-  </li>
-  <li>
-    <p>  Let <var title="">file</var> be the result of applying the <a href=http://www.w3.org/TR/widgets/#rule-for-finding-a-file-within-a-widget-package-0>rule for
-      
-      finding a file within a widget package</a> to <var>path</var>. If <var title="">file</var> is not a <a href=http://www.w3.org/TR/widgets/#processable-file>processable file</a>, as
-    determined by applying the <a href=http://www.w3.org/TR/widgets/#rule-for-identifying-the-media-type-of-a-file-0>rule for identifying the media type of a
-      file</a>, then terminate this algorithm.
-    </p>
-
-  </li>
-  <li>Otherwise, if the file is a processable file, then let <var>splash file</var> be <var>file</var>.</li>
 </ol>
 <h3 class="no-num done" id=locate-the-default-splash-screen-file>Locate the default splash screen file</h3>
 <p>The <dfn id=algorithm-to-locate-the-default-splash-screen-file>algorithm to locate the default splash-screen file </dfn> is given by the following algorithm:</p>
@@ -227,14 +233,12 @@
       agent:</p>
     <ol>
       <li>
-        <p>Let <var>potential-splash</var> be the result of applying the <span>rule for
-          finding a file within a widget package</span> to <var>file name</var>.</p>
+        <p>Let <var>potential-splash</var> be the result of applying the <a href=http://www.w3.org/TR/widgets/#rule-for-finding-a-file-within-a-widget-package-0>rule for
+          finding a file within a widget package</a> to <var>file name</var>.</p>
       </li>
       <li>
-        <p>If the <var>potential-splash</var> is a <span>processable file</span>, determined
-          by the <span>media type</span> given in the media type column of the default splash screen table<span></span>, then let splash screen be <var>potential-splash</var><span></span> and terminate this algorithm. </p>
-      </li>
-      <li>
+        <p>If the <var>potential-splash</var> is a <a href=http://www.w3.org/TR/widgets/#processable-file>processable file</a>, determined
+          by the <a href=http://www.w3.org/TR/widgets/#media-type-0>media type</a> given in the media type column of the default splash screen table<span></span>, then append  <var>potential-splash</var><span></span> to the <a href=#dfn-access-request-list><var>splashscreens</var></a> list  and terminate this algorithm. </p>
         <p>Otherwise, move onto the next <var>file name</var> in the default splash screen table<span></span>. If no default splash screen file is found, then terminate this algorithm. </p>
       </li>
     </ol>
--- a/splashscreen/Overview.src.html	Thu Feb 16 23:43:40 2012 +0000
+++ b/splashscreen/Overview.src.html	Fri Feb 17 00:02:43 2012 +0000
@@ -147,14 +147,16 @@
 </table>
 <p>It is <em class="ct">optional</em> for a <span>user agent</span> to <span title="supported">support</span> the <span title="media type">media types</span> listed in the <span>default splash-screen table</span>.</p>
 <p class="note"> At the time of writing, there is limited support on devices for displaying SVG as a splash screen. We recommend you include a splash screen in one of more of the other formats listed in the <span>default splash-screen table</span>.</p>
-<h2>Finding the splash screen</h2>
-<p> A user agent behaves as if the <span>splash file defaults table</span> had been defined as part of the <a href="http://www.w3.org/TR/widgets/#table-of-configuration-defaults">Table of Configuration Defaults</a> in <a href="http://dev.w3.org/2006/waf/widgets/#step-3--set-the-configuration-defaults">Step 3</a> of the <cite>Widget Packaging</cite> specification.</p>
+<h2>Finding the splash screens</h2>
+<p>TODO: write how to hook into processing algorithm. </p>
+<h3>Processing splash elements</h3>
+<p>A user agent behaves as if the <span>splash file defaults table</span> had been defined as part of the <a href="http://www.w3.org/TR/widgets/#table-of-configuration-defaults">Table of Configuration Defaults</a> in <a href="http://dev.w3.org/2006/waf/widgets/#step-3--set-the-configuration-defaults">Step 3</a> of the <cite>Widget Packaging</cite> specification.</p>
 <table summary="The configuration defaults that a user agent must set prior to instantiation." class="simple" style="border: 1px solid black">
   <caption>
-  <dfn>Splash file defaults table</dfn>
+    <dfn>Splash file defaults table</dfn>
   </caption>
   <thead>
-          <tr>
+    <tr>
       <th scope="col">Variable</th>
       <th scope="col">Type</th>
       <th scope="col">Default Value</th>
@@ -163,38 +165,42 @@
   </thead>
   <tbody>
     <tr>
-      <th scope="row"><dfn id="dfn-access-request-list"><var>splash files</var></dfn></th>
+      <th scope="row"><dfn id="dfn-access-request-list"><var>splashscreens</var></dfn></th>
       <td>List</td>
       <td><code>null</code></td>
       <td><a href="http://dev.w3.org/2006/waf/widgets/#step-7--process-the-configuration-docume">Step 7</a></td>
     </tr>
   </tbody>
 </table>
-<p>For each spluser agent MUST run the <span>steps to process the <code>splash</code> element</span> at 
-  the appropriate point in the <a href="http://dev.w3.org/2006/waf/widgets/#algorithm-to-process-a-configuration-doc">algorithm to process a
-configuration document</a>: the appropriate point is . </p>
-<p>Thirdly, if no splash screen file was found by running  the <span>steps to locate the splash screen file</span>, the user agent MUST attempt to locate </p>
-<h3>Processing splash elements</h3>
-<p>The <dfn>steps to process splash elments </dfn> is given by the following algorithm: </p>
+<p>The <dfn>steps to process splash elments </dfn> is given by the following algorithm:</p>
 <ol>
-  <li>
-    <p>If the <code>splash</code> element does not have a <code>src</code> attribute, then terminate this algorithm. </p>
+  <li><p>For each <code>splash</code> element in tree order:</p>  
+    <ol>
+      <li>
+        <p>If the <code>splash</code> element does not have a <code>src</code> attribute, then terminate this algorithm. </p>
+      </li>
+      <li>Let <var>path</var> be the result of applying the <a href="http://www.w3.org/TR/widgets/#rule-for-getting-a-single-attribute-value-0">rule for getting a
+        single attribute value</a> to the <code title="icon src">src</code> attribute of this <code title="icon element">splash</code> element. If <var>path</var> is
+        not a <a href="http://www.w3.org/TR/widgets/#valid-path">valid path</a> or is an empty string, then terminate this algorithm. </li>
+      <li>
+        <p>  Let <var title="">file</var> be the result of applying the <a href="http://www.w3.org/TR/widgets/#rule-for-finding-a-file-within-a-widget-package-0">rule for
+          
+          finding a file within a widget package</a> to <var>path</var>. If <var title="">file</var> is not a <a href="http://www.w3.org/TR/widgets/#processable-file">processable file</a>, as
+          determined by applying the <a href="http://www.w3.org/TR/widgets/#rule-for-identifying-the-media-type-of-a-file-0">rule for identifying the media type of a
+            file</a>, then terminate this algorithm.
+        </p>
+      </li>
+      <li>
+        <p>If the <code>height</code> attribute is used, then let <var> height</var> be the result of applying the <a href="http://www.w3.org/TR/widgets/#rule-for-parsing-a-non-negative-integer-0">rule for parsing a non-negative integer</a> to the attribute's value. If the<var> height</var> is not <a href="http://www.w3.org/TR/widgets/#in-error">in error</a> and greater than 0, then <a href="http://www.w3.org/TR/widgets/#associate">associate</a> the <var>height</var> with <var>file</var>. Otherwise, the <code>height</code> attribute is <a href="http://www.w3.org/TR/widgets/#in-error">in error</a> and the <a href="http://www.w3.org/TR/widgets/#user-agent">user agent</a> <em>MUST</em> <a href="http://www.w3.org/TR/widgets/#ignore">ignore</a> the <code>height</code> attribute.</p>
+      </li>
+      <li>
+        <p>If the <code>width</code> attribute is used, then let <var> width</var> be the result of applying the <a href="http://www.w3.org/TR/widgets/#rule-for-parsing-a-non-negative-integer-0">rule for parsing a non-negative integer</a> to the attribute's value. If the <var>width</var> is not <a href="http://www.w3.org/TR/widgets/#in-error">in error</a> and greater than 0, then <a href="http://www.w3.org/TR/widgets/#associate">associate</a> the <var>width</var> with <var>file</var>. Otherwise, the <code>width</code> attribute is <a href="http://www.w3.org/TR/widgets/#in-error">in error</a> and the <a href="http://www.w3.org/TR/widgets/#user-agent">user agent</a> <em>MUST</em> <a href="http://www.w3.org/TR/widgets/#ignore">ignore</a> the <code>width</code> attribute.</p>
+      </li>
+      <li>
+        <p>Add <var>file</var> and any <a href="http://www.w3.org/TR/widgets/#associate" title="associate">associated</a>  <var>width</var> and/or <var>height</var> to the list of <var>splashscreens</var>.</p>
+      </li>
+    </ol>
   </li>
-  <li>
-    <p>Let <var>path</var> be the result of applying the <a href="http://www.w3.org/TR/widgets/#rule-for-getting-a-single-attribute-value-0">rule for getting a
-      single attribute value</a> to the <code title="icon src">src</code> attribute of this <code title="icon element">splash</code> element. If <var>path</var> is
-      not a <a href="http://www.w3.org/TR/widgets/#valid-path">valid path</a> or is an empty string, then terminate this algorithm. </p>
-  </li>
-  <li>
-    <p>  Let <var title="">file</var> be the result of applying the <a href="http://www.w3.org/TR/widgets/#rule-for-finding-a-file-within-a-widget-package-0">rule for
-      
-      finding a file within a widget package</a> to <var>path</var>. If <var title="">file</var> is not a <a href="http://www.w3.org/TR/widgets/#processable-file">processable file</a>, as
-    determined by applying the <a href="http://www.w3.org/TR/widgets/#rule-for-identifying-the-media-type-of-a-file-0">rule for identifying the media type of a
-      file</a>, then terminate this algorithm.
-    </p>
-
-  </li>
-  <li>Otherwise, if the file is a processable file, then let <var>splash file</var> be <var>file</var>.</li>
 </ol>
 <h3 class="no-num done">Locate the default splash screen file</h3>
 <p>The <dfn>algorithm to locate the default splash-screen file </dfn> is given by the following algorithm:</p>
@@ -205,14 +211,12 @@
       agent:</p>
     <ol>
       <li>
-        <p>Let <var>potential-splash</var> be the result of applying the <span>rule for
-          finding a file within a widget package</span> to <var>file name</var>.</p>
+        <p>Let <var>potential-splash</var> be the result of applying the <a href="http://www.w3.org/TR/widgets/#rule-for-finding-a-file-within-a-widget-package-0">rule for
+          finding a file within a widget package</a> to <var>file name</var>.</p>
       </li>
       <li>
-        <p>If the <var>potential-splash</var> is a <span>processable file</span>, determined
-          by the <span>media type</span> given in the media type column of the default splash screen table<span></span>, then let splash screen be <var>potential-splash</var><span></span> and terminate this algorithm. </p>
-      </li>
-      <li>
+        <p>If the <var>potential-splash</var> is a <a href="http://www.w3.org/TR/widgets/#processable-file">processable file</a>, determined
+          by the <a href="http://www.w3.org/TR/widgets/#media-type-0">media type</a> given in the media type column of the default splash screen table<span></span>, then append  <var>potential-splash</var><span></span> to the <var>splashscreens</var> list  and terminate this algorithm. </p>
         <p>Otherwise, move onto the next <var>file name</var> in the default splash screen table<span></span>. If no default splash screen file is found, then terminate this algorithm. </p>
       </li>
     </ol>