Skip to content

Commit 8a7912b

Browse files
committed
[css2] Issues 24, 68, 85, 88, 94, 95, 100, 102, 103, 104, 105, and 108 from http://wiki.csswg.org/spec/css2.1
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402898
1 parent 84fdec0 commit 8a7912b

5 files changed

Lines changed: 31 additions & 10 deletions

File tree

css2/colors.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.01//EN">
22
<html lang="en">
3-
<!-- $Id: colors.src,v 2.52 2008-11-03 16:46:04 bbos Exp $ -->
3+
<!-- $Id: colors.src,v 2.53 2009-04-15 13:26:27 bbos Exp $ -->
44
<head>
55
<title>Colors and backgrounds</title>
66
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
@@ -73,7 +73,7 @@ For documents whose root element is an HTML "HTML" element or an XHTML
7373
"html" element that has computed values of 'transparent' for <span
7474
class="propinst-background-color">'background-color'</span> and 'none'
7575
for <span class="propinst-background-image">'background-image'</span>,
76-
user agents must instead use the computed value of those properties
76+
user agents must instead use the computed value of the background properties
7777
from that element's first HTML "BODY" element or XHTML "body" element
7878
child when painting backgrounds for the canvas, and must not paint a
7979
background for that child element. Such backgrounds must also be

css2/generate.src

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,12 @@ with the given name in scope at this pseudo-element, from outermost to
193193
innermost separated by the specified string. The counters are rendered
194194
in the indicated <a href="#counter-styles">style</a> ('decimal' by
195195
default). See the section on <a href="#counters">automatic counters
196-
and numbering</a> for more information. <dt><span class="index-inst"
196+
and numbering</a> for more information.
197+
198+
The name must not be 'none', 'inherit' or 'initial'. Such a name
199+
causes the declaration to be ignored.
200+
201+
<dt><span class="index-inst"
197202
title="open-quote"><span
198203
class="value-inst-open-quote"><strong>open-quote</strong></span></span>
199204
and <span class="index-inst" title="close-quote"><span
@@ -467,6 +472,12 @@ one optionally followed by an integer. The integer gives the value that
467472
the counter is set to on each occurrence of the element. The default
468473
is 0.
469474

475+
<p>The keywords 'none', 'inherit' and 'initial' must not be used as
476+
counter names. A value of 'none' on its own means no counters are
477+
reset, resp. incremented. 'Inherit' on its own has its usual meaning
478+
(see <a href="cascade.html#value-def-inherit">6.2.1</a>). 'Initial' is
479+
reserved for future use.
480+
470481
<div class="example">
471482
<p>This example shows a way to number chapters and sections with
472483
"Chapter 1", "1.1", "1.2", etc.
@@ -1026,6 +1037,14 @@ class="propinst-list-style">'list-style'</span> values from OL and
10261037
UL elements to LI elements. This is the recommended way to
10271038
specify list style information.
10281039

1040+
<P>A value of 'none' within the <span
1041+
class="propinst-list-style">'list-style'</span> property sets
1042+
whichever of <span
1043+
class="propinst-list-style-type">'list-style-type'</span> and <span
1044+
class="propinst-list-style-image">'list-style-image'</span> are not
1045+
otherwise specified to 'none'. However, if both are otherwise
1046+
specified, the declaration is in error (and thus ignored).
1047+
10291048
<div class="example"><P>
10301049
<P>A URI value may be combined with any other value, as in:
10311050

@@ -1035,7 +1054,7 @@ ul { list-style: url("http://png.com/ellipse.png") disc }
10351054
<P> In the example above, the 'disc' will be used when the image is
10361055
unavailable.
10371056

1038-
<P>A value of 'none' for the <span
1057+
<P>For example, a value of 'none' for the <span
10391058
class="propinst-list-style">'list-style'</span> property sets both
10401059
<span class="propinst-list-style-type">'list-style-type'</span> and
10411060
<span class="propinst-list-style-image">'list-style-image'</span> to

css2/page.src

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: page.src,v 2.59 2009-02-23 21:09:31 bbos Exp $ -->
3+
<!-- $Id: page.src,v 2.60 2009-04-15 13:26:27 bbos Exp $ -->
44
<HEAD>
55
<TITLE>Paged media</TITLE>
66
</HEAD>
@@ -296,6 +296,8 @@ at the bottom of a page. The <span class="propinst-widows">'widows'</span> prope
296296
number of lines in a block element that must be left at the top of a page.
297297
Examples of how they are used to control page breaks are given below.
298298

299+
<p>Only positive values are allowed.
300+
299301
<P>For information about paragraph formatting, please consult the
300302
section on <a href="visuren.html#line-box">line boxes</a>.
301303

css2/tables.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.01//EN">
22
<html lang="en">
3-
<!-- $Id: tables.src,v 2.108 2009-02-03 11:24:59 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.109 2009-04-15 13:26:27 bbos Exp $ -->
44
<head>
55
<title>Tables</title>
66
</head>
@@ -473,7 +473,7 @@ anonymous box instead of the table box. The table box uses the initial
473473
values for those properties.
474474

475475
<div class="figure">
476-
<p><img src="images/top-caption.png" alt="A table with a caption above
476+
<p><img src="images/table_container.png" alt="A table with a caption above
477477
it">
478478

479479
<p class="caption">Diagram of a table with a caption above it; the

css2/visudet.src

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: visudet.src,v 2.133 2009-02-23 15:44:46 bbos Exp $ -->
3+
<!-- $Id: visudet.src,v 2.134 2009-04-15 13:26:27 bbos Exp $ -->
44
<head>
55
<title>Visual formatting model details</title>
66
<style type="text/css">
@@ -269,8 +269,8 @@ situations need to be distinguished:</p>
269269
<li>'inline-block', replaced elements in normal flow</li>
270270
</ol>
271271

272-
<p>For Points 1-6 and 9-10, the values of 'left' and 'right' used for
273-
layout are determined by the rules in <a
272+
<p>For Points 1-6 and 9-10, the values of 'left' and 'right' in the
273+
case of relatively positioned elements are determined by the rules in <a
274274
href="visuren.html#relative-positioning">section 9.4.3.</a>
275275
</p>
276276
<h3><a name="inline-width">Inline, non-replaced elements</a></h3>

0 commit comments

Comments
 (0)