Skip to content

Commit 43eceb9

Browse files
bert-githubbert-github
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402894
1 parent f710061 commit 43eceb9

6 files changed

Lines changed: 44 additions & 38 deletions

File tree

‎css2/changes.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4132,10 +4132,11 @@ <h3 id="s.17.5.4"><a name="q356">C.5.69 </a><a
41324132
and that </del> <ins>The anonymous box establishes a block formatting
41334133
context.</ins> The table box (not the anonymous box) is used when
41344134
doing baseline vertical alignment for an 'inline-table'.
4135+
</blockquote>
41354136

41364137

41374138

4138-
<h3 id="s.17.5.4"><a name="q357">C.5.70 </a><a
4139+
<h3 id="s.17.5.4a"><a name="q357">C.5.70 </a><a
41394140
href="/TR/2007/CR-CSS21-20070719/tables.html#column-alignment">
41404141
Section&nbsp;17.5.4 Horizontal alignment in a column</a></h3>
41414142

‎css2/diffs-rec/changes.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4132,10 +4132,11 @@ <h3 id="s.17.5.4"><a name="q356"><ins>C.5.69</ins> </a><a
41324132
and <del>this</del> <del>specification</del> <del>reflects</del> <del>this</del> <del>by</del> <del>introducing</del><ins>that</ins> </del> <ins>The <del>term</del> <del>"containing</del> <del>block".</del><ins>anonymous</ins> <ins>box</ins> <ins>establishes</ins> <ins>a</ins> <ins>block</ins> <ins>formatting</ins>
41334133
<ins>context.</ins></ins> The <del>initial</del> <del>value</del> <del>of</del> <del>'display'</del><ins>table</ins> <ins>box</ins> <ins>(not</ins> <ins>the</ins> <ins>anonymous</ins> <ins>box)</ins> is <del>'inline'</del> <del>in</del> <del>CSS2,</del> <del>not</del> <del>'block'</del> <del>as</del> <del>in</del> <del>CSS1.</del><ins>used</ins> <ins>when</ins>
41344134
<ins>doing</ins> <ins>baseline</ins> <ins>vertical</ins> <ins>alignment</ins> <ins>for</ins> <ins>an</ins> <ins>'inline-table'.</ins>
4135+
</blockquote>
41354136

41364137

41374138

4138-
<h3 id="s.17.5.4"><a name="q357"><ins>C.5.70</ins> </a><a
4139+
<h3 id="s.17.5.4a"><a name="q357"><ins>C.5.70</ins> </a><a
41394140
href="/TR/2007/CR-CSS21-20070719/tables.html#column-alignment">
41404141
<ins>Section&nbsp;17.5.4</ins> <ins>Horizontal</ins> <ins>alignment</ins> in <del>CSS1,</del><ins>a</ins> <ins>column</ins></a></h3>
41414142

‎css2/diffs-rec/grammar.html‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ <h2> <del>D.1</del><ins>G.1</ins> <a name="grammar">Grammar</a></h2>
6666
<pre>
6767
stylesheet
6868
: [ CHARSET_SYM <del>S*</del>STRING <del>S*</del>';' ]?
69-
[S|CDO|CDC]* [ import [S|CDO|CDC]* ]*
70-
[ [ ruleset | media | page <del>|</del> <del>font_face</del>] [S|CDO|CDC]* ]*
69+
[S|CDO|CDC]* [ import <del>[S|CDO|CDC]*</del><ins>[</ins> <ins>[CDO|CDC]</ins> <ins>[S|CDO|CDC]</ins> <ins>]*</ins> ]*
70+
[ [ ruleset | media | page <del>|</del> <del>font_face</del>] <del>[S|CDO|CDC]*</del><ins>[</ins> <ins>[CDO|CDC]</ins> <ins>[S|CDO|CDC]</ins> <ins>]*</ins> ]*
7171
;
7272
import
7373
: IMPORT_SYM S*
@@ -80,15 +80,15 @@ <h2> <del>D.1</del><ins>G.1</ins> <a name="grammar">Grammar</a></h2>
8080
: IDENT S*
8181
;
8282
page
83-
: PAGE_SYM S* <del>IDENT?</del>pseudo_page? S*
84-
<del>'{'</del><ins>LBRACE</ins> S* declaration [ ';' S* declaration ]* '}' S*
83+
: PAGE_SYM S* <del>IDENT?</del>pseudo_page?
84+
<ins>LBRACE</ins> S* <del>'{'</del> <del>S*</del> <del>declaration</del><ins>declaration?</ins> [ ';' S* <del>declaration</del><ins>declaration?</ins> ]* '}' S*
8585
;
8686
pseudo_page
87-
: ':' IDENT
88-
;
89-
<del>font_face</del> <del>:</del> <del>FONT_FACE_SYM</del> <del>S*</del> <del>'{'</del> <del>S*</del> <del>declaration</del> <del>[</del> <del>';'</del> <del>S*</del> <del>declaration</del> <del>]*</del> <del>'}'</del> <del>S*</del> <del>;</del>operator
90-
: '/' S* | <del>','</del><ins>COMMA</ins> S* | /* empty */
87+
: ':' IDENT <del>;</del> <del>font_face</del> <del>:</del> <del>FONT_FACE_SYM</del> <del>S*</del> <del>'{'</del> <del>S*</del> <del>declaration</del> <del>[</del> <del>';'</del> <del>S*</del> <del>declaration</del> <del>]*</del> <del>'}'</del>S*
9188
;
89+
operator
90+
: '/' S* | <del>','</del><ins>COMMA</ins> S*
91+
<del>|</del> <del>/*</del> <del>empty</del> <del>*/</del>;
9292
combinator
9393
: <del>'+'</del><ins>PLUS</ins> S*
9494
| <del>'>'</del><ins>GREATER</ins> S*
@@ -102,7 +102,7 @@ <h2> <del>D.1</del><ins>G.1</ins> <a name="grammar">Grammar</a></h2>
102102
;
103103
ruleset
104104
: selector [ <del>','</del><ins>COMMA</ins> S* selector ]*
105-
<del>'{'</del><ins>LBRACE</ins> S* declaration [ ';' S* declaration ]* '}' S*
105+
<del>'{'</del><ins>LBRACE</ins> S* <del>declaration</del><ins>declaration?</ins> [ ';' S* <del>declaration</del><ins>declaration?</ins> ]* '}' S*
106106
;
107107
<a name="x1"><span class="index-inst" title="selector">selector</span></a>
108108
: simple_selector [ combinator simple_selector ]*
@@ -122,17 +122,16 @@ <h2> <del>D.1</del><ins>G.1</ins> <a name="grammar">Grammar</a></h2>
122122
[ IDENT | STRING ] S* ]? ']'
123123
;
124124
pseudo
125-
: ':' [ IDENT | FUNCTION S* <del>IDENT</del><ins>IDENT?</ins> S* ')' ]
125+
: ':' [ IDENT | FUNCTION S* <del>IDENT</del> <del>S*</del><ins>[IDENT</ins> <ins>S*]?</ins> ')' ]
126126
;
127127
declaration
128128
: property ':' S* expr prio?
129-
| /* empty */
130-
;
129+
<del>|</del> <del>/*</del> <del>empty</del> <del>*/</del>;
131130
prio
132131
: IMPORTANT_SYM S*
133132
;
134133
expr
135-
: term [ operator term ]*
134+
: term [ <del>operator</del><ins>operator?</ins> term ]*
136135
;
137136
term
138137
: unary_operator?
@@ -199,13 +198,15 @@ <h2> <del>D.2</del><ins>G.2</ins> <a name="scanner">Lexical scanner</a></h2>
199198
<ins>H</ins> <ins>h|\\0{0,4}(48|68)(\r\n|[</ins> <ins>\t\r\n\f])?|\\h</ins>
200199
<ins>I</ins> <ins>i|\\0{0,4}(49|69)(\r\n|[</ins> <ins>\t\r\n\f])?|\\i</ins>
201200
<ins>K</ins> <ins>k|\\0{0,4}(4b|6b)(\r\n|[</ins> <ins>\t\r\n\f])?|\\k</ins>
201+
<ins>L</ins> <ins>l|\\0{0,4}(4c|6c)(\r\n|[</ins> <ins>\t\r\n\f])?|\\l</ins>
202202
<ins>M</ins> <ins>m|\\0{0,4}(4d|6d)(\r\n|[</ins> <ins>\t\r\n\f])?|\\m</ins>
203203
<ins>N</ins> <ins>n|\\0{0,4}(4e|6e)(\r\n|[</ins> <ins>\t\r\n\f])?|\\n</ins>
204204
<ins>O</ins> <ins>o|\\0{0,4}(4f|6f)(\r\n|[</ins> <ins>\t\r\n\f])?|\\o</ins>
205205
<ins>P</ins> <ins>p|\\0{0,4}(50|70)(\r\n|[</ins> <ins>\t\r\n\f])?|\\p</ins>
206206
<ins>R</ins> <ins>r|\\0{0,4}(52|72)(\r\n|[</ins> <ins>\t\r\n\f])?|\\r</ins>
207207
<ins>S</ins> <ins>s|\\0{0,4}(53|73)(\r\n|[</ins> <ins>\t\r\n\f])?|\\s</ins>
208208
<ins>T</ins> <ins>t|\\0{0,4}(54|74)(\r\n|[</ins> <ins>\t\r\n\f])?|\\t</ins>
209+
<ins>U</ins> <ins>u|\\0{0,4}(55|75)(\r\n|[</ins> <ins>\t\r\n\f])?|\\u</ins>
209210
<ins>X</ins> <ins>x|\\0{0,4}(58|78)(\r\n|[</ins> <ins>\t\r\n\f])?|\\x</ins>
210211
<ins>Z</ins> <ins>z|\\0{0,4}(5a|7a)(\r\n|[</ins> <ins>\t\r\n\f])?|\\z</ins>
211212

‎css2/diffs-wd/changes.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4132,10 +4132,11 @@ <h3 id="s.17.5.4"><a name="q356"><ins>C.5.69</ins> </a><a
41324132
<ins>and</ins> <ins>that</ins> </del> <ins><ins>The</ins> <ins>anonymous</ins> <ins>box</ins> <ins>establishes</ins> <ins>a</ins> <ins>block</ins> <ins>formatting</ins>
41334133
<ins>context.</ins></ins> <ins>The</ins> <ins>table</ins> <ins>box</ins> <ins>(not</ins> <ins>the</ins> <ins>anonymous</ins> <ins>box)</ins> <ins>is</ins> <ins>used</ins> <ins>when</ins>
41344134
<ins>doing</ins> <ins>baseline</ins> <ins>vertical</ins> <ins>alignment</ins> <ins>for</ins> <ins>an</ins> <ins>'inline-table'.</ins>
4135+
</blockquote>
41354136

41364137

41374138

4138-
<h3 id="s.17.5.4"><a name="q357"><ins>C.5.70</ins> </a><a
4139+
<h3 id="s.17.5.4a"><a name="q357"><ins>C.5.70</ins> </a><a
41394140
href="/TR/2007/CR-CSS21-20070719/tables.html#column-alignment">
41404141
<ins>Section&nbsp;17.5.4</ins> <ins>Horizontal</ins> <ins>alignment</ins> <ins>in</ins> <ins>a</ins> <ins>column</ins></a></h3>
41414142

‎css2/diffs-wd/grammar.html‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ <h2>G.1 <a name="grammar">Grammar</a></h2>
6666
<pre>
6767
stylesheet
6868
: [ CHARSET_SYM STRING ';' ]?
69-
[S|CDO|CDC]* [ import [S|CDO|CDC]* ]*
70-
[ [ ruleset | media | page ] [S|CDO|CDC]* ]*
69+
[S|CDO|CDC]* [ import <del>[S|CDO|CDC]*</del><ins>[</ins> <ins>[CDO|CDC]</ins> <ins>[S|CDO|CDC]</ins> <ins>]*</ins> ]*
70+
[ [ ruleset | media | page ] <del>[S|CDO|CDC]*</del><ins>[</ins> <ins>[CDO|CDC]</ins> <ins>[S|CDO|CDC]</ins> <ins>]*</ins> ]*
7171
;
7272
import
7373
: IMPORT_SYM S*
@@ -80,15 +80,15 @@ <h2>G.1 <a name="grammar">Grammar</a></h2>
8080
: IDENT S*
8181
;
8282
page
83-
: PAGE_SYM S* pseudo_page? S*
84-
LBRACE S* declaration [ ';' S* declaration ]* '}' S*
83+
: PAGE_SYM S* pseudo_page?
84+
<del>S*</del>LBRACE S* <del>declaration</del><ins>declaration?</ins> [ ';' S* <del>declaration</del><ins>declaration?</ins> ]* '}' S*
8585
;
8686
pseudo_page
87-
: ':' IDENT
87+
: ':' IDENT <ins>S*</ins>
8888
;
8989
operator
90-
: '/' S* | COMMA S* | /* empty */
91-
;
90+
: '/' S* | COMMA S*
91+
<del>|</del> <del>/*</del> <del>empty</del> <del>*/</del>;
9292
combinator
9393
: PLUS S*
9494
| GREATER S*
@@ -102,7 +102,7 @@ <h2>G.1 <a name="grammar">Grammar</a></h2>
102102
;
103103
ruleset
104104
: selector [ COMMA S* selector ]*
105-
LBRACE S* declaration [ ';' S* declaration ]* '}' S*
105+
LBRACE S* <del>declaration</del><ins>declaration?</ins> [ ';' S* <del>declaration</del><ins>declaration?</ins> ]* '}' S*
106106
;
107107
<a name="x1"><span class="index-inst" title="selector">selector</span></a>
108108
: simple_selector [ combinator simple_selector ]*
@@ -122,17 +122,16 @@ <h2>G.1 <a name="grammar">Grammar</a></h2>
122122
[ IDENT | STRING ] S* ]? ']'
123123
;
124124
pseudo
125-
: ':' [ IDENT | FUNCTION S* IDENT? S* ')' ]
125+
: ':' [ IDENT | FUNCTION S* <del>IDENT?</del> <del>S*</del><ins>[IDENT</ins> <ins>S*]?</ins> ')' ]
126126
;
127127
declaration
128128
: property ':' S* expr prio?
129-
| /* empty */
130-
;
129+
<del>|</del> <del>/*</del> <del>empty</del> <del>*/</del>;
131130
prio
132131
: IMPORTANT_SYM S*
133132
;
134133
expr
135-
: term [ operator term ]*
134+
: term [ <del>operator</del><ins>operator?</ins> term ]*
136135
;
137136
term
138137
: unary_operator?
@@ -199,13 +198,15 @@ <h2>G.2 <a name="scanner">Lexical scanner</a></h2>
199198
H h|\\0{0,4}(48|68)(\r\n|[ \t\r\n\f])?|\\h
200199
I i|\\0{0,4}(49|69)(\r\n|[ \t\r\n\f])?|\\i
201200
K k|\\0{0,4}(4b|6b)(\r\n|[ \t\r\n\f])?|\\k
201+
<ins>L</ins> <ins>l|\\0{0,4}(4c|6c)(\r\n|[</ins> <ins>\t\r\n\f])?|\\l</ins>
202202
M m|\\0{0,4}(4d|6d)(\r\n|[ \t\r\n\f])?|\\m
203203
N n|\\0{0,4}(4e|6e)(\r\n|[ \t\r\n\f])?|\\n
204204
O <del>o|\\0{0,4}(51|71)(\r\n|[</del><ins>o|\\0{0,4}(4f|6f)(\r\n|[</ins> \t\r\n\f])?|\\o
205205
P p|\\0{0,4}(50|70)(\r\n|[ \t\r\n\f])?|\\p
206206
R r|\\0{0,4}(52|72)(\r\n|[ \t\r\n\f])?|\\r
207207
S s|\\0{0,4}(53|73)(\r\n|[ \t\r\n\f])?|\\s
208208
T t|\\0{0,4}(54|74)(\r\n|[ \t\r\n\f])?|\\t
209+
<ins>U</ins> <ins>u|\\0{0,4}(55|75)(\r\n|[</ins> <ins>\t\r\n\f])?|\\u</ins>
209210
X x|\\0{0,4}(58|78)(\r\n|[ \t\r\n\f])?|\\x
210211
Z z|\\0{0,4}(5a|7a)(\r\n|[ \t\r\n\f])?|\\z
211212

‎css2/grammar.html‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ <h2>G.1 <a name="grammar">Grammar</a></h2>
6666
<pre>
6767
stylesheet
6868
: [ CHARSET_SYM STRING ';' ]?
69-
[S|CDO|CDC]* [ import [S|CDO|CDC]* ]*
70-
[ [ ruleset | media | page ] [S|CDO|CDC]* ]*
69+
[S|CDO|CDC]* [ import [ [CDO|CDC] [S|CDO|CDC] ]* ]*
70+
[ [ ruleset | media | page ] [ [CDO|CDC] [S|CDO|CDC] ]* ]*
7171
;
7272
import
7373
: IMPORT_SYM S*
@@ -80,14 +80,14 @@ <h2>G.1 <a name="grammar">Grammar</a></h2>
8080
: IDENT S*
8181
;
8282
page
83-
: PAGE_SYM S* pseudo_page? S*
84-
LBRACE S* declaration [ ';' S* declaration ]* '}' S*
83+
: PAGE_SYM S* pseudo_page?
84+
LBRACE S* declaration? [ ';' S* declaration? ]* '}' S*
8585
;
8686
pseudo_page
87-
: ':' IDENT
87+
: ':' IDENT S*
8888
;
8989
operator
90-
: '/' S* | COMMA S* | /* empty */
90+
: '/' S* | COMMA S*
9191
;
9292
combinator
9393
: PLUS S*
@@ -102,7 +102,7 @@ <h2>G.1 <a name="grammar">Grammar</a></h2>
102102
;
103103
ruleset
104104
: selector [ COMMA S* selector ]*
105-
LBRACE S* declaration [ ';' S* declaration ]* '}' S*
105+
LBRACE S* declaration? [ ';' S* declaration? ]* '}' S*
106106
;
107107
<a name="x1"><span class="index-inst" title="selector">selector</span></a>
108108
: simple_selector [ combinator simple_selector ]*
@@ -122,17 +122,16 @@ <h2>G.1 <a name="grammar">Grammar</a></h2>
122122
[ IDENT | STRING ] S* ]? ']'
123123
;
124124
pseudo
125-
: ':' [ IDENT | FUNCTION S* IDENT? S* ')' ]
125+
: ':' [ IDENT | FUNCTION S* [IDENT S*]? ')' ]
126126
;
127127
declaration
128128
: property ':' S* expr prio?
129-
| /* empty */
130129
;
131130
prio
132131
: IMPORTANT_SYM S*
133132
;
134133
expr
135-
: term [ operator term ]*
134+
: term [ operator? term ]*
136135
;
137136
term
138137
: unary_operator?
@@ -199,13 +198,15 @@ <h2>G.2 <a name="scanner">Lexical scanner</a></h2>
199198
H h|\\0{0,4}(48|68)(\r\n|[ \t\r\n\f])?|\\h
200199
I i|\\0{0,4}(49|69)(\r\n|[ \t\r\n\f])?|\\i
201200
K k|\\0{0,4}(4b|6b)(\r\n|[ \t\r\n\f])?|\\k
201+
L l|\\0{0,4}(4c|6c)(\r\n|[ \t\r\n\f])?|\\l
202202
M m|\\0{0,4}(4d|6d)(\r\n|[ \t\r\n\f])?|\\m
203203
N n|\\0{0,4}(4e|6e)(\r\n|[ \t\r\n\f])?|\\n
204204
O o|\\0{0,4}(4f|6f)(\r\n|[ \t\r\n\f])?|\\o
205205
P p|\\0{0,4}(50|70)(\r\n|[ \t\r\n\f])?|\\p
206206
R r|\\0{0,4}(52|72)(\r\n|[ \t\r\n\f])?|\\r
207207
S s|\\0{0,4}(53|73)(\r\n|[ \t\r\n\f])?|\\s
208208
T t|\\0{0,4}(54|74)(\r\n|[ \t\r\n\f])?|\\t
209+
U u|\\0{0,4}(55|75)(\r\n|[ \t\r\n\f])?|\\u
209210
X x|\\0{0,4}(58|78)(\r\n|[ \t\r\n\f])?|\\x
210211
Z z|\\0{0,4}(5a|7a)(\r\n|[ \t\r\n\f])?|\\z
211212

0 commit comments

Comments
 (0)