[t] (0) Minor fixes: Ignore out-of-band encoding if it's not supporte…

…d; require 2d context's 'font' attribute to ignore errors on setting. git-svn-id: http://svn.whatwg.org/webapps@2131 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Sep 2, 2008 · 5ecf7ee0635f7c100c6285f63edac36e3e0d9f3c · 5ecf7ee
1 parent fda210b
commit 5ecf7ee0635f7c100c6285f63edac36e3e0d9f3c
Unified Split

Showing with 18 additions and 14 deletions.

+11 −9 index

+7 −5 source
diff --git a/index b/index
@@ -1,4 +1,4 @@
-  
-
+  
+<!DOCTYPE HTML>
 <html lang=en-US-x-hixie>
 <head>
  <title>HTML 5</title>
@@ -28,8 +28,8 @@
   <h1 id=html-5>HTML 5</h1>
-  
-   <h2 class="no-num no-toc" id=draft>Draft Recommendation &mdash; 29 August
-  
-    2008</h2>
+  
+   <h2 class="no-num no-toc" id=draft>Draft Recommendation &mdash; 1
+  
+    September 2008</h2>
   <p>You can take part in this work. <a
    href="http://www.whatwg.org/mailing-list">Join the working group's

   attribute, on setting, must be parsed the same way as the 'font' property
   of CSS (but without supporting property-independent stylesheet syntax like
   'inherit'), and the resulting font must be assigned to the context, with
-  
-   the 'line-height' component forced to 'normal'. <a
-  
-   href="#refsCSS">[CSS]</a><!-- XXX generic
-  
-  version-independent reference -->
+  
+   the 'line-height' component forced to 'normal'. If the new value is
+  
+   syntactically incorrect, then it must be ignored, without assigning a new
+  
+   font value. <a
+  
+   href="#refsCSS">[CSS]</a><!-- XXX generic version-independent
+  
+  reference -->
  <p>Font names must be interpreted in the context of the <code><a
   href="#canvas">canvas</a></code> element's stylesheets; any fonts embedded

  <ol>
   <li>
-  
-    <p>If the transport layer specifies an encoding, return that encoding
-  
-     with the <a href="#confidence"
+  
+    <p>If the transport layer specifies an encoding, and it is supported,
+  
+     return that encoding with the <a href="#confidence"
     title=concept-encoding-confidence>confidence</a> <i>certain</i>, and
     abort these steps.

    href="#form-element"><code>form</code> element pointer</a> in the parser)
  </ul>
-  
-  <p class=note>The mutatiosn allowed by this section apply <em>after</em>
+  
+  <p class=note>The mutations allowed by this section apply <em>after</em>
   the <a href="#html-0">HTML parser</a>'s rules have been applied. For
   example, a <code title="">&lt;a::></code> start tag will be closed by a
   <code title="">&lt;/a::></code> end tag, and never by a <code
diff --git a/source b/source

  property of CSS (but without supporting property-independent
  stylesheet syntax like 'inherit'), and the resulting font must be
  assigned to the context, with the 'line-height' component forced to
-  
-  'normal'. <a href="#refsCSS">[CSS]</a><!-- XXX generic
-  
-  version-independent reference --></p>
+  
+  'normal'. If the new value is syntactically incorrect, then it must
+  
+  be ignored, without assigning a new font value. <a
+  
+  href="#refsCSS">[CSS]</a><!-- XXX generic version-independent
+  
+  reference --></p>
  <p>Font names must be interpreted in the context of the
  <code>canvas</code> element's stylesheets; any fonts embedded using

  <ol>
-  
-   <li><p>If the transport layer specifies an encoding, return that
-  
-   encoding with the <span
+  
+   <li><p>If the transport layer specifies an encoding, and it is
+  
+   supported, return that encoding with the <span
   title="concept-encoding-confidence">confidence</span>
   <i>certain</i>, and abort these steps.</p></li>

  </ul>
-  
-  <p class="note">The mutatiosn allowed by this section apply
+  
+  <p class="note">The mutations allowed by this section apply
  <em>after</em> the <span>HTML parser</span>'s rules have been
  applied. For example, a <code title="">&lt;a::></code> start tag
  will be closed by a <code title="">&lt;/a::></code> end tag, and