Skip to content

Commit 697a876

Browse files
bert-githubbert-github
committed
[css2] Edits from 28 Jul telcon.
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402117
1 parent 16edc2f commit 697a876

5 files changed

Lines changed: 17 additions & 31 deletions

File tree

‎css2/aural.src‎

Lines changed: 2 additions & 2 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: aural.src,v 2.44 2003-01-27 22:30:55 bbos Exp $ -->
5+
<!-- $Id: aural.src,v 2.45 2003-08-04 13:29:19 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>Aural style sheets</TITLE>
@@ -13,7 +13,7 @@
1313
<p>This chapter is informative. UAs are not required to implement the
1414
properties of this chapter in order to conform to CSS 2.1.
1515

16-
<h2><a name="aural-media-group">The media type 'aural'</a></h2>
16+
<h2><a name="aural-media-group">The media types 'aural' and 'speech'</a></h2>
1717

1818
<p>We expect that in a future level of CSS there will be new
1919
properties and values defined for speech output. Therefore

‎css2/changes.src‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: changes.src,v 2.40 2003-06-09 15:58:41 bbos Exp $ -->
3+
<!-- $Id: changes.src,v 2.41 2003-08-04 13:29:19 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
6-
<TITLE>Appendix B: Changes</TITLE>
6+
<TITLE>Appendix C: Changes</TITLE>
77
</HEAD>
88
<BODY>
99
<H1>Changes</H1>

‎css2/fonts.src‎

Lines changed: 1 addition & 7 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: fonts.src,v 2.75 2003-07-04 17:08:01 bbos Exp $ -->
4+
<!-- $Id: fonts.src,v 2.76 2003-08-04 13:29:19 bbos Exp $ -->
55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<title>Fonts</title>
@@ -168,18 +168,12 @@ as a last alternative. Generic font family names are keywords and must NOT be q
168168
</dd>
169169
</dl>
170170

171-
<del class="current">
172-
<p>Font names containing whitespace should be quoted:
173-
</p>
174-
</del>
175-
<ins class="proposed">
176171
<p>If an unquoted font family name contains
177172
parentheses, brackets, and/or braces, they must still be either balanced or
178173
escaped per CSS grammar rules. Similarly, quote marks, semicolons,
179174
exclamation marks and commas within unquoted font family names must be escaped.
180175
Font names containing any such characters or whitespace should be quoted:
181176
</p>
182-
</ins>
183177

184178
<pre>
185179
body { font-family: "New Century Schoolbook", serif }

‎css2/sample.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: sample.src,v 2.30 2003-07-14 13:47:03 bbos Exp $ -->
3+
<!-- $Id: sample.src,v 2.31 2003-08-04 13:29:20 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>A sample style sheet for HTML 4.0</TITLE>
@@ -77,7 +77,7 @@ big { font-size: 1.17em }
7777
small, sub, sup { font-size: .83em }
7878
sub { vertical-align: sub }
7979
sup { vertical-align: super }
80-
<ins cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0459.html">td, th { vertical-align: middle }</ins>
80+
td, th { vertical-align: middle }
8181
s, strike, del { text-decoration: line-through }
8282
hr { border: 1px inset }
8383
ol, ul, dir,

‎css2/tables.src‎

Lines changed: 10 additions & 18 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: tables.src,v 2.66 2003-07-14 13:48:47 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.67 2003-08-04 13:29:20 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
66
<title>Tables</title>
@@ -474,15 +474,9 @@ if they were a block element before or after the table, except that
474474
not considered to be a block box for the purposes of any
475475
'run-in' element that may precede the table.
476476

477-
<p><del
478-
cite="http://lists.w3.org/Archives/Public/www-style/1999Jul/0083.html">A
479-
caption that is above or below a table box also behaves like a block
480-
box for width calculations; the width is calculated with respect to
481-
the width of the table box's containing block.</del> <ins
482-
cite="http://lists.w3.org/Archives/Public/www-style/1999Jul/0083.html">
483-
A caption that is above or below a table box also behaves like a block
477+
<p>A caption that is above or below a table box also behaves like a block
484478
box for width and height calculations; the width and height are
485-
calculated with respect to the table box's containing block.</ins></p>
479+
calculated with respect to the table box's containing block.</p>
486480

487481
<P>To align caption content horizontally within the caption box, use
488482
the <span class="propinst-text-align">'text-align'</span>
@@ -562,8 +556,8 @@ table size.
562556
</div>
563557

564558
<div class="html-example">
565-
<p>Here are two examples. The first is assumed to occur in an HTML
566-
document:
559+
<p>Here are two examples. The first is assumed is assumed to occur in
560+
an HTML document, the second an XHTML document:
567561

568562
<pre>
569563
&lt;TABLE&gt;
@@ -572,14 +566,14 @@ document:
572566
&lt;/TABLE&gt;
573567
</pre>
574568

575-
<pre>
569+
<pre><pre>
576570
&lt;TABLE&gt;
577-
&lt;ROW&gt;&lt;CELL&gt;1 &lt;CELL rowspan="2"&gt;2 &lt;CELL&gt;3 &lt;CELL&gt;4
578-
&lt;ROW&gt;&lt;CELL colspan="2"&gt;5
571+
&lt;TR&gt;&lt;TD&gt;1 &lt;/TD&gt;&lt;TD rowspan="2"&gt;2 &lt;/TD&gt;&lt;TD&gt;3 &lt;/TD&gt;&lt;TD&gt;4 &lt;TD&gt;&lt;TR&gt;
572+
&lt;TR&gt;&lt;TD colspan="2"&gt;5 &lt;TD&gt;&lt;TR&gt;
579573
&lt;/TABLE&gt;
580574
</pre>
581575

582-
<p>The second table is formatted as in the figure on the
576+
<p>The second case is formatted as in the figure on the
583577
right. However, the HTML table's rendering is explicitly undefined by
584578
HTML, and CSS doesn't try to define it. User agents are free to render
585579
it, e.g., as in the figure on the left.
@@ -588,7 +582,7 @@ it, e.g., as in the figure on the left.
588582
<p><img src="images/table-overlap.png" alt="One table with overlapping
589583
cells and one without"> <p class="caption">On the left, one possible
590584
rendering of an erroneous HTML 4 table; on the right, the only
591-
possible formatting of a similar, <del cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0306.html">non-HTML</del> <ins cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0306.html">XHTML</ins> table.
585+
possible formatting of a similar, XHTML table.
592586
</div>
593587
</div>
594588

@@ -1044,13 +1038,11 @@ vertical spacing. If two are specified, the first gives the horizontal
10441038
spacing and the second the vertical spacing. Lengths may not be
10451039
negative.
10461040

1047-
<ins>
10481041
<p>The distance between the table border and the borders of the cells
10491042
on the edge of the table is the table's padding for that side, plus
10501043
the relevant border spacing distance. For example, on the right hand
10511044
side, the distance is <var>padding-right</var> + <var>horizontal
10521045
border-spacing</var>.
1053-
</ins>
10541046

10551047
<p>In this model, each cell has an individual border. The
10561048
<span class="propinst-border-spacing">'border-spacing'</span> property

0 commit comments

Comments
 (0)