[css2] Issues 61, 72, 89, 113, 116, 123, 124

bert-github · bert-github · commit 816f7fd0fb11 · 2009-08-06T19:22:15.000Z
from http://wiki.csswg.org/spec/css2.1 --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402952
diff --git a/css2/grammar.src b/css2/grammar.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: grammar.src,v 2.59 2009-05-15 17:31:38 bbos Exp $ -->
+<!-- $Id: grammar.src,v 2.60 2009-08-06 19:22:14 bbos Exp $ -->
 <HEAD>
 <TITLE>Grammar of CSS&nbsp;2.1</TITLE>
 </HEAD>
@@ -41,46 +41,46 @@ used:</P>
 <pre>
 stylesheet
   : [ CHARSET_SYM STRING ';' ]?
-    [S|CDO|CDC]* [ import [ [CDO|CDC] [S|CDO|CDC] ]* ]*
-    [ [ ruleset | media | page ] [ [CDO|CDC] [S|CDO|CDC] ]* ]*
+    [S|CDO|CDC]* [ import [ CDO S* | CDC S* ]* ]*
+    [ [ ruleset | media | page ] [ CDO S* | CDC S* ]* ]*
   ;
 import
   : IMPORT_SYM S*
-    [STRING|URI] S* [ medium [ COMMA S* medium]* ]? ';' S*
+    [STRING|URI] S* [ medium [ ',' S* medium]* ]? ';' S*
   ;
 media
-  : MEDIA_SYM S* medium [ COMMA S* medium ]* LBRACE S* ruleset* '}' S*
+  : MEDIA_SYM S* medium [ ',' S* medium ]* '{' S* ruleset* '}' S*
   ;
 medium
   : IDENT S*
   ;
 page
   : PAGE_SYM S* pseudo_page?
-    LBRACE S* declaration? [ ';' S* declaration? ]* '}' S*
+    '{' S* declaration? [ ';' S* declaration? ]* '}' S*
   ;
 pseudo_page
   : ':' IDENT S*
   ;
 operator
-  : '/' S* | COMMA S*
+  : '/' S* | ',' S*
   ;
 combinator
-  : PLUS S*
-  | GREATER S*
+  : S* '+' S*
+  | S* '>' S*
   | S+
   ;
 unary_operator
-  : '-' | PLUS
+  : '-' | '+'
   ;
 property
   : IDENT S*
   ;
 ruleset
-  : selector [ COMMA S* selector ]*
-    LBRACE S* declaration? [ ';' S* declaration? ]* '}' S*
+  : selector [ ',' S* selector ]*
+    '{' S* declaration? [ ';' S* declaration? ]* '}' S*
   ;
 <span class="index-inst" title="selector">selector</span>
-  : simple_selector [ combinator simple_selector ]*
+  : simple_selector [ combinator simple_selector ]* S*
   ;
 simple_selector
   : element_name [ HASH | class | attrib | pseudo ]*
@@ -196,11 +196,6 @@ Z		z|\\0{0,4}(5a|7a)(\r\n|[ \t\r\n\f])?|\\z
 "~="			{return INCLUDES;}
 "|="			{return DASHMATCH;}
 
-{w}"{"			{return LBRACE;}
-{w}"+"			{return PLUS;}
-{w}">"			{return GREATER;}
-{w}","			{return COMMA;}
-
 {string}		{return STRING;}
 {invalid}		{return INVALID; /* unclosed string */}
 
diff --git a/css2/page.src b/css2/page.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: page.src,v 2.61 2009-05-15 17:31:38 bbos Exp $ -->
+<!-- $Id: page.src,v 2.62 2009-08-06 19:22:14 bbos Exp $ -->
 <HEAD>
 <TITLE>Paged media</TITLE>
 </HEAD> 
@@ -321,6 +321,10 @@ be set to '0' or retained.
 
 <li>Between <a href="visuren.html#line-box">line boxes</a>
 inside a <a href="visuren.html#block-box">block</a> box.
+
+<li>Between the content edge of a block box and the outer edges of its
+child content (margin edges of block-level children or line box edges
+for inline-level children) if there is a (non-zero) gap between them.
 </ol>
 
 <p class=note>Note: It is expected that CSS3 will specify that the
diff --git a/css2/syndata.src b/css2/syndata.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: syndata.src,v 2.169 2009-05-15 17:31:39 bbos Exp $ -->
+<!-- $Id: syndata.src,v 2.170 2009-08-06 19:22:14 bbos Exp $ -->
 <head>
 <title>Syntax and basic data types</title>
 <meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
@@ -690,10 +690,11 @@ pair. -->
 
 <li><strong>Invalid at-keywords.</strong> User agents must <span
 class="index-inst" title="ignore"><a href="#ignore">ignore</a></span>
-an invalid at-keyword together with everything following it, up to and
-including the next semicolon (;), the next block ({...}), or the end
-of the block (}) that contains the invalid at-keyword, whichever
-comes first. For example, consider the following:
+an invalid at-keyword together with everything following it, up to the
+end of the block that contains the invalid at-keyword, or up to and
+including the next semicolon (;), or up to and including the next
+block ({...}), whichever comes first. For example, consider the
+following:
 
 <pre class="illegal-example"><code>
 @three-dee {
diff --git a/css2/tables.src b/css2/tables.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: tables.src,v 2.113 2009-05-20 14:15:41 bbos Exp $ -->
+<!-- $Id: tables.src,v 2.114 2009-08-06 19:22:14 bbos Exp $ -->
 <head>
 <title>Tables</title>
 </head>
@@ -942,8 +942,9 @@ class="propinst-height">'height'</span> value of 'auto' for a
 'table-row' means the row height used for layout is MIN. MIN depends
 on cell box heights and cell box alignment (much like the calculation
 of a <a href="visudet.html#line-height">line box</a> height).
-Percentage heights on table cells, table rows, and table row groups
-compute to 'auto'.
+CSS&nbsp;2.1 does not define how the height of table cells, table rows
+and table row groups is calculated when their height is specified
+using percentage values.
 
 <p>In CSS&nbsp;2.1, the height of a cell box is the maximum of the
 table cell's <span class="propinst-height">'height'</span> property
diff --git a/css2/visudet.src b/css2/visudet.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: visudet.src,v 2.136 2009-05-15 17:31:39 bbos Exp $ -->
+<!-- $Id: visudet.src,v 2.137 2009-08-06 19:22:15 bbos Exp $ -->
 <head>
 <title>Visual formatting model details</title>
 <style type="text/css">
@@ -1307,8 +1307,9 @@ influence these calculations just like elements with content.
 <h3><a name="leading">Leading and half-leading</a></h3>
 
 <p>Since the value of <span
-class="propinst-line-height">'line-height'</span> may be different
-from the height of the content area there may be space above and below
+class="propinst-line-height">'line-height'</span> for an inline box
+may be different
+from the height of its content area there may be space above and below
 rendered glyphs. The difference between the content height and the used
 value of <span class="propinst-line-height">'line-height'</span> is
 called the <span class="index-def"
diff --git a/css2/visuren.src b/css2/visuren.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: visuren.src,v 2.154 2009-05-19 17:25:35 bbos Exp $ -->
+<!-- $Id: visuren.src,v 2.155 2009-08-06 19:22:15 bbos Exp $ -->
 <head>
 <title>Visual formatting model</title>
 <meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
@@ -248,7 +248,7 @@ boxes</dfn></a>.
 </code></pre>
 </div>
 
-<p>The <code>&lt;p&gt;</code> generates a block box, with several inline boxes inside
+<p>the <code>&lt;p&gt;</code> generates a block box, with several inline boxes inside
 it. The box for "emphasized" is an inline box generated by an inline
 element (<code>&lt;em&gt;</code>), but the other boxes ("Some" and "text") are inline boxes generated by a block-level element (<code>&lt;p&gt;</code>). The latter are called <span
 class="index-def" title="anonymous inline boxes">anonymous inline
@@ -714,7 +714,7 @@ However, it may be taller than the tallest box it contains
 (if, for example, boxes are aligned so that baselines line up). 
 When the height of a box B is less than the height of the line box containing it, 
 the vertical alignment of B within the line box is determined by 
-the 'vertical-align' property.
+the <span class="propinst-vertical-align">'vertical-align'</span> property.
 When several inline boxes cannot fit horizontally within a single
 line box, they are distributed among two or more vertically-stacked
 line boxes. Thus, a paragraph is a vertical stack of line boxes. Line
