Skip to content

Commit b5455fd

Browse files
committed
[css-text] Update DoC. Edit in soft hyphen resolution. Remove some non-issues from DoC.
--HG-- extra : rebase_source : 0756b0d42a9fe2e49c111a159a28d31031e8d47a
1 parent 6e69556 commit b5455fd

4 files changed

Lines changed: 233 additions & 202 deletions

File tree

css-text/Overview.bs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,8 +1225,12 @@ Line Breaking Details</h3>
12251225
<dd>Words may be broken at <i>hyphenation opportunities</i>
12261226
determined automatically by a language-appropriate hyphenation resource
12271227
in addition to those indicated explicitly by a conditional hyphen.
1228-
Automatic <i>hyphenation opportunities</i> within a word are ignored
1229-
if it contains a conditional hyphen (&amp;shy; or U+00AD).
1228+
Automatic <i>hyphenation opportunities</i> within a word must be ignored
1229+
if the word contains a conditional hyphen (&amp;shy; or U+00AD),
1230+
in favor of the conditional hyphen(s).
1231+
However, if, even after breaking at such opportunities,
1232+
a portion of that word is is still too long to fit on one line,
1233+
an automatic hyphenation opportunity may be used.
12301234
</dl>
12311235

12321236
<p>Correct automatic hyphenation requires a hyphenation resource

css-text/Overview.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
</p>
105105
<h1 class="p-name no-ref" id=title>CSS Text Module Level 3</h1>
106106
<h2 class="no-num no-toc no-ref heading settled" id=subtitle><span class=content>Editor’s Draft,
107-
<span class=dt-updated><span class=value-title title=20140818>18 August 2014</span></span></span></h2>
107+
<span class=dt-updated><span class=value-title title=20140907>7 September 2014</span></span></span></h2>
108108
<div data-fill-with=spec-metadata><dl>
109109
<dt>This version:
110110
<dd><a class=u-url href=http://dev.w3.org/csswg/css-text-3/>http://dev.w3.org/csswg/css-text-3/</a>
@@ -1386,8 +1386,12 @@ <h3 class="heading settled" data-level=6.1 id=hyphens-property><span class=secno
13861386
<dd>Words may be broken at <a data-link-type=dfn href=#hyphenation-opportunity title="hyphenation opportunities">hyphenation opportunities</a>
13871387
determined automatically by a language-appropriate hyphenation resource
13881388
in addition to those indicated explicitly by a conditional hyphen.
1389-
Automatic <a data-link-type=dfn href=#hyphenation-opportunity title="hyphenation opportunities">hyphenation opportunities</a> within a word are ignored
1390-
if it contains a conditional hyphen (&amp;shy; or U+00AD).
1389+
Automatic <a data-link-type=dfn href=#hyphenation-opportunity title="hyphenation opportunities">hyphenation opportunities</a> within a word must be ignored
1390+
if the word contains a conditional hyphen (&amp;shy; or U+00AD),
1391+
in favor of the conditional hyphen(s).
1392+
However, if, even after breaking at such opportunities,
1393+
a portion of that word is is still too long to fit on one line,
1394+
an automatic hyphenation opportunity may be used.
13911395
</dl>
13921396

13931397
<p>Correct automatic hyphenation requires a hyphenation resource

0 commit comments

Comments
 (0)