E84D [css2] Processed some of the issues between 1 and 66 · w3c/csswg-drafts@f8d339d · GitHub
Skip to content

Commit f8d339d

Browse files
bert-githubbert-github
committed
[css2] Processed some of the issues between 1 and 66
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402187
1 parent c6d6b31 commit f8d339d

11 files changed

Lines changed: 70 additions & 54 deletions

File tree

‎css2/about.src‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'http://www.w3.org/TR/html4/strict.dtd'>
33

44
<html lang="en">
5-
<!-- $Id: about.src,v 2.53 2003-07-01 15:42:14 bbos Exp $ -->
5+
<!-- $Id: about.src,v 2.54 2003-10-17 17:52:46 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>About the CSS&nbsp;2.1 Specification</TITLE>
@@ -345,7 +345,7 @@ specification and CSS1 user agents will render them specially.
345345

346346
<P>Most images in the electronic version of this specification are
347347
accompanied by "long descriptions" of what they represent. A link to
348-
the long description is denoted by a "[D]" to the right of the image.
348+
the long description is denoted by a "[D]" after the image.
349349

350350
<P>Images and long descriptions are informative only.
351351

@@ -362,15 +362,15 @@ Bottelier, Christian Roth, Christoph P&auml;per, Claus F&auml;rber,
362362
Coises, Craig Saila, Darren Ferguson, Dylan Schiemann, Etan Wexler,
363363
George Lund, James Craig, Jan Eirik Olufsen, Jan Roland Eriksson,
364364
Joris Huizer, Joshua Prowse, Kai Lahmann, Kevin Smith, Lachlan Cannon,
365-
Lars Knoll, Lars Knoll, Lauri Raittila, Mark Gallagher, Michael Day,
366-
Peter Sheerin, Peter Sheerin, Rijk van Geijtenbeek, Robin Berjon,
365+
Lars Knoll, Lauri Raittila, Mark Gallagher, Michael Day,
366+
Peter Sheerin, Rijk van Geijtenbeek, Robin Berjon,
367367
Scott Montgomery, Shelby Moore, Stuart Ballard, Tom Gilder, Vadim
368368
Plessky, and the Open eBook Publication Structure Working Group
369369
Editors. We would also like to thank Glenn Adams and Susan Lesch, who
370370
helped proofread this document.</p>
371371

372372
<p>In addition, we would like to extend special thanks to fantasai,
373-
Ada Chan, and Boris Zbarsky, who have both contributed significant
373+
Ada Chan, and Boris Zbarsky, who have contributed significant
374374
time to CSS2.1.</p>
375375

376376

‎css2/bin/addlongdesc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Add d-link just after image.
88
#
99
# Ian Jacobs ij@w3.org
10-
# $Id: addlongdesc,v 1.2 1998-05-01 20:09:14 ijacobs Exp $
10+
# $Id: addlongdesc,v 1.3 2003-10-17 17:52:48 bbos Exp $
1111

1212
use English;
1313
use DB_File;
@@ -23,6 +23,7 @@ shift;
2323

2424
sub image_name {
2525
my $f = `basename $_[0] '.gif'`;
26+
$f = `basename $_[0] '.png'`;
2627
chop $f;
2728
return($f);
2829
}

‎css2/cascade.src‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: cascade.src,v 2.45 2003-01-27 21:01:45 bbos Exp $ -->
3+
<!-- $Id: cascade.src,v 2.46 2003-10-17 17:52:46 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Assigning property values, Cascading, and Inheritance</TITLE>
@@ -68,7 +68,8 @@ for the definition of computed values when the specified value is
6868
'inherit'.
6969

7070
<p>The computed value exists even when the property doesn't apply, as
71-
defined by the 'Applies To' [add reference] line. However, some
71+
defined by the <a href="about.html#applies-to">'Applies To'</a> line.
72+
However, some
7273
properties may define the computed value of a property for an element
7374
to depend on whether the property applies to that element.
7475

@@ -380,7 +381,7 @@ Some examples:
380381
<PRE>
381382
* {} /* a=0 b=0 c=0 d=0 -&gt; specificity = 0,0,0,0 */
382383
li {} /* a=0 b=0 c=0 d=1 -&gt; specificity = 0,0,0,1 */
383-
li:first-line {} /* a=0 b=0 c=0 d=1 -&gt; specificity = 0,0,0,2 */
384+
li:first-line {} /* a=0 b=0 c=0 d=2 -&gt; specificity = 0,0,0,2 */
384385
ul li {} /* a=0 b=0 c=0 d=2 -&gt; specificity = 0,0,0,2 */
385386
ul ol+li {} /* a=0 b=0 c=0 d=3 -&gt; specificity = 0,0,0,3 */
386387
h1 + *[rel=up]{} /* a=0 b=0 c=1 d=1 -&gt; specificity = 0,0,1,1 */

‎css2/colors.src‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: colors.src,v 2.36 2003-09-05 14:24:27 bbos Exp $ -->
3+
<!-- $Id: colors.src,v 2.37 2003-10-17 17:52:46 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Colors and backgrounds</title>
@@ -295,10 +295,10 @@ values are given, the horizontal position comes first. Combinations of
295295
keyword, length and percentage values are allowed, (e.g., '50% 2cm' or 'center 2cm' or 'center 10%'). For combinations of keyword and non-keyword values, 'left' and 'right' may only be used as the first value, and 'top' and 'bottom' may only be used as the second value. Negative positions are allowed.
296296
</p>
297297
<p>
298-
The computed value of background-position for the purpose of inheritance is
299-
undefined, since the allowed values on this property may have different
300-
effects in a child element due to differences in size and position of their
301-
respective boxes.
298+
The tiling and positioning of the
299+
background-image on inline elements is undefined in this specification.
300+
A future level of CSS may define the tiling and positioning of the
301+
background-image on inline elements.
302302
</p>
303303
<div class="example">
304304

6867

‎css2/grammar.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.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: grammar.src,v 2.34 2003-08-27 17:34:30 bbos Exp $ -->
3+
<!-- $Id: grammar.src,v 2.35 2003-10-17 17:52:46 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>
@@ -151,7 +151,7 @@ title="iso-10646">ISO-10646</span>.
151151

152152
h [0-9a-f]
153153
nonascii [\200-\377]
154-
unicode \\{h}{1,6}[ \t\r\n\f]?
154+
unicode \\{h}{1,6}(\r\n|[ \t\r\n\f])?
155155
escape {unicode}|\\[ -~\200-\377]
156156
nmstart [_a-z]|{nonascii}|{escape}
157157
nmchar [_a-zA-Z0-9-]|{nonascii}|{escape}

‎css2/images/longdesc/floatclear-desc.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ <h1>Long description of how floats overlap with boxes in normal
1616
the non-transparent parts of the image. The second paragraph is
1717
forced below the float by the 'clear' property.
1818

19-
<P>There are two paragraphs in normal flow, each surrounded by red
19+
<P>There are two paragraphs in normal flow, each surrounded by a red
2020
border. A left-floating image causes the final three lines of the
2121
upper paragraph to float along its right side. The paragraph borders
2222
shine through the margin area of the image box. The non-transparent
2323
part of the image content area clips them, however.
2424

2525
<P>The second paragraph flows normally, starting below the image's
26-
bottom margin. The top margin of the second paragraph is stretched
27-
up to meet the bottom margin of the preceding paragraph.
26+
bottom margin. Sufficient "clearance" is added above the top margin of
27+
the second paragraph, so that its border meets the bottom margin of
28+
the preceding paragraph.
2829

2930
<P><a href="../../visuren.html#img-floatclear">Return to image.</a>
3031

‎css2/properties/properties.db‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ table-cell | table-caption | none | inherit;;
433433
/* background-position;;
434434
[ [<percentage> | <length> | top | center | bottom] || [<percentage> | <length> | left | center | right] ] | inherit;;
435435
0% 0%;;
436-
block-level and replaced elements;;
436+
*;;
437437
no;;
438438
refer to the size of the box itself;;
439439
visual;;

‎css2/selector.src‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.0 Transitional//EN'>
22
<html lang="en">
3-
<!-- $Id: selector.src,v 2.76 2003-08-27 16:39:11 bbos Exp $ -->
3+
<!-- $Id: selector.src,v 2.77 2003-10-17 17:52:46 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Selectors</title>
@@ -233,7 +233,7 @@ div * p
233233

234234
<P>matches a P element that is a grandchild or later descendant of a
235235
DIV element. Note the whitespace on either side of the "*" is not part
236-
of the universal selector; the whitespace is the descendant selector
236+
of the universal selector; the whitespace 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.
@@ -428,7 +428,7 @@ to be read aloud in different voices for each role:</p>
428428

429429
<pre class="example">
430430
DIALOGUE[character=romeo]
431-
{ voice-family: "Lawrence Olivier", charles, male }
431+
{ voice-family: "Laurence Olivier", charles, male }
432432

433433
DIALOGUE[character=juliet]
434434
{ voice-family: "Vivien Leigh", victoria, female }
@@ -1075,7 +1075,7 @@ tag sequence for
10751075
to an inline-level element, but with certain restrictions. Only the
10761076
following properties apply to a :first-line pseudo-element: <a
10771077
href="fonts.html">font properties,</a> <a href="colors.html">color
1078-
properties,</a> <a href="colors.html#background-properties">background
1078+
property,</a> <a href="colors.html#background-properties">background
10791079
properties,</a> <span
10801080
class="propinst-word-spacing">'word-spacing',</span> <span
10811081
class="propinst-letter-spacing">'letter-spacing',</span> <span
@@ -1102,11 +1102,14 @@ is similar to a floated element.</p>
11021102
<span class="propinst-letter-spacing">'letter-spacing',</span>
11031103
<span class="propinst-word-spacing">'word-spacing'</span> (when appropriate),
11041104
<span class="propinst-line-height">'line-height',</span>
1105+
<span class="propinst-float">'float',</span>
1106+
<span class="propinst-height">'height'</span> (only if 'float' is 'none'),
1107+
<span class="propinst-width">'width'</span> (only if 'float' is 'none'),
11051108
<span class="propinst-vertical-align">'vertical-align'</span> (only if 'float' is 'none'),
11061109
<a href="box.html#margin-properties">margin properties,</a>
11071110
<a href="box.html#padding-properties">padding properties,</a>
11081111
<a href="box.html#border-properties">border properties,</a>
1109-
<a href="colors.html">color properties,</a>
1112+
<a href="colors.html">color property,</a>
11101113
<a href="colors.html#background-properties">background properties.</a>
11111114
To allow UAs to render a typographically correct drop cap or initial
11121115
cap, the UA may choose a line-height, width and height based on the

‎css2/syndata.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.0 Transitional//EN"
22
"http://www.w3.org/TR/1998/REC-html40-19980424/loose.dtd">
33
<html lang="en">
4-
<!-- $Id: syndata.src,v 2.87 2003-08-24 20:03:43 bbos Exp $ -->
4+
<!-- $Id: syndata.src,v 2.88 2003-10-17 17:52:47 bbos Exp $ -->
55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<title>Syntax and basic data types</title>
@@ -1103,8 +1103,8 @@ range will be outside the device gamut and will thus be clipped.
11031103
<p><span class="index-def" title="&lt;string&gt;, definition of"><a
11041104
name="value-def-string">Strings</a></span> can either be written
11051105
with double quotes or with single quotes. Double quotes cannot occur
1106-
inside double quotes, unless escaped (as '\"' or as
1107-
'\22'). Analogously for single quotes ("\'" or "\27").
1106+
inside double quotes, unless escaped (e.g., as '\"' or as
1107+
'\22'). Analogously for single quotes (e.g., "\'" or "\27").
11081108
</p>
11091109
<div class="example">
11101110
<pre>

‎css2/visufx.src‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ may be rendered outside the block box.
8080

8181
<dd>This value indicates that the content is clipped and that no
8282
scrolling user interface should be provided to view the content outside the
83-
clipping region; users will not have access to clipped
84-
content.
83+
clipping region.
8584
</dd>
8685

8786
<dt><strong>scroll</strong></dt>

0 commit comments

Comments
 (0)