Skip to content

Commit 473936b

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402264
1 parent 6667ad4 commit 473936b

5 files changed

Lines changed: 32 additions & 35 deletions

File tree

css2/cascade.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<link rel="CSS-properties" href="propidx.html" title="properties">
1313
<link rel="index" href="indexlist.html" title="index">
1414
<link rel="first" href="cover.html">
15-
1615
</HEAD>
1716
<BODY>
1817
<div class="navbar">
@@ -187,6 +186,9 @@ <h3>6.2.1 The <span class="index-def" title="inherit, definition
187186
can be used to strengthen inherited values, and it can also be used on
188187
properties that are not normally inherited.
189188

189+
<p>If the 'inherit' value is set on the root element, the property is
190+
assigned its initial value.
191+
190192
<div class="example"><P style="display:none">Example(s):</P><P>In the example below, the <a href="colors.html#propdef-color" class="noxref"><span
191193
class="propinst-color">'color'</span></a> and <a href="colors.html#propdef-background" class="noxref"><span
192194
class="propinst-background">'background'</span></a> properties are set on
@@ -334,11 +336,11 @@ <H3>6.4.1 <a name="cascading-order">Cascading order</a></H3>
334336

335337
</OL>
336338

337-
<P> Apart from the "!important" setting on individual declarations,
339+
<P>Apart from the "!important" setting on individual declarations,
338340
this strategy gives author's style sheets higher weight than those of
339-
the reader. It is therefore important that the user agent give the
340-
user the ability to turn off the influence of a certain style sheet,
341-
e.g., through a pull-down menu.
341+
the reader. User agents must give the user the ability to turn off the
342+
influence of specific author style sheets, e.g., through a pull-down
343+
menu.
342344

343345
<H3>6.4.2 <a name="important-rules">!important rules</a></H3>
344346

css2/conform.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ <H1><a name="q0">3 Conformance: Requirements and Recommendations</a></H1>
3737

3838
<H2><a name="q1">3.1 Definitions</a></H2>
3939

40-
<p>In this section, we begin the formal specification of CSS&nbsp;2.1,
41-
starting with the contract between authors, users, and implementors.
42-
4340
<P>The key words <a name="x0"><span class="index-def" title="MUST">"MUST"</span></a>,
4441
<a name="x1"><span class="index-def" title="MUST NOT">"MUST NOT"</span></a>, <a name="x2"><span
4542
class="index-def" title="REQUIRED">"REQUIRED"</span></a>, <a name="x3"><span
@@ -336,6 +333,10 @@ <h2>3.2 <a name="conformance">Conformance</a></h2>
336333
with the "alternate" keyword in HTML 4.0 <a href="refs.html#ref-HTML40" rel="biblioentry" class="noxref"><span class="informref">[HTML40]</span></a>), the UA must
337334
allow the user to select which style sheet set the UA should apply.
338335

336+
<li>User agents must give the user the ability to turn off the
337+
influence of specific author style sheets. Conformance to UAAG 1.0
338+
checkpoint 4.14 satisfies this condition [[-UUAG]].
339+
339340
</ol>
340341

341342
<P>Not every user agent must observe every point, however:</p>

css2/generate.html

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ <h2>12.2 <a name="content">The</a> <a href="generate.html#propdef-content" class
217217
<dt><span class="index-inst" title="&lt;uri&gt;"><a name="x11" href="syndata.html#value-def-uri" class="noxref"><span
218218
class="value-inst-uri"><strong>&lt;uri&gt;</strong></span></a></span>
219219
<dd>The value is a URI that designates an external resource.
220-
If a user agent cannot support the resource because of the
221-
<a href="media.html">media types</a> it supports, it must ignore the resource.
220+
If a user agent cannot display the resource it must ignore it.
222221

223222
<dt><span class="index-inst" title="&lt;counter&gt;"><a name="x12" href="syndata.html#value-def-counter" class="noxref"><span
224223
class="value-inst-counter"><strong>&lt;counter&gt;</strong></span></a></span>
@@ -500,7 +499,7 @@ <H3>12.3.2 <a name="quotes-insert">Inserting quotes</a> with the <a href="genera
500499
<h2>12.4 Automatic <span class="index-def" title="counters"><a
501500
name="counters">counters</a></span> and numbering</h2>
502501

503-
<p>Automatic numbering in CSS2 is controlled with two properties,
502+
<p>Automatic numbering in CSS2.1 is controlled with two properties,
504503
<a href="generate.html#propdef-counter-increment" class="noxref"><span class="propinst-counter-increment">'counter-increment'</span></a>
505504
and <a href="generate.html#propdef-counter-reset" class="noxref"><span class="propinst-counter-reset">'counter-reset'</span></a>. The
506505
counters defined by these properties are used with the counter() and
@@ -581,12 +580,8 @@ <h2>12.4 Automatic <span class="index-def" title="counters"><a
581580
<p>If the same counter is specified more than once in the value of the
582581
<a href="generate.html#propdef-counter-reset" class="noxref"><span class="propinst-counter-reset">'counter-reset'</span></a> and <a href="generate.html#propdef-counter-increment" class="noxref"><span
583582
class="propinst-counter-increment">'counter-increment'</span></a>
584-
properties, all counters are processed in the order specified.
585-
586-
<p>If the same counter is specified more than once in the value of the
587-
<a href="generate.html#propdef-counter-reset" class="noxref"><span class="propinst-counter-reset">'counter-reset'</span></a> and <a href="generate.html#propdef-counter-increment" class="noxref"><span
588-
class="propinst-counter-increment">'counter-increment'</span></a>
589-
properties, the counter will be processed accordingly.
583+
properties, each reset/increment of the counter is processed in the order
584+
specified.
590585

591586
<div class="example"><P style="display:none">Example(s):</P>
592587
<p>The following example will reset the 'section' counter to 0:
@@ -845,9 +840,6 @@ <h3>12.5.1 <a name="lists">Lists:</a> the <a href="generate.html#propdef-list-st
845840
<dd>Traditional Armenian numbering.
846841
</dl>
847842

848-
<P>A user agent that does not recognize a numbering system should use
849-
'decimal'.
850-
851843

852844
<P>Alphabetic systems are specified with:</P>
853845

css2/page.html

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ <h2><a name="q1">13.1 Introduction to paged media</a></h2>
5858
on computer screens, etc.) differ from <a
5959
href="./media.html#continuous-media-group">continuous media</a> in
6060
that the content of the document is split into one or more discrete
61-
pages. To handle pages, CSS 2.1 describes how page margins are set
61+
pages. To handle pages, CSS&nbsp;2.1 describes how page margins are set
6262
on <a href="#page-box">page boxes</a>, and how <a href="#page-breaks">page breaks</a> are declared.
6363

6464
<p>The user agent is responsible for transferring the page boxes of a
@@ -92,7 +92,7 @@ <h2>13.2 <a name="page-box">Page boxes</a>: the @page rule</h2>
9292
<li>The <span class="index-def" title="page area"><a
9393
name="page-area"><dfn>page area</dfn></a></span>. The page
9494
area includes the boxes laid out on that page.
95-
The edges of the page area act as the initial <a
95+
The edges of the first page area act as the initial <a
9696
href="visudet.html#containing-block-details">containing block</a>
9797
for layout that occurs between page breaks.
9898

@@ -115,7 +115,7 @@ <h2>13.2 <a name="page-box">Page boxes</a>: the @page rule</h2>
115115

116116
<h3>13.2.1 <a name="page-margins">Page margins</a></h3>
117117

118-
<P>In CSS 2.1, only the <a href="box.html#margin-properties">margin
118+
<P>In CSS&nbsp;2.1, only the <a href="box.html#margin-properties">margin
119119
properties</a> (<a href="box.html#propdef-margin-top" class="noxref"><span class="propinst-margin-top">'margin-top'</span></a>,
120120
<a href="box.html#propdef-margin-right" class="noxref"><span class="propinst-margin-right">'margin-right'</span></a>, <a href="box.html#propdef-margin-bottom" class="noxref"><span
121121
class="propinst-margin-bottom">'margin-bottom'</span></a>, <a href="box.html#propdef-margin-left" class="noxref"><span
@@ -144,9 +144,9 @@ <h3>13.2.1 <a name="page-margins">Page margins</a></h3>
144144
fonts, so 'em' and 'ex' units are not allowed. Percentage values on
145145
the margin properties are relative to the dimensions of the <a
146146
href="#page-box">page box</a>; for left and right margins, they refer
147-
to page box width while for top and bottom margins, they refer to page
148-
box height. All other units associated with the respective CSS&nbsp;2.1
149-
properties are allowed.
147+
to the width of the page box while for top and bottom margins, they
148+
refer to the height of the page box. All other units associated with
149+
the respective CSS&nbsp;2.1 properties are allowed.
150150

151151
<P>Due to negative margin values (either on the page box or on
152152
elements) or <a href="visuren.html#absolute-positioning">absolute
@@ -370,8 +370,10 @@ <h3>13.3.1 <a name="page-break-props">Page break properties</a>: <a href="page.h
370370
than 'auto', the values 'always', 'left', and 'right' take precedence
371371
over 'avoid'.
372372

373-
<P>These properties only apply to block level elements that
374-
are in the normal flow of the root element.
373+
<P>User Agents must apply these properties to block-level elements
374+
in the normal flow of the root element. User agents may also apply
375+
these properties to other elements, e.g., 'table-row' elements.
376+
375377

376378
<h3>13.3.2 <a name="break-inside">Breaks inside elements</a>: <a href="page.html#propdef-orphans" class="noxref"><span
377379
class="propinst-orphans">'orphans'</span></a>, <a href="page.html#propdef-widows" class="noxref"><span
@@ -487,9 +489,9 @@ <h3>13.3.4 <a name="forced">Forced page breaks</a></h3>
487489

488490
<h3><a name="q13">13.3.5 "Best" page breaks</a></h3>
489491

490-
<p>CSS2 does <em>not</em> define which of a set of allowed page breaks
491-
must be used; CSS2 does not forbid a user agent from breaking at every
492-
possible break point, or not to break at all. But CSS2 does recommend
492+
<p>CSS&nbsp;2.1 does <em>not</em> define which of a set of allowed page breaks
493+
must be used; CSS&nbsp;2.1 does not forbid a user agent from breaking at every
494+
possible break point, or not to break at all. But CSS&nbsp;2.1 does recommend
493495
that user agents observe the following heuristics (while recognizing
494496
that they are sometimes contradictory):</p>
495497

@@ -542,7 +544,7 @@ <h3><a name="q13">13.3.5 "Best" page breaks</a></h3>
542544
<h2><a name="q14">13.4 Cascading in the page context</a></H2>
543545

544546
<P>Declarations in the <a href="#page-context">page context</a> obey
545-
the <a href="cascade.html">cascade</a> just like normal CSS2
547+
the <a href="cascade.html">cascade</a> just like normal CSS
546548
declarations.
547549

548550
<div class="example"><P style="display:none">Example(s):</P><P>

css2/sample.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ <H1><a name="q0">Appendix D. Default style sheet for HTML 4.0</a></H1>
6363
tfoot { display: table-footer-group }
6464
col { display: table-column }
6565
colgroup { display: table-column-group }
66-
td, th { display: table-cell; }
66+
td, th { display: table-cell }
6767
caption { display: table-caption }
6868
th { font-weight: bolder; text-align: center }
6969
caption { text-align: center }
70-
body { margin: 8px; line-height: 1.12 }
70+
body { margin: 8px }
7171
h1 { font-size: 2em; margin: .67em 0 }
7272
h2 { font-size: 1.5em; margin: .75em 0 }
7373
h3 { font-size: 1.17em; margin: .83em 0 }
@@ -88,7 +88,7 @@ <H1><a name="q0">Appendix D. Default style sheet for HTML 4.0</a></H1>
8888
kbd, samp { font-family: monospace }
8989
pre { white-space: pre }
9090
button, textarea,
91-
input, object,
91+
input, img,
9292
select { display:inline-block; }
9393
big { font-size: 1.17em }
9494
small, sub, sup { font-size: .83em }

0 commit comments

Comments
 (0)