Skip to content

Commit 188c2cd

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

4 files changed

Lines changed: 245 additions & 84 deletions

File tree

‎css2/colors.src‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: colors.src,v 2.32 2003-07-04 17:08:01 bbos Exp $ -->
3+
<!-- $Id: colors.src,v 2.33 2003-07-21 14:39:28 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Colors and backgrounds</title>
77
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
8-
<!-- Changed by: Tantek Celik, 2002-12-16 -->
8+
<!-- Changed by: Tantek Celik, 2003-07-18 -->
99
<style type="text/css">
10-
.current,.proposed { background:#feb }
11-
ins.proposed { background:#bfb }
12-
del.proposed { background:#fbb }
10+
.current,.proposed,span.delcurrent { background:#feb }
11+
ins.proposed,span.insproposed { background:#bfb }
12+
del.proposed,span.delproposed { background:#fbb }
13+
span.insproposed { text-decoration:underline }
14+
span.delproposed,span.delcurrent { text-decoration:line-through }
1315
body>del,body>ins {display:block}
1416
</style>
1517
</head>
@@ -59,9 +61,18 @@ background will shine through by default because of the initial
5961
'transparent' value on <span
6062
class="propinst-background-color">'background-color'</span>.
6163
</p>
64+
<del class="current">
6265
<p>The background of the box generated by the root element covers the
6366
entire <a href="intro.html#canvas">canvas</a>.
6467
</p>
68+
</del>
69+
<ins class="proposed">
70+
<p>
71+
The background of the canvas is the same as the background of the
72+
root element, anchored at the same point as it would be if the root
73+
element was a block level element.
74+
</p>
75+
</ins>
6576
<p>For HTML documents, however, we recommend that authors specify the
6677
background for the BODY element rather than the HTML element. User
6778
agents should observe the following precedence rules to fill in the
@@ -93,6 +104,13 @@ HTML document will have a "marble" background:
93104
</pre>
94105
</div>
95106

107+
<ins class="proposed">
108+
<p>
109+
Backgrounds of elements that form a stacking context (see the
110+
'z-index' property) are painted at the bottom of the element's
111+
stacking context, below any other elements in that stacking context.
112+
</p>
113+
</ins>
96114

97115
<h3><a name="background-properties">Background properties</a>: <span
98116
class="propinst-background-color">'background-color'</span>, <span
@@ -286,7 +304,7 @@ padding area.
286304
<p> If only one percentage or length value is given, it sets the
287305
horizontal position only, and the vertical position will be 50%. If two
288306
values are given, the horizontal position comes first. Combinations of
289-
length and percentage values are allowed, (e.g., '50% 2cm'). Negative
307+
<span class="insproposed">keyword,</span> length and percentage values are allowed, (e.g., '50% 2cm'<span class="insproposed"> or 'center 2cm' or 'center 10%'</span>). Negative
290308
positions are allowed.
291309
</p>
292310
<p>

‎css2/syndata.src‎

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
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.83 2003-07-04 17:08:01 bbos Exp $ -->
4+
<!-- $Id: syndata.src,v 2.84 2003-07-21 14:39:28 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-06-09 -->
9+
<!-- Changed by: Tantek Celik, 2003-07-15 -->
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 }
1313
div.colordiagram { width:25em; height:20em; margin:1em auto; font-family:Verdana,sans-serif; font-size:12px }
1414
div.diagramrow { height:5em }
1515
</style>
1616
<style type="text/css">
17-
.current,.proposed { background:#feb }
18-
ins.proposed { background:#bfb }
19-
del.proposed { background:#fbb }
17+
.current,.proposed,span.delcurrent { background:#feb }
18+
ins.proposed,span.insproposed { background:#bfb }
19+
del.proposed,span.delproposed { background:#fbb }
20+
span.insproposed { text-decoration:underline }
21+
span.delproposed,span.delcurrent { text-decoration:line-through }
2022
body>del,body>ins {display:block}
2123
</style>
2224
</head>
@@ -88,7 +90,7 @@ the above rules, and neither a single nor a double quote</var>
8890
<tr><th>Macro </th><th>Definition</th></tr>
8991
</thead>
9092
<tr><td colspan=2><hr></td></tr>
91-
<tr><td>ident </td><td><code><var>{nmstart}{nmchar}*</var></code></td></tr>
93+
<tr><td>ident </td><td><code><span class="insproposed">[-]?</span><var>{nmstart}</var><var>{nmchar}*</var></code></td></tr>
9294
<tr><td>name </td><td><code><var>{nmchar}+</var></code></td></tr>
9395
<tr><td>nmstart </td><td><code>[_a-zA-Z]|<var>{nonascii}</var>|<var>{escape}</var></code></td></tr>
9496
<tr><td>nonascii</td><td><code>[^\0-\177]</code></td></tr>
@@ -111,7 +113,7 @@ more restrictive grammar that is closer to the CSS level 2 language.
111113
stylesheet : [ CDO | CDC | S | statement ]*;
112114
statement : ruleset | at-rule;
113115
at-rule : ATKEYWORD S* any* [ block | ';' S* ];
114-
block : '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*;
116+
block : '{' S* [ any | block | ATKEYWORD S* | ';' <span class="insproposed">S*</span> ]* '}' S*;
115117
ruleset : selector? '{' S* declaration? [ ';' S* declaration? ]* '}' S*;
116118
selector : any+;
117119
declaration : DELIM? property S* ':' S* value;
@@ -161,6 +163,53 @@ background: "red";
161163
</pre>
162164
</div>
163165

166+
<ins class="proposed">
167+
<h4 id="vendor-keywords">Vendor-specific extensions</h4>
168+
169+
<p>In CSS2.1, identifiers may begin with '<code
170+
class="css">-</code>' (dash) or '<code
171+
class="css">_</code>' (underscore). Keywords and property names, beginning with <code class="css">-</code>' or '<code
172+
class="css">_</code>' are reserved for vendor-specific extensions. Such vendor-specific extensions should have one of the following formats:
173+
</p>
174+
<pre>
175+
'-' + vendor identifier + '-' + meaningful name
176+
'_' + vendor identifier + '-' + meaningful name
177+
</pre>
178+
<div class="example">
179+
<p>For example, if XYZ organization added a property to describe the color of the
180+
border on the East side of the display, they might call it <span
181+
class="css">-xyz-border-east-color</span>.
182+
</p>
183+
<p>Other known examples:</p>
184+
<pre>
185+
-moz-box-sizing
186+
-moz-border-radius
187+
-wap-accesskey
188+
</pre>
189+
</div>
190+
<p>An initial dash or underscore is guaranteed never to be used in a property or keyword by any current or future level of CSS. Thus typical CSS implementations may not
191+
recognize such properties and may ignore them according to the <a
192+
href="#parsing-errors">rules for handling parsing errors</a>. However, because the initial dash or underscore is part of the grammar, CSS2.1 implementers should always be able to use a CSS-conforming parser, whether or not they support any vendor-specific extensions.
193+
</p>
194+
<h4 id="vendor-keyword-history">Informative Historical Notes</h4>
195+
<p>This section is informative.</p>
196+
<p>At the time of writing, the following prefixes are known to exist:</p>
197+
198+
<table border='1'>
199+
<thead><tr><th>prefix</th><th>organization</th><th>notes</th></tr></thead>
200+
<tbody>
201+
<tr><td><code>mso-</code></td><td>Microsoft Corporation</td><td>Created before the working group established a naming convention for extensions.</td></tr>
202+
<tr><td><code>-moz-</code></td><td>The Mozilla Organization</td></tr>
203+
<tr><td><code>-opera-</code></td><td>Opera Software</td></tr>
204+
<tr><td><code>-atsc-</code></td><td>Advanced Television Standards Committee</td></tr>
205+
<tr><td><code>-wap-</code></td><td>The WAP Forum</td></tr>
206+
</tbody>
207+
</table>
208+
209+
<p>Vendor/organization specific extensions should be avoided.</p>
210+
211+
</ins>
212+
164213

165214
<h3>Characters and case</h3>
166215
<p> The following rules always hold:</p>

‎css2/visufx.src‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
55
<title>Visual effects</title>
66
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
7-
<!-- Changed by: Tantek Celik, 2003-06-24 -->
7+
<!-- Changed by: Tantek Celik, 2003-07-15 -->
88
<style type="text/css">
99
.current,.proposed,span.delcurrent { background:#feb }
1010
ins.proposed,span.insproposed { background:#bfb }
@@ -46,7 +46,7 @@ absolutely</a>, partly outside the box. Such boxes are <em>not</em> clipped by
4646
<li>A descendent box has <a href="box.html#margin-properties">negative margins</a>, causing it
4747
to be positioned partly outside the box.
4848
</li>
49-
<li><span class="insproposed">The 'text-indent' property causes an inline box to hang off either the left or right edge of the block box.</span>
49+
<li>The 'text-indent' property causes an inline box to hang off either the left or right edge of the block box.
5050
</li>
5151
</ul>
5252

@@ -61,20 +61,12 @@ class="propinst-overflow">'overflow'</span> property</h3>
6161

6262
<!-- #include src=properties/overflow.srb -->
6363

64-
<del class="proposed">
65-
<p>This property specifies whether the content of a block-level
66-
element is clipped when it overflows the element's box (which is
67-
acting as a containing block for the content). Values have the
68-
following meanings:</p>
69-
</del>
70-
<ins class="proposed">
7164
<p>
7265
This property specifies whether content of a block-level element is
7366
clipped when it overflows the element's box. It affects the clipping
7467
of all of the element's content except any descendant elements (and
7568
their respective content and descendants) whose containing block is the viewport or an ancestor of the element. Values have the following meanings:
7669
</p>
77-
</ins>
7870

7971
<dl>
8072

@@ -186,7 +178,6 @@ could access the clipped content.
186178
</p>
187179
</div>
188180

189-
<ins class="proposed">
190181
<div>
191182
<p>
192183
Finally, consider this case where an absolutely positioned element
@@ -218,7 +209,6 @@ In this example, the "scroller" element will not scroll the
218209
the element whose overflow is being clipped and scrolled.
219210
</p>
220211
</div>
221-
</ins>
222212

223213
<h3><a name="clipping">Clipping</a>: the <span
224214
class="propinst-clip">'clip'</span> property</h3>
@@ -243,18 +233,12 @@ modified by the <span class="propinst-clip">'clip'</span> property.
243233

244234
<!-- #include src=properties/clip.srb -->
245235

246-
<p>The 'clip' property applies only to absolutely positioned elements
247-
<span class="insproposed">, though UAs and/or a future level of CSS may apply it to all elements</span>.
248-
<!--that have a <span
249-
class="propinst-overflow">'overflow'</span> property with a value
250-
other than 'visible'-->
236+
<p>The 'clip' property applies only to absolutely positioned elements.
251237
Values have the following meanings:</p>
252238

253239
<dl>
254240
<dt><strong>auto</strong></dt>
255-
<dd>The clipping region has the same size and location
256-
as the element's <span class="delcurrent">box(es)</span><span class="insproposed">border box</span>.
257-
</dd>
241+
<dd>The element does not clip.</dd>
258242

259243
<dt><span class="index-def" title="&lt;shape&gt;::definition of"><a
260244
name="value-def-shape"
@@ -298,8 +282,8 @@ computed value of the width plus the sum of the horizontal padding and
298282
border widths for <span class="value-inst-right">&lt;right&gt;</span>
299283
(in left-to-right text, <span
300284
class="value-inst-right">&lt;left&gt;</span> in right-to-left text),
301-
such that four 'auto' values result in the clipping region being <span class="delcurrent">fit with the border edge</span>
302-
<span class="insproposed">the same as the element's border box</span>).
285+
such that four 'auto' values result in the clipping region being
286+
the same as the element's border box).
303287
</p>
304288
<p>When coordinates are rounded to pixel coordinates, care should be
305289
taken that no pixels remain visible when &lt;left&gt; and
@@ -310,11 +294,9 @@ element's border box remain hidden when these values are 'auto'.
310294
</dd>
311295
</dl>
312296

313-
<ins class="proposed">
314297
<p>An element's clipping region clips out any aspect of the element (e.g. content, children, background, borders, text decoration, outline and visible scrolling mechanism &mdash; if any) that is outside the clipping region.
315298
</p>
316-
</ins>
317-
<p>The element's ancestors may also clip portions of their content (e.g. <span class="insproposed">via their own <span class="propinst-clip">'clip'</span> property and/or</span> if
299+
<p>The element's ancestors may also clip portions of their content (e.g. via their own <span class="propinst-clip">'clip'</span> property and/or if
318300
their <span class="propinst-overflow">'overflow'</span> property is
319301
not 'visible'); what is rendered is the cumulative intersection.
320302
</p>

0 commit comments

Comments
 (0)