Skip to content

Commit d4f40cc

Browse files
committed
[css2] Tantek's edits
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402131
1 parent 516f400 commit d4f40cc

6 files changed

Lines changed: 447 additions & 455 deletions

File tree

css2/fonts.src

Lines changed: 4 additions & 4 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.76 2003-08-04 13:29:19 bbos Exp $ -->
4+
<!-- $Id: fonts.src,v 2.77 2003-08-24 20:03:42 bbos Exp $ -->
55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<title>Fonts</title>
@@ -93,13 +93,13 @@ will be satisfied if there is either a face in the UA's font database
9393
labeled with the CSS keyword 'italic' (preferred) or 'oblique'.
9494
Otherwise the values must be matched exactly or font-style will fail.
9595
</li>
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
96+
<li><span class="propinst-font-variant">'font-variant'</span> is tried next. 'small-caps' matches (1) a
9797
font labeled as 'small-caps', (2) a font in which the small caps are
9898
synthesized, or (3) a font where all lowercase letters are replaced by
9999
upper case letters. A small-caps font may be synthesized by
100100
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>
101+
'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.
103103
</li>
104104
<li><span class="propinst-font-weight">'font-weight'</span> is matched next, it will
105105
never fail. (See 'font-weight' below.)

css2/syndata.src

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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.86 2003-08-20 16:43:57 bbos Exp $ -->
4+
<!-- $Id: syndata.src,v 2.87 2003-08-24 20:03:43 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>
88
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
9-
<!-- Changed by: Tantek Celik, 2003-07-15 -->
9+
<!-- Changed by: Tantek Celik, 2003-08-24 -->
1010
<style type="text/css">
1111
span.colorsquare { float:left; width:5em; height:3em; text-align:center; padding:1.2em 0 .8em }
1212
span.colorname { font-weight:bold }
@@ -90,7 +90,7 @@ the above rules, and neither a single nor a double quote</var>
9090
<tr><th>Macro </th><th>Definition</th></tr>
9191
</thead>
9292
<tr><td colspan=2><hr></td></tr>
93-
<tr><td>ident </td><td><code><span class="insproposed">[-]?</span><var>{nmstart}</var><var>{nmchar}*</var></code></td></tr>
93+
<tr><td>ident </td><td><code>[-]?<var>{nmstart}</var><var>{nmchar}*</var></code></td></tr>
9494
<tr><td>name </td><td><code><var>{nmchar}+</var></code></td></tr>
9595
<tr><td>nmstart </td><td><code>[_a-zA-Z]|<var>{nonascii}</var>|<var>{escape}</var></code></td></tr>
9696
<tr><td>nonascii</td><td><code>[^\0-\177]</code></td></tr>
@@ -121,7 +121,7 @@ property : IDENT;
121121
value : [ any | block | ATKEYWORD S* ]+;
122122
any : [ IDENT | NUMBER | PERCENTAGE | DIMENSION | STRING
123123
| DELIM | URI | HASH | UNICODE-RANGE | INCLUDES
124-
| DASHMATCH | FUNCTION S* any* ')'
124+
| DASHMATCH | FUNCTION S* any* ')'
125125
| '(' S* any* ')' | '[' S* any* ']' ] S*;
126126
</pre>
127127

@@ -164,7 +164,6 @@ background: "red";
164164
</pre>
165165
</div>
166166

167-
<ins class="proposed">
168167
<h4 id="vendor-keywords">Vendor-specific extensions</h4>
169168

170169
<p>In CSS2.1, identifiers may begin with '<code
@@ -201,16 +200,14 @@ href="#parsing-errors">rules for handling parsing errors</a>. However, because t
201200
<tbody>
202201
<tr><td><code>mso-</code></td><td>Microsoft Corporation</td><td>Created before the working group established a naming convention for extensions.</td></tr>
203202
<tr><td><code>-moz-</code></td><td>The Mozilla Organization</td></tr>
204-
<tr><td><code>-opera-</code></td><td>Opera Software</td></tr>
203+
<tr><td><code>-o-</code></td><td>Opera Software</td></tr>
205204
<tr><td><code>-atsc-</code></td><td>Advanced Television Standards Committee</td></tr>
206205
<tr><td><code>-wap-</code></td><td>The WAP Forum</td></tr>
207206
</tbody>
208207
</table>
209208

210209
<p>Vendor/organization specific extensions should be avoided.</p>
211210

212-
</ins>
213-
214211

215212
<h3>Characters and case</h3>
216213
<p> The following rules always hold:</p>

css2/text.src

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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: text.src,v 2.39 2003-07-04 17:08:02 bbos Exp $ -->
4+
<!-- $Id: text.src,v 2.40 2003-08-24 20:03:43 bbos Exp $ -->
55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<title>Text</title>
88
<meta http-equiv="Content-Style-Type" content="text/css">
99
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
10-
<!-- Changed by: Tantek Celik, 2003-06-25 -->
10+
<!-- Changed by: Tantek Celik, 2003-07-28 -->
1111
<style type="text/css">
1212
.current,.proposed,span.delcurrent { background:#feb }
1313
ins.proposed,span.insproposed { background:#bfb }
@@ -61,15 +61,10 @@ block width.</dd>
6161
<p>The value of <span
6262
class="propinst-text-indent">'text-indent'</span> may be negative, but
6363
there may be implementation-specific limits.
64-
<span class="delcurrent">If the value of <span
65-
class="propinst-text-indent">'text-indent'</span> is negative, the
66-
value of <span class="propinst-overflow">'overflow'</span> will affect
67-
whether the text is visible.</span>
68-
<span class="insproposed">
6964
If the value of <span
7065
class="propinst-text-indent">'text-indent'</span> is either negative or exceeds the width of the block, that <em>first box</em>, described above, may overflow the block. The
7166
value of <span class="propinst-overflow">'overflow'</span> will affect
72-
whether such text that overflows the block is visible.</span>
67+
whether such text that overflows the block is visible.
7368
</p>
7469

7570

@@ -150,18 +145,6 @@ property</h3>
150145

151146
<!-- #include src=properties/text-decoration.srb -->
152147

153-
<del class="current">
154-
<p>This property describes decorations that are added to the text of
155-
an element. If the property is specified for a <a
156-
href="visuren.html#block-level">block-level</a> element, it affects
157-
all inline-level descendants of the element. If it is specified for (or
158-
affects) an <a href="visuren.html#inline-level">inline-level</a> element, it
159-
affects all boxes generated by the element. If the element has no
160-
content or no text content (e.g., the IMG element in HTML), user
161-
agents must <a href="syndata.html#ignore">ignore</a> this property.
162-
</p>
163-
</del>
164-
<ins class="proposed">
165148
<p>
166149
This property describes decorations that are added
167150
to the text of an element. When specified on an inline element, it
@@ -189,7 +172,7 @@ decoration lines, user agents may consider the font sizes of and
189172
dominant baselines of descendants, but must use the same baseline
190173
and thickness on each line.
191174
</p>
192-
</ins>
175+
193176
<p>Values have the following meanings:</p>
194177

195178
<dl>
@@ -208,18 +191,6 @@ may simply not blink the text. Note that not blinking the text
208191
is one technique to satisfy
209192
<a href="http://www.w3.org/TR/UAAG/guidelines.html#tech-on-off-blinking-text">checkpoint 3.3 of WAI-UAAG</a>.</dd>
210193
</dl>
211-
<del class="current">
212-
<p>The color(s) required for the text decoration must be derived
213-
from the <span class="propinst-color">'color'</span> property value.
214-
</p>
215-
<p> This property is not inherited, but descendant boxes of a
216-
block box should be formatted with the same decoration (e.g.,
217-
they should all be underlined). The color of decorations should remain
218-
the same even if descendant elements have different <span
219-
class="propinst-color">'color'</span> values.
220-
</p>
221-
</del>
222-
<ins class="proposed">
223194
<p>
224195
The color(s) required for the text decoration must be derived from
225196
the <span class="propinst-color">'color'</span> property value of the element on which 'text-decoration'
@@ -235,7 +206,6 @@ CSS1-only, and CSS2-only user agents may implement the older model
235206
and still claim conformance to this part of CSS2.1. (This does not
236207
apply to UAs developed after this specification was released.)
237208
</p>
238-
</ins>
239209

240210
<div class="example"><p>
241211
In the following example for HTML, the text content of all
@@ -246,7 +216,6 @@ a:visited,a:link { text-decoration: underline }
246216
</code></pre>
247217
</div>
248218

249-
<ins class="proposed">
250219
<div class="example"><p>
251220
In the following stylesheet and document fragment:
252221
</p>
@@ -278,7 +247,7 @@ inline element. The final line of text is fuchsia, but the underline
278247
underneath it is still the blue underline from the anonymous inline
279248
element.
280249
</p>
281-
<p><img src="images/underline-example.png" alt="Sample rendering of the above underline example">
250+
<p><img src="underline-example.png" alt="Sample rendering of the above underline example">
282251
</p>
283252
<p>
284253
This diagram shows the boxes involved in the example above. The rounded
@@ -287,7 +256,6 @@ contents of the paragraph element, the rounded blue line represents
287256
the span element, and the orange lines represent the blocks.
288257
</p>
289258
</div>
290-
</ins>
291259

292260
<h2><a name="spacing-props">Letter and word spacing</a>: the <span
293261
class="propinst-letter-spacing">'letter-spacing'</span> and <span
@@ -505,7 +473,7 @@ As each line is laid out,
505473
</li>
506474
<li>All tabs (U+0009) are rendered as a horizontal shift that lines
507475
up the start edge of the next glyph with the next tab stop. Tab
508-
stops occur at points that are multiples of 8 times the width of
476+
stops occur at points that are mutiples of 8 times the width of
509477
a space (U+0020) rendered in the block's font from the block's
510478
starting content edge.
511479
</li>

css2/ui.src

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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: ui.src,v 2.30 2003-07-04 17:08:02 bbos Exp $ -->
4+
<!-- $Id: ui.src,v 2.31 2003-08-24 20:03:43 bbos Exp $ -->
55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<title>User interface</title>
88
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
9-
<!-- Changed by: Tantek Celik, 2003-06-24 -->
9+
<!-- Changed by: Tantek Celik, 2003-07-28 -->
1010
<style type="text/css">
1111
.current,.proposed,span.delcurrent { background:#feb }
1212
ins.proposed,span.insproposed { background:#bfb }
@@ -96,43 +96,22 @@ and simply render the 'pointer' cursor.
9696

9797

9898

99-
<del class="current">
100-
<h2><a name="system-colors">User preferences for colors</a></h2>
101-
</del>
102-
<ins class="proposed">
10399
<h2><a name="system-colors">CSS2 System Colors</a></h2>
104-
</ins>
105100

106101
<div class="note"><p><em><strong>Note.</strong>
107102
The CSS2 System Colors are
108103
<a href="http://www.w3.org/TR/2003/CR-css3-color-20030514/#css2-system">deprecated in the CSS3 Color Module</a>.
109104
</em></p>
110105
</div>
111106

112-
<del class="current">
113-
<p>In addition to being able to assign pre-defined <a
114-
href="syndata.html#color-units">color values</a> to text, backgrounds,
115-
etc., CSS&nbsp;2.1 allows authors to specify colors in a manner that
116-
integrates them into the user's graphic environment. Style rules that
117-
take into account user preferences thus offer the following
118-
advantages:
119-
</p>
120-
<ol>
121-
<li>They produce pages that fit the user's defined look and feel.</li>
122-
<li>They produce pages that may be more accessible as the current user
123-
settings may be related to a disability.</li>
124-
</ol>
125-
</del>
126-
<ins class="proposed">
127107
<p>In addition to being able to assign pre-defined <a
128108
href="syndata.html#color-units">color values</a> to text, backgrounds, etc., CSS2 introduced a set of named color values that allows authors to specify colors in a manner that integrates them into the operating system's graphic environment.
129109
</p>
130-
</ins>
131110

132111
<p>For systems that do not have a corresponding value, the
133-
specified value should be mapped to the nearest system <span class="delcurrent">attribute</span><span class="insproposed">value</span>, or to a default color.</p>
112+
specified value should be mapped to the nearest system value, or to a default color.</p>
134113

135-
<p>The following lists additional values for color-related CSS <span class="delcurrent">attributes</span><span class="insproposed">properties</span> and their general meaning. Any color property (e.g., <span
114+
<p>The following lists additional values for color-related CSS properties and their general meaning. Any color property (e.g., <span
136115
class="propinst-color">'color'</span> or <span
137116
class="propinst-background-color">'background-color'</span>) can take
138117
one of the following names. Although these are case-insensitive, it is

0 commit comments

Comments
 (0)