Skip to content

Commit a916599

Browse files
committed
Rename word-wrap to overflow-wrap per WG resolution
1 parent a903bf1 commit a916599

2 files changed

Lines changed: 60 additions & 59 deletions

File tree

css3-text/Overview.html

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@
8484

8585
<h1>CSS Text Level 3</h1>
8686

87-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 24 July 2011</h2>
87+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 25 July 2011</h2>
8888

8989
<dl>
9090
<dt>This version:
9191

9292
<dd><a href="http://dev.w3.org/csswg/css3-text/Overview.html">$Date:
93-
2011/07/24 23:11:53 $ (CVS $Revision$)</a> <!--
94-
<dd><a href="http://www.w3.org/TR/2011/WD-css3-text-20110724/">http://www.w3.org/TR/2011/WD-css3-text-20110724/</a></dd>
93+
2011/07/24 23:27:22 $ (CVS $Revision$)</a> <!--
94+
<dd><a href="http://www.w3.org/TR/2011/WD-css3-text-20110725/">http://www.w3.org/TR/2011/WD-css3-text-20110725/</a></dd>
9595
-->
9696

9797

@@ -336,8 +336,8 @@ <h2 class="no-num no-toc" id=contents>Table of Contents</h2>
336336
presenting a footer</a>
337337
</ul>
338338

339-
<li><a href="#word-wrap"><span class=secno>6.2. </span> Emergency
340-
Wrapping: the &lsquo;<code class=property>word-wrap</code>&rsquo;
339+
<li><a href="#overflow-wrap"><span class=secno>6.2. </span> Emergency
340+
Wrapping: the &lsquo;<code class=property>overflow-wrap</code>&rsquo;
341341
property</a>
342342
</ul>
343343

@@ -1872,8 +1872,8 @@ <h3 id=hyphenate-line-limits><span class=secno>5.5. </span> Hyphenation
18721872
value means that there is no limit.
18731873

18741874
<p>In some cases, user agents may not be able to honor the specified value.
1875-
(See &lsquo;<a href="#word-wrap0"><code
1876-
class=property>word-wrap</code></a>&rsquo;.) It is not defined whether
1875+
(See &lsquo;<a href="#overflow-wrap0"><code
1876+
class=property>overflow-wrap</code></a>&rsquo;.) It is not defined whether
18771877
hyphenation introduced by such emergency breaking influences nearby
18781878
hyphenation points.
18791879

@@ -2177,8 +2177,8 @@ <h2 id=wrapping><span class=secno>6. </span> Text Wrapping</h2>
21772177

21782178
<p>Text wrapping is controlled by the &lsquo;<a href="#text-wrap0"><code
21792179
class=property>text-wrap</code></a>&rsquo; and &lsquo;<a
2180-
href="#word-wrap0"><code class=property>word-wrap</code></a>&rsquo;
2181-
properties:
2180+
href="#overflow-wrap0"><code
2181+
class=property>overflow-wrap</code></a>&rsquo; properties:
21822182

21832183
<h3 id=text-wrap><span class=secno>6.1. </span> Text Wrap Settings: the
21842184
&lsquo;<a href="#text-wrap0"><code
@@ -2318,16 +2318,16 @@ <h4 id=example-avoid><span class=secno>6.1.1. </span>Example of using
23182318
</pre>
23192319
</div>
23202320

2321-
<h3 id=word-wrap><span class=secno>6.2. </span> Emergency Wrapping: the
2322-
&lsquo;<a href="#word-wrap0"><code
2323-
class=property>word-wrap</code></a>&rsquo; property</h3>
2321+
<h3 id=overflow-wrap><span class=secno>6.2. </span> Emergency Wrapping: the
2322+
&lsquo;<a href="#overflow-wrap0"><code
2323+
class=property>overflow-wrap</code></a>&rsquo; property</h3>
23242324

23252325
<table class=propdef>
23262326
<tbody>
23272327
<tr>
23282328
<th>Name:
23292329

2330-
<td><dfn id=word-wrap0>word-wrap</dfn>
2330+
<td><dfn id=overflow-wrap0>overflow-wrap</dfn>
23312331

23322332
<tr>
23332333
<th>Value:
@@ -2373,7 +2373,7 @@ <h3 id=word-wrap><span class=secno>6.2. </span> Emergency Wrapping: the
23732373
class=property>avoid</code>&rsquo;. Possible values:
23742374

23752375
<dl>
2376-
<dt><dfn id=normal3 title="word-wrap:normal"><code>normal</code></dfn>
2376+
<dt><dfn id=normal3 title="overflow-wrap:normal"><code>normal</code></dfn>
23772377

23782378
<dd>Lines may break only at allowed break points. However, the
23792379
restrictions introduced by &lsquo;<code class=css>word-break:
@@ -2383,7 +2383,7 @@ <h3 id=word-wrap><span class=secno>6.2. </span> Emergency Wrapping: the
23832383
break points in the line.
23842384

23852385
<dt><dfn id=hyphenate
2386-
title="word-wrap:hyphenate"><code>hyphenate</code></dfn>
2386+
title="overflow-wrap:hyphenate"><code>hyphenate</code></dfn>
23872387

23882388
<dd>An unbreakable "word" may be hyphenated if there are no
23892389
otherwise-acceptable break points in the line even if hyphenation is
@@ -2392,7 +2392,7 @@ <h3 id=word-wrap><span class=secno>6.2. </span> Emergency Wrapping: the
23922392
prevent overflow.
23932393

23942394
<dt><dfn id=break-word
2395-
title="word-wrap:break-word"><code>break-word</code></dfn>
2395+
title="overflow-wrap:break-word"><code>break-word</code></dfn>
23962396

23972397
<dd>An unbreakable "word" may be broken at an arbitrary point if there are
23982398
no otherwise-acceptable break points in the line. Shaping characters are
@@ -2402,13 +2402,15 @@ <h3 id=word-wrap><span class=secno>6.2. </span> Emergency Wrapping: the
24022402
over &lsquo;<code class=css>break-word</code>&rsquo; breaking.
24032403
</dl>
24042404

2405-
<p>Break opportunities not part of &lsquo;<code class=css>word-wrap:
2405+
<p>Break opportunities not part of &lsquo;<code class=css>overflow-wrap:
24062406
normal</code>&rsquo; line breaking are not considered when calculating
24072407
&lsquo;<code class=css>min-content</code>&rsquo; intrinsic sizes.
24082408

2409-
<p class=note>This property should have been called &lsquo;<code
2410-
class=property>overflow-wrap</code>&rsquo;, however due to historical
2411-
reasons it could not be given a less confusing name.
2409+
<p>For legacy reasons, UAs may also accept &lsquo;<code
2410+
class=property>word-wrap</code>&rsquo; as an alternate name for the
2411+
&lsquo;<a href="#overflow-wrap0"><code
2412+
class=property>overflow-wrap</code></a>&rsquo; property. However this
2413+
syntax not valid.
24122414

24132415
<h2 id=justification><span class=secno>7. </span> Alignment and
24142416
Justification</h2>
@@ -6323,6 +6325,21 @@ <h2 class=no-num id=appendix-h-full-property-index>Appendix H: Full
63236325

63246326
<td>visual
63256327

6328+
<tr>
6329+
<td><a class=property href="#overflow-wrap0">overflow-wrap</a>
6330+
6331+
<td>normal | [ break-word || hyphenate ]
6332+
6333+
<td>normal
6334+
6335+
<td>all elements
6336+
6337+
<td>yes
6338+
6339+
<td>N/A
6340+
6341+
<td>visual
6342+
63266343
<tr>
63276344
<td><a class=property href="#tab-size0">tab-size</a>
63286345

@@ -6700,21 +6717,6 @@ <h2 class=no-num id=appendix-h-full-property-index>Appendix H: Full
67006717

67016718
<td>refers to width of space (U+0020) glyph
67026719

6703-
<td>visual
6704-
6705-
<tr>
6706-
<td><a class=property href="#word-wrap0">word-wrap</a>
6707-
6708-
<td>normal | [ break-word || hyphenate ]
6709-
6710-
<td>normal
6711-
6712-
<td>all elements
6713-
6714-
<td>yes
6715-
6716-
<td>N/A
6717-
67186720
<td>visual
67196721
</table>
67206722
<!--end-properties-->
@@ -6877,6 +6879,18 @@ <h2 class=no-num id=index>Appendix I: Index</h2>
68776879
<li>Non-ideographic numerals, <a href="#non-ideographic-numerals"
68786880
title="Non-ideographic numerals"><strong>8.3.2.</strong></a>
68796881

6882+
<li>overflow-wrap, <a href="#overflow-wrap0"
6883+
title=overflow-wrap><strong>6.2.</strong></a>
6884+
6885+
<li>overflow-wrap:break-word, <a href="#break-word"
6886+
title="overflow-wrap:break-word"><strong>6.2.</strong></a>
6887+
6888+
<li>overflow-wrap:hyphenate, <a href="#hyphenate"
6889+
title="overflow-wrap:hyphenate"><strong>6.2.</strong></a>
6890+
6891+
<li>overflow-wrap:normal, <a href="#normal3"
6892+
title="overflow-wrap:normal"><strong>6.2.</strong></a>
6893+
68806894
<li>overline, <a href="#overline"
68816895
title=overline><strong>10.1.1.</strong></a>
68826896

@@ -7208,18 +7222,6 @@ <h2 class=no-num id=index>Appendix I: Index</h2>
72087222

72097223
<li>word-spacing, <a href="#word-spacing0"
72107224
title=word-spacing><strong>8.1.</strong></a>
7211-
7212-
<li>word-wrap, <a href="#word-wrap0"
7213-
title=word-wrap><strong>6.2.</strong></a>
7214-
7215-
<li>word-wrap:break-word, <a href="#break-word"
7216-
title="word-wrap:break-word"><strong>6.2.</strong></a>
7217-
7218-
<li>word-wrap:hyphenate, <a href="#hyphenate"
7219-
title="word-wrap:hyphenate"><strong>6.2.</strong></a>
7220-
7221-
<li>word-wrap:normal, <a href="#normal3"
7222-
title="word-wrap:normal"><strong>6.2.</strong></a>
72237225
</ul>
72247226
<!--end-index-->
72257227

css3-text/Overview.src.html

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ <h3 id="hyphenate-line-limits">
12631263
lines in an element. The ''no-limit'' value means that there is no limit.
12641264

12651265
<p>In some cases, user agents may not be able to honor the specified value.
1266-
(See 'word-wrap'.) It is not defined whether hyphenation introduced by
1266+
(See 'overflow-wrap'.) It is not defined whether hyphenation introduced by
12671267
such emergency breaking influences nearby hyphenation points.
12681268

12691269
<table class=propdef>
@@ -1485,7 +1485,7 @@ <h4 id="the-hyphenate-resource">The 'hyphenate-resource' property</h4>
14851485
<h2 id="wrapping">
14861486
Text Wrapping</h2>
14871487

1488-
<p>Text wrapping is controlled by the 'text-wrap' and 'word-wrap' properties:</p>
1488+
<p>Text wrapping is controlled by the 'text-wrap' and 'overflow-wrap' properties:</p>
14891489

14901490
<h3 id="text-wrap">
14911491
Text Wrap Settings: the 'text-wrap' property</h3>
@@ -1599,14 +1599,14 @@ <h4 id="example-avoid">Example of using 'text-wrap: avoid' in presenting a foote
15991599
</pre>
16001600
</div>
16011601

1602-
<h3 id="word-wrap">
1603-
Emergency Wrapping: the 'word-wrap' property</h3>
1602+
<h3 id="overflow-wrap">
1603+
Emergency Wrapping: the 'overflow-wrap' property</h3>
16041604

16051605
<table class="propdef">
16061606
<tbody>
16071607
<tr>
16081608
<th>Name:</th>
1609-
<td><dfn>word-wrap</dfn></td>
1609+
<td><dfn>overflow-wrap</dfn></td>
16101610
</tr>
16111611
<tr>
16121612
<th>Value:</th>
@@ -1645,19 +1645,19 @@ <h3 id="word-wrap">
16451645
'text-wrap' is either 'normal' or 'avoid'. Possible values:</p>
16461646

16471647
<dl>
1648-
<dt><dfn title="word-wrap:normal"><code>normal</code></dfn></dt>
1648+
<dt><dfn title="overflow-wrap:normal"><code>normal</code></dfn></dt>
16491649
<dd>Lines may break only at allowed break points. However, the restrictions
16501650
introduced by ''word-break: keep-all'' may be relaxed to match
16511651
''word-break: normal'' and the various hyphenation limit properties
16521652
may be ignored if there are no otherwise-acceptable break points in
16531653
the line.</dd>
1654-
<dt><dfn title="word-wrap:hyphenate"><code>hyphenate</code></dfn></dt>
1654+
<dt><dfn title="overflow-wrap:hyphenate"><code>hyphenate</code></dfn></dt>
16551655
<dd>An unbreakable "word" may be hyphenated if there are no
16561656
otherwise-acceptable break points in the line even if hyphenation is
16571657
turned off or otherwise restricted.
16581658
Hyphenation controls may influence where the word breaks,
16591659
but cannot forbid the word from hyphenating to prevent overflow.
1660-
<dt><dfn title="word-wrap:break-word"><code>break-word</code></dfn></dt>
1660+
<dt><dfn title="overflow-wrap:break-word"><code>break-word</code></dfn></dt>
16611661
<dd>An unbreakable "word" may be broken at an arbitrary point if
16621662
there are no otherwise-acceptable break points in the line.
16631663
Shaping characters are still shaped as if the word were not
@@ -1666,13 +1666,12 @@ <h3 id="word-wrap">
16661666
takes precedence over ''break-word'' breaking.</dd>
16671667
</dl>
16681668

1669-
<p>Break opportunities not part of ''word-wrap: normal'' line breaking
1669+
<p>Break opportunities not part of ''overflow-wrap: normal'' line breaking
16701670
are not considered when calculating ''min-content'' intrinsic
16711671
sizes.
16721672

1673-
<p class="note">This property should have been called 'overflow-wrap',
1674-
however due to historical reasons it could not be given a less
1675-
confusing name.</p>
1673+
<p>For legacy reasons, UAs may also accept 'word-wrap' as an alternate name
1674+
for the 'overflow-wrap' property. However this syntax not valid.
16761675

16771676
<h2 id="justification">
16781677
Alignment and Justification</h2>

0 commit comments

Comments
 (0)