8000 [css2] Edits by Håkon. · w3c/csswg-drafts@acee51e · GitHub
Skip to content

Commit acee51e

Browse files
bert-githubbert-github
committed
[css2] Edits by Håkon.
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401957
1 parent b4b28ab commit acee51e

4 files changed

Lines changed: 44 additions & 113 deletions

File tree

‎css2/cascade.src‎

Lines changed: 6 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: cascade.src,v 2.38 2002-09-13 23:40:54 bbos Exp $ -->
3+
<!-- $Id: cascade.src,v 2.39 2002-09-17 11:43:36 bbos 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>
@@ -172,7 +172,7 @@ body {
172172

173173
* {
174174
color: inherit !important;
175-
background: transparent;
175+
background: transparent !important;
176176
}
177177
</PRE>
178178

@@ -268,11 +268,10 @@ rules in user style sheets. Precedence is reversed, however, for
268268
"!important" rules. All user and author rules have more weight
269269
than rules in the UA's default style sheet.
270270

271-
<P>Imported style sheets also cascade and their weight depends on
272-
their import order. Rules specified in a given style sheet override
273-
rules of the same weight imported from other style sheets. Imported
274-
style sheets can themselves import and override other style sheets,
275-
recursively, and the same precedence rules apply.
271+
<P>Rules specified in a given style sheet override rules of the same
272+
weight imported from other style sheets. Imported style sheets can
273+
themselves import and override other style sheets, recursively, and
274+
the same precedence rules apply.
276275

277276
<H3><a name="cascading-order">Cascading order</a></H3>
278277

‎css2/generate.src‎

Lines changed: 29 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ body:after {
111111
</div>
112112

113113

114-
<!-- Proposed -IJ -->
115-
116114
<P>User agents must ignore the following properties with :before and
117115
:after pseudo-elements: <span
118116
class="propinst-position">'position'</span>, <span
@@ -154,6 +152,16 @@ to generate content in a document. Values have the following
154152
meanings:</p>
155153

156154
<dl>
155+
156+
<dt><span class="index-inst" title="normal"><span
157+
class="value-inst-normal"><strong>normal</strong></span></span>
158+
<dd>On the :before and :after pseudo-elements, this value is the same
159+
as 'none'.
160+
161+
<dt><span class="index-inst" title="none"><span
162+
class="value-inst-none"><strong>none</strong></span></span>
163+
<dd>No content is generated.</dd>
164+
157165
<dt><span class="index-inst" title="&lt;string&gt;"><span
158166
class="value-inst-string"><strong>&lt;string&gt;</strong></span></span>
159167
<dd>Text content
@@ -197,8 +205,7 @@ class="value-inst-no-open-quote"><strong>no-open-quote</strong></span></span>
197205
and <span class="index-inst" title="no-close-quote"><span
198206
class="value-inst-no-close-quote"><strong>no-close-quote</strong></span></span>
199207

200-
<dd>Inserts nothing (the empty string), but increments (decrements)
201-
the level of nesting for quotes.
208+
<dd>Same as 'none', but increments (decrements) the level of nesting for quotes.
202209

203210
<dt><span class="index-def" title="attr()"><strong>attr(X)</strong></span>
204211
<dd>This function returns as a string the value of attribute X
@@ -214,34 +221,13 @@ attribute values for other elements than the subject of the selector.
214221
controls whether the content is placed in a block, inline, or marker
215222
box.
216223

217-
<P>Authors should put <span class="propinst-content">'content'</span>
218-
declarations in <span class="index-inst" title="@media"><a
219-
href="media.html#at-media-rule">@media</a></span> rules when
220-
the content is media-sensitive. For instance, literal
221-
text may be used for any media group, but images only
222-
apply to the visual + bitmap media groups, and sound files only
223-
apply to the aural media group.
224-
225-
<div class="example">
226-
<p>The following rule causes a sound file to be played
227-
at the end of a quotation (see the section
228-
on <a href="aural.html">aural style sheets</a> for additional
229-
mechanisms):</p>
230-
231-
<pre>
232-
@media aural {
233-
BLOCKQUOTE:after { content: url("beautiful-music.wav") }
234-
}
235-
</pre>
236-
</div>
237-
238-
<div class="example">
239-
<p>The next rule inserts the text of the HTML "alt" attribute before the
240-
image. If the image is not displayed, the reader will still see the
241-
"alt" text.
224+
<div class="example"><p>The 77EC following rule causes the string "Chapter: " to be generated before each H1 element:</p>
242225

243226
<pre>
244-
img:before { content: attr(alt) }
227+
H1:before {
228+
content: "Chapter: ";
229+
display: inline;
230+
}
245231
</pre>
246232
</div>
247233

@@ -277,8 +263,6 @@ class="value-inst-run-in">'run-in'</span></span> elements</h2>
277263

278264
<p>The following cases can occur:</p>
279265

280-
<!-- I'd rather say 'display: inline' than type 'inline' -IJ -->
281-
282266
<ol>
283267
<li><strong>A 'run-in' element has a :before pseudo-element of type
284268
'inline':</strong> the pseudo-element is rendered inside the same
@@ -441,18 +425,18 @@ informative table lists some of the ISO 10646 quotation
441425
mark characters:</em></p>
442426

443427
<TABLE border>
444-
<TR><TH>Approximate rendering<TH>ISO 10646 code (hex)<TH>Description
445-
<TR><TD>"<!--"--><TD>0022<TD>QUOTATION MARK [the ASCII double quotation mark]
446-
<TR><TD>'<TD>0027<TD>APOSTROPHE [the ASCII single quotation mark]
447-
<TR><TD>&lt;<TD>2039<TD>SINGLE LEFT-POINTING ANGLE QUOTATION MARK
448-
<TR><TD>><TD>203A<TD>SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
449-
<TR><TD>�<TD>00AB<TD>LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
450-
<TR><TD>�<TD>00BB<TD>RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
451-
<TR><TD>`<TD>2018<TD>LEFT SINGLE QUOTATION MARK [single high-6]
452-
<TR><TD>'<TD>2019<TD>RIGHT SINGLE QUOTATION MARK [single high-9]
453-
<TR><TD>``<TD>201C<TD>LEFT DOUBLE QUOTATION MARK [double high-6]
454-
<TR><TD>''<TD>201D<TD>RIGHT DOUBLE QUOTATION MARK [double high-9]
455-
<TR><TD>,,<TD>201E<TD>DOUBLE LOW-9 QUOTATION MARK [double low-9]
428+
<TR><TH>Character</TH><TH>Approximate rendering<TH>ISO 10646 code (hex)<TH>Description
429+
<TR><TD>&#x0022;<TD>"<!--"--><TD>0022<TD>QUOTATION MARK [the ASCII double quotation mark]
430+
<TR><TD>&#x0027;<TD>'<TD>0027<TD>APOSTROPHE [the ASCII single quotation mark]
431+
<TR><TD>&#x2039;<TD>&lt;<TD>2039<TD>SINGLE LEFT-POINTING ANGLE QUOTATION MARK
432+
<TR><TD>&#x203A;<TD>><TD>203A<TD>SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
433+
<TR><TD>&#x00AB;<TD>�<TD>00AB<TD>LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
434+
<TR><TD>&#x00BB;<TD>�<TD>00BB<TD>RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
435+
<TR><TD>&#x2018;<TD>`<TD>2018<TD>LEFT SINGLE QUOTATION MARK [single high-6]
436+
<TR><TD>&#x2019;<TD>'<TD>2019<TD>RIGHT SINGLE QUOTATION MARK [single high-9]
437+
<TR><TD>&#x201C;<TD>``<TD>201C<TD>LEFT DOUBLE QUOTATION MARK [double high-6]
438+
<TR><TD>&#x201D;<TD>''<TD>201D<TD>RIGHT DOUBLE QUOTATION MARK [double high-9]
439+
<TR><TD>&#x201E;<TD>,,<TD>201E<TD>DOUBLE LOW-9 QUOTATION MARK [double low-9]
456440
</TABLE>
457441
</div>
458442

@@ -510,64 +494,14 @@ blockquote p:after { content: no-close-quote }
510494
blockquote p.last:after { content: close-quote }
511495
</pre>
512496

513-
<P>This relies on the last paragraph being marked with a class "last",
514-
since there are no selectors that can match the last child of an
515-
element.
497+
<P>This relies on the last paragraph being marked with a class "last".
516498
</div>
517499

518500
<p>For symmetry, there is also a <span class="index-def"
519501
title="no-open-quote"><a class="value-def"
520502
name="value-def-no-open-quote">'no-open-quote'</a></span> keyword,
521503
which inserts nothing, but increments the quotation depth by one.
522504

523-
<div class="note"><p>
524-
<em><strong>Note.</strong> If a quotation is in a different language than the
525-
surrounding text, it is customary to quote the text with the quote
526-
marks of the language of the surrounding text, not the language of the
527-
quotation itself.
528-
</em>
529-
</div>
530-
531-
<div class="example">
532-
<P>For example, French inside English:
533-
534-
<blockquote>
535-
The device of the order of the garter is &#8220;Honi soit qui mal y
536-
pense.&#8221;
537-
</blockquote>
538-
539-
English inside French:
540-
541-
<blockquote>
542-
Il disait: �&nbsp;Il faut mettre l'action en &#8249;&nbsp;fast
543-
forward&nbsp;&#8250;.�
544-
</blockquote>
545-
546-
<p>A style sheet like the following will set the 'quotes' property so
547-
that 'open-quote' and 'close-quote' will work correctly on all elements.
548-
These rules are for documents that contain only English, French, or
< 133E /code>
549-
both. One rule is needed for every additional language.
550-
Note the use of the child <span
551-
class="index-inst" title="combinator"><a
552-
name="selector.html#combinator">combinator</a></span> (">") to set
553-
quotes on elements based on the language of the surrounding
554-
text:</P>
555-
556-
<pre>
557-
[lang|=fr] > * { quotes: "� " " �" "\2039 " " \203A" }
558-
[lang|=en] > * { quotes: "\201C" "\201D" "\2018" "\2019" }
559-
</pre>
560-
561-
<p>The quotation marks for English are shown here in a form that most
562-
people will be able to type. If you can type them directly, they will
563-
look like this:
564-
565-
<pre>
566-
[LANG|=fr] > * { quotes: "�" "�" "&#8249;" "&#8250;" }
567-
[LANG|=en] > * { quotes: "&#8220;" "&#8221;" "&#8216;" "&#8217;" }
568-
</pre>
569-
</div>
570-
571505

572506
<h2>Automatic <span class="index-def" title="counters"><a
573507
name="counters">counters</a></span> and numbering</h2>

‎css2/intro.src‎

Lines changed: 2 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: intro.src,v 2.41 2002-08-20 09:38:41 bbos Exp $ -->
3+
<!-- $Id: intro.src,v 2.42 2002-09-17 11:43:37 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Introduction to CSS&nbsp;2.1</TITLE>
@@ -209,7 +209,7 @@ other elements to be block-level. Element names in XML are
209209
case-sensitive, so a selector written in lowercase (e.g. 'instrument')
210210
is different from uppercase (e.g. 'INSTRUMENT').
211211

212-
<P>One proposal for linking a style sheet to an XML document is to use
212+
<P>One way of linking a style sheet to an XML document is to use
213213
a processing instruction:
214214

215215
<PRE class="xml-example">

‎css2/media.src‎

Lines changed: 7 additions & 9 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: media.src,v 2.28 2002-08-02 17:44:45 bbos Exp $ -->
3+
<!-- $Id: media.src,v 2.29 2002-09-17 11:43:37 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Media types</TITLE>
@@ -132,7 +132,7 @@ section on <a href="./aural.html">aural style sheets</a> for details.
132132

133133
<dt><strong>handheld</strong>
134134
<dd>Intended for handheld devices (typically small
135-
screen, monochrome, limited bandwidth).
135+
screen, limited bandwidth).
136136

137137
<dt><strong>print</strong>
138138
<dd>Intended for paged material and for documents viewed on
@@ -149,9 +149,9 @@ information about formatting issues that are specific to paged media.
149149
<dd>Intended primarily for color computer screens.
150150

151151
<dt><strong>tty</strong>
152-
<dd>Intended for media using a fixed-pitch character grid, such as
152+
<dd>Intended for media using a fixed-pitch character grid (such as
153153
teletypes, terminals, or portable devices with limited display
154-
capabilities. Authors should not use <a
154+
capabilities). Authors should not use <a
155155
href="syndata.html#pixel-units">pixel units</a> with the "tty" media
156156
type.
157157

@@ -204,7 +204,7 @@ listed in its definition.
204204
name="continuous-media-group"><strong>continuous</strong></a></span>
205205
or <span class="index-def" title="'paged' media group"><a
206206
name="paged-media-group"><strong>paged</strong></a></span>.
207-
"Both" means that the property in question applies to both media groups.
207+
208208
<li><span
209209
class="index-def" title="'visual' media group"><a
210210
name="visual-media-group"> <strong>visual</strong></a>,</span> <span
@@ -219,8 +219,7 @@ character grid devices), or
219219
<span
220220
class="index-def" title="'bitmap' media group"><a
221221
name="bitmap-media-group"><strong>bitmap</strong></a></span>.
222-
"Both" means that the property in question applies to both media
223-
groups.
222+
224223
<li><span
225224
class="index-def" title="'interactive media group"><a
226225
name="interactive-media-group"><strong>interactive</strong></a></span> (for
@@ -229,8 +228,7 @@ devices that allow user interaction), or
229228
class="index-def" title="'static' media group"><a
230229
name="static-media-group"><strong>static</strong></a></span> (for
231230
those that don't).
232-
"Both" means that the property in question applies to both media
233-
groups.
231+
234232
<li><span class="index-def" title="'all'
235233
media group"> <a name="all-media-group"><strong>all</strong></a></span>
236234
(includes all media types)

0 commit comments

Comments
 (0)