Skip to content

Commit b8d8561

Browse files
committed
--HG-- extra : rebase_source : 15ac58ad3272cca15ab51490991973a8adf4463b
1 parent 1748181 commit b8d8561

File tree

2 files changed

+77
-65
lines changed

2 files changed

+77
-65
lines changed

css-text/Overview.html

+50-43
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ <h2 class="no-num no-toc" id=contents> Table of Contents</h2>
294294

295295
<li><a href="#overflow-wrap-property"><span class=secno>6.2. </span>
296296
Overflow Wrapping: the ‘<code
297-
class=property>word-wrap</code>’/‘<code
298-
class=property>overflow-wrap</code>’ property</a>
297+
class=property>overflow-wrap</code>’/‘<code
298+
class=property>word-wrap</code>’ property</a>
299299
</ul>
300300

301301
<li><a href="#justification"><span class=secno>7. </span> Alignment and
@@ -1724,7 +1724,7 @@ <h3 id=hyphens-property><span class=secno>6.1. </span>Hyphenation Control:
17241724
<dd>Words may be broken at appropriate hyphenation points either as
17251725
determined by hyphenation characters inside the word or as determined
17261726
automatically by a language-appropriate hyphenation resource. Conditional
1727-
hyphenation characters inside a word, if present, take priority over
1727+
hyphenation characters inside a word, if present, suppress the use of
17281728
automatic resources when determining hyphenation opportunities within the
17291729
word.
17301730
</dl>
@@ -1746,9 +1746,9 @@ <h3 id=hyphens-property><span class=secno>6.1. </span>Hyphenation Control:
17461746
</div>
17471747

17481748
<h3 id=overflow-wrap-property><span class=secno>6.2. </span> Overflow
1749-
Wrapping: the ‘<a href="#word-wrap"><code
1750-
class=property>word-wrap</code></a>’/‘<a href="#overflow-wrap"><code
1751-
class=property>overflow-wrap</code></a>’ property</h3>
1749+
Wrapping: the ‘<a href="#overflow-wrap"><code
1750+
class=property>overflow-wrap</code></a>’/‘<a href="#word-wrap"><code
1751+
class=property>word-wrap</code></a>’ property</h3>
17521752

17531753
<table class=propdef>
17541754
<tbody>
@@ -1826,7 +1826,7 @@ <h3 id=overflow-wrap-property><span class=secno>6.2. </span> Overflow
18261826
<dd>An unbreakable "word" may be broken at an arbitrary point if there are
18271827
no otherwise-acceptable break points in the line. Shaping characters are
18281828
still shaped as if the word were not broken, and grapheme clusters must
1829-
together stay as one unit. No hyphenation character is inserted at the
1829+
stay together as one unit. No hyphenation character is inserted at the
18301830
break point.
18311831
</dl>
18321832

@@ -2388,12 +2388,13 @@ <h4 id=justify-algos><span class=secno>7.3.5. </span> Possible Algorithms</h4>
23882388
word spaces first, expanding between letters only if the spaces between
23892389
words hit a limit defined by the UA.
23902390

2391-
<p>A more sophisticated but slower justification algorithm might use a
2392-
Knuth/Plass method where <a href="#expansion-opportunity"><i>expansion
2393-
opportunities</i></a> and limits were assigned weights and assessed with
2394-
other line breaking considerations. This algorithm could follow the
2395-
guidelines by giving more weight to <a href="#word-separator"><i>word
2396-
separators</i></a> than letter spacing.
2391+
<p>A more sophisticated but harder-to-implement justification algorithm
2392+
might use a Knuth/Plass method where <a
2393+
href="#expansion-opportunity"><i>expansion opportunities</i></a> and
2394+
limits were assigned weights and assessed with other line breaking
2395+
considerations. This algorithm could follow the guidelines by giving more
2396+
weight to <a href="#word-separator"><i>word separators</i></a> than
2397+
letter spacing.
23972398
</div>
23982399

23992400
<div class=example>
@@ -2517,8 +2518,7 @@ <h3 id=word-spacing-property><span class=secno>8.1. </span> Word Spacing:
25172518
class=css>&lt;length&gt;</code></dfn>
25182519

25192520
<dd>Specifies extra spacing <em>in addition to</em> the intrinsic
2520-
inter-word spacing defined by the font. Values may be negative, but there
2521-
may be implementation-dependent limits.
2521+
inter-word spacing defined by the font.
25222522

25232523
<dt><dfn id=percentage
25242524
title="&lt;percentage&gt;!!word-spacing"><code
@@ -2532,7 +2532,8 @@ <h3 id=word-spacing-property><span class=secno>8.1. </span> Word Spacing:
25322532
separator</i></a> left in the text after the <a
25332533
href="#white-space-rules">white space processing rules</a> have been
25342534
applied, and should be applied half on each side of the character unless
2535-
otherwise dictated by typographic tradition.
2535+
otherwise dictated by typographic tradition. Values may be negative, but
2536+
there may be implementation-dependent limits.
25362537

25372538
<div class=example>
25382539
<p>The following example will make all the spaces between words in Arabic
@@ -2550,15 +2551,16 @@ <h3 id=word-spacing-property><span class=secno>8.1. </span> Word Spacing:
25502551

25512552
<p><dfn id=word-separator
25522553
title="word-separator character | word separator">Word-separator
2553-
characters</dfn> include the space (U+0020), the no-break space (U+00A0),
2554-
the Ethiopic word space (U+1361), the Aegean word separators
2555-
(U+10100,U+10101), the Ugaritic word divider (U+1039F), and the Phoenician
2556-
Word Separator (U+1091F). If there are no word-separator characters, or if
2557-
a word-separating character has a zero advance width (such as the zero
2558-
width space U+200B) then the user agent must not create an additional
2559-
spacing between words. General punctuation and fixed-width spaces (such as
2560-
U+3000 and U+2000 through U+200A) are not considered word-separator
2561-
characters.
2554+
characters</dfn> are <a href="#character"><i>characters</i></a> whose
2555+
purpose and general usage is to separate words. In [UNICODE] this includes
2556+
the space (U+0020), the no-break space (U+00A0), the Ethiopic word space
2557+
(U+1361), the Aegean word separators (U+10100,U+10101), the Ugaritic word
2558+
divider (U+1039F), and the Phoenician Word Separator (U+1091F). If there
2559+
are no word-separator characters, or if a word-separating character has a
2560+
zero advance width (such as the zero width space U+200B) then the user
2561+
agent must not create an additional spacing between words. General
2562+
punctuation and fixed-width spaces (such as U+3000 and U+2000 through
2563+
U+200A) are not considered word-separator characters.
25622564

25632565
<h3 id=letter-spacing-property><span class=secno>8.2. </span> Tracking: the
25642566
<a href="#letter-spacing"><code
@@ -2741,8 +2743,9 @@ <h3 id=letter-spacing-property><span class=secno>8.2. </span> Tracking: the
27412743
class=color-box>א</span> ב ג
27422744
</div>
27432745

2744-
<p>Letter-spacing ignores zero-width characters (such as those from the
2745-
Unicode Cf category).
2746+
<p>Letter-spacing ignores invisible zero-width formatting characters (such
2747+
as those from the Unicode Cf category). Spacing must be added as if those
2748+
characters did not exist in the document.
27462749

27472750
<p class=example>For example, ‘<a href="#letter-spacing"><code
27482751
class=property>letter-spacing</code></a>’ applied to
@@ -2843,13 +2846,16 @@ <h3 id=text-indent-property><span class=secno>9.1. </span> First Line
28432846

28442847
<p>This property specifies the indentation applied to lines of inline
28452848
content in a block. The indent is treated as a margin applied to the start
2846-
edge of the line box. Unless otherwise specified via the ‘<code
2847-
class=css>each-line</code>’ and/or ‘<code class=css>hanging</code>
2848-
keywords, only lines that are the <a
2849+
edge of the line box.
2850+
2851+
<p>Unless otherwise specified by the ‘<code class=css>each-line</code>
2852+
and/or ‘<code class=css>hanging</code>’ keywords, only lines that are
2853+
the <a
28492854
href="http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo">first
2850-
formatted line</a> of an element are affected. For example, the first line
2851-
of an anonymous block box is only affected if it is the first child of its
2852-
parent element.
2855+
formatted line</a> <a href="#ref-CSS21"
2856+
rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> of an element are affected.
2857+
For example, the first line of an anonymous block box is only affected if
2858+
it is the first child of its parent element.
28532859

28542860
<p>Values have the following meanings:
28552861

@@ -2868,10 +2874,10 @@ <h3 id=text-indent-property><span class=secno>9.1. </span> First Line
28682874
<dt><dfn id=each-line title="each-line!!text-indent"><code
28692875
class=css>each-line</code></dfn>
28702876

2871-
<dd>Indentation affects the first line of the block container as well as
2872-
each line after a <a href="#forced-line-break"><i>forced line
2873-
break</i></a>, but does not affect lines after a <a
2874-
href="#soft-wrap-break"><i>soft wrap break</i></a>.
2877+
<dd>Indentation affects the first line of each block container and each
2878+
line after a <a href="#forced-line-break"><i>forced line break</i></a>
2879+
(but not lines after a <a href="#soft-wrap-break"><i>soft wrap
2880+
break</i></a>).
28752881

28762882
<dt><dfn id=hanging title="hanging!!text-indent"><code
28772883
class=css>hanging</code></dfn>
@@ -2949,7 +2955,7 @@ <h3 id=hanging-punctuation-property><span class=secno>9.2. </span> Hanging
29492955
<td>as specified
29502956

29512957
<tr>
2952-
<th>Animatable:>
2958+
<th>Animatable:
29532959

29542960
<td>no
29552961

@@ -3293,16 +3299,16 @@ <h2 class=no-num id=order>Appendix A: Text Processing Order of Operations</h2>
32933299

32943300
<li><a href="#white-space-phase-2">white space processing</a> part II
32953301

3296-
<li><a href="#letter-spacing"><code
3297-
class=property>letter-spacing</code></a>’ and ‘<a
3298-
href="#word-spacing"><code class=property>word-spacing</code></a>
3299-
33003302
<li><a href="http://www.w3.org/TR/css3-fonts/">font/glyph selection and
33013303
positioning</a> <a href="#ref-CSS21"
33023304
rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> / <a
33033305
href="#ref-CSS3-FONTS"
33043306
rel=biblioentry>[CSS3-FONTS]<!--{{!CSS3-FONTS}}--></a>
33053307

3308+
<li><a href="#letter-spacing"><code
3309+
class=property>letter-spacing</code></a>’ and ‘<a
3310+
href="#word-spacing"><code class=property>word-spacing</code></a>
3311+
33063312
<li><a href="#hanging-punctuation">hanging punctuation</a>
33073313
</ol>
33083314

@@ -3315,7 +3321,8 @@ <h2 class=no-num id=order>Appendix A: Text Processing Order of Operations</h2>
33153321
<h2 class=no-num id=default-stylesheet> Appendix B: Default UA Stylesheet</h2>
33163322

33173323
<p>This appendix is informative, and is to help UA developers to implement
3318-
default stylesheet, but UA developers are free to ignore or change.
3324+
a default stylesheet for HTML, but UA developers are free to ignore or
3325+
modify as appropriate.
33193326

33203327
<div class=example>
33213328
<pre>

css-text/Overview.src.html

+27-22
Original file line numberDiff line numberDiff line change
@@ -1214,8 +1214,8 @@ <h3 id="hyphens-property">Hyphenation Control: the 'hyphens' property</h3>
12141214
as determined by hyphenation characters inside the word or
12151215
as determined automatically by a language-appropriate hyphenation resource.
12161216
Conditional hyphenation characters inside a word, if present,
1217-
take priority over automatic resources when determining
1218-
hyphenation opportunities within the word.
1217+
suppress the use of automatic resources
1218+
when determining hyphenation opportunities within the word.
12191219
</dl>
12201220

12211221
<p>Correct automatic hyphenation requires a hyphenation resource
@@ -1237,7 +1237,7 @@ <h3 id="hyphens-property">Hyphenation Control: the 'hyphens' property</h3>
12371237

12381238

12391239
<h3 id="overflow-wrap-property">
1240-
Overflow Wrapping: the 'word-wrap'/'overflow-wrap' property</h3>
1240+
Overflow Wrapping: the 'overflow-wrap'/'word-wrap' property</h3>
12411241

12421242
<table class="propdef">
12431243
<tr>
@@ -1294,7 +1294,7 @@ <h3 id="overflow-wrap-property">
12941294
<dd>An unbreakable "word" may be broken at an arbitrary point if
12951295
there are no otherwise-acceptable break points in the line.
12961296
Shaping characters are still shaped as if the word were not
1297-
broken, and grapheme clusters must together stay as one unit.
1297+
broken, and grapheme clusters must stay together as one unit.
12981298
No hyphenation character is inserted at the break point.
12991299
</dl>
13001300

@@ -1708,7 +1708,7 @@ <h4 id="justify-algos">
17081708
This algorithm could follow the guidelines by expanding word spaces first,
17091709
expanding between letters only if the spaces between words hit a limit defined by the UA.
17101710

1711-
<p>A more sophisticated but slower justification algorithm
1711+
<p>A more sophisticated but harder-to-implement justification algorithm
17121712
might use a Knuth/Plass method
17131713
where <i>expansion opportunities</i> and limits were assigned weights
17141714
and assessed with other line breaking considerations.
@@ -1805,7 +1805,6 @@ <h3 id="word-spacing-property">
18051805
<dt><dfn title="&lt;length&gt;!!word-spacing">''&lt;length&gt;''</dfn>
18061806
<dd>Specifies extra spacing <em>in addition to</em>
18071807
the intrinsic inter-word spacing defined by the font.
1808-
Values may be negative, but there may be implementation-dependent limits.
18091808
<dt><dfn title="&lt;percentage&gt;!!word-spacing">''&lt;percentage&gt;''</dfn>
18101809
<dd>Specifies the additional spacing as a percentage of the affected
18111810
character's <i>advance measure</i>.
@@ -1815,6 +1814,7 @@ <h3 id="word-spacing-property">
18151814
left in the text after the <a href="#white-space-rules">white space processing rules</a> have been applied,
18161815
and should be applied half on each side of the character
18171816
unless otherwise dictated by typographic tradition.
1817+
Values may be negative, but there may be implementation-dependent limits.
18181818

18191819
<div class="example">
18201820
<p>The following example will make all the spaces between words in Arabic
@@ -1828,7 +1828,9 @@ <h3 id="word-spacing-property">
18281828
<pre>p { word-spacing: 0.5ch; }</pre>
18291829
</div>
18301830

1831-
<p><dfn id="word-separator" title="word-separator character | word separator">Word-separator characters</dfn> include
1831+
<p><dfn id="word-separator" title="word-separator character | word separator">Word-separator characters</dfn>
1832+
are <i>characters</i> whose purpose and general usage is to separate words.
1833+
In [UNICODE] this includes
18321834
the space (U+0020), the no-break space (U+00A0), the Ethiopic word space (U+1361),
18331835
the Aegean word separators (U+10100,U+10101), the Ugaritic word divider (U+1039F),
18341836
and the Phoenician Word Separator (U+1091F).
@@ -1984,8 +1986,9 @@ <h3 id="letter-spacing-property">
19841986
<p class="ls-ex">a&emsp;b</span>&emsp;<span class="color-box">c</span>&emsp;<span class="color-box">&#x5d0;</span>&emsp;&#x5d1;&emsp;&#x5d2;</p>
19851987
</div>
19861988

1987-
<p>Letter-spacing ignores zero-width characters (such as those from the
1988-
Unicode Cf category).
1989+
<p>Letter-spacing ignores invisible zero-width formatting characters
1990+
(such as those from the Unicode Cf category).
1991+
Spacing must be added as if those characters did not exist in the document.
19891992

19901993
<p class="example">For example, 'letter-spacing' applied to
19911994
<code>A&amp;zwsp;B</code> is identical to <code>AB</code>,
@@ -2066,12 +2069,14 @@ <h3 id="text-indent-property">
20662069

20672070
<p>This property specifies the indentation applied to lines of inline
20682071
content in a block. The indent is treated as a margin applied to
2069-
the start edge of the line box. Unless otherwise specified via the
2070-
''each-line'' and/or ''hanging'' keywords, only lines that are the
2071-
<a href="http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo">first
2072-
formatted line</a> of an element are affected. For example, the first line of
2073-
an anonymous block box is only affected if it is the first child
2074-
of its parent element.
2072+
the start edge of the line box.
2073+
2074+
<p>Unless otherwise specified by the ''each-line'' and/or ''hanging'' keywords,
2075+
only lines that are the
2076+
<a href="http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo">first formatted line</a> [[!CSS21]]
2077+
of an element are affected.
2078+
For example, the first line of an anonymous block box is only affected
2079+
if it is the first child of its parent element.
20752080

20762081
<p>Values have the following meanings:</p>
20772082

@@ -2082,9 +2087,9 @@ <h3 id="text-indent-property">
20822087
<dd>Gives the amount of the indent as a percentage of the containing
20832088
block's logical width.</dd>
20842089
<dt><dfn title="each-line!!text-indent">''each-line''</dfn>
2085-
<dd>Indentation affects the first line of the block container as
2086-
well as each line after a <i>forced line break</i>,
2087-
but does not affect lines after a <i>soft wrap break</i>.
2090+
<dd>Indentation affects the first line of each block container
2091+
and each line after a <i>forced line break</i>
2092+
(but not lines after a <i>soft wrap break</i>).
20882093
<dt><dfn title="hanging!!text-indent">''hanging''</dfn>
20892094
<dd>Inverts which lines are affected.</dd>
20902095
</dl>
@@ -2146,7 +2151,7 @@ <h3 id="hanging-punctuation-property">
21462151
<td>as specified</td>
21472152
</tr>
21482153
<tr>
2149-
<th>Animatable:>
2154+
<th>Animatable:
21502155
<td>no
21512156
<tr>
21522157
<th>Canonical order:
@@ -2358,8 +2363,8 @@ <h2 class="no-num" id="order">Appendix A:
23582363
<li><a href="#text-indent">indentation</a>
23592364
<li><a href="http://www.w3.org/TR/css3-writing-modes/#text-direction">bidirectional reordering</a> [[!CSS21]] / [[!CSS3-WRITING-MODES]]
23602365
<li><a href="#white-space-phase-2">white space processing</a> part II
2361-
<li>'letter-spacing' and 'word-spacing'
23622366
<li><a href="http://www.w3.org/TR/css3-fonts/">font/glyph selection and positioning</a> [[!CSS21]] / [[!CSS3-FONTS]]
2367+
<li>'letter-spacing' and 'word-spacing'
23632368
<li><a href="#hanging-punctuation">hanging punctuation</a>
23642369
</ol>
23652370
<li><a href="#justification">justification</a> (which may affect glyph selection and/or text wrapping, looping back into that step)
@@ -2370,8 +2375,8 @@ <h2 class="no-num" id="default-stylesheet">
23702375
Appendix B: Default UA Stylesheet</h2>
23712376

23722377
<p>This appendix is informative,
2373-
and is to help UA developers to implement default stylesheet,
2374-
but UA developers are free to ignore or change.
2378+
and is to help UA developers to implement a default stylesheet for HTML,
2379+
but UA developers are free to ignore or modify as appropriate.
23752380

23762381
<div class="example">
23772382
<pre>

0 commit comments

Comments
 (0)