Skip to content

Commit 495b5f5

Browse files
ianbjacobsianbjacobs
committed
[css2] Incorporated the rest of Adam Costello's comments.
Noteworthy changes include: colors.src: In example, added "BODY" selector fonts.src: Some wording changes in descriptor properties. (see 'widths', 'units-per-em') refs.src: Added informative link to Postscript Lang. Ref. manual Made HTML 4.0 spec normative (for bidi) sRGB reference should be updated. media.src: Changed presentation of media group table. page.src: wording change in 'size' value defs. wording change in page-break-before/after section. selector.src: changed definition of "subject" syndata.src: Added section about %hh in some URIs. text.src: For 'text-decoration', changed "child" to descendant.. Also changed underline example to include :hover Also simplified BLOCKQUOTE example visudet.src: Removed some comments about abs. positioned box margins. (Now clearly states there are no margins). Note: Questions about <percentage> and <length> values for 'vertical-align' remain unanswered. In section on floats, "top" clarified. visufx.src: Clip region description changed. visuren.src: In section on compact boxes, description of layout changed slightly. In description of 'fixed', wording changes Note: Description of 'z-index' values changed. Is the value '0' equivalent to 'auto'? properties/properties.db: - Sections referring to width of parents now refer to width of containing block. - proposed: 'overflow' applies to all elements. - Some syntax fixing for 'background-position', 'font', and 'marks'. - Value of 'auto' removed from 'letter-spacing' - 'font-size-adjust' fixed to use <number> instead of "z" --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401084
1 parent 266d178 commit 495b5f5

22 files changed

Lines changed: 347 additions & 296 deletions

‎css2/about.src‎

Lines changed: 10 additions & 8 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: about.src,v 2.11 1998-02-24 00:55:20 ijacobs Exp $ -->
3+
<!-- $Id: about.src,v 2.12 1998-02-24 22:52:26 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>About the CSS2 Specification</TITLE>
@@ -119,12 +119,14 @@ name is the property name (complete with quotes) between "&lt;" and
119119
the document, each instance of this type of non-terminal links to the
120120
corresponding property definition.
121121

122-
<li> types that do not share the same name as a property. In
123-
this case, the non-terminal name appears between "&lt;" and "&gt;"
124-
(e.g., &lt;border-width&gt;) and its definition is located near its
125-
first appearance in the specification. In the electronic version of
126-
the document, each instance of this type of value links to the
127-
corresponding value definition.
122+
<li> non-terminals that do not share the same name as a property. In this
123+
case, the non-terminal name appears between "&lt;" and "&gt;", as in
124+
&lt;border-width&gt;. Notice the distinction between
125+
&lt;border-width&gt; and &lt;'border-width'&gt;; the latter is defined
126+
in terms of the former. The definition of a non-terminal is located
127+
near its first appearance in the specification. In the electronic
128+
version of the document, each instance of this type of value links to
129+
the corresponding value definition.
128130
</ol>
129131

130132
Other words in these definitions are keywords that must appear
@@ -139,7 +141,7 @@ given order.
139141
<li>A bar (|) separates two or more alternatives:
140142
exactly one of them must occur.
141143
<li>A double bar (||) separates
142-
two or more alternatives: one or more of them must occur, in any order.
144+
two or more options: one or more of them must occur, in any order.
143145
<li>Brackets ([]) are for grouping.
144146
</ul>
145147

‎css2/aural.src‎

Lines changed: 3 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: aural.src,v 2.13 1998-02-21 04:04:21 ijacobs Exp $ -->
3+
<!-- $Id: aural.src,v 2.14 1998-02-24 22:52:32 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Aural style sheets</TITLE>
@@ -12,7 +12,7 @@
1212

1313
<p>The aural rendering of a document, already commonly used by the
1414
blind and print-impaired communities, combines speech synthesis and
15-
<span class="index-def" title="auditory icon">"auditory icons"</span> Often
15+
<span class="index-def" title="auditory icon">"auditory icons."</span> Often
1616
such aural presentation occurs by converting the document to plain
1717
text and feeding this to a <span class="index-def" title="screen
1818
reader"><dfn>screen reader</dfn></span> -- software or hardware that
@@ -224,7 +224,7 @@ class="propinst-cue">'cue'</span></H2>
224224
<!-- #include src=properties/cue-after.srb -->
225225

226226
<P>Auditory icons are another way to distinguish semantic
227-
elements. Sounds may be played before, and/or after the element to
227+
elements. Sounds may be played before and/or after the element to
228228
delimit it. Values have the following meanings:</p>
229229

230230
<dl>
@@ -320,10 +320,6 @@ Examples:
320320
</pre>
321321
</div>
322322

323-
<P>If a stereo icon is dereferenced, the central point of the stereo
324-
pair should be placed at the azimuth for that element and the left and
325-
right channels should be placed to either side of this position.
326-
327323
<H2><a name="spatial-props">Spatial properties</a>: <span
328324
class="propinst-azimuth">'azimuth'</span> and
329325
<span class="propinst-elevation">'elevation'</span>

‎css2/bin/Attic/dextr‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# <span class="propinst-name">&lt;'name'&gt;</span>
1313
#
1414
# Ian Jacobs - ij@w3.org (Based on work by Arnaud Le Hors)
15-
# $Id: dextr,v 1.9 1998-02-02 20:17:50 ijacobs Exp $
15+
# $Id: dextr,v 1.10 1998-02-24 22:54:29 ijacobs Exp $
1616

1717
$PROGNAME = substr($0, rindex($0, "/") + 1);
1818

@@ -80,7 +80,15 @@ print output "<TR valign=\"top\"><TH align=\"right\">Initial:&nbsp;&nbsp;<TD>$in
8080
}
8181

8282
sub format_media {
83-
print output "<TR valign=\"top\"><TH align=\"right\">Media&nbsp;groups:&nbsp;&nbsp;<TD>$media</TR>\n";
83+
$fmedia = $_[0];
84+
$fmedia =~ s/visual/<a href=\"media.html#visual-media-group\">visual<\/a>/;
85+
$fmedia =~ s/aural/<a href=\"media.html#aural-media-group\">aural<\/a>/;
86+
$fmedia =~ s/tactile/<a href=\"media.html#tactile-media-group\">tactile<\/a>/;
87+
$fmedia =~ s/continuous/<a href=\"media.html#continuous-media-group\">continuous<\/a>/;
88+
$fmedia =~ s/paged/<a href=\"media.html#paged-media-group\">paged<\/a>/;
89+
$fmedia =~ s/grid/<a href=\"media.html#grid-media-group\">grid<\/a>/;
90+
$fmedia =~ s/all/<a href=\"media.html#all-media-group\">all<\/a>/;
91+
print output "<TR valign=\"top\"><TH align=\"right\">Media&nbsp;groups:&nbsp;&nbsp;<TD>$fmedia</TR>\n";
8492
}
8593

8694
# extract every possible block

‎css2/bin/dextr‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# <span class="propinst-name">&lt;'name'&gt;</span>
1313
#
1414
# Ian Jacobs - ij@w3.org (Based on work by Arnaud Le Hors)
15-
# $Id: dextr,v 1.9 1998-02-02 20:17:50 ijacobs Exp $
15+
# $Id: dextr,v 1.10 1998-02-24 22:54:29 ijacobs Exp $
1616

1717
$PROGNAME = substr($0, rindex($0, "/") + 1);
1818

@@ -80,7 +80,15 @@ print output "<TR valign=\"top\"><TH align=\"right\">Initial:&nbsp;&nbsp;<TD>$in
8080
}
8181

8282
sub format_media {
83-
print output "<TR valign=\"top\"><TH align=\"right\">Media&nbsp;groups:&nbsp;&nbsp;<TD>$media</TR>\n";
83+
$fmedia = $_[0];
84+
$fmedia =~ s/visual/<a href=\"media.html#visual-media-group\">visual<\/a>/;
85+
$fmedia =~ s/aural/<a href=\"media.html#aural-media-group\">aural<\/a>/;
86+
$fmedia =~ s/tactile/<a href=\"media.html#tactile-media-group\">tactile<\/a>/;
87+
$fmedia =~ s/continuous/<a href=\"media.html#continuous-media-group\">continuous<\/a>/;
88+
$fmedia =~ s/paged/<a href=\"media.html#paged-media-group\">paged<\/a>/;
89+
$fmedia =~ s/grid/<a href=\"media.html#grid-media-group\">grid<\/a>/;
90+
$fmedia =~ s/all/<a href=\"media.html#all-media-group\">all<\/a>/;
91+
print output "<TR valign=\"top\"><TH align=\"right\">Media&nbsp;groups:&nbsp;&nbsp;<TD>$fmedia</TR>\n";
8492
}
8593

8694
# extract every possible block

‎css2/cascade.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: cascade.src,v 2.8 1998-02-24 00:55:24 ijacobs Exp $ -->
3+
<!-- $Id: cascade.src,v 2.9 1998-02-24 22:52:37 ijacobs 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>
@@ -78,13 +78,15 @@ actual value.
7878
<h3>Order of value calculation</h3>
7979
<P><em>This section is under construction</em>
8080

81+
<!-- Finish me! -IJ -->
82+
8183
<P>Due to dependencies among properties, user agents must
8284
<a href="cascade.html#computed-value">compute</a> some property
8385
values in a specific order.</P>
8486

8587
<ul>
8688
<li><span class="propinst-font-size">'font-size'</span> must be
87-
computed before any property that may take a <a
89+
computed before any property that uses <a
8890
href="syndata.html#absrel-units">relative length</a> units.
8991

9092
<li><span class="propinst-display">'display'</span>, <span

‎css2/changes.src‎

Lines changed: 9 additions & 4 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: changes.src,v 2.4 1998-02-24 00:55:26 ijacobs Exp $ -->
3+
<!-- $Id: changes.src,v 2.5 1998-02-24 22:52:41 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Appendix B: Changes from CSS1</TITLE>
@@ -84,13 +84,18 @@ in CSS1.
8484

8585
<LI>[strength of constraints based on writing direction]
8686

87-
<LI>In CSS1, several properties (e.g. 'padding') had values referring
87+
<!-- Don't forget -IJ -->
88+
89+
<LI>In CSS1, several properties (e.g., 'padding') had values referring
8890
to the width of the parent element. This was an error; the value
8991
should always refer to the width of a block-level element and this
90-
specification reflects this.
92+
specification reflects this by introducing the term "containing block".
9193

9294
<LI>Initial value of 'display' is 'inline', not 'block' as in CSS1.
93-
<LI>[the 'clear' property now only applies to block-level elements]
95+
96+
<LI>The 'clear' property now only applies to block-level elements.
97+
98+
<!-- Is the 'clear' comment final? -IJ -->
9499

95100
<li>Please also consult the section on the <a
96101
href="grammar.html#tokenizer-diffs">differences between the CSS1

‎css2/colors.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.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: colors.src,v 2.5 1998-02-24 00:55:29 ijacobs Exp $ -->
3+
<!-- $Id: colors.src,v 2.6 1998-02-24 22:52:45 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Colors and backgrounds</TITLE>
@@ -46,7 +46,7 @@ href="visudet.html#border-properties">border properties</a>. Margins
4646
are always transparent so the background of the parent box always
4747
shines through.
4848

49-
<P>Background properties do not inherit, but the parent box's
49+
<P>Background properties are not inherited, but the parent box's
5050
background will shine through by default because of the initial
5151
'transparent' value on <span
5252
class="propinst-background-color">'background-color'</span>.
@@ -74,7 +74,7 @@ generated by the BODY element will be red:
7474
&lt;HTML&gt;
7575
&lt;HEAD&gt;
7676
&lt;STYLE type="text/css"&gt;
77-
{ background: url(http://style.com/marble.png) }
77+
BODY { background: url(http://style.com/marble.png) }
7878
&lt;/STYLE&gt;
7979
&lt;TITLE&gt;Setting the canvas background&lt;/TITLE&gt;
8080
&lt;/HEAD&gt;

‎css2/css.dico‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,7 @@ bidi
474474
bidirectionality
475475
bitfield
476476
bitmapped
477+
bitstream
477478
bline
478479
blockquote
479480
bmp
@@ -776,6 +777,7 @@ opentype
776777
org
777778
overexposing
778779
overline
780+
overlining
779781
panose
780782
para
781783
paul
@@ -929,7 +931,6 @@ wd
929931
wg
930932
webmasters
931933
website
932-
whilst
933934
wil
934935
windowframe
935936
windowtext

0 commit comments

Comments
 (0)