[gw] (2) Clarify how context.font works regarding relative values for…

… font-size. git-svn-id: http://svn.whatwg.org/webapps@3537 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 4, 2009 · 5a7bf59 · 5a7bf59
1 parent e8a6f73
commit 5a7bf59
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/index b/index
@@ -24670,8 +24670,8 @@ notes on what would need to be defined for dashed lines:
     the CSS 'font' property; values that cannot be parsed as CSS font
     values are ignored.</p>
 
-    <p>Relative keywords and lengths are computed relative to the
-    default font, 10px sans-serif.</p>
+    <p>Relative keywords and lengths are computed relative to the font
+    of the <code><a href=#the-canvas-element>canvas</a></code> element.</p>
 
    </dd>
 
@@ -24733,10 +24733,10 @@ notes on what would need to be defined for dashed lines:
   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'. If the new value is syntactically incorrect (including
-  using property-independent stylesheet syntax like 'inherit' or
-  'initial'), then it must be ignored, without assigning a new font
-  value. <a href=#refsCSS>[CSS]</a></p>
+  'normal', and with the 'font-size' component converted to CSS
+  pixels. If the new value is syntactically incorrect (including using
+  property-independent stylesheet syntax like 'inherit' or 'initial'),
+  then it must be ignored, without assigning a new font value. <a href=#refsCSS>[CSS]</a></p>
 
   <p>Font names must be interpreted in the context of the
   <code><a href=#the-canvas-element>canvas</a></code> element's stylesheets; any fonts embedded using
@@ -24750,8 +24750,9 @@ notes on what would need to be defined for dashed lines:
   make the font look very ugly.</p>
 
   <p>On getting, the <code title=dom-context-2d-font><a href=#dom-context-2d-font>font</a></code>
-  attribute must return the serialized form of the current font of the
-  context (with no 'line-height' component). <a href=#refsCSSOM>[CSSOM]</a></p>
+  attribute must return the <span title="serializing a CSS
+  value">serialized form</span> of the current font of the context
+  (with no 'line-height' component). <a href=#refsCSSOM>[CSSOM]</a></p>
 
   <div class=example>
 

diff --git a/source b/source
@@ -26945,8 +26945,8 @@ notes on what would need to be defined for dashed lines:
     the CSS 'font' property; values that cannot be parsed as CSS font
     values are ignored.</p>
 
-    <p>Relative keywords and lengths are computed relative to the
-    default font, 10px sans-serif.</p>
+    <p>Relative keywords and lengths are computed relative to the font
+    of the <code>canvas</code> element.</p>
 
    </dd>
 
@@ -27014,10 +27014,11 @@ notes on what would need to be defined for dashed lines:
   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'. If the new value is syntactically incorrect (including
-  using property-independent stylesheet syntax like 'inherit' or
-  'initial'), then it must be ignored, without assigning a new font
-  value. <a href="#refsCSS">[CSS]</a></p>
+  'normal', and with the 'font-size' component converted to CSS
+  pixels. If the new value is syntactically incorrect (including using
+  property-independent stylesheet syntax like 'inherit' or 'initial'),
+  then it must be ignored, without assigning a new font value. <a
+  href="#refsCSS">[CSS]</a></p>
 
   <p>Font names must be interpreted in the context of the
   <code>canvas</code> element's stylesheets; any fonts embedded using
@@ -27032,8 +27033,9 @@ notes on what would need to be defined for dashed lines:
   make the font look very ugly.</p>
 
   <p>On getting, the <code title="dom-context-2d-font">font</code>
-  attribute must return the serialized form of the current font of the
-  context (with no 'line-height' component). <a
+  attribute must return the <span title="serializing a CSS
+  value">serialized form</span> of the current font of the context
+  (with no 'line-height' component). <a
   href="#refsCSSOM">[CSSOM]</a></p>
 
   <div class="example">