Skip to content

Commit 1af8a60

Browse files
committed
[css2] Changes after Provo ftf
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401097
1 parent cf414bf commit 1af8a60

10 files changed

Lines changed: 82 additions & 30 deletions

File tree

css2/aural.src

Lines changed: 3 additions & 1 deletion
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: aural.src,v 2.14 1998-02-24 22:52:32 ijacobs Exp $ -->
3+
<!-- $Id: aural.src,v 2.15 1998-02-28 01:12:16 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Aural style sheets</TITLE>
@@ -636,6 +636,8 @@ naturally as various pauses.
636636
<!-- Proposed: cut this because too semantic, hard to
637637
implement -Ij -->
638638

639+
<!-- Remove. 27/2/98 -->
640+
639641
<p>This property controls how dates are spoken.
640642
Values have the following meanings:</p>
641643

css2/conform.src

Lines changed: 4 additions & 1 deletion
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: conform.src,v 2.12 1998-02-24 00:55:33 ijacobs Exp $ -->
3+
<!-- $Id: conform.src,v 2.13 1998-02-28 01:12:35 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Conformance: requirements and recommendations</TITLE>
@@ -250,6 +250,9 @@ user interface):</p>
250250
<LI>Allow the user to turn on or off specific style sheets .
251251
</UL>
252252

253+
<!-- Make requirement that alternate style sheets (see HTML 4.0) can
254+
be selected. 27/2/98 -->
255+
253256
<h2>Error conditions</h2>
254257

255258
<P>In general, this document does not specify error handling behavior

css2/fonts.src

Lines changed: 4 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: fonts.src,v 2.17 1998-02-24 22:52:55 ijacobs Exp $ -->
3+
<!-- $Id: fonts.src,v 2.18 1998-02-28 01:13:11 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Fonts</TITLE>
@@ -588,7 +588,7 @@ character of a font on screen) is less dependent on its <a
588588
href="syndata.html#em-height">em-height</a> than on the size of its <a
589589
href="syndata.html#x-height">x-height</a>, or, more usefully, on the
590590
ratio of these two values, called the <span class="index-def" title="z
591-
value"><dfn>z value</dfn></span> (x-height divided by em-height. The
591+
value"><dfn>z value</dfn></span> (em-height divided by x-height). The
592592
lower the z value, the more likely it is that a font at smaller em
593593
sizes will be legible. Inversely, faces with a higher z value will
594594
become illegible more rapidly below a given threshold size than faces
@@ -1401,6 +1401,8 @@ resource may have been moved; but the client has a better idea of what
14011401
is likely to be there, in a more robust way than trying to parse
14021402
filename extensions in URIs.
14031403

1404+
<!-- syntax: [ format(<string>) ]* . 27/2/98 -->
1405+
14041406
<!-- Is "adorned font name" a good term? -IJ -->
14051407
<p> The <span class="index-def"
14061408
title="&lt;font-face-name&gt;::definition of"><a

css2/generate.src

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ title=":before|pseudo-elements:::before|before">:before</span> and <span
5353
class="index-def" title=":after|pseudo-elements:::after|after">:after</span>
5454
pseudo elements</h2>
5555

56+
<!-- If elt is list-item, :before suppresses the bullet. New value
57+
for display: marker. 'marker-offset' property and 'text-align' (or
58+
new property?) determine position of marker. 27/2/98 -->
59+
5660
<p>Authors specify the location of generated content with the :before
5761
and :after pseudo-elements. The <span
5862
class="propinst-content">'content'</span> property, in conjunction
@@ -554,12 +558,14 @@ counters. (We assume the style sheet as given in the example above).
554558
&lt;LI&gt;item &lt;!-- increment item[4] (= 2) --&gt;
555559
&lt;/OL&gt; &lt;!-- ) --&gt;
556560
</pre>
561+
</div>
557562

558-
<P>It is impossible to number lists with numbers of the type "1",
559-
"1.1", "1.1.1", etc., when self-nesting counters are used. A <span
560-
class="propinst-content">'content'</span> property of the form
561-
'counter(item) "." counter(item)' simply refers twice to the same
562-
counter. [?? or should they automatically map to nested counters?]
563+
<p>To create numbers like "1", "1.1", "1.1.1", etc., the notation
564+
<span class="index-def" title="counters">'counters</span>(X,
565+
&lt;string&gt;)', or 'counters(X, &lt;string&gt;,
566+
&lt;list-item-style&gt;)' can be used. This results in a string with
567+
all counters separated by the given string. Example: 'counters(item,
568+
".")'
563569

564570

565571
<h3>Counter styles</h3>

css2/lists.src

Lines changed: 9 additions & 1 deletion
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: lists.src,v 2.6 1998-02-24 22:53:07 ijacobs Exp $ -->
3+
<!-- $Id: lists.src,v 2.7 1998-02-28 01:13:49 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Lists</TITLE>
@@ -159,6 +159,14 @@ displayed.
159159

160160
<!-- Comments from Dan Glazman not yet accounted for -IJ -->
161161

162+
<!-- ordinal (1st, 2nd, 3rd), cardinal text (one, two, three), ordinal
163+
text (first, second, third), leading-zero (01, 02, 03)? ChrisW 27/2/98
164+
-->
165+
166+
<!-- enumerated values? RobertP 27/2/98 -->
167+
168+
<!-- Resolved: add leading-zero, rest for CSS3. 27/2/98 -->
169+
162170
<div class="html-example"><P>
163171
For example, the following HTML document:
164172
<PRE>

css2/page.src

Lines changed: 5 additions & 1 deletion
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: page.src,v 2.6 1998-02-27 07:58:12 bbos Exp $ -->
3+
<!-- $Id: page.src,v 2.7 1998-02-28 01:14:03 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Paged media</TITLE>
@@ -331,6 +331,8 @@ Future versions of CSS may include other page pseudo-classes.
331331
</em>
332332
</div>
333333

334+
<!-- Add named pages. 27/2/98 -->
335+
334336
<h3>Content outside the page box</h3>
335337

336338
<P>When formatting content in the page model, some content may end up
@@ -396,6 +398,8 @@ class="propinst-page-break-before">'page-break-before'</span>,
396398

397399
<!-- #include src=properties/page-break-after.srb -->
398400

401+
<!-- Add 'page' property for named pages. 27/2/98 -->
402+
399403
<P>Values for these properties have the following meanings:</p>
400404

401405
<dl>

css2/selector.src

Lines changed: 10 additions & 7 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.18 1998-02-27 08:00:06 bbos Exp $ -->
3+
<!-- $Id: selector.src,v 2.19 1998-02-28 01:14:26 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Selectors</title>
@@ -66,6 +66,8 @@ beginning (from the left) with "en".
6666
equal to "myid".<TD><a href="#id-selectors">ID selectors</a></TR>
6767
</table>
6868

69+
<!-- Add :lang(fr). 27/2/98 -->
70+
6971
<h2>Selector syntax</h2>
7072

7173
<P>A <span class="index-def" title="simple selector"><a
@@ -833,32 +835,33 @@ start tag is inserted right after the start tag of the element to
833835
which it is attached.</p>
834836
</div>
835837

836-
<p>The user agent defines what characters are inside the :first-letter
837-
element. Punctuation (characters in the "open", "close", and
838+
<p><!--
839+
The user agent defines what characters are inside the :first-letter
840+
element. Removed. 27/2/98 -->
841+
Punctuation (characters in the "open", "close", and
838842
"other" punctuation classes as defined in the Unicode standard <a
839843
rel="biblioentry" href="refs.html#ref-UNICODE">[UNICODE]</a>), that
840844
precedes the first letter should be included, as in:</p>
841845

842846
<P><img src="./images/first-letter2.gif" alt="Quotes that precede the
843847
first letter should be included."></p>
844848

849+
<!--
845850
<p> When the paragraph starts with other punctuation (e.g.,
846851
parenthesis and ellipsis points) or other characters that are normally
847852
not considered letters (e.g., digits and mathematical symbols),
848853
:first-letter pseudo-elements are generally <span class="index-inst"
849854
title="skip"><a href="syndata.html#skip">skipped</a></span></p>
855+
Removed 27/2/98 -->
850856

851857
<p>The :first-letter pseudo-element matches parts of <a
852858
href="visuren.html#block-level">block-level</a> elements only.</p>
853859

854-
<div class="note"><p>
855-
<em><strong>Note.</strong>
860+
<p>
856861
Some languages may have specific rules about how to treat certain
857862
letter combinations. In Dutch, for example, if the letter combination
858863
"ij" appears at the beginning of a word, they should both be
859864
considered within the :first-letter pseudo-element.
860-
</em></p>
861-
</div>
862865

863866
<div class="example"><p>
864867
<a name="overlapping-example">The following example</a> illustrates

css2/style/default.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Style sheet for the CSS2 specification
3-
* $Id: default.css,v 2.9 1998-02-25 19:34:42 bbos Exp $
3+
* $Id: default.css,v 2.10 1998-02-28 01:16:39 bbos Exp $
44
*/
55

66
BODY {
@@ -23,7 +23,7 @@ H1 {
2323

2424
PRE {
2525
font-family: monospace;
26-
margin-left: 2em;
26+
margin-left: 1em;
2727
font-size: 90%
2828
}
2929

css2/tables.src

Lines changed: 31 additions & 9 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.15 1998-02-21 04:28:28 ijacobs Exp $ -->
3+
<!-- $Id: tables.src,v 2.16 1998-02-28 01:15:05 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
66
<title>Tables</title>
@@ -237,6 +237,8 @@ HTML: CAPTION)
237237
<dd>Specifies a caption for the table.
238238
</dl>
239239

240+
<!-- table-column-header-group? StevenP 27/2/98 -->
241+
240242
<p>Elements with <span class="propinst-display">'display'</span> set
241243
to 'table-column' or 'table-column-group' are not rendered (exactly as
242244
if they had 'display: none'), but they are useful, because they may
@@ -250,27 +252,31 @@ in the appendix illustrates the use of these values for HTML 4.0:</p>
250252
TABLE { display: table }
251253
TR { display: table-row }
252254
THEAD { display: table-header-group }
253-
TBODY { display: table-footer-group }
254-
TFOOT { display: table-row-group }
255+
TBODY { display: table-row-group }
256+
TFOOT { display: table-footer-group }
255257
COL { display: table-column }
256258
COLGROUP { display: table-column-group }
257259
TD, TH { display: table-cell }
258260
CAPTION { display: table-caption }
259261
</pre>
260262

261-
<P>User agents must <a href="syndata.html#skip">skip</a> these <span
263+
<P>User agents may <a href="syndata.html#skip">skip</a> these <span
262264
class="propinst-display">'display'</span> property values for HTML
263265
documents, since authors should not alter an element's expected
264266
behavior.
267+
<!-- must ==> may 27/2/98 -->
265268

266269
<h3>Anonymous table boxes</h3>
270+
<!--... in other lang than HTML -->
267271

268-
<P>For document languages other than HTML 4.0, authors may end up
272+
<!-- what is this first sentence? -->
273+
<P>For document languages other than HTML<!-- 4.0-->, authors may end up
269274
some, but not all, document language elements with those in the CSS2
270275
table model. In these cases, the "missing" elements must be assumed in
271276
order for the table model to work. The missing elements generate <a
272277
href="visuren.html#anonymous">anonymous</a> boxes according to the
273278
following rules:</p>
279+
<!-- Make explicit: this is NOT required for HTML -->
274280

275281
<ol>
276282

@@ -407,6 +413,8 @@ COL.totals {width: 5em}
407413
</pre>
408414
</div>
409415

416+
<!-- Make illustration. 27/2/98 -->
417+
410418

411419
<h2>Tables in the visual rendering model</h2>
412420

@@ -501,6 +509,7 @@ TABLE {
501509
margin-right: auto
502510
}
503511
CAPTION {
512+
caption-side: left;
504513
margin-left: -8em;
505514
width: 8em;
506515
text-align: right;
@@ -597,6 +606,9 @@ specification), the table is in error according to HTML 4.0, and a UA
597606
is free to try to recover. UAs that implement CSS2 are not free
598607
anymore, and must leave gaps, as per the algorithm above. </em></div>
599608

609+
<!-- Make the above only suggested for XML, not for HTML. HTML stays
610+
undefined. 27/2/98 -->
611+
600612
<div class="html-example">
601613
<p>Here is an example:
602614

@@ -674,7 +686,7 @@ row. The following HTML code and style rules</p>
674686
&lt;HTML&gt;
675687
&lt;HEAD&gt;
676688
&lt;STYLE type="text/css"&gt;
677-
TABLE { background: #ff0 }
689+
TABLE { background: #ff0; border-spacing: none }
678690
TD { background: red; border: double black }
679691
&lt;/STYLE&gt;
680692
&lt;/HEAD&gt;
@@ -688,7 +700,6 @@ row. The following HTML code and style rules</p>
688700
&lt;TD&gt; 4
689701
&lt;/TR&gt;
690702
&lt;TR&gt;
691-
&lt;TD&gt; &amp;nbsp;
692703
&lt;/TR&gt;
693704
&lt;/TABLE&gt;
694705
&lt;/BODY&gt;
@@ -739,6 +750,8 @@ and columns. Values have the following meaning:</p>
739750
not depend on the contents of the cells; it only depends on the
740751
table's width and the width of the cells in the first row.
741752

753+
<!-- Only use width of column, not of cells. ChrisW. Agreed. 27/2/98 -->
754+
742755
<P>The table's width is determined by the <span
743756
class="propinst-width">'width'</span> property. If the value is
744757
'auto', the table is as wide as the available horizontal space.
@@ -1011,6 +1024,9 @@ potential change in column constraints.
10111024

10121025
<h2><a name="borders">Borders</a></h2>
10131026

1027+
<!-- Add property that switches between drawing borders on empty
1028+
cells. MikeW 27/2/98 -->
1029+
10141030
<p>There are two distinct models for setting borders on table cells in
10151031
CSS. One is most suitable for so-called <span class="index-inst"
10161032
title="2�D borders">"2�D" borders</span> around individual cells, the
@@ -1020,6 +1036,9 @@ model, so it is often a matter of taste which one is used.
10201036

10211037
<!-- #include src=properties/border-spacing.srb -->
10221038

1039+
<!-- make collapse/non-collapse a separate, binary property.
1040+
border-collapse: collapse|separate. 27/2/98 -->
1041+
10231042
<P>The property <span
10241043
class="propinst-border-spacing">'border-spacing'</span> selects a
10251044
table's border model. Values have the following meanings:</p>
@@ -1053,8 +1072,8 @@ href="syndata.html#skip">skip</a></span> the border properties for
10531072
those elements.
10541073

10551074
<div class="example">
1056-
<p>The table in Figure 3[??] could be the result of a style sheet like
1057-
this:
1075+
<p>The table in the figure below could be the result of a style sheet
1076+
like this:
10581077

10591078
<pre>
10601079
TABLE { border: outset 10pt; border-spacing: 15pt }
@@ -1156,6 +1175,8 @@ group and, lastly, table.
11561175
<P>The following example illustrates the application
11571176
of these precedence rules. This style sheet:</p>
11581177

1178+
<!-- Add border-collapse: collapse to style below. 27/2/98 -->
1179+
11591180
<pre>
11601181
TABLE { border: 5px solid yellow; }
11611182
*#col1 { border: 1px solid black; }
@@ -1166,6 +1187,7 @@ of these precedence rules. This style sheet:</p>
11661187

11671188
<P>with this HTML source:</p>
11681189

1190+
<!-- Put some real content instead of nbsp. 27/2/98 -->
11691191
<pre class="html-example">
11701192
&lt;P&gt;
11711193
&lt;TABLE&gt;

css2/visuren.src

Lines changed: 3 additions & 1 deletion
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: visuren.src,v 2.23 1998-02-27 08:02:12 bbos Exp $ -->
3+
<!-- $Id: visuren.src,v 2.24 1998-02-28 01:15:53 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Visual rendering model</TITLE>
@@ -102,6 +102,8 @@ box it generates.
102102

103103
<!-- #include src=properties/display.srb -->
104104

105+
<!-- What about BUTTON? -->
106+
105107
<P><span class="index-def" title="block-level
106108
element"><dfn>Block-level elements</dfn></span> are those elements of
107109
the document language that, by default, are formatted visually as

0 commit comments

Comments
 (0)