Skip to content

Commit e8752c1

Browse files
bert-githubbert-github
committed
[css2] Tantek's edits
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402290
1 parent 26594a3 commit e8752c1

5 files changed

Lines changed: 53 additions & 51 deletions

File tree

‎css2/fonts.src‎

Lines changed: 27 additions & 34 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: fonts.src,v 2.79 2005-03-02 03:18:35 bbos Exp $ -->
4+
<!-- $Id: fonts.src,v 2.80 2005-04-12 13:21:52 bbos Exp $ -->
55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<title>Fonts</title>
88
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
9-
<!-- Changed by: Tantek Celik, 2005-02-28 -->
9+
<!-- Changed by: Tantek Celik, 2005-04-04 -->
1010
<style type="text/css">
1111
#AutoNumber2 td { text-align:center }
1212
</style>
@@ -425,9 +425,8 @@ have the following meanings:</p>
425425
sizes computed and kept by the UA. Possible values are:
426426
<p> [ xx-small | x-small | small | medium | large | x-large | xx-large ]</p>
427427
<p>The following table provides user agent guidelines for the absolute-size
428-
scaling factor and their mapping to HTML heading and absolute font-sizes. The
429-
'medium' value is used as the reference middle value. The user agent may fine
430-
tune these values for different fonts or different types of display devices.</p>
428+
mapping to HTML heading and absolute font-sizes. The 'medium' value is
429+
the user's preferred font size and is used as the reference middle value.</p>
431430

432431
<table border="1" style="border-collapse: collapse" width="73%" id="AutoNumber2">
433432
<tr>
@@ -442,40 +441,34 @@ tune these values for different fonts or different types of display devices.</p>
442441
<td style="width:8%">&nbsp;</td>
443442
</tr>
444443
<tr>
445-
<th style="width:16%">scaling factor</th>
446-
<td style="width:12%">3/5</td>
447-
<td style="width:9%">3/4</td>
448-
<td style="width:10%">8/9</td>
449-
<td style="width:11%">1</td>
450-
<td style="width:11%">6/5</td>
451-
<td style="width:12%">3/2</td>
452-
<td style="width:11%">2/1</td>
453-
<td style="width:8%">3/1</td>
444+
<th>HTML headings</th>
445+
<td>h6</td>
446+
<td>&nbsp;</td>
447+
<td>h5</td>
448+
<td>h4</td>
449+
<td>h3</td>
450+
<td>h2</td>
451+
<td>h1</td>
452+
<td>&nbsp;</td>
454453
</tr>
455454
<tr>
456-
<th style="width:16%">HTML headings</th>
457-
<td style="width:12%">h6</td>
458-
<td style="width:9%">&nbsp;</td>
459-
<td style="width:10%">h5</td>
460-
<td style="width:11%">h4</td>
461-
<td style="width:11%">h3</td>
462-
<td style="width:12%">h2</td>
463-
<td style="width:11%">h1</td>
464-
<td style="width:8%">&nbsp;</td>
465-
</tr>
466-
<tr>
467-
<th style="width:16%">HTML font sizes</th>
468-
<td style="width:12%">1</td>
469-
<td style="width:9%">&nbsp;</td>
470-
<td style="width:10%">2</td>
471-
<td style="width:11%">3</td>
472-
<td style="width:11%">4</td>
473-
<td style="width:12%">5</td>
474-
<td style="width:11%">6</td>
475-
<td style="width:8%">7</td>
455+
<th>HTML font sizes</th>
456+
<td>1</td>
457+
<td>&nbsp;</td>
458+
<td>2</td>
459+
<td>3</td>
460+
<td>4</td>
461+
<td>5</td>
462+
<td>6</td>
463+
<td>7</td>
476464
</tr>
477465
</table>
478466

467+
<p class="note">Note: implementation experience has demonstrated that a fixed ratio between adjacent absolute-size keywords is problematic, and this specification does NOT recommend such a fixed ratio, in contrast to previous specifications (<a href="http://www.w3.org/TR/REC-CSS1#font-size">CSS1 suggested 1.5</a>, and <a href="http://www.w3.org/TR/REC-CSS2/fonts.html#font-size-props">CSS2 suggested 1.2</a>).</p>
468+
469+
<p>Implementors should build a table of scaling factors for absolute-size keywords relative to the 'medium' font size and the particular device and its characteristics (e.g. the resolution of the device).
470+
</p>
471+
479472
<p>
480473
Different media may need different scaling factors. Also, the UA
481474
should take the quality and availability of fonts into account when

‎css2/syndata.src‎

Lines changed: 4 additions & 4 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.110 2005-04-12 13:11:25 bbos Exp $ -->
4+
<!-- $Id: syndata.src,v 2.111 2005-04-12 13:21:53 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, 2005-02-28 -->
9+
<!-- Changed by: Tantek Celik, 2005-04-04 -->
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 }
@@ -371,7 +371,7 @@ curly brace (}). In between there may be any characters, except that
371371
parentheses ((&nbsp;)), brackets ([&nbsp;]) and braces ({&nbsp;}) must
372372
always occur in
373373
matching pairs and may be nested. Single (') and double quotes (")
374-
must also occur in matching pairs, and characters between them
374+
<!-- " --> must also occur in matching pairs, and characters between them
375375
are parsed as a <span class="index-inst" title="string">string</span>.
376376
See <a href="#tokenization">Tokenization</a> above for the definition
377377
of a string.
@@ -494,7 +494,7 @@ h1 {
494494
href="#value-def-identifier">identifier</a>. Any character may occur
495495
in the value. Parentheses ("(&nbsp;)"), brackets ("[&nbsp;]"),
496496
braces ("{&nbsp;}"), single
497-
quotes (') and double quotes (") must come in matching
497+
quotes (') and double quotes (") <!-- " --> must come in matching
498498
pairs, and semicolons not in strings must be <a
499499
href="#escaped-characters">escaped</a>. Parentheses, brackets, and
500500
braces may be nested. Inside the quotes, characters are parsed as a

‎css2/text.src‎

Lines changed: 17 additions & 5 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.45 2005-03-02 03:18:35 bbos Exp $ -->
4+
<!-- $Id: text.src,v 2.46 2005-04-12 13:21:53 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, 2005-02-28 -->
10+
<!-- Changed by: Tantek Celik, 2005-04-04 -->
1111
<style type="text/css">
1212
.current,.proposed,span.delcurrent { background:#feb }
1313
ins.proposed,span.insproposed { background:#bfb }
@@ -93,7 +93,7 @@ have the following meanings:</p>
9393

9494
<dl>
9595
<dt>left, right, center, justify</dt>
96-
<dd>Left, right, center, and justify text, respectively.</dd>
96+
<dd>Left, right, center, and justify text, respectively, as described in <a href="visuren.html#inline-formatting">the section on inline formatting</a>.</dd>
9797
</dl>
9898

9999
<p>A block of text is a stack of <a href="visuren.html#line-box">line
@@ -428,7 +428,7 @@ inline) should be treated as an anonymous inline element.
428428
</p>
429429
<p>
430430
For each inline (including anonymous inlines), the following steps are
431-
performed, ignoring bidi formatting characters as if they were not
431+
performed, treating bidi formatting characters as if they were not
432432
there:
433433
</p>
434434
<ol>
@@ -439,7 +439,7 @@ character surrounding a linefeed (U+000A) character is removed if
439439
</li>
440440
<li>If 'white-space' is set to 'pre' or 'pre-wrap', any sequence of
441441
spaces (U+0020) unbroken by an element boundary is treated as a
442-
sequence of non-breaking spaces. However, a line breaking
442+
sequence of non-breaking spaces. However, for 'pre-wrap', a line breaking
443443
opportunity exists at the end of the sequence.
444444
</li>
445445
<li>If 'white-space' is set to 'normal' or 'nowrap', linefeed
@@ -519,6 +519,18 @@ to avoid spaces immediately inside start and end tags, as these tend
519519
to do weird things when dealing with white space collapsing.
520520
</p>
521521

522+
<h3 id="ctrlchars">Control and combining characters' details</h3>
523+
524+
<p>Control characters other than U+0009 (tab), U+000A (line feed),
525+
U+0020 (space), and U+202x (bidi formatting characters) are treated as
526+
characters to render in the same way as any normal character.</p>
527+
528+
<p>Combining characters should be treated as part of the character
529+
with which they are supposed to combine. For example, :first-letter
530+
styles the entire glyph if you have content like
531+
"<code>o&lt;span&gt;&amp;#x308;&lt;/span&gt;</code>"; it doesn't just
532+
match the base character.</p>
533+
522534
</body>
523535
</html>
524536
<!-- Keep this comment at the end of the file

‎css2/ui.src‎

Lines changed: 3 additions & 3 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.31 2003-08-24 20:03:43 bbos Exp $ -->
4+
<!-- $Id: ui.src,v 2.32 2005-04-12 13:21:53 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-07-28 -->
9+
<!-- Changed by: Tantek Celik, 2005-04-04 -->
1010
<style type="text/css">
1111
.current,.proposed,span.delcurrent { background:#feb }
1212
ins.proposed,span.insproposed { background:#bfb }
@@ -273,7 +273,7 @@ partially obscured behind other elements.
273273
</p>
274274
<div class="note"><p>
275275
<em><strong>Note.</strong>
276-
Since the focus outline does not affect formatting (i.e., no
276+
Since the outline does not affect formatting (i.e., no
277277
space is left for it in the box model), it may well overlap
278278
other elements on the page.
279279
</em></p>

‎css2/visuren.src‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: visuren.src,v 2.116 2005-03-03 22:46:08 bbos Exp $ -->
3+
<!-- $Id: visuren.src,v 2.117 2005-04-12 13:21:53 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model</title>
77
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
8-
<!-- Changed by: Tantek Celik, 2005-02-28 -->
8+
<!-- Changed by: Tantek Celik, 2005-04-04 -->
99
<style type="text/css">
1010
.current,.proposed,span.delcurrent { background:#feb }
1111
ins.proposed,span.insproposed,li.insproposed { background:#bfb }
@@ -18,9 +18,6 @@ body>del,body>ins {display:block}
1818
<body>
1919
<h1>Visual formatting model</h1>
2020

21-
22-
Change "If the 'direction' property is 'ltr'" to "If the 'direction' property of the containing block is 'ltr'" in 9.4.3.
23-
2421
<h2>Introduction to the visual formatting model</h2>
2522

2623
<p>This chapter and the next describe the <span class="index-def"

0 commit comments

Comments
 (0)