Skip to content

Commit 1381ae5

Browse files
tabatkinstabatkins
committed
[css-syntax] Correct the token diagrams to reflect that percentage and dimension can have scinot.
1 parent 5c694e9 commit 1381ae5

3 files changed

Lines changed: 61 additions & 77 deletions

File tree

‎css-syntax/Diagrams.src.html‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ <h3>Parsing</h3>
122122
NonTerminal('not " \' ( ) \\ whitespace or non-printable'),
123123
NonTerminal('escape')))));
124124

125-
add('numeric', Diagram(
125+
add('NUMBER', Diagram(
126126
Choice(1, '+', Skip(), '-'),
127127
Choice(0,
128128
Sequence(
@@ -132,10 +132,7 @@ <h3>Parsing</h3>
132132
OneOrMore(NonTerminal('digit')),
133133
Sequence(
134134
'.',
135-
OneOrMore(NonTerminal('digit'))))));
136-
137-
add('NUMBER', Diagram(
138-
NonTerminal('numeric'),
135+
OneOrMore(NonTerminal('digit')))),
139136
Choice(0,
140137
Skip(),
141138
Sequence(
@@ -144,10 +141,10 @@ <h3>Parsing</h3>
144141
OneOrMore(NonTerminal('digit'))))));
145142

146143
add('DIMENSION', Diagram(
147-
NonTerminal('numeric'), NonTerminal('IDENT')));
144+
NonTerminal('NUMBER'), NonTerminal('IDENT')));
148145

149146
add('PERCENTAGE', Diagram(
150-
NonTerminal('numeric'), '%'));
147+
NonTerminal('NUMBER'), '%'));
151148

152149
add('UNICODE-RANGE', Diagram(
153150
Choice(0,

‎css-syntax/Overview.html‎

Lines changed: 54 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,9 +1076,9 @@ <h3 id=token-diagrams><span class=secno>4.1. </span> Token Railroad
10761076
d="M458 31h10"></path><path
10771077
d="M 468 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
10781078

1079-
<dt id=numeric-diagram>numeric
1079+
<dt id=number-diagram>NUMBER
10801080

1081-
<dd><svg class=railroad-diagram height=178 width=437><g
1081+
<dd><svg class=railroad-diagram height=179 width=713><g
10821082
transform="translate(.5 .5)"><path
10831083
d="M 20 50 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path><g><path
10841084
d="M40 60h0"></path><path d="M108 60h0"></path><path
@@ -1137,80 +1137,70 @@ <h3 id=token-diagrams><span class=secno>4.1. </span> Token Railroad
11371137
d="M246 158h60"></path></g><path
11381138
d="M306 158a10 10 0 0 0 10 -10v0a10 10 0 0 0 -10 -10"></path></g><path
11391139
d="M316 138h10"></path></g><path
1140-
d="M376 138a10 10 0 0 0 10 -10v-58a10 10 0 0 1 10 -10"></path></g><path
1141-
d="M 396 60 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
1142-
1143-
<dt id=number-diagram>NUMBER
1144-
1145-
<dd><svg class=railroad-diagram height=150 width=453><g
1146-
transform="translate(.5 .5)"><path
1147-
d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path><path
1148-
d="M40 31h10"></path><g><path d="M50 31h0"></path><path
1149-
d="M126 31h0"></path><rect height=22 width=76 x=50 y=20></rect><text x=88
1150-
y=35>numeric</text></g><path d="M126 31h10"></path><g><path
1151-
d="M136 31h0"></path><path d="M412 31h0"></path><path
1152-
d="M136 31h20"></path><g><path d="M156 31h236"></path></g><path
1153-
d="M392 31h20"></path><path
1154-
d="M136 31a10 10 0 0 1 10 10v28a10 10 0 0 0 10 10"></path><g><path
1155-
d="M156 79h0"></path><path d="M392 79h0"></path><g><path
1156-
d="M156 79h0"></path><path d="M224 79h0"></path><path
1157-
d="M156 79h20"></path><g><path d="M176 79h0"></path><path
1158-
d="M204 79h0"></path><rect height=22 rx=10 ry=10 width=28 x=176
1159-
y=68></rect><text x=190 y=83>e</text></g><path
1160-
d="M204 79h20"></path><path
1161-
d="M156 79a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path><g><path
1162-
d="M176 109h0"></path><path d="M204 109h0"></path><rect height=22 rx=10
1163-
ry=10 width=28 x=176 y=98></rect><text x=190 y=113>E</text></g><path
1164-
d="M204 109a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path></g><g><path
1165-
d="M224 79h0"></path><path d="M292 79h0"></path><path
1166-
d="M224 79a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path><g><path
1167-
d="M244 59h0"></path><path d="M272 59h0"></path><rect height=22 rx=10
1168-
ry=10 width=28 x=244 y=48></rect><text x=258 y=63>+</text></g><path
1169-
d="M272 59a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path><path
1170-
d="M224 79h20"></path><g><path d="M244 79h28"></path></g><path
1171-
d="M272 79h20"></path><path
1172-
d="M224 79a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path><g><path
1173-
d="M244 99h0"></path><path d="M272 99h0"></path><rect height=22 rx=10
1174-
ry=10 width=28 x=244 y=88></rect><text x=258 y=103>-</text></g><path
1175-
d="M272 99a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path></g><path
1176-
d="M292 79h10"></path><g><path d="M302 79h0"></path><path
1177-
d="M382 79h0"></path><path d="M302 79h10"></path><g><path
1178-
d="M312 79h0"></path><path d="M372 79h0"></path><rect height=22 width=60
1179-
x=312 y=68></rect><text x=342 y=83>digit</text></g><path
1180-
d="M372 79h10"></path><path
1181-
d="M312 79a10 10 0 0 0 -10 10v0a10 10 0 0 0 10 10"></path><g><path
1182-
d="M312 99h60"></path></g><path
1183-
d="M372 99a10 10 0 0 0 10 -10v0a10 10 0 0 0 -10 -10"></path></g><path
1184-
d="M382 79h10"></path></g><path
1185-
d="M392 79a10 10 0 0 0 10 -10v-28a10 10 0 0 1 10 -10"></path></g><path
1186-
d="M 412 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
1140+
d="M376 138a10 10 0 0 0 10 -10v-58a10 10 0 0 1 10 -10"></path></g><g><path
1141+
d="M396 60h0"></path><path d="M672 60h0"></path><path
1142+
d="M396 60h20"></path><g><path d="M416 60h236"></path></g><path
1143+
d="M652 60h20"></path><path
1144+
d="M396 60a10 10 0 0 1 10 10v28a10 10 0 0 0 10 10"></path><g><path
1145+
d="M416 108h0"></path><path d="M652 108h0"></path><g><path
1146+
d="M416 108h0"></path><path d="M484 108h0"></path><path
1147+
d="M416 108h20"></path><g><path d="M436 108h0"></path><path
1148+
d="M464 108h0"></path><rect height=22 rx=10 ry=10 width=28 x=436
1149+
y=97></rect><text x=450 y=112>e</text></g><path
1150+
d="M464 108h20"></path><path
1151+
d="M416 108a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path><g><path
1152+
d="M436 138h0"></path><path d="M464 138h0"></path><rect height=22 rx=10
1153+
ry=10 width=28 x=436 y=127></rect><text x=450 y=142>E</text></g><path
1154+
d="M464 138a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path></g><g><path
1155+
d="M484 108h0"></path><path d="M552 108h0"></path><path
1156+
d="M484 108a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path><g><path
1157+
d="M504 88h0"></path><path d="M532 88h0"></path><rect height=22 rx=10
1158+
ry=10 width=28 x=504 y=77></rect><text x=518 y=92>+</text></g><path
1159+
d="M532 88a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path><path
1160+
d="M484 108h20"></path><g><path d="M504 108h28"></path></g><path
1161+
d="M532 108h20"></path><path
1162+
d="M484 108a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path><g><path
1163+
d="M504 128h0"></path><path d="M532 128h0"></path><rect height=22 rx=10
1164+
ry=10 width=28 x=504 y=117></rect><text x=518 y=132>-</text></g><path
1165+
d="M532 128a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path></g><path
1166+
d="M552 108h10"></path><g><path d="M562 108h0"></path><path
1167+
d="M642 108h0"></path><path d="M562 108h10"></path><g><path
1168+
d="M572 108h0"></path><path d="M632 108h0"></path><rect height=22
1169+
width=60 x=572 y=97></rect><text x=602 y=112>digit</text></g><path
1170+
d="M632 108h10"></path><path
1171+
d="M572 108a10 10 0 0 0 -10 10v0a10 10 0 0 0 10 10"></path><g><path
1172+
d="M572 128h60"></path></g><path
1173+
d="M632 128a10 10 0 0 0 10 -10v0a10 10 0 0 0 -10 -10"></path></g><path
1174+
d="M642 108h10"></path></g><path
1175+
d="M652 108a10 10 0 0 0 10 -10v-28a10 10 0 0 1 10 -10"></path></g><path
1176+
d="M 672 60 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
11871177

11881178
<dt id=dimension-diagram>DIMENSION
11891179

1190-
<dd><svg class=railroad-diagram height=62 width=257><g
1180+
<dd><svg class=railroad-diagram height=62 width=249><g
11911181
transform="translate(.5 .5)"><path
11921182
d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path><path
11931183
d="M40 31h10"></path><g><path d="M50 31h0"></path><path
1194-
d="M126 31h0"></path><rect height=22 width=76 x=50 y=20></rect><text x=88
1195-
y=35>numeric</text></g><path d="M126 31h10"></path><path
1196-
d="M136 31h10"></path><g><path d="M146 31h0"></path><path
1197-
d="M206 31h0"></path><rect height=22 width=60 x=146 y=20></rect><text
1198-
x=176 y=35>IDENT</text></g><path d="M206 31h10"></path><path
1199-
d="M 216 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
1184+
d="M118 31h0"></path><rect height=22 width=68 x=50 y=20></rect><text x=84
1185+
y=35>NUMBER</text></g><path d="M118 31h10"></path><path
1186+
d="M128 31h10"></path><g><path d="M138 31h0"></path><path
1187+
d="M198 31h0"></path><rect height=22 width=60 x=138 y=20></rect><text
1188+
x=168 y=35>IDENT</text></g><path d="M198 31h10"></path><path
1189+
d="M 208 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
12001190

12011191
<dt id=percentage-diagram>PERCENTAGE
12021192

1203-
<dd><svg class=railroad-diagram height=62 width=225><g
1193+
<dd><svg class=railroad-diagram height=62 width=217><g
12041194
transform="translate(.5 .5)"><path
12051195
d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path><path
12061196
d="M40 31h10"></path><g><path d="M50 31h0"></path><path
1207-
d="M126 31h0"></path><rect height=22 width=76 x=50 y=20></rect><text x=88
1208-
y=35>numeric</text></g><path d="M126 31h10"></path><path
1209-
d="M136 31h10"></path><g><path d="M146 31h0"></path><path
1210-
d="M174 31h0"></path><rect height=22 rx=10 ry=10 width=28 x=146
1211-
y=20></rect><text x=160 y=35>%</text></g><path
1212-
d="M174 31h10"></path><path
1213-
d="M 184 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
1197+
d="M118 31h0"></path><rect height=22 width=68 x=50 y=20></rect><text x=84
1198+
y=35>NUMBER</text></g><path d="M118 31h10"></path><path
1199+
d="M128 31h10"></path><g><path d="M138 31h0"></path><path
1200+
d="M166 31h0"></path><rect height=22 rx=10 ry=10 width=28 x=138
1201+
y=20></rect><text x=152 y=35>%</text></g><path
1202+
d="M166 31h10"></path><path
1203+
d="M 176 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
12141204

12151205
<dt id=unicode-range-diagram>UNICODE-RANGE
12161206

0 commit comments

Comments
 (0)