Skip to content

Commit da420eb

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

7 files changed

Lines changed: 42 additions & 100 deletions

File tree

css2/about.html

Lines changed: 4 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ <H1><a name="q0">1 About the CSS&nbsp;2.1 Specification</a></H1>
4949
<li class="tocline3"><a href="about.html#q16" class="tocxref">1.4.5 Images and long descriptions</a>
5050
</ul>
5151
<li class="tocline2"><a href="about.html#q17" class="tocxref">1.5 Acknowledgments</a>
52-
<li class="tocline2"><a href="about.html#copyright" class="tocxref">1.6 Copyright Notice</a>
5352
</ul>
5453
</div>
5554

@@ -394,7 +393,7 @@ <H3>1.4.3 <a name="shorthand">Shorthand properties</a></H3>
394393
take their initial values.</p>
395394
</div>
396395

397-
<h3><a name="q15">1.4.4 Notes and examples</a></h3>
396+
<h3 id="notes-and-example"><a name="q15">1.4.4 Notes and examples</a></h3>
398397

399398
<P>All examples that illustrate illegal usage are clearly
400399
marked as "ILLEGAL EXAMPLE".
@@ -405,8 +404,9 @@ <h3><a name="q15">1.4.4 Notes and examples</a></h3>
405404

406405
<P>All notes are informative only.
407406

408-
<P>Examples and notes are marked within the source HTML for the
409-
specification and CSS1 user agents will render them specially.
407+
<P>Examples and notes are <a href="conform.html#defs">marked within
408+
the source HTML</a> for the specification and CSS user agents will
409+
render them specially.
410410

411411
<h3><a name="q16">1.4.5 Images and long descriptions</a></h3>
412412

@@ -441,91 +441,6 @@ <H2><a name="q17">1.5 Acknowledgments</a></H2>
441441
time to CSS&nbsp;2.1, and to Kimberly Blessing, for help with the
442442
editing.</p>
443443

444-
445-
<H2>1.6 <a name="copyright">Copyright Notice</a></H2>
446-
447-
<p class="copyright"><a
448-
href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">
449-
Copyright</a> &copy; 1997-2003 <a href="http://www.w3.org/"><abbr
450-
title="World Wide Web Consortium">W3C</abbr></a><sup>&reg;</sup> (<a
451-
href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of
452-
Technology">MIT</abbr></a>, <acronym title="European Research
453-
Consortium for Informatics and Mathematics"><a
454-
href="http://www.ercim.org/">ERCIM</a></acronym>, <a
455-
href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a
456-
href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
457-
<a
458-
href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a>,
459-
<a
460-
href="http://www.w3.org/Consortium/Legal/copyright-documents">document
461-
use</a> and <a
462-
href="http://www.w3.org/Consortium/Legal/copyright-software">software
463-
licensing</a> rules apply.</p>
464-
465-
<p>Documents on the <a href="http://www.w3.org/">W3C</a> site are
466-
provided by the copyright holders under the following license. By
467-
obtaining, using and/or copying this document, or the W3C document
468-
from which this statement is linked, you agree that you have read,
469-
understood, and will comply with the following terms and
470-
conditions:</p>
471-
472-
<p>Public documents on the W3C site are provided by the copyright holders
473-
under the following license. The software or Document Type Definitions (DTDs)
474-
associated with W3C specifications are governed by the <a
475-
href="http://www.w3.org/Consortium/Legal/copyright-software.html"> Software
476-
Notice</a>. By using and/or copying this document, or the W3C document from
477-
which this statement is linked, you (the licensee) agree that you have read,
478-
understood, and will comply with the following terms and conditions:</p>
479-
480-
<p>Permission to use, copy, and distribute the contents of this document, or
481-
the W3C document from which this statement is linked, in any medium for any
482-
purpose and without fee or royalty is hereby granted, provided that you
483-
include the following on <i>ALL</i> copies of the document, or portions
484-
thereof, that you use:</p>
485-
<ol>
486-
<li>A link or URL to the original W3C document.</li>
487-
<li>The pre-existing copyright notice of the original author, or if it
488-
doesn't exist, a notice of the form: "Copyright &copy; [$date-of-document] <a
489-
href="http://www.w3.org/">World Wide Web Consortium</a>, (<a
490-
href="http://www.lcs.mit.edu/">Massachusetts Institute of Technology</a>,
491-
<a href="http://www.inria.fr/"> Institut National de Recherche en
492-
Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio
493-
University</a>). All Rights Reserved.
494-
http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but a
495-
textual representation is permitted.)</li>
496-
<li><em>If it exists</em>, the STATUS of the W3C document.</li>
497-
</ol>
498-
499-
<p>When space permits, inclusion of the full text of this <b> NOTICE</b>
500-
should be provided. We request that authorship attribution be provided in any
501-
software, documents, or other items or products that you create pursuant to
502-
the implementation of the contents of this document, or any portion
503-
thereof.</p>
504-
505-
<p>No right to create modifications or derivatives of W3C documents is
506-
granted pursuant to this license. However, if additional requirements
507-
(documented in the <a
508-
href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright
509-
FAQ</a>) are satisfied,
510-
the right to create modifications or derivatives is sometimes granted by the
511-
W3C to individuals complying with those requirements.</p>
512-
513-
<p>THIS DOCUMENT IS PROVIDED &quot;AS IS,&quot; AND COPYRIGHT HOLDERS MAKE NO
514-
REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED
515-
TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
516-
NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE
517-
FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT
518-
INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
519-
520-
<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
521-
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
522-
PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.</p>
523-
524-
<p>The name and trademarks of copyright holders may NOT be used in
525-
advertising or publicity pertaining to this document or its contents without
526-
specific, written prior permission. Title to copyright in this document will
527-
at all times remain with copyright holders.</p>
528-
529444
<hr class="navbar">
530445

531446
<div class="navbar">

css2/box.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -433,12 +433,13 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
433433
top border, no top padding, and the child has no <a
434434
href="visuren.html#clearance">clearance.</a></p>
435435

436-
<p>The bottom margin of an in-flow block-level element with a <a href="visudet.html#propdef-height" class="noxref"><span
437-
class="propinst-height">'height'</span></a> of 'auto' and <a href="visudet.html#propdef-min-height" class="noxref"><span
438-
class="propinst-min-height">'min-height'</span></a> less than the
439-
element's used height is adjoining to its last in-flow block-level
440-
child's bottom margin if the element has no bottom padding or
441-
border.</p>
436+
The bottom margin of an in-flow block-level element with
437+
a <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> of 'auto'
438+
and <a href="visudet.html#propdef-min-height" class="noxref"><span class="propinst-min-height">'min-height'</span></a> less than
439+
the element's used height
440+
and <a href="visudet.html#propdef-max-height" class="noxref"><span class="propinst-max-height">'max-height'</span></a> greater than
441+
the element's used height is adjoining to its last in-flow block-level
442+
child's bottom margin if the element has no bottom padding or border.
442443

443444
<p>An element's own margins are adjoining if the <a href="visudet.html#propdef-min-height" class="noxref"><span
444445
class="propinst-min-height">'min-height'</span></a> property is zero, and

css2/conform.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <H1><a name="q0">3 Conformance: Requirements and Recommendations</a></H1>
3535
</ul>
3636
</div>
3737

38-
<H2><a name="q1">3.1 Definitions</a></H2>
38+
<H2 id=defs><a name="q1">3.1 Definitions</a></H2>
3939

4040
<P>The key words <a name="x0"><span class="index-def" title="MUST">"MUST"</span></a>,
4141
<a name="x1"><span class="index-def" title="MUST NOT">"MUST NOT"</span></a>, <a name="x2"><span
@@ -66,7 +66,8 @@ <H2><a name="q1">3.1 Definitions</a></H2>
6666
UAs do not need to support it; the system colors are normative, so UAs
6767
must support them.)
6868

69-
<p>Examples and notes are not normative.
69+
<p><a href="about.html#notes-and-examples">Examples and notes</a>
70+
are not normative.
7071

7172
<div class=example><P style="display:none">Example(s):</P><p>Examples usually have the word "example" near
7273
their start ("Example:", "The following example&hellip;," "For

css2/cover.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ <h2><a name="toc">Full Table of Contents</a></h2>
317317
<li class="tocline3"><a href="about.html#q16" class="tocxref">1.4.5 Images and long descriptions</a>
318318
</ul>
319319
<li class="tocline2"><a href="about.html#q17" class="tocxref">1.5 Acknowledgments</a>
320-
<li class="tocline2"><a href="about.html#copyright" class="tocxref">1.6 Copyright Notice</a>
321320
</ul>
322321
<li class="tocline1"><a href="intro.html" class="tocxref">2 Introduction to CSS&nbsp;2.1</a>
323322
<ul class="toc">

css2/refs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ <H2><a name="q1">B.1 Normative references</a></H2>
9090
<dt><strong><a name="ref-PNG" class="normref">[PNG]</a></strong>
9191
<dd>"Portable Network Graphics (PNG) Specification (Second Edition)",
9292
David Duce, ed., 10 November 2003.<BR>
93-
Available at <a href="http://www.w3.org/pub/WWW/TR/PNG">
94-
http://www.w3.org/pub/WWW/TR/PNG</a>.
93+
Available at <a href="http://www.w3.org/TR/PNG">
94+
http://www.w3.org/TR/PNG</a>.
9595

9696
<dt><strong><a name="ref-RFC3986" class="normref">[RFC3986]</a></strong>
9797
<dd>"Uniform Resource Identifier (URI): Generic Syntax," T.

css2/selector.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,6 +1050,17 @@ <h3>5.11.4 <a name="lang">The language pseudo-class:</a> <a name="x41"><span
10501050
French &#8220;&agrave; l'improviste&#8221; in the middle of an English
10511051
text uses the English quotation marks. </div>
10521052

1053+
<div class=note>
1054+
<p><strong>Note</strong> the difference between [lang|=xx] and
1055+
:lang(xx). In this HTML example, only the BODY matches [lang|=fr]
1056+
(because it has a LANG attribute) but both the BODY and the P match
1057+
:lang(fr) (because both are in French).
1058+
1059+
<pre>&lt;body lang=fr>
1060+
&lt;p>Je suis fran&ccedil;ais.&lt;/p>
1061+
&lt;/body></pre>
1062+
</div>
1063+
10531064
<h2><a name="q20">5.12 Pseudo-elements</a></h2>
10541065

10551066
<h3>5.12.1 The <span class="index-def"

css2/visuren.html

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,6 +1422,21 @@ <h3>9.5.1 <a name="float-position">Positioning the float:</a> the
14221422
<p>References to other elements in these rules refer only to other elements in the same <a href="#block-formatting">block formatting context</a> as the float.
14231423
</p>
14241424

1425+
<div class=example><P style="display:none">Example(s):</P>
1426+
<p>This HTML fragment results in the b floating to the right.
1427+
1428+
<pre>&lt;P>a&lt;SPAN style="float: right">b&lt;/SPAN>&lt;/P></pre>
1429+
1430+
<p>If the P element's width is enough, the a and the b will be side by
1431+
side. It might look like this:
1432+
1433+
<div class=figure>
1434+
<p><img src="images/float-right.png"
1435+
alt="An a at the left side of a box and a b at the right side">
1436+
</div>
1437+
</div>
1438+
1439+
14251440
<h3>9.5.2 <a name="flow-control">Controlling flow next to floats:</a>
14261441
the <a href="visuren.html#propdef-clear" class="noxref"><span class="propinst-clear">'clear'</span></a> property</h3>
14271442

0 commit comments

Comments
 (0)