Skip to content

Commit a76d4c6

Browse files
committed
[css2] Replaced "whitespace" by "white space" as the "Manual of style" recommends
http://www.w3.org/2001/06/manual/#Terms --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402836
1 parent 2cc3d3c commit a76d4c6

9 files changed

Lines changed: 67 additions & 67 deletions

File tree

css2/aural.src

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01//EN'>
22

33
<html lang="en">
4-
<!-- $Id: aural.src,v 2.53 2007-07-17 03:40:55 fantasai Exp $ -->
4+
<!-- $Id: aural.src,v 2.54 2008-04-08 16:33:57 bbos Exp $ -->
55
<HEAD>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<TITLE>Aural style sheets</TITLE>
@@ -630,8 +630,8 @@ syntax rules for <a
630630
href="syndata.html#tokenization">identifiers</a>. It is also
631631
recommended to quote specific voices with a name consisting of more
632632
than one word. If quoting is omitted, any <a
633-
href="syndata.html#whitespace">whitespace</a> characters before and
634-
after the voice family name are ignored and any sequence of whitespace
633+
href="syndata.html#whitespace">white space</a> characters before and
634+
after the voice family name are ignored and any sequence of white space
635635
characters inside the voice family name is converted to a single space.
636636

637637
<!-- #include src=properties/pitch.srb -->

css2/changes.src

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: changes.src,v 2.87 2008-04-08 11:51:28 bbos Exp $ -->
3+
<!-- $Id: changes.src,v 2.88 2008-04-08 16:33:57 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Changes</TITLE>
@@ -38,7 +38,7 @@ The 'display' property</a></h3>
3838
functions in CSS3.)
3939

4040
<h3 id="a16.6"><a href="text.html#propdef-white-space">Section 16.6
41-
Whitespace: the 'white-space' property</a></h3>
41+
White space: the 'white-space' property</a></h3>
4242

4343
<p>New 'white-space' values: 'pre-wrap' and 'pre-line'
4444

@@ -409,7 +409,7 @@ a block box.</p>
409409
<h3 id="c9.2.2.1"><a href="visuren.html#anonymous">Section 9.2.2.1
410410
Anonymous inline boxes</a></h3>
411411

412-
<p>Specified that collapsed whitespace does not generate anonymous
412+
<p>Specified that collapsed white space does not generate anonymous
413413
inline boxes.</p>
414414

415415
<h3 id="c9.2.3"><a href="visuren.html#run-in">Section 9.2.3
@@ -1087,7 +1087,7 @@ Letter and word spacing</a></h3>
10871087
is no longer optional.</p>
10881088

10891089
<p>Specified that word spacing affects each space, non-breaking space,
1090-
and ideographic space left in the text after whitespace processing
1090+
and ideographic space left in the text after white space processing
10911091
rules have been applied.</p>
10921092

10931093
<h3 id="c16.5"><a href="text.html#caps-prop">Section 16.5
@@ -1097,19 +1097,19 @@ Capitalization</a></h3>
10971097
is an appropriate transformation but which are outside of Latin-1.</p>
10981098

10991099
<h3 id="c16.6"><a href="text.html#white-space-prop">Section 16.6
1100-
Whitespace</a></h3>
1100+
White space</a></h3>
11011101

11021102
<p>The 'white-space' property now applies to all elements, not just
11031103
to block-level elements.</p>
11041104

11051105
<p>"\A" in generated content no longer forces a break for 'normal'
11061106
and 'nowrap' values of 'white-space'.</p>
11071107

1108-
<p>Specified that the CSS whitespace processing model assumes all
1108+
<p>Specified that the CSS white space processing model assumes all
11091109
newlines have been normalized to line feeds.</p>
11101110

11111111
<p>Added <a href="text.html#white-space-model">section 16.6.1</a> to precisely define
1112-
whitespace handling.</p>
1112+
white space handling.</p>
11131113

11141114
<p>Added <a href="text.html#ctrlchars">section 16.6.3</a> to specify handling
11151115
of control and combining characters.</p>
@@ -1383,7 +1383,7 @@ anyway, it was redundant.</p>
13831383

13841384
<p>Corrected "unicode" macro to treat CRLF as a single character.</p>
13851385

1386-
<p>Corrected "block" production to allow whitespace between declarations.</p>
1386+
<p>Corrected "block" production to allow white space between declarations.</p>
13871387

13881388
<p>In the rule for "any" (in the core syntax), corrected "FUNCTION"
13891389
to "FUNCTION any* ')'".</p>
@@ -1430,7 +1430,7 @@ no escaping requirements are missing from the prose.</p>
14301430
<h3 id="x4.3.5"><a href="syndata.html#counter">Section 4.3.5
14311431
Counters</a></h3>
14321432

1433-
<p>Corrected syntax of counter() and counters() notation to allow whitespace
1433+
<p>Corrected syntax of counter() and counters() notation to allow white space
14341434
between tokens.</p>
14351435

14361436
<h3 id="x4.3.6"><a href="syndata.html#color-units">Section 4.3.6</a></h3>
@@ -1896,7 +1896,7 @@ CSS2.1.</p>
18961896
Characters and case</a></h3>
18971897

18981898
<p>Clarified that when a CRLF pair terminates an escape sequence, the pair
1899-
is treated as a single whitespace character as <a href="#x4.1.1">corrected</a>
1899+
is treated as a single white space character as <a href="#x4.1.1">corrected</a>
19001900
in the tokenization rules.</p>
19011901

19021902
<p>Replaced "[a-z0-9]" by "[a-zA-Z0-9]" as an extra reminder that CSS
@@ -2446,10 +2446,10 @@ Capitalization</a></h3>
24462446
<p>Switched language reference from RFC2070 to RFC3066.</p>
24472447

24482448
<h3 id="r16.6"><a href="text.html#white-space-prop">Section 16.6
2449-
Whitespace</a></h3>
2449+
White space</a></h3>
24502450

24512451
<p>Added <a href="text.html#egbidiwscollapse">section 16.6.1</a> as an example
2452-
to illustrate the interaction of whitespace collapsing and bidi.</p>
2452+
to illustrate the interaction of white space collapsing and bidi.</p>
24532453

24542454
<h3 id="r17.1"><a href="tables.html#tables-intro">Section 17.1
24552455
Introduction to tables</a></h3>

css2/fonts.src

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: fonts.src,v 2.88 2007-11-13 14:53:27 bbos Exp $ -->
3+
<!-- $Id: fonts.src,v 2.89 2008-04-08 16:33:57 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Fonts</title>
@@ -171,7 +171,7 @@ as a last alternative. Generic font family names are keywords and must NOT be q
171171
parentheses, brackets, and/or braces, they must still be
172172
escaped per CSS grammar rules. Similarly, quotation marks (both single and double), semicolons,
173173
exclamation marks, commas, and leading slashes within unquoted font family names must be escaped.
174-
Font names containing any such characters or whitespace should be quoted:
174+
Font names containing any such characters or white space should be quoted:
175175
</p>
176176

177177
<pre>
@@ -180,8 +180,8 @@ body { font-family: "New Century Schoolbook", serif }
180180
&lt;BODY STYLE="font-family: 'My own font', fantasy"&gt;
181181
</pre>
182182

183-
<p>If quoting is omitted, any whitespace characters before and after
184-
the font name are ignored and any sequence of whitespace characters
183+
<p>If quoting is omitted, any white space characters before and after
184+
the font name are ignored and any sequence of white space characters
185185
inside the font name is converted to a single space.
186186

187187
Font family <em>names</em> that happen to be the same as a keyword value (e.g. 'initial', 'inherit', 'default', 'serif', 'sans-serif', 'monospace', 'fantasy', and 'cursive') must be quoted to prevent confusion with the keywords with the same names. UAs must not consider these keywords as matching the '&lt;family-name&gt;' type.

css2/grammar.src

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: grammar.src,v 2.53 2008-03-05 18:52:32 bbos Exp $ -->
3+
<!-- $Id: grammar.src,v 2.54 2008-04-08 16:33:57 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Grammar of CSS&nbsp;2.1</TITLE>
@@ -142,7 +142,7 @@ possible code point in <span class="index-inst"
142142
title="unicode">Unicode</span>/<span class="index-inst"
143143
title="iso-10646">ISO-10646</span>.
144144

145-
<!-- ignored whitespace after Unicode escape, is it OK? -->
145+
<!-- ignored white space after Unicode escape, is it OK? -->
146146
<pre>
147147
%option case-insensitive
148148

@@ -263,7 +263,7 @@ the CSS1 tokenizer, and some UAs have accepted 2-byte encodings.
263263
<li>CSS1 only allowed four hex-digits after the backslash (\) to refer
264264
to Unicode characters, CSS2 <a
265265
href="syndata.html#escaped-characters">allows six</a>. Furthermore,
266-
CSS2 allows a whitespace character to delimit the escape
266+
CSS2 allows a white space character to delimit the escape
267267
sequence. E.g., according to CSS1, the string "\abcdef" has 3 letters
268268
(\abcd, e, and f), according to CSS2 it has only one (\abcdef).
269269

css2/selector.src

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01//EN'>
22
<html lang="en">
3-
<!-- $Id: selector.src,v 2.109 2008-04-07 18:31:50 bbos Exp $ -->
3+
<!-- $Id: selector.src,v 2.110 2008-04-08 16:33:57 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Selectors</title>
@@ -99,8 +99,8 @@ See the CSS3 Selectors module [[-CSS3SEL]].
9999
title="selector"><dfn>selector</dfn></span> is a chain of one or more
100100
simple selectors separated by combinators. <span class="index-def"
101101
title="combinator"><a
102-
name="combinator"><dfn>Combinators</dfn></a></span> are: whitespace,
103-
"&gt;", and "+". Whitespace may appear between a combinator and the
102+
name="combinator"><dfn>Combinators</dfn></a></span> are: white space,
103+
"&gt;", and "+". White space may appear between a combinator and the
104104
simple selectors around it.
105105

106106
<P>The elements of the document tree that match a selector are called
@@ -186,7 +186,7 @@ those EM elements that are contained by an H1 element"). <span
186186
class="index-def" title="descendant-selectors">Descendant
187187
selectors</span> express such a relationship in a pattern. A
188188
descendant selector is made up of two or more selectors separated by
189-
<a href="syndata.html#whitespace">whitespace</a>. A descendant
189+
<a href="syndata.html#whitespace">white space</a>. A descendant
190190
selector of the form "<code>A B</code>" matches when an element
191191
<code>B</code> is an arbitrary descendant of some <a
192192
href="conform.html#doctree">ancestor</a> element <code>A</code>.
@@ -232,8 +232,8 @@ div * p
232232
</PRE>
233233

234234
<P>matches a P element that is a grandchild or later descendant of a
235-
DIV element. Note the whitespace on either side of the "*" is not part
236-
of the universal selector; the whitespace is a combinator
235+
DIV element. Note the white space on either side of the "*" is not part
236+
of the universal selector; the white space is a combinator
237237
indicating
238238
that the DIV must be the ancestor of some element, and that that
239239
element must be an ancestor of the P.
@@ -274,7 +274,7 @@ div ol&gt;li p
274274

275275
<P>It matches a P element that is a descendant of an LI; the LI element
276276
must be the child of an OL element; the OL element must be a
277-
descendant of a DIV. Notice that the optional whitespace around
277+
descendant of a DIV. Notice that the optional white space around
278278
the "&gt;" combinator has been left out.
279279
</div>
280280

@@ -336,8 +336,8 @@ matching|="><code>[att=val]</code></span>
336336
<dt><span class="index-def" title="space-separated
337337
matching|~="><code>[att~=val]</code></span>
338338
<dd>Represents an element with the <code>att</code> attribute whose
339-
value is a whitespace-separated list of words, one of which is exactly
340-
"val". If "val" contains whitespace, it will never represent anything
339+
value is a white space-separated list of words, one of which is exactly
340+
"val". If "val" contains white space, it will never represent anything
341341
(since the words are <em>separated</em> by spaces).
342342
<dt><span class="index-def" title="hyphen-separated
343343
matching|&#124;="><code>[att|=val]</code></span>

css2/syndata.src

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: syndata.src,v 2.155 2008-02-21 20:39:38 bbos Exp $ -->
3+
<!-- $Id: syndata.src,v 2.156 2008-04-08 16:33:57 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Syntax and basic data types</title>
@@ -35,7 +35,7 @@ complemented by the normative grammar rules presented in <a
3535
href="grammar.html">Appendix G</a>.
3636
</p>
3737
<p>In this specification, the expressions "immediately before" or
38-
"immediately after" mean with no intervening whitespace or comments.
38+
"immediately after" mean with no intervening white space or comments.
3939

4040
<h3><a name="tokenization">Tokenization</a></h3>
4141

@@ -139,10 +139,10 @@ in the grammar (to keep it readable), but any number of these tokens
139139
may appear anywhere between other tokens.
140140
</p>
141141
<p>The token S in the grammar above stands for <a
142-
name="whitespace">whitespace</a>. Only the characters "space" (<!--Unicode
142+
name="whitespace">white space</a>. Only the characters "space" (<!--Unicode
143143
code 32-->U+0020), "tab" (U+0009), "line feed" (<!--10-->U+000A), "carriage return" (<!--13-->U+000D), and
144-
"form feed" (<!--12-->U+000C) can occur in whitespace. Other space-like characters,
145-
such as "em-space" (<!--8195-->U+2003) and "ideographic space" (<!--12288-->U+3000), are never part of whitespace.
144+
"form feed" (<!--12-->U+000C) can occur in white space. Other space-like characters,
145+
such as "em-space" (<!--8195-->U+2003) and "ideographic space" (<!--12288-->U+3000), are never part of white space.
146146
</p>
147147
<p>The meaning of input that cannot be tokenized or parsed is
148148
undefined in CSS&nbsp;2.1.
@@ -283,13 +283,13 @@ href="#parsing-errors">rules for handling parsing errors</a>. However, because t
283283
to do that:
284284
</p>
285285
<ol>
286-
<li>with a space (or other whitespace character): "\26 B" ("&amp;B").
286+
<li>with a space (or other white space character): "\26 B" ("&amp;B").
287287
In this case, user agents should treat a "CR/LF" pair
288-
(<!--13/10-->U+000D/U+000A) as a single whitespace character.</li>
288+
(<!--13/10-->U+000D/U+000A) as a single white space character.</li>
289289
<li>by providing exactly 6 hexadecimal digits: "\000026B" ("&amp;B")</li>
290290
</ol>
291291

292-
<p>In fact, these two methods may be combined. Only one whitespace
292+
<p>In fact, these two methods may be combined. Only one white space
293293
character is ignored after a hexadecimal escape. Note that this means
294294
that a "real" space after the escape sequence must itself either be
295295
escaped or doubled.
@@ -320,11 +320,11 @@ href="#parsing-errors">rules for handling parsing errors</a>. However, because t
320320
kinds of statements: <span
321321
class="index-inst" title="at-rules"><em>at-rules</em></span>
322322
and <span class="index-inst" title="rule sets"><em>rule
323-
sets.</em></span> There may be <a href="#whitespace">whitespace</a>
323+
sets.</em></span> There may be <a href="#whitespace">white space</a>
324324
around the statements.
325325
</p>
326326

327-
<!-- Should comments be defined as whitespace? -->
327+
<!-- Should comments be defined as white space? -->
328328

329329
<h3><span class="index-def" title="at-rule">
330330
<a name="at-rules">At-rules</a></span></h3>
@@ -487,7 +487,7 @@ title="declaration"><dfn>declaration</dfn></span> is either empty or
487487
consists of a <span class="index-inst"
488488
title="property">property name</span>, followed by a colon (:), followed by
489489
a value. Around each of these there may be <a
490-
href="#whitespace">whitespace</a>.
490+
href="#whitespace">white space</a>.
491491
</p>
492492
<p>Because of the way selectors work, multiple declarations for the
493493
same selector may be organized into semicolon (;) separated
@@ -993,10 +993,10 @@ body { background: url("http://www.example.com/pinkish.png") }
993993
</div>
994994

995995
<p> The format of a URI value is 'url(' followed by optional <a
996-
href="#whitespace">whitespace</a> followed by an optional single quote
996+
href="#whitespace">white space</a> followed by an optional single quote
997997
(') or double quote (") character followed by the URI
998998
itself, followed by an optional single quote (') or double quote (")
999-
character followed by optional whitespace followed by
999+
character followed by optional white space followed by
10001000
')'. The two quote characters must be the same.
10011001
</p>
10021002
<div class="example"><p>An example without quotes:
@@ -1008,7 +1008,7 @@ li { list-style: url(http://www.example.com/redball.png) disc }
10081008

10091009
<p>
10101010
Some characters appearing in an unquoted URI, such as parentheses,
1011-
commas, whitespace characters, single quotes (') and double quotes
1011+
commas, white space characters, single quotes (') and double quotes
10121012
("), must be escaped with a backslash so that the resulting URI value
10131013
is a URI token: '\(', '\)', '\,'.
10141014
</p>
@@ -1055,13 +1055,13 @@ class="propinst-counter-increment">'counter-increment'</span> and
10551055
properties). To refer to the value of a counter, the notation
10561056
<span class="index-def" title="counter()">
10571057
'counter(&lt;identifier&gt;)'</span> or 'counter(&lt;identifier&gt;,
1058-
&lt;'list-style-type'&gt;)', with optional whitespace separating the tokens,
1058+
&lt;'list-style-type'&gt;)', with optional white space separating the tokens,
10591059
is used. The default style is 'decimal'.
10601060
</p>
10611061
<p>To refer to a sequence of nested counters of the same name, the
10621062
notation is 'counters(&lt;identifier&gt;, &lt;string&gt;)' or
10631063
'counters(&lt;identifier&gt;, &lt;string&gt;, &lt;'list-style-type'&gt;)'
1064-
with optional whitespace separating the tokens.
1064+
with optional white space separating the tokens.
10651065
</p>
10661066
<p>See <a href="generate.html#scope">"Nested counters and scope"</a>
10671067
in the chapter on <a href="generate.html">generated content</a> for
@@ -1167,7 +1167,7 @@ followed by a comma-separated list of three numerical values (either
11671167
three integer values or three percentage values) followed by ')'.
11681168
The integer value 255 corresponds to 100%, and to F or FF in the
11691169
hexadecimal notation: rgb(255,255,255) = rgb(100%,100%,100%) =
1170-
#FFF. <a href="#whitespace">Whitespace</a> characters are allowed
1170+
#FFF. <a href="#whitespace">White space</a> characters are allowed
11711171
around the numerical values.
11721172
</p>
11731173
<p>All RGB colors are specified in the sRGB color space (see

css2/tables.src

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: tables.src,v 2.103 2008-02-05 18:17:02 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.104 2008-04-08 16:33:57 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
66
<title>Tables</title>
@@ -1179,7 +1179,7 @@ class="propinst-visibility">'visibility'</span> property set to
11791179
Cells are empty unless they contain one or more of the following:
11801180
<ul>
11811181
<li>floating content (including empty elements),
1182-
<li>in-flow content (including empty elements) other than whitespace
1182+
<li>in-flow content (including empty elements) other than white space
11831183
that has been collapsed away by the <span
11841184
class="propinst-white-space">'white-space'</span> property handling.
11851185
</ul>

0 commit comments

Comments
 (0)