Skip to content

Commit ff720b8

Browse files
bert-githubbert-github
committed
[css2] Tantek's edits.
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402108
1 parent 0fcab9a commit ff720b8

8 files changed

Lines changed: 438 additions & 188 deletions

File tree

‎css2/colors.src‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: colors.src,v 2.31 2003-04-14 15:26:19 bbos Exp $ -->
3+
<!-- $Id: colors.src,v 2.32 2003-07-04 17:08:01 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Colors and backgrounds</title>
7+
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
78
<!-- Changed by: Tantek Celik, 2002-12-16 -->
89
<style type="text/css">
910
.current,.proposed { background:#feb }
@@ -225,9 +226,9 @@ body {
225226
<p>
226227
See the section on <a
227228
href="conform.html#conformance">conformance</a> for details.
228-
</p>
229-
<!-- #include src=properties/background-position.srb -->
230229

230+
<!-- #include src=properties/background-position.srb -->
231+
</p>
231232
<p> If a background image has been specified, this property specifies
232233
its initial position. Values have the following meanings:</p>
233234

‎css2/fonts.src‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
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.74 2003-02-05 11:12:22 bbos Exp $ -->
4+
<!-- $Id: fonts.src,v 2.75 2003-07-04 17:08:01 bbos Exp $ -->
55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<title>Fonts</title>
8-
<!-- Changed by: Tantek Celik, 2003-01-27 -->
8+
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
9+
<!-- Changed by: Tantek Celik, 2003-06-24 -->
910
<style type="text/css">
1011
#AutoNumber2 td { text-align:center }
1112
</style>
1213
<style type="text/css">
13-
.current,.proposed { background:#feb }
14-
ins.proposed { background:#bfb }
15-
del.proposed { background:#fbb }
14+
.current,.proposed,span.delcurrent { background:#feb }
15+
ins.proposed,span.insproposed { background:#bfb }
16+
del.proposed,span.delproposed { background:#fbb }
17+
span.insproposed { text-decoration:underline }
18+
span.delproposed,span.delcurrent { text-decoration:line-through }
1619
body>del,body>ins {display:block}
1720
</style>
1821
</head>
@@ -90,12 +93,13 @@ will be satisfied if there is either a face in the UA's font database
9093
labeled with the CSS keyword 'italic' (preferred) or 'oblique'.
9194
Otherwise the values must be matched exactly or font-style will fail.
9295
</li>
93-
<li><span class="propinst-font-variant">'font-variant'</span> is tried next. 'normal'
94-
matches a font not labeled as 'small-caps'; 'small-caps' matches (1) a
96+
<li><span class="propinst-font-variant">'font-variant'</span> is tried next. <span class="delcurrent">'normal' matches a font not labeled as 'small-caps';</span> 'small-caps' matches (1) a
9597
font labeled as 'small-caps', (2) a font in which the small caps are
9698
synthesized, or (3) a font where all lowercase letters are replaced by
9799
upper case letters. A small-caps font may be synthesized by
98-
electronically scaling uppercase letters from a normal font.
100+
electronically scaling uppercase letters from a normal font.
101+
<span class="insproposed">'normal' matches a font's normal (non-small-caps) variant. A font cannot fail to have a normal variant. A font
102+
that is only available as small-caps shall be selectable as either a 'normal' face or a 'small-caps' face.</span>
99103
</li>
100104
<li><span class="propinst-font-weight">'font-weight'</span> is matched next, it will
101105
never fail. (See 'font-weight' below.)
@@ -164,6 +168,10 @@ as a last alternative. Generic font family names are keywords and must NOT be q
164168
</dd>
165169
</dl>
166170

171+
<del class="current">
172+
<p>Font names containing whitespace should be quoted:
173+
</p>
174+
</del>
167175
<ins class="proposed">
168176
<p>If an unquoted font family name contains
169177
parentheses, brackets, and/or braces, they must still be either balanced or
@@ -172,10 +180,7 @@ exclamation marks and commas within unquoted font family names must be escaped.
172180
Font names containing any such characters or whitespace should be quoted:
173181
</p>
174182
</ins>
175-
<del class="proposed">
176-
<p>Font names containing whitespace should be quoted:
177-
</p>
178-
</del>
183+
179184
<pre>
180185
body { font-family: "New Century Schoolbook", serif }
181186

@@ -185,7 +190,10 @@ body { font-family: "New Century Schoolbook", serif }
185190
<p>If quoting is omitted, any whitespace characters before and after
186191
the font name are ignored and any sequence of whitespace characters
187192
inside the font name is converted to a single space.
193+
194+
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.
188195
</p>
196+
189197
<h2><a name="font-styling">Font styling</a>: the
190198
<span class="propinst-font-style">'font-style'</span> property</h2>
191199

‎css2/images/underline-example.png‎

3.06 KB
Loading

0 commit comments

Comments
 (0)