[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:39:39 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 4f3b4af914382b5cf27147ed7f139fb6c12b0b9a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu May 1 00:12:12 2003 +0000
Fixes for 3227983 and 3224521, both bugs involving bad letter-spacing
property values. This fixes all Movable Type blogs that had this
error in their stylesheets.
Reviewed by gramps
* khtml/css/parser.cpp:
* khtml/css/parser.y:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4230 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 561770c..da15c71 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-04-30 David Hyatt <hyatt at apple.com>
+
+ Fixes for 3227983 and 3224521, both bugs involving bad letter-spacing
+ property values. This fixes all Movable Type blogs that had this
+ error in their stylesheets.
+
+ Reviewed by gramps
+
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.y:
+
2003-04-30 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 561770c..da15c71 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-04-30 David Hyatt <hyatt at apple.com>
+
+ Fixes for 3227983 and 3224521, both bugs involving bad letter-spacing
+ property values. This fixes all Movable Type blogs that had this
+ error in their stylesheets.
+
+ Reviewed by gramps
+
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.y:
+
2003-04-30 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index bb5b28f..1e1886d 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -181,7 +181,7 @@ static int cssyylex( YYSTYPE *yylval ) {
-#define YYFINAL 264
+#define YYFINAL 271
#define YYFLAG -32768
#define YYNTBASE 60
@@ -231,12 +231,12 @@ static const short yyprhs[] = { 0,
192, 194, 196, 198, 201, 204, 206, 208, 210, 212,
215, 218, 223, 232, 234, 236, 238, 240, 242, 244,
246, 248, 251, 255, 262, 264, 267, 269, 273, 275,
- 279, 283, 289, 294, 299, 306, 312, 315, 317, 320,
- 323, 324, 326, 330, 333, 336, 339, 340, 342, 345,
- 348, 351, 354, 357, 359, 361, 364, 367, 370, 373,
- 376, 379, 382, 385, 388, 391, 394, 397, 400, 403,
- 406, 409, 412, 415, 418, 424, 428, 431, 435, 439,
- 442, 448, 452, 454
+ 279, 284, 288, 294, 299, 304, 311, 317, 320, 327,
+ 329, 332, 335, 336, 338, 342, 345, 348, 351, 352,
+ 354, 357, 360, 363, 366, 369, 371, 373, 376, 379,
+ 382, 385, 388, 391, 394, 397, 400, 403, 406, 409,
+ 412, 415, 418, 421, 424, 427, 430, 436, 440, 443,
+ 447, 451, 454, 460, 464, 466
};
static const short yyrhs[] = { 66,
@@ -267,25 +267,26 @@ static const short yyrhs[] = { 66,
0, 9, 0, 11, 0, 10, 0, 13, 11, 0,
13, 13, 11, 0, 13, 45, 64, 84, 64, 57,
0, 96, 0, 95, 96, 0, 95, 0, 1, 108,
- 1, 0, 1, 0, 96, 49, 64, 0, 1, 49,
- 64, 0, 1, 108, 1, 49, 64, 0, 95, 96,
- 49, 64, 0, 95, 1, 49, 64, 0, 95, 1,
- 108, 1, 49, 64, 0, 97, 13, 64, 99, 98,
- 0, 97, 1, 0, 98, 0, 11, 64, 0, 24,
- 64, 0, 0, 101, 0, 99, 100, 101, 0, 99,
- 1, 0, 58, 64, 0, 50, 64, 0, 0, 102,
- 0, 80, 102, 0, 10, 64, 0, 11, 64, 0,
- 44, 64, 0, 46, 64, 0, 104, 0, 103, 0,
- 43, 64, 0, 42, 64, 0, 28, 64, 0, 29,
- 64, 0, 30, 64, 0, 31, 64, 0, 32, 64,
- 0, 33, 64, 0, 34, 64, 0, 35, 64, 0,
- 36, 64, 0, 37, 64, 0, 38, 64, 0, 39,
- 64, 0, 40, 64, 0, 26, 64, 0, 25, 64,
- 0, 27, 64, 0, 41, 64, 0, 45, 64, 99,
- 57, 64, 0, 45, 64, 1, 0, 12, 64, 0,
- 59, 1, 107, 0, 59, 1, 49, 0, 1, 107,
- 0, 47, 1, 108, 1, 48, 0, 47, 1, 48,
- 0, 107, 0, 108, 1, 107, 0
+ 1, 0, 1, 0, 96, 49, 64, 0, 96, 108,
+ 49, 64, 0, 1, 49, 64, 0, 1, 108, 1,
+ 49, 64, 0, 95, 96, 49, 64, 0, 95, 1,
+ 49, 64, 0, 95, 1, 108, 1, 49, 64, 0,
+ 97, 13, 64, 99, 98, 0, 97, 1, 0, 97,
+ 13, 64, 1, 99, 98, 0, 98, 0, 11, 64,
+ 0, 24, 64, 0, 0, 101, 0, 99, 100, 101,
+ 0, 99, 1, 0, 58, 64, 0, 50, 64, 0,
+ 0, 102, 0, 80, 102, 0, 10, 64, 0, 11,
+ 64, 0, 44, 64, 0, 46, 64, 0, 104, 0,
+ 103, 0, 43, 64, 0, 42, 64, 0, 28, 64,
+ 0, 29, 64, 0, 30, 64, 0, 31, 64, 0,
+ 32, 64, 0, 33, 64, 0, 34, 64, 0, 35,
+ 64, 0, 36, 64, 0, 37, 64, 0, 38, 64,
+ 0, 39, 64, 0, 40, 64, 0, 26, 64, 0,
+ 25, 64, 0, 27, 64, 0, 41, 64, 0, 45,
+ 64, 99, 57, 64, 0, 45, 64, 1, 0, 12,
+ 64, 0, 59, 1, 107, 0, 59, 1, 49, 0,
+ 1, 107, 0, 47, 1, 108, 1, 48, 0, 47,
+ 1, 48, 0, 107, 0, 108, 1, 107, 0
};
#endif
@@ -301,12 +302,12 @@ static const short yyrline[] = { 0,
560, 581, 586, 591, 601, 607, 614, 615, 616, 619,
628, 652, 658, 666, 670, 673, 676, 679, 682, 687,
689, 692, 698, 704, 712, 716, 721, 724, 730, 738,
- 742, 748, 754, 759, 765, 773, 796, 800, 807, 814,
- 816, 819, 824, 837, 843, 847, 850, 855, 857, 858,
- 859, 865, 866, 867, 869, 874, 876, 877, 878, 879,
- 880, 881, 882, 883, 884, 885, 886, 887, 888, 889,
- 890, 891, 892, 893, 897, 905, 917, 924, 931, 939,
- 965, 967, 970, 972
+ 742, 745, 751, 757, 762, 768, 776, 799, 803, 811,
+ 818, 825, 827, 830, 835, 848, 854, 858, 861, 866,
+ 868, 869, 870, 876, 877, 878, 880, 885, 887, 888,
+ 889, 890, 891, 892, 893, 894, 895, 896, 897, 898,
+ 899, 900, 901, 902, 903, 904, 908, 916, 928, 935,
+ 942, 950, 976, 978, 981, 983
};
#endif
@@ -341,12 +342,12 @@ static const short yyr1[] = { 0,
85, 85, 86, 86, 86, 87, 87, 87, 87, 88,
89, 90, 90, 91, 91, 91, 91, 91, 91, 92,
92, 93, 93, 93, 94, 94, 94, 94, 94, 95,
- 95, 95, 95, 95, 95, 96, 96, 96, 97, 98,
- 98, 99, 99, 99, 100, 100, 100, 101, 101, 101,
- 101, 101, 101, 101, 101, 102, 102, 102, 102, 102,
+ 95, 95, 95, 95, 95, 95, 96, 96, 96, 96,
+ 97, 98, 98, 99, 99, 99, 100, 100, 100, 101,
+ 101, 101, 101, 101, 101, 101, 101, 102, 102, 102,
102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
- 102, 102, 102, 102, 103, 103, 104, 105, 105, 106,
- 107, 107, 108, 108
+ 102, 102, 102, 102, 102, 102, 103, 103, 104, 105,
+ 105, 106, 107, 107, 108, 108
};
static const short yyr2[] = { 0,
@@ -359,12 +360,12 @@ static const short yyr2[] = { 0,
1, 1, 1, 2, 2, 1, 1, 1, 1, 2,
2, 4, 8, 1, 1, 1, 1, 1, 1, 1,
1, 2, 3, 6, 1, 2, 1, 3, 1, 3,
- 3, 5, 4, 4, 6, 5, 2, 1, 2, 2,
- 0, 1, 3, 2, 2, 2, 0, 1, 2, 2,
- 2, 2, 2, 1, 1, 2, 2, 2, 2, 2,
+ 4, 3, 5, 4, 4, 6, 5, 2, 6, 1,
+ 2, 2, 0, 1, 3, 2, 2, 2, 0, 1,
+ 2, 2, 2, 2, 2, 1, 1, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 5, 3, 2, 3, 3, 2,
- 5, 3, 1, 3
+ 2, 2, 2, 2, 2, 2, 5, 3, 2, 3,
+ 3, 2, 5, 3, 1, 3
};
static const short yydefact[] = { 13,
@@ -373,198 +374,220 @@ static const short yydefact[] = { 13,
9, 8, 0, 0, 0, 12, 11, 19, 0, 0,
61, 66, 0, 0, 8, 62, 8, 0, 0, 55,
8, 0, 63, 67, 68, 69, 89, 8, 8, 0,
- 0, 85, 0, 98, 8, 8, 8, 8, 8, 8,
+ 0, 85, 0, 100, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 50,
- 49, 0, 0, 102, 108, 115, 114, 0, 0, 10,
- 142, 143, 0, 14, 82, 0, 8, 70, 0, 0,
+ 49, 0, 0, 104, 110, 117, 116, 0, 0, 10,
+ 144, 145, 0, 14, 82, 0, 8, 70, 0, 0,
54, 8, 8, 57, 8, 8, 0, 58, 0, 65,
- 60, 64, 8, 0, 99, 100, 6, 0, 86, 8,
- 97, 8, 110, 111, 137, 132, 131, 133, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 134, 117, 116, 112, 0, 113, 109, 104, 7,
- 8, 8, 0, 0, 0, 0, 0, 8, 0, 0,
- 10, 22, 23, 24, 21, 26, 25, 18, 0, 83,
- 0, 8, 0, 5, 0, 0, 46, 47, 56, 59,
- 91, 88, 8, 0, 8, 90, 0, 136, 0, 106,
- 105, 103, 29, 28, 30, 31, 8, 140, 0, 34,
- 0, 0, 20, 141, 144, 8, 71, 75, 76, 77,
- 78, 79, 72, 74, 8, 0, 0, 8, 94, 0,
- 93, 0, 8, 34, 43, 42, 8, 0, 35, 45,
- 44, 139, 138, 0, 0, 51, 92, 8, 96, 135,
- 0, 0, 41, 37, 8, 8, 84, 81, 80, 8,
- 95, 27, 39, 0, 0, 0, 36, 73, 38, 8,
- 40, 0, 0, 0
+ 60, 64, 8, 0, 101, 102, 6, 0, 86, 8,
+ 0, 98, 8, 112, 113, 139, 134, 133, 135, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 136, 119, 118, 114, 0, 115, 111, 106,
+ 7, 8, 8, 0, 0, 0, 0, 0, 8, 0,
+ 0, 10, 22, 23, 24, 21, 26, 25, 18, 0,
+ 83, 0, 8, 0, 5, 0, 0, 46, 47, 56,
+ 59, 92, 88, 8, 0, 8, 90, 0, 8, 0,
+ 138, 0, 108, 107, 105, 29, 28, 30, 31, 8,
+ 142, 0, 34, 0, 0, 20, 143, 146, 8, 71,
+ 75, 76, 77, 78, 79, 72, 74, 8, 0, 0,
+ 8, 95, 0, 94, 91, 0, 0, 8, 34, 43,
+ 42, 8, 0, 35, 45, 44, 141, 140, 0, 0,
+ 51, 93, 8, 0, 97, 137, 0, 0, 41, 37,
+ 8, 8, 84, 81, 80, 8, 96, 99, 27, 39,
+ 0, 0, 0, 36, 73, 38, 8, 40, 0, 0,
+ 0
};
-static const short yydefgoto[] = { 262,
- 5, 6, 7, 10, 17, 8, 28, 89, 161, 90,
- 197, 241, 228, 162, 256, 229, 163, 164, 107, 82,
- 37, 38, 39, 40, 41, 42, 43, 44, 173, 45,
- 215, 250, 46, 50, 51, 52, 53, 54, 83, 153,
- 84, 85, 86, 87, 166, 167, 92, 93
+static const short yydefgoto[] = { 269,
+ 5, 6, 7, 10, 17, 8, 28, 89, 162, 90,
+ 200, 247, 233, 163, 263, 234, 164, 165, 107, 82,
+ 37, 38, 39, 40, 41, 42, 43, 44, 174, 45,
+ 218, 256, 46, 50, 51, 52, 53, 54, 83, 154,
+ 84, 85, 86, 87, 167, 168, 92, 93
};
-static const short yypact[] = { 280,
- 11, -28, -8, 35,-32768,-32768,-32768,-32768, -31, 19,
--32768,-32768,-32768, 39, 39, 39, 169, 14,-32768,-32768,
--32768,-32768, 127, 155, 460,-32768,-32768, 73, 58, 106,
--32768,-32768, 194, 82,-32768,-32768,-32768, 40, 34,-32768,
- 244, 174,-32768,-32768,-32768,-32768, -9,-32768,-32768, 54,
- 150, 64, 12,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+static const short yypact[] = { 198,
+ 19, -28, -19, 2,-32768,-32768,-32768,-32768, -24, 106,
+-32768,-32768,-32768, 84, 84, 84, 149, 120,-32768,-32768,
+-32768,-32768, 129, 564, 518,-32768,-32768, 122, 108, 82,
+-32768,-32768, 1, 116,-32768,-32768,-32768, 44, 160,-32768,
+ 222, 395,-32768,-32768,-32768,-32768, 70,-32768,-32768, 55,
+ 109, 90, 14,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 526, 287,-32768,-32768,-32768,-32768, 199, 110,-32768,
--32768,-32768, 130,-32768,-32768, 148,-32768,-32768, 17, 109,
--32768,-32768,-32768,-32768,-32768,-32768, 238, 39, 174,-32768,
- 39,-32768,-32768, 153, 39, 39,-32768, 47, 113,-32768,
--32768,-32768, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 416, 39,-32768,-32768,-32768,
--32768,-32768, 497, 67, 116, 118, 181,-32768, 193, 196,
--32768,-32768,-32768,-32768,-32768,-32768,-32768, 169, 143,-32768,
- 127,-32768, 128,-32768, 155, 127, 39, 39,-32768, 39,
- 39, 71,-32768, 210,-32768, 39, 460,-32768, 338, 39,
- 39,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 121, 20,
- 159, 168, 169,-32768,-32768,-32768, 39,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768, 164, 386,-32768, 39, 180,
- 39, 236,-32768, 96,-32768,-32768,-32768, 102,-32768,-32768,
--32768,-32768,-32768, 21, 23,-32768, 39,-32768,-32768, 39,
- 167, 94, 39,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- 39,-32768, 39, 20, 24, 293,-32768,-32768,-32768,-32768,
- 39, 219, 220,-32768
+-32768, 618, 293,-32768,-32768,-32768,-32768, 159, 111,-32768,
+-32768,-32768, 145,-32768,-32768, 139,-32768,-32768, 102, 87,
+-32768,-32768,-32768,-32768,-32768,-32768, 244, 84, 395,-32768,
+ 84,-32768,-32768, 158, 84, 84,-32768, 153, 114,-32768,
+ 85,-32768,-32768, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 84, 84, 84, 428, 84,-32768,-32768,
+-32768,-32768,-32768, 589, 192, 92, 150, 175,-32768, 200,
+ 204,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 149, 119,
+-32768, 129,-32768, 33,-32768, 564, 129, 84, 84,-32768,
+ 84, 84, 193,-32768, 205,-32768, 84, 150,-32768, 474,
+-32768, 344, 84, 84,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768, 201, 103, 214, 250, 149,-32768,-32768,-32768, 84,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 161, 179,
+-32768, 84, 259, 84, 84, 589, 242,-32768, 96,-32768,
+-32768,-32768, 46,-32768,-32768,-32768,-32768,-32768, 18, 23,
+-32768, 84,-32768, 242,-32768, 84, 166, 30, 84,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768, 84,-32768,-32768, 84,
+ 103, 21, 174,-32768,-32768,-32768,-32768, 84, 208, 224,
+-32768
};
static const short yypgoto[] = {-32768,
-32768,-32768,-32768, -5, -81,-32768,-32768,-32768,-32768,-32768,
--32768,-32768, -1,-32768,-32768, -24,-32768,-32768,-32768,-32768,
- -85,-32768, 56, -96,-32768, 195, -32,-32768,-32768,-32768,
--32768,-32768,-32768, 59,-32768, 184,-32768, 16, -55,-32768,
- 89, 162,-32768,-32768,-32768,-32768, -6, -42
+-32768,-32768, -4,-32768,-32768, -29,-32768,-32768,-32768,-32768,
+ -85,-32768, 67, -94,-32768, 219, -32,-32768,-32768,-32768,
+-32768,-32768,-32768, 69,-32768, 213,-32768, -209, -142,-32768,
+ 95, 183,-32768,-32768,-32768,-32768, -6, -36
};
-#define YYLAST 569
+#define YYLAST 661
static const short yytable[] = { 14,
- 15, 16, 20, 165, 114, 23, 24, 25, 168, 112,
- 179, 9, 121, -8, 29, 18, 30, 19, 11, 21,
- -8, 21, 21, 21, 122, 21, 21, 172, 22, 99,
- 227, 100, 248, 249, 104, 108, 111, 18, 12, 113,
- 101, 21, 115, 116, -48, -48, -48, -48, -48, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 206, 184, 112, 247, 258, 203,
- -52, 13, 155, -52, 105, 106, 102, -48, 88, 103,
- 189, 171, 98, 18, 244, 183, 175, 176, 21, 177,
- 178, 117, 244, 180, 18, 91, 227, 181, 21, -1,
- 156, 21, 120, 18, 186, 193, 187, 18, 21, 218,
- 31, 32, 33, 34, 35, 195, 157, 158, 159, 21,
- 169, 222, 208, 209, 210, 211, 212, 31, 32, 33,
- 34, 35, -33, 246, -32, 190, 191, 194, 245, 198,
- 118, 246, 200, 182, 94, 47, 174, 21, 170, 196,
- 48, 185, 205, 36, 18, 48, 207, 18, 160, 225,
- 260, 26, 27, 49, 110, 205, -8, 219, 49, 221,
- 36, 199, 213, 214, -8, 32, 33, 34, 35, 18,
- 204, 224, 226, 201, 231, 233, 202, -87, -101, 154,
- 234, -8, -101, -101, 95, 18, 96, 230, -8, 235,
- 220, 236, 237, 205, 18, 252, 232, 240, 263, 264,
- -8, 243, 242, -8, -8, -8, 18, -8, 238, 257,
- -8, 217, 251, 216, 119, 109, 149, 239, 97, 253,
- 254, 192, -8, 148, 255, -107, -107, -107, 31, 32,
- 33, 34, 35, 0, 261, 32, 33, 34, 35, 49,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, 0, -101, -101, 151, -107, 149, -107, 0,
- 0, 36, 0, 152, 0, 0, -107, -107, -107, 1,
- 2, 3, 4, 31, 32, 33, 34, 35, 0, 0,
- 0, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, -107, 0, 150, 0, 151, -107, 149, -107,
- 259, 0, 0, 0, 152, 0, 36, -107, -107, -107,
+ 15, 16, 20, 166, 192, 23, 24, 25, 169, 112,
+ 114, 95, 180, 96, 122, 121, 30, 245, 11, 9,
+ 21, -8, 18, 21, 19, 21, 123, 12, -8, 99,
+ 250, 100, 254, 255, 258, 108, 111, 211, 212, 213,
+ 214, 215, 115, 116, 101, 97, 250, 227, 13, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
+ 145, 146, 147, 148, 253, 265, 112, 209, -33, 252,
+ 206, 185, 156, 244, 21, 188, 21, 216, 217, 21,
+ 102, 172, 251, 103, 21, 252, 176, 177, 21, 178,
+ 179, 198, 117, 181, 21, 21, 232, 182, 21, 118,
+ -1, 157, 173, 232, 187, 22, 18, 190, 113, 48,
+ 29, 31, 32, 33, 34, 35, 98, 158, 159, 160,
+ 94, 21, 49, 189, 175, 199, 18, 88, 120, 31,
+ 32, 33, 34, 35, -32, 170, 193, 194, 197, 171,
+ 201, 26, 27, 203, 18, 91, -87, -103, 183, 155,
+ 104, -8, 186, 208, 36, 18, 207, 210, -8, 161,
+ -48, -48, -48, -48, -48, 202, 208, 267, 222, 104,
+ 224, 208, 36, 225, 31, 32, 33, 34, 35, -48,
+ -48, -48, -48, -48, 229, 231, 18, 236, 238, 18,
+ 204, 184, -8, 239, 205, 223, -52, 270, 241, -52,
+ 105, 106, 240, -48, 259, 242, 208, 1, 2, 3,
+ 4, 266, 246, 271, 248, -53, 249, 36, -53, 105,
+ 106, 264, -48, 32, 33, 34, 35, 257, 18, 18,
+ 196, 221, 150, 220, 219, 260, 261, 18, 195, 230,
+ 262, -109, -109, -109, 31, 32, 33, 34, 35, 109,
+ 18, 268, 235, 119, 149, 49, -109, -109, -109, -109,
+ -109, -109, -109, -109, -109, -109, -109, -109, -109, -109,
+ -109, -109, -109, -109, -109, -109, -109, -109, -103, -103,
+ -103, 152, -109, 150, -109, 0, 18, 36, 237, 153,
+ 0, 0, -109, -109, -109, 18, 0, 243, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, -109, -109, -109,
+ -109, -109, -109, -109, -109, -109, -109, -109, -109, -109,
+ -109, -109, -109, -109, -109, -109, -109, -109, -109, 0,
+ 151, 0, 152, -109, 150, -109, 0, 0, 0, 0,
+ 153, 0, 0, -109, -109, -109, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, -109, -109,
+ -109, -109, -109, -109, -109, -109, -109, -109, -109, -109,
+ -109, -109, -109, -109, -109, -109, -109, -109, -109, -109,
+ 0, 0, 0, 152, -109, 110, -109, -8, 0, 0,
+ 228, 153, 0, 0, 0, -8, 32, 33, 34, 35,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, -107, -107, 0, 0, 104, 151, -107, 0,
- -107, 0, 0, 0, 223, 152, -48, -48, -48, -48,
- -48, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 188, 0, 21, 0,
- 0, 0, 0, 0, 0, 55, 56, 57, 0, 0,
- 0, 0, -53, 0, 0, -53, 105, 106, 0, -48,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 21, 0, 0, 0, 80, 0, 81, 55,
- 56, 57, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 77, 78, 79, 55, 56, 57, 0,
- 80, 0, 81, 0, 0, 0, 0, 0, 0, 0,
- 0, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 0, 0, 0, 0, 80, 0, 81,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 76
+ 0, 0, 0, 0, 0, 0, 0, 0, 191, 0,
+ 21, 0, 0, 0, 0, 0, 0, 55, 56, 57,
+ 0, -8, 0, 0, -8, -8, -8, 0, -8, 0,
+ 0, -8, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 226, 0, 21, 0, 80, 0,
+ 81, 0, 0, 55, 56, 57, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 21, 0, 0, 0, 80, 0, 81, 55, 56, 57,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 47, 0, 21, 0, 80, 0,
+ 81, 0, 0, 0, 48, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 49, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 55, 56,
+ 57, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ -103, -103, -103, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 0, 0, 0, 0, 80,
+ 0, 81, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76
};
static const short yycheck[] = { 5,
- 6, 7, 9, 89, 47, 11, 12, 13, 90, 42,
- 107, 1, 1, 3, 1, 47, 22, 49, 47, 3,
- 10, 3, 3, 3, 13, 3, 3, 11, 10, 35,
- 11, 37, 10, 11, 1, 41, 42, 47, 47, 49,
- 1, 3, 48, 49, 11, 12, 13, 14, 15, 55,
+ 6, 7, 9, 89, 147, 11, 12, 13, 90, 42,
+ 47, 11, 107, 13, 1, 52, 22, 227, 47, 1,
+ 3, 3, 47, 3, 49, 3, 13, 47, 10, 35,
+ 1, 37, 10, 11, 244, 41, 42, 5, 6, 7,
+ 8, 9, 48, 49, 1, 45, 1, 190, 47, 55,
56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 171, 118, 109, 57, 55, 161,
- 47, 47, 88, 50, 51, 52, 47, 54, 16, 50,
- 146, 97, 11, 47, 1, 49, 102, 103, 3, 105,
- 106, 48, 1, 109, 47, 48, 11, 113, 3, 0,
- 1, 3, 49, 47, 120, 49, 122, 47, 3, 49,
- 11, 12, 13, 14, 15, 10, 17, 18, 19, 3,
- 1, 187, 5, 6, 7, 8, 9, 11, 12, 13,
- 14, 15, 49, 50, 49, 151, 152, 154, 47, 156,
- 1, 50, 158, 1, 49, 1, 48, 3, 11, 44,
- 11, 49, 169, 54, 47, 11, 172, 47, 59, 49,
- 256, 3, 4, 24, 1, 182, 3, 183, 24, 185,
- 54, 1, 55, 56, 11, 12, 13, 14, 15, 47,
- 48, 197, 199, 1, 201, 202, 1, 48, 49, 1,
- 206, 3, 48, 49, 11, 47, 13, 49, 10, 215,
- 1, 48, 218, 220, 47, 49, 49, 223, 0, 0,
- 47, 227, 224, 50, 51, 52, 47, 54, 49, 254,
- 57, 176, 238, 175, 51, 41, 1, 222, 45, 245,
- 246, 153, 44, 82, 250, 10, 11, 12, 11, 12,
- 13, 14, 15, -1, 260, 12, 13, 14, 15, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, -1, 48, 49, 50, 51, 1, 53, -1,
- -1, 54, -1, 58, -1, -1, 10, 11, 12, 20,
- 21, 22, 23, 11, 12, 13, 14, 15, -1, -1,
- -1, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, -1, 48, -1, 50, 51, 1, 53,
- 48, -1, -1, -1, 58, -1, 54, 10, 11, 12,
+ 76, 77, 78, 79, 57, 55, 109, 172, 49, 50,
+ 162, 118, 88, 226, 3, 1, 3, 55, 56, 3,
+ 47, 97, 47, 50, 3, 50, 102, 103, 3, 105,
+ 106, 10, 48, 109, 3, 3, 11, 113, 3, 1,
+ 0, 1, 11, 11, 120, 10, 47, 123, 49, 11,
+ 1, 11, 12, 13, 14, 15, 11, 17, 18, 19,
+ 49, 3, 24, 49, 48, 44, 47, 16, 49, 11,
+ 12, 13, 14, 15, 49, 1, 152, 153, 155, 11,
+ 157, 3, 4, 159, 47, 48, 48, 49, 1, 1,
+ 1, 3, 49, 170, 54, 47, 48, 173, 10, 59,
+ 11, 12, 13, 14, 15, 1, 183, 263, 184, 1,
+ 186, 188, 54, 189, 11, 12, 13, 14, 15, 11,
+ 12, 13, 14, 15, 200, 202, 47, 204, 205, 47,
+ 1, 49, 44, 209, 1, 1, 47, 0, 48, 50,
+ 51, 52, 218, 54, 49, 221, 223, 20, 21, 22,
+ 23, 48, 228, 0, 229, 47, 232, 54, 50, 51,
+ 52, 261, 54, 12, 13, 14, 15, 243, 47, 47,
+ 49, 49, 1, 177, 176, 251, 252, 47, 154, 49,
+ 256, 10, 11, 12, 11, 12, 13, 14, 15, 41,
+ 47, 267, 49, 51, 82, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 1, 53, -1, 47, 54, 49, 58,
+ -1, -1, 10, 11, 12, 47, -1, 49, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, -1,
+ 48, -1, 50, 51, 1, 53, -1, -1, -1, -1,
+ 58, -1, -1, 10, 11, 12, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ -1, -1, -1, 50, 51, 1, 53, 3, -1, -1,
+ 57, 58, -1, -1, -1, 11, 12, 13, 14, 15,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 1, -1,
+ 3, -1, -1, -1, -1, -1, -1, 10, 11, 12,
+ -1, 47, -1, -1, 50, 51, 52, -1, 54, -1,
+ -1, 57, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 1, -1, 3, -1, 51, -1,
+ 53, -1, -1, 10, 11, 12, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 3, -1, -1, -1, 51, -1, 53, 10, 11, 12,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, -1, -1, 1, 50, 51, -1,
- 53, -1, -1, -1, 57, 58, 11, 12, 13, 14,
- 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 1, -1, 3, -1,
- -1, -1, -1, -1, -1, 10, 11, 12, -1, -1,
- -1, -1, 47, -1, -1, 50, 51, 52, -1, 54,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 3, -1, -1, -1, 51, -1, 53, 10,
- 11, 12, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 10, 11, 12, -1,
- 51, -1, 53, -1, -1, -1, -1, -1, -1, -1,
- -1, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, -1, -1, -1, -1, 51, -1, 53,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43
+ 43, 44, 45, 46, 1, -1, 3, -1, 51, -1,
+ 53, -1, -1, -1, 11, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 24, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 10, 11,
+ 12, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 47, 48, 49, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, -1, -1, -1, -1, 51,
+ -1, 53, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43
};
#define YYPURE 1
@@ -1659,14 +1682,20 @@ case 90:
case 91:
#line 742 "parser.y"
{
+ yyval.ok = false;
+ ;
+ break;}
+case 92:
+#line 745 "parser.y"
+{
yyval.ok = false;
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "skipping bogus declaration" << endl;
#endif
;
break;}
-case 92:
-#line 748 "parser.y"
+case 93:
+#line 751 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1674,16 +1703,16 @@ case 92:
#endif
;
break;}
-case 93:
-#line 754 "parser.y"
+case 94:
+#line 757 "parser.y"
{
yyval.ok = yyvsp[-3].ok;
if ( yyvsp[-2].ok )
yyval.ok = yyvsp[-2].ok;
;
break;}
-case 94:
-#line 759 "parser.y"
+case 95:
+#line 762 "parser.y"
{
yyval.ok = yyvsp[-3].ok;
#ifdef CSS_DEBUG
@@ -1691,8 +1720,8 @@ case 94:
#endif
;
break;}
-case 95:
-#line 765 "parser.y"
+case 96:
+#line 768 "parser.y"
{
yyval.ok = yyvsp[-5].ok;
#ifdef CSS_DEBUG
@@ -1700,8 +1729,8 @@ case 95:
#endif
;
break;}
-case 96:
-#line 774 "parser.y"
+case 97:
+#line 777 "parser.y"
{
yyval.ok = false;
CSSParser *p = static_cast<CSSParser *>(parser);
@@ -1725,43 +1754,53 @@ case 96:
p->valueList = 0;
;
break;}
-case 97:
-#line 797 "parser.y"
+case 98:
+#line 800 "parser.y"
{
yyval.ok = false;
;
break;}
-case 98:
-#line 801 "parser.y"
+case 99:
+#line 804 "parser.y"
+{
+ /* The default movable type template has letter-spacing: .none; Handle this by looking for
+ error tokens at the start of an expr, recover the expr and then treat as an error, cleaning
+ up and deleting the shifted expr. */
+ delete yyvsp[-1].valueList;
+ yyval.ok = false;
+ ;
+ break;}
+case 100:
+#line 812 "parser.y"
{
/* Handle this case: div { text-align: center; !important } Just reduce away the stray !important. */
yyval.ok = false;
;
break;}
-case 99:
-#line 808 "parser.y"
+case 101:
+#line 819 "parser.y"
{
QString str = qString(yyvsp[-1].string);
yyval.prop_id = getPropertyID( str.lower().latin1(), str.length() );
;
break;}
-case 100:
-#line 815 "parser.y"
+case 102:
+#line 826 "parser.y"
{ yyval.b = true; ;
break;}
-case 101:
-#line 816 "parser.y"
+case 103:
+#line 827 "parser.y"
{ yyval.b = false; ;
break;}
-case 102:
-#line 820 "parser.y"
+case 104:
+#line 831 "parser.y"
{
yyval.valueList = new ValueList;
yyval.valueList->addValue( yyvsp[0].value );
;
break;}
-case 103:
-#line 824 "parser.y"
+case 105:
+#line 835 "parser.y"
{
yyval.valueList = yyvsp[-2].valueList;
if ( yyval.valueList ) {
@@ -1776,45 +1815,45 @@ case 103:
}
;
break;}
-case 104:
-#line 837 "parser.y"
+case 106:
+#line 848 "parser.y"
{
delete yyvsp[-1].valueList;
yyval.valueList = 0;
;
break;}
-case 105:
-#line 844 "parser.y"
+case 107:
+#line 855 "parser.y"
{
yyval.tok = '/';
;
break;}
-case 106:
-#line 847 "parser.y"
+case 108:
+#line 858 "parser.y"
{
yyval.tok = ',';
;
break;}
-case 107:
-#line 850 "parser.y"
+case 109:
+#line 861 "parser.y"
{
yyval.tok = 0;
;
break;}
-case 108:
-#line 856 "parser.y"
+case 110:
+#line 867 "parser.y"
{ yyval.value = yyvsp[0].value; ;
break;}
-case 109:
-#line 857 "parser.y"
+case 111:
+#line 868 "parser.y"
{ yyval.value = yyvsp[0].value; yyval.value.fValue *= yyvsp[-1].val; ;
break;}
-case 110:
-#line 858 "parser.y"
+case 112:
+#line 869 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_STRING; ;
break;}
-case 111:
-#line 859 "parser.y"
+case 113:
+#line 870 "parser.y"
{
QString str = qString( yyvsp[-1].string );
yyval.value.id = getValueID( str.lower().latin1(), str.length() );
@@ -1822,102 +1861,102 @@ case 111:
yyval.value.string = yyvsp[-1].string;
;
break;}
-case 112:
-#line 865 "parser.y"
+case 114:
+#line 876 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_URI; ;
break;}
-case 113:
-#line 866 "parser.y"
+case 115:
+#line 877 "parser.y"
{ yyval.value.id = 0; yyval.value.iValue = 0; yyval.value.unit = CSSPrimitiveValue::CSS_UNKNOWN;/* ### */ ;
break;}
-case 114:
-#line 867 "parser.y"
+case 116:
+#line 878 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[0].string; yyval.value.unit = CSSPrimitiveValue::CSS_RGBCOLOR; ;
break;}
-case 115:
-#line 869 "parser.y"
+case 117:
+#line 880 "parser.y"
{
yyval.value = yyvsp[0].value;
;
break;}
-case 116:
-#line 875 "parser.y"
+case 118:
+#line 886 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;
break;}
-case 117:
-#line 876 "parser.y"
+case 119:
+#line 887 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;
break;}
-case 118:
-#line 877 "parser.y"
+case 120:
+#line 888 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PX; ;
break;}
-case 119:
-#line 878 "parser.y"
+case 121:
+#line 889 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_CM; ;
break;}
-case 120:
-#line 879 "parser.y"
+case 122:
+#line 890 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MM; ;
break;}
-case 121:
-#line 880 "parser.y"
+case 123:
+#line 891 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_IN; ;
break;}
-case 122:
-#line 881 "parser.y"
+case 124:
+#line 892 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PT; ;
break;}
-case 123:
-#line 882 "parser.y"
+case 125:
+#line 893 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PC; ;
break;}
-case 124:
-#line 883 "parser.y"
+case 126:
+#line 894 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_DEG; ;
break;}
-case 125:
-#line 884 "parser.y"
+case 127:
+#line 895 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_RAD; ;
break;}
-case 126:
-#line 885 "parser.y"
+case 128:
+#line 896 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_GRAD; ;
break;}
-case 127:
-#line 886 "parser.y"
+case 129:
+#line 897 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MS; ;
break;}
-case 128:
-#line 887 "parser.y"
+case 130:
+#line 898 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_S; ;
break;}
-case 129:
-#line 888 "parser.y"
+case 131:
+#line 899 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_HZ; ;
break;}
-case 130:
-#line 889 "parser.y"
+case 132:
+#line 900 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_KHZ; ;
break;}
-case 131:
-#line 890 "parser.y"
+case 133:
+#line 901 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EMS; ;
break;}
-case 132:
-#line 891 "parser.y"
+case 134:
+#line 902 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = Value::Q_EMS; ;
break;}
-case 133:
-#line 892 "parser.y"
+case 135:
+#line 903 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EXS; ;
break;}
-case 134:
-#line 893 "parser.y"
+case 136:
+#line 904 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_DIMENSION ;
break;}
-case 135:
-#line 898 "parser.y"
+case 137:
+#line 909 "parser.y"
{
Function *f = new Function;
f->name = yyvsp[-4].string;
@@ -1927,20 +1966,20 @@ case 135:
yyval.value.function = f;
;
break;}
-case 136:
-#line 906 "parser.y"
+case 138:
+#line 917 "parser.y"
{
yyval.value.id = 0;
yyval.value.unit = Value::Function;
yyval.value.function = 0;
;
break;}
-case 137:
-#line 918 "parser.y"
+case 139:
+#line 929 "parser.y"
{ yyval.string = yyvsp[-1].string; ;
break;}
-case 138:
-#line 925 "parser.y"
+case 140:
+#line 936 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -1948,8 +1987,8 @@ case 138:
#endif
;
break;}
-case 139:
-#line 931 "parser.y"
+case 141:
+#line 942 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -1957,8 +1996,8 @@ case 139:
#endif
;
break;}
-case 140:
-#line 940 "parser.y"
+case 142:
+#line 951 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -2188,6 +2227,6 @@ yyerrhandle:
}
return 1;
}
-#line 975 "parser.y"
+#line 986 "parser.y"
diff --git a/WebCore/khtml/css/parser.y b/WebCore/khtml/css/parser.y
index be0f204..16c9bbb 100644
--- a/WebCore/khtml/css/parser.y
+++ b/WebCore/khtml/css/parser.y
@@ -739,6 +739,9 @@ decl_list:
declaration ';' maybe_space {
$$ = $1;
}
+ | declaration invalid_block_list ';' maybe_space {
+ $$ = false;
+ }
| error ';' maybe_space {
$$ = false;
#ifdef CSS_DEBUG
@@ -798,6 +801,14 @@ declaration:
$$ = false;
}
|
+ property ':' maybe_space error expr prio {
+ /* The default movable type template has letter-spacing: .none; Handle this by looking for
+ error tokens at the start of an expr, recover the expr and then treat as an error, cleaning
+ up and deleting the shifted expr. */
+ delete $5;
+ $$ = false;
+ }
+ |
prio {
/* Handle this case: div { text-align: center; !important } Just reduce away the stray !important. */
$$ = false;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list