Skip to content

Commit ae68270

Browse files
committed
remove mention of removed hyphenation limit properties
1 parent c5242c4 commit ae68270

2 files changed

Lines changed: 24 additions & 19 deletions

File tree

css3-text/Overview.html

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,8 +1478,12 @@ <h2 id=hyphenation><span class=secno>5. </span>Hyphenation</h2>
14781478
<p>Hyphenation is controlled with the &lsquo;<a href="#hyphens0"><code
14791479
class=property>hyphens</code></a>&rsquo; property.
14801480

1481-
<p>Hyphenation opportunities are not considered when calculating
1481+
<p>Hyphenation opportunities <em>are</em> considered when calculating
14821482
&lsquo;<code class=css>min-content</code>&rsquo; intrinsic sizes.
1483+
<!-- This is because it allows tables to hyphenate instead of overflowing,
1484+
which is particularly important in long-word languages like German.
1485+
https://bugzilla.mozilla.org/show_bug.cgi?id=418975 -->
1486+
14831487

14841488
<h3 id=hyphens><span class=secno>5.1. </span>Hyphenation Control: the
14851489
&lsquo;<a href="#hyphens0"><code class=property>hyphens</code></a>&rsquo;
@@ -1646,24 +1650,24 @@ <h3 id=text-wrap><span class=secno>6.1. </span> Text Wrap Settings: the
16461650
<dt><dfn id=normal2 title="text-wrap:normal">&lsquo;<code
16471651
class=css>normal</code>&rsquo;</dfn>
16481652

1649-
<dd>Lines may break at allowed break points, as determined by the
1653+
<dd>Lines may wrap at allowed break points, as determined by the
16501654
line-breaking rules in effect. Line breaking behavior defined for the WJ,
16511655
ZW, and GL line-breaking classes in <a href="#UAX14"
16521656
rel=biblioentry>[UAX14]<!--{{!UAX14}}--></a> must be honored.
16531657

16541658
<dt><dfn id=none1 title="text-wrap:none">&lsquo;<code
16551659
class=css>none</code>&rsquo;</dfn>
16561660

1657-
<dd>Lines may not break; text that does not fit within the block container
1661+
<dd>Lines must not wrap; text that does not fit within the block container
16581662
overflows it.
16591663

16601664
<dt><dfn id=avoid title="text-wrap:avoid">&lsquo;<code
16611665
class=css>avoid</code>&rsquo;</dfn>
16621666

1663-
<dd>Line breaking is suppressed within the element: the UA may only break
1664-
within the element if there are no other valid break points in the line.
1665-
If the text breaks, line-breaking restrictions are honored as for
1666-
&lsquo;<code class=property>normal</code>&rsquo;.
1667+
<dd>Line wrapping is suppressed within the element: the UA may only wrap
1668+
at a breakpoint within the element if there are no other valid
1669+
breakpoints in the line. If the text breaks, line-breaking restrictions
1670+
are honored as for &lsquo;<code class=property>normal</code>&rsquo;.
16671671
</dl>
16681672

16691673
<p>Regardless of the &lsquo;<a href="#text-wrap0"><code
@@ -1675,12 +1679,12 @@ <h3 id=text-wrap><span class=secno>6.1. </span> Text Wrap Settings: the
16751679
<p>When <span class=property>&lsquo;<a href="#text-wrap0"><code
16761680
class=property>text-wrap</code></a>&rsquo;</span> is set to &lsquo;<code
16771681
class=property>normal</code>&rsquo; or &lsquo;<code
1678-
class=property>avoid</code>&rsquo;, UAs that allow breaks at punctuation
1682+
class=property>avoid</code>&rsquo;, UAs that allow wrapping at punctuation
16791683
other than spaces should prioritize breakpoints. For example, if breaks
1680-
after slashes have a lower priority than spaces, the sequence "check /etc"
1681-
will never break between the &lsquo;<code class=css>/</code>&rsquo; and
1682-
the &lsquo;<code class=property>e</code>&rsquo;. The UA may use the width
1683-
of the containing block, the text's language, and other factors in
1684+
after slashes are given a lower priority than spaces, the sequence "check
1685+
/etc" will never break between the &lsquo;<code class=css>/</code>&rsquo;
1686+
and the &lsquo;<code class=property>e</code>&rsquo;. The UA may use the
1687+
width of the containing block, the text's language, and other factors in
16841688
assigning priorities. As long as care is taken to avoid such awkward
16851689
breaks, allowing breaks at appropriate punctuation other than spaces is
16861690
recommended, as it results in more even-looking margins, particularly in
@@ -1795,9 +1799,10 @@ <h3 id=overflow-wrap><span class=secno>6.2. </span> Emergency Wrapping: the
17951799
<dd>Lines may break only at allowed break points. However, the
17961800
restrictions introduced by &lsquo;<code class=css>word-break:
17971801
keep-all</code>&rsquo; may be relaxed to match &lsquo;<code
1798-
class=css>word-break: normal</code>&rsquo; and the various hyphenation
1799-
limit properties may be ignored if there are no otherwise-acceptable
1800-
break points in the line.
1802+
class=css>word-break: normal</code>&rsquo;
1803+
<!-- and the various hyphenation limit properties
1804+
may be ignored -->
1805+
if there are no otherwise-acceptable break points in the line.
18011806

18021807
<dt><dfn id=break-word title="overflow-wrap:break-word">&lsquo;<code
18031808
class=css>break-word</code>&rsquo;</dfn>
@@ -1817,7 +1822,7 @@ <h3 id=overflow-wrap><span class=secno>6.2. </span> Emergency Wrapping: the
18171822
class=property>word-wrap</code>&rsquo; as an alternate name for the
18181823
&lsquo;<a href="#overflow-wrap0"><code
18191824
class=property>overflow-wrap</code></a>&rsquo; property. However this
1820-
syntax non-conforming in author style sheets.
1825+
syntax is non-conforming in author style sheets.
18211826

18221827
<h2 id=justification><span class=secno>7. </span> Alignment and
18231828
Justification</h2>

css3-text/Overview.src.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,8 +1255,8 @@ <h3 id="overflow-wrap">
12551255
<dt><dfn title="overflow-wrap:normal">''normal''</dfn></dt>
12561256
<dd>Lines may break only at allowed break points. However, the restrictions
12571257
introduced by ''word-break: keep-all'' may be relaxed to match
1258-
''word-break: normal'' and the various hyphenation limit properties
1259-
may be ignored if there are no otherwise-acceptable break points in
1258+
''word-break: normal'' <!-- and the various hyphenation limit properties
1259+
may be ignored --> if there are no otherwise-acceptable break points in
12601260
the line.</dd>
12611261
<dt><dfn title="overflow-wrap:break-word">''break-word''</dfn></dt>
12621262
<dd>An unbreakable "word" may be broken at an arbitrary point if
@@ -1271,7 +1271,7 @@ <h3 id="overflow-wrap">
12711271
sizes.
12721272

12731273
<p>For legacy reasons, UAs may also accept 'word-wrap' as an alternate name
1274-
for the 'overflow-wrap' property. However this syntax non-conforming in
1274+
for the 'overflow-wrap' property. However this syntax is non-conforming in
12751275
author style sheets.
12761276

12771277
<h2 id="justification">

0 commit comments

Comments
 (0)