[giow] (0) Match implementations.

git-svn-id: http://svn.whatwg.org/webapps@6289 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jul 12, 2011 · 2db1c27 · 2db1c27
1 parent 3efc7e1
commit 2db1c27
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/complete.html b/complete.html
@@ -239,7 +239,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 11 July 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 12 July 2011</h2>
    </hgroup><dl><dt>Multiple-page version:</dt>
     <dd><a href=http://www.whatwg.org/specs/web-apps/current-work/complete/>http://www.whatwg.org/specs/web-apps/current-work/complete/</a></dd>
     <dt>One-page version:</dt>
@@ -37126,9 +37126,10 @@ <h6 id=text-0><span class=secno>4.8.11.1.9 </span>Text</h6> <!-- a v3 feature --
    <li><p>Form a hypothetical infinitely wide CSS line box containing
    a single inline box containing the text <var title="">text</var>,
    with all the properties at their initial values except the 'font'
-   property of the inline box set to <var title="">font</var> and the
+   property of the inline box set to <var title="">font</var>, the
    'direction' property of the inline box set to <a href=#the-directionality>the
-   directionality</a> of the <code><a href=#the-canvas-element>canvas</a></code> element. <a href=#refsCSS>[CSS]</a></li>
+   directionality</a> of the <code><a href=#the-canvas-element>canvas</a></code> element, and the
+   'white-space' property set to 'pre'. <a href=#refsCSS>[CSS]</a></li>
 
    <!-- if you insert a step here, make sure to adjust the next step's
    final words -->
@@ -37400,8 +37401,9 @@ <h6 id=text-0><span class=secno>4.8.11.1.9 </span>Text</h6> <!-- a v3 feature --
   U+0020 SPACE characters, and then must form a hypothetical
   infinitely wide CSS line box containing a single inline box
   containing the text <var title="">text</var>, with all the
-  properties at their initial values except the 'font' property of the
-  inline element set to the current font of the context, as given by
+  properties at their initial values except the 'white-space' property
+  of the inline element set to 'pre' and the 'font' property of the
+  inline element set to the current font of the context as given by
   the <code title=dom-context-2d-font><a href=#dom-context-2d-font>font</a></code> attribute, and
   must then return a new <code><a href=#textmetrics>TextMetrics</a></code> object with its
   <code title=dom-textmetrics-width><a href=#dom-textmetrics-width>width</a></code> attribute set to

diff --git a/index b/index
@@ -243,7 +243,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 11 July 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 12 July 2011</h2>
    </hgroup><dl><dt><strong>Web developer edition</strong></dt>
     <dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
     <dt>Multiple-page version:</dt>
@@ -36998,9 +36998,10 @@ hairline width with transform. ack Shaun Morris.
    <li><p>Form a hypothetical infinitely wide CSS line box containing
    a single inline box containing the text <var title="">text</var>,
    with all the properties at their initial values except the 'font'
-   property of the inline box set to <var title="">font</var> and the
+   property of the inline box set to <var title="">font</var>, the
    'direction' property of the inline box set to <a href=#the-directionality>the
-   directionality</a> of the <code><a href=#the-canvas-element>canvas</a></code> element. <a href=#refsCSS>[CSS]</a></li>
+   directionality</a> of the <code><a href=#the-canvas-element>canvas</a></code> element, and the
+   'white-space' property set to 'pre'. <a href=#refsCSS>[CSS]</a></li>
 
    <!-- if you insert a step here, make sure to adjust the next step's
    final words -->
@@ -37272,8 +37273,9 @@ v6DVT (also check for '- -' bits in the part above) --><p>The <dfn id=dom-contex
   U+0020 SPACE characters, and then must form a hypothetical
   infinitely wide CSS line box containing a single inline box
   containing the text <var title="">text</var>, with all the
-  properties at their initial values except the 'font' property of the
-  inline element set to the current font of the context, as given by
+  properties at their initial values except the 'white-space' property
+  of the inline element set to 'pre' and the 'font' property of the
+  inline element set to the current font of the context as given by
   the <code title=dom-context-2d-font><a href=#dom-context-2d-font>font</a></code> attribute, and
   must then return a new <code><a href=#textmetrics>TextMetrics</a></code> object with its
   <code title=dom-textmetrics-width><a href=#dom-textmetrics-width>width</a></code> attribute set to

diff --git a/source b/source
@@ -41094,9 +41094,10 @@ hairline width with transform. ack Shaun Morris.
    <li><p>Form a hypothetical infinitely wide CSS line box containing
    a single inline box containing the text <var title="">text</var>,
    with all the properties at their initial values except the 'font'
-   property of the inline box set to <var title="">font</var> and the
+   property of the inline box set to <var title="">font</var>, the
    'direction' property of the inline box set to <span>the
-   directionality</span> of the <code>canvas</code> element. <a
+   directionality</span> of the <code>canvas</code> element, and the
+   'white-space' property set to 'pre'. <a
    href="#refsCSS">[CSS]</a></p></li>
 
    <!-- if you insert a step here, make sure to adjust the next step's
@@ -41419,8 +41420,9 @@ v6DVT (also check for '- -' bits in the part above) -->
   U+0020 SPACE characters, and then must form a hypothetical
   infinitely wide CSS line box containing a single inline box
   containing the text <var title="">text</var>, with all the
-  properties at their initial values except the 'font' property of the
-  inline element set to the current font of the context, as given by
+  properties at their initial values except the 'white-space' property
+  of the inline element set to 'pre' and the 'font' property of the
+  inline element set to the current font of the context as given by
   the <code title="dom-context-2d-font">font</code> attribute, and
   must then return a new <code>TextMetrics</code> object with its
   <code title="dom-textmetrics-width">width</code> attribute set to