csspool 3.0.2 → 4.0.0.pre

data/lib/csspool/css/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.9
+# This file is automatically generated by Racc 1.4.8
 # from Racc grammer file "".
 #
 
@@ -9,7 +9,7 @@ module CSSPool
   module CSS
     class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 318)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 511)
 
 def numeric thing
   thing = thing.gsub(/[^\d.]/, '')
@@ -21,7 +21,11 @@ def interpret_identifier s
 end
 
 def interpret_uri s
-  interpret_escapes s.match(/^url\((.*)\)$/mu)[1].strip.match(/^(['"]?)((?:\\.|.)*)\1$/mu)[2]
+  interpret_escapes s.match(/^url\((.*)\)$/mui)[1].strip.match(/^(['"]?)((?:\\.|.)*)\1$/mu)[2]
+end
+
+def interpret_string_no_quote s
+  interpret_escapes s.match(/^(.*)\)$/mu)[1].strip.match(/^(['"]?)((?:\\.|.)*)\1$/mu)[2]
 end
 
 def interpret_string s
@@ -50,247 +54,384 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    13,    17,    41,    52,    22,    25,    61,    56,    51,     4,
-     6,     9,    13,    17,    83,    42,    22,    25,     3,    62,
-    63,     4,     6,     9,    46,    94,    13,    17,    66,    81,
-    22,    25,     8,    10,    14,     4,     6,     9,    80,    73,
-     6,     9,    22,    82,     8,    10,    14,     4,     6,     9,
-    22,    74,    47,    66,    67,     4,     6,     9,     8,    10,
-    14,    22,    25,    10,    14,    93,     4,     6,     9,    22,
-    25,    10,    14,    79,     4,     6,     9,    22,    25,    10,
-    14,    78,     4,     6,     9,     6,     9,    22,    25,     8,
-    10,    14,     4,     6,     9,    52,    72,     8,    10,    14,
-    51,    34,   121,   105,    35,   109,    10,    14,    10,    14,
-    89,    98,    90,     6,     9,     8,    10,    14,   116,    91,
-   119,    92,    97,   100,   102,   104,   107,   110,   112,   115,
-   118,   120,   105,   122,   109,   143,    10,    14,   123,    87,
-    98,    88,     6,     9,     6,     9,   124,   116,   125,   119,
-   126,    97,   100,   102,   104,   107,   110,   112,   115,   118,
-   120,   105,   127,   109,   114,    10,    14,    10,    14,    98,
-    68,    69,    70,    71,    86,   133,   116,   134,   119,   135,
-    97,   100,   102,   104,   107,   110,   112,   115,   118,   120,
-   105,   136,   109,    76,    34,    77,   137,    59,    98,    57,
-    40,   141,    37,    36,   141,   116,   147,   119,    31,    97,
-   100,   102,   104,   107,   110,   112,   115,   118,   120,   105,
-   141,   109,   141,   nil,   nil,   nil,   nil,    98,   nil,   nil,
-   nil,   nil,   nil,   nil,   116,   nil,   119,   nil,    97,   100,
-   102,   104,   107,   110,   112,   115,   118,   120,   105,   nil,
-   109,   nil,   131,   nil,   nil,   nil,    98,   nil,   nil,   129,
-   nil,   nil,   nil,   116,   nil,   119,   128,    97,   100,   102,
-   104,   107,   110,   112,   115,   118,   120,   105,   nil,   109,
-   nil,   nil,   nil,   nil,   nil,    98,   nil,   nil,   nil,   nil,
-   nil,   nil,   116,   nil,   119,   nil,    97,   100,   102,   104,
-   107,   110,   112,   115,   118,   120,   119,   nil,    97,   100,
-   102,   104,   107,   110,   112,   115,   118 ]
+     9,    10,   166,    48,    30,    24,   123,   124,   105,    32,
+    38,    40,    48,   107,    52,    48,     9,    10,   121,    76,
+    30,    24,   -47,   185,   170,    32,    38,    40,   219,   171,
+   218,    49,    18,    76,    20,   184,    11,    38,    40,    77,
+    49,     3,    22,    49,   165,    31,    39,    41,    18,   106,
+    20,    81,    11,    77,    91,     9,    10,   174,    22,    30,
+    24,    31,    39,    41,    32,    38,    40,    92,    93,    97,
+   175,     9,    10,    39,    41,    30,    24,   210,    30,   211,
+    32,    38,    40,    32,    38,    40,    94,    18,    30,    20,
+   190,    11,   118,    32,    38,    40,   119,    22,   118,   109,
+    31,    39,    41,    18,    30,    20,   213,    11,   212,    32,
+    38,    40,   111,    22,    67,    81,    31,    39,    41,    31,
+    39,    41,   189,    58,   183,   123,    59,    69,   113,    31,
+    39,    41,    68,   161,    30,    24,   112,   160,   114,    32,
+    38,    40,   110,    30,    24,    31,    39,    41,    32,    38,
+    40,    67,    30,    24,    81,    85,   159,    32,    38,    40,
+    86,    30,    24,   158,    69,    97,    32,    38,    40,    68,
+    98,    18,   154,    20,   172,    31,    39,    41,   191,   173,
+    18,    22,    20,   130,    31,    39,    41,    38,    40,    18,
+    22,    20,   129,    31,    39,    41,    38,    40,   121,    22,
+    30,    24,    31,    39,    41,    32,    38,    40,    30,    38,
+    40,    30,   198,    32,    38,    40,    32,    38,    40,    81,
+    85,    38,    40,    39,    41,    86,   130,    76,    18,   199,
+    20,    71,    39,    41,    81,    85,   129,   200,    22,    80,
+    86,    31,    39,    41,   128,    39,    41,    77,   202,    31,
+    39,    41,    31,    39,    41,    30,    24,    39,    41,    61,
+    32,    38,    40,   182,   176,   177,   178,   153,   127,   144,
+   152,   146,   145,   147,   148,   149,   150,   151,   117,    58,
+   118,   126,   125,    18,   142,    20,    52,   207,   193,   179,
+   180,   181,   141,    22,   170,   195,    31,    39,    41,    67,
+   172,   153,   194,   144,   152,   146,   145,   147,   148,   149,
+   150,   151,    69,   142,   122,    52,   229,    81,    85,   115,
+   104,   141,   157,    86,   167,   217,   140,   216,    67,   215,
+   153,   214,   144,   152,   146,   145,   147,   148,   149,   150,
+   151,    69,   142,   209,    52,   208,    99,    96,   220,   221,
+   141,   222,   223,    89,   226,   140,    88,    67,    78,   153,
+   230,   144,   152,   146,   145,   147,   148,   149,   150,   151,
+    69,   142,   231,    52,   232,   233,   234,   235,   236,   141,
+   237,   238,   239,   240,   140,   241,    67,    46,   153,   226,
+   144,   152,   146,   145,   147,   148,   149,   150,   151,    69,
+   142,   226,    52,    42,   226,   nil,   nil,   nil,   141,   nil,
+   nil,   nil,   nil,   140,   nil,    67,   nil,   153,   nil,   144,
+   152,   146,   145,   147,   148,   149,   150,   151,    69,   142,
+   nil,    52,   206,   nil,   nil,   nil,   nil,   141,   nil,   nil,
+   nil,   nil,   140,   nil,    67,   nil,   153,   nil,   144,   152,
+   146,   145,   147,   148,   149,   150,   151,    69,   142,   nil,
+    52,   nil,   nil,   nil,   nil,   nil,   141,   nil,   nil,   nil,
+   nil,   140,   nil,    67,   nil,   153,   nil,   144,   152,   146,
+   145,   147,   148,   149,   150,   151,    69,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   140 ]
 
 racc_action_check = [
-    29,    29,    14,    21,    29,    29,    28,    21,    21,    29,
-    29,    29,     2,     2,    55,    14,     2,     2,     1,    28,
-    28,     2,     2,     2,    17,    75,    27,    27,    75,    54,
-    27,    27,    29,    29,    29,    27,    27,    27,    53,    42,
-    15,    15,    59,    55,     2,     2,     2,    59,    59,    59,
-    64,    42,    17,    33,    33,    64,    64,    64,    27,    27,
-    27,    19,    19,    15,    15,    73,    19,    19,    19,    16,
-    16,    59,    59,    51,    16,    16,    16,    25,    25,    64,
-    64,    49,    25,    25,    25,    20,    20,    12,    12,    19,
-    19,    19,    12,    12,    12,    80,    40,    16,    16,    16,
-    80,     8,    83,   116,     8,   116,    25,    25,    20,    20,
-    70,   116,    70,    11,    11,    12,    12,    12,   116,    71,
-   116,    71,   116,   116,   116,   116,   116,   116,   116,   116,
-   116,   116,   121,    87,   121,   121,    11,    11,    88,    69,
-   121,    69,     5,     5,    18,    18,    89,   121,    90,   121,
-    91,   121,   121,   121,   121,   121,   121,   121,   121,   121,
-   121,    82,    92,    82,    82,     5,     5,    18,    18,    82,
-    36,    36,    36,    36,    66,    99,    82,   103,    82,   106,
-    82,    82,    82,    82,    82,    82,    82,    82,    82,    82,
-   132,   108,   132,    45,    45,    45,   111,    26,   132,    24,
-    13,   117,    10,     9,   139,   132,   140,   132,     3,   132,
-   132,   132,   132,   132,   132,   132,   132,   132,   132,   143,
-   144,   143,   148,   nil,   nil,   nil,   nil,   143,   nil,   nil,
-   nil,   nil,   nil,   nil,   143,   nil,   143,   nil,   143,   143,
-   143,   143,   143,   143,   143,   143,   143,   143,    96,   nil,
-    96,   nil,    96,   nil,   nil,   nil,    96,   nil,   nil,    96,
-   nil,   nil,   nil,    96,   nil,    96,    96,    96,    96,    96,
-    96,    96,    96,    96,    96,    96,    96,   114,   nil,   114,
-   nil,   nil,   nil,   nil,   nil,   114,   nil,   nil,   nil,   nil,
-   nil,   nil,   114,   nil,   114,   nil,   114,   114,   114,   114,
-   114,   114,   114,   114,   114,   114,   113,   nil,   113,   113,
-   113,   113,   113,   113,   113,   113,   113 ]
+     2,     2,    84,    10,     2,     2,    57,    57,    40,     2,
+     2,     2,    11,    40,    11,    51,     7,     7,    51,    72,
+     7,     7,    72,   111,    96,     7,     7,     7,   181,    96,
+   181,    10,     2,   159,     2,   111,     2,    36,    36,    72,
+    11,     1,     2,    51,    84,     2,     2,     2,     7,    40,
+     7,    82,     7,   159,    27,     6,     6,   105,     7,     6,
+     6,     7,     7,     7,     6,     6,     6,    27,    27,   106,
+   107,     5,     5,    36,    36,     5,     5,   177,    89,   177,
+     5,     5,     5,    89,    89,    89,    27,     6,    90,     6,
+   120,     6,   120,    90,    90,    90,    50,     6,    50,    41,
+     6,     6,     6,     5,   222,     5,   178,     5,   178,   222,
+   222,   222,    41,     5,    20,    81,     5,     5,     5,    89,
+    89,    89,   116,    18,   110,   116,    18,    20,    41,    90,
+    90,    90,    20,    79,    24,    24,    41,    78,    41,    24,
+    24,    24,    41,    12,    12,   222,   222,   222,    12,    12,
+    12,   127,    13,    13,   163,   163,    75,    13,    13,    13,
+   163,    14,    14,    74,   127,    31,    14,    14,    14,   127,
+    31,    12,    70,    12,    99,    24,    24,    24,   123,    99,
+    13,    12,    13,    66,    12,    12,    12,    28,    28,    14,
+    13,    14,    65,    13,    13,    13,    34,    34,   132,    14,
+    17,    17,    14,    14,    14,    17,    17,    17,   112,    35,
+    35,   114,   134,   112,   112,   112,   114,   114,   114,    83,
+    83,    37,    37,    28,    28,    83,   135,    21,    17,   136,
+    17,    21,    34,    34,    23,    23,   138,   139,    17,    23,
+    23,    17,    17,    17,    64,    35,    35,    21,   156,   112,
+   112,   112,   114,   114,   114,    19,    19,    37,    37,    19,
+    19,    19,    19,   108,   108,   108,   108,   143,    63,   143,
+   143,   143,   143,   143,   143,   143,   143,   143,    47,    47,
+    47,    62,    60,    19,   131,    19,   131,   166,   131,   108,
+   108,   108,   131,    19,   174,   131,    19,    19,    19,   131,
+   175,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+   131,   131,   131,   207,    56,   207,   207,    73,    73,    46,
+    39,   207,    73,    73,    86,   180,   131,   180,   207,   179,
+   207,   179,   207,   207,   207,   207,   207,   207,   207,   207,
+   207,   207,    67,   176,    67,   176,    32,    30,   185,   186,
+    67,   187,   188,    26,   205,   207,    25,    67,    22,    67,
+   208,    67,    67,    67,    67,    67,    67,    67,    67,    67,
+    67,   229,   209,   229,   210,   211,   212,   213,   214,   229,
+   215,   216,   217,   218,    67,   219,   229,     9,   229,   227,
+   229,   229,   229,   229,   229,   229,   229,   229,   229,   229,
+   196,   228,   196,     3,   245,   nil,   nil,   nil,   196,   nil,
+   nil,   nil,   nil,   229,   nil,   196,   nil,   196,   nil,   196,
+   196,   196,   196,   196,   196,   196,   196,   196,   196,   165,
+   nil,   165,   165,   nil,   nil,   nil,   nil,   165,   nil,   nil,
+   nil,   nil,   196,   nil,   165,   nil,   165,   nil,   165,   165,
+   165,   165,   165,   165,   165,   165,   165,   165,   206,   nil,
+   206,   nil,   nil,   nil,   nil,   nil,   206,   nil,   nil,   nil,
+   nil,   165,   nil,   206,   nil,   206,   nil,   206,   206,   206,
+   206,   206,   206,   206,   206,   206,   206,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   206 ]
 
 racc_action_pointer = [
-   nil,    18,    10,   208,   nil,   130,   nil,   nil,    95,   197,
-   196,   101,    81,   196,    -4,    28,    63,    20,   132,    55,
-    73,    -3,   nil,   nil,   190,    71,   189,    24,    -1,    -2,
-   nil,   nil,   nil,    45,   nil,   nil,   156,   nil,   nil,   nil,
-    91,   nil,    33,   nil,   nil,   188,   nil,   nil,   nil,    71,
-   nil,    67,   nil,    33,    19,     7,   nil,   nil,   nil,    36,
-   nil,   nil,   nil,   nil,    44,   nil,   168,   nil,   nil,   135,
-   106,   115,   nil,    47,   nil,    20,   nil,   nil,   nil,   nil,
-    89,   nil,   157,    66,   nil,   nil,   nil,   119,   124,   132,
-   134,   136,   148,   nil,   nil,   nil,   244,   nil,   nil,   168,
-   nil,   nil,   nil,   170,   nil,   nil,   172,   nil,   184,   nil,
-   nil,   189,   nil,   285,   273,   nil,    99,   168,   nil,   nil,
-   nil,   128,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   186,   nil,   nil,   nil,   nil,   nil,   nil,   171,
-   188,   nil,   nil,   215,   187,   nil,   nil,   nil,   189,   nil,
-   nil ]
+   nil,    41,    -2,   403,   nil,    69,    53,    14,   nil,   383,
+    -1,     8,   137,   146,   155,   nil,   nil,   194,   117,   249,
+    95,   221,   352,   229,   128,   347,   345,    47,   175,   nil,
+   300,   159,   299,   nil,   184,   197,    25,   209,   nil,   314,
+     2,    93,   nil,   nil,   nil,   nil,   314,   273,   nil,   nil,
+    91,    11,   nil,   nil,   nil,   nil,   304,    -2,   nil,   nil,
+   272,   nil,   272,   260,   237,   185,   176,   338,   nil,   nil,
+   162,   nil,    13,   312,   154,   148,   nil,   nil,   128,   123,
+   nil,   110,    46,   214,    -5,   nil,   318,   nil,   nil,    72,
+    82,   nil,   nil,   nil,   nil,   nil,    18,   nil,   nil,   168,
+   nil,   nil,   nil,   nil,   nil,    10,    63,    23,   249,   nil,
+   118,    17,   202,   nil,   205,   nil,   117,   nil,   nil,   nil,
+    85,   nil,   nil,   172,   nil,   nil,   nil,   132,   nil,   nil,
+   nil,   280,   191,   nil,   205,   219,   222,   nil,   229,   219,
+   nil,   nil,   nil,   246,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   238,   nil,   nil,    27,
+   nil,   nil,   nil,   149,   nil,   425,   238,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   288,   294,   339,    73,   102,   325,
+   321,    24,   nil,   nil,   nil,   330,   331,   343,   334,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   396,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   321,   454,   309,   346,   358,
+   360,   361,   362,   363,   364,   366,   367,   368,   369,   371,
+   nil,   nil,    98,   nil,   nil,   nil,   nil,   356,   368,   367,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   371,   nil ]
 
 racc_action_default = [
-    -1,  -103,  -103,  -103,   -38,   -35,   -47,   -36,  -103,  -103,
-  -103,   -39,   -18,  -103,  -103,   -40,   -19,  -103,   -41,  -103,
-   -42,  -103,   -37,    -2,  -103,  -103,   -28,    -5,   -30,    -6,
-    -7,   151,   -34,  -103,   -15,   -22,  -103,   -48,   -43,   -16,
-  -103,   -56,  -103,   -44,   -17,  -103,   -12,   -13,   -45,  -103,
-   -46,  -103,   -68,   -61,  -103,  -103,   -24,   -26,   -25,  -103,
-    -3,   -31,   -32,   -33,  -103,    -4,  -103,   -21,   -55,  -103,
-  -103,  -103,    -8,  -103,   -57,  -103,   -10,   -11,   -20,   -69,
-   -60,   -23,  -103,  -103,   -27,   -29,   -14,  -103,  -103,  -103,
-  -103,  -103,  -103,   -58,    -9,   -59,   -75,   -91,   -85,   -76,
-   -99,   -77,   -93,   -78,   -92,   -89,   -79,   -94,   -80,  -102,
-   -95,   -81,   -96,  -103,  -103,   -97,  -103,   -67,   -98,  -100,
-   -87,  -103,   -50,   -49,   -51,   -52,   -54,   -53,   -71,   -72,
-   -74,   -70,  -103,  -101,   -88,   -86,   -84,   -82,   -90,   -67,
-  -103,   -66,   -62,  -103,   -67,   -73,   -63,   -83,   -67,   -64,
-   -65 ]
+    -1,  -160,  -160,  -160,    -2,    -6,    -7,    -8,    -9,  -160,
+  -160,  -160,   -23,   -24,   -25,   -26,   -27,  -160,  -160,  -160,
+  -160,   -47,  -160,  -160,  -160,  -160,   -57,   -59,   -65,   -66,
+   -69,  -160,   -74,   -73,   -78,   -79,   -80,   -81,   -86,  -160,
+  -160,  -160,   247,    -3,    -4,    -5,  -160,  -160,   -14,   -15,
+  -160,  -160,  -159,   -20,   -21,   -22,  -160,  -160,   -19,   -30,
+  -160,   -32,  -160,   -35,   -36,   -37,   -38,  -160,  -139,  -144,
+  -160,   -40,   -43,  -160,  -160,   -49,   -50,   -51,  -160,  -160,
+   -53,  -108,  -113,  -114,  -160,  -121,  -160,   -54,   -55,  -160,
+  -160,   -60,   -61,   -62,   -63,   -64,  -160,   -71,   -75,  -160,
+   -82,   -83,   -84,   -85,   -87,   -69,  -160,  -160,  -160,  -101,
+  -160,  -160,  -160,  -106,  -160,   -10,  -160,   -12,   -13,   -17,
+  -160,  -158,   -28,  -160,   -29,   -31,   -33,  -160,  -138,  -136,
+  -143,  -128,  -129,  -130,  -131,  -132,  -133,  -134,  -135,  -160,
+  -140,  -142,  -146,  -160,  -148,  -149,  -150,  -151,  -152,  -153,
+  -154,  -155,  -156,  -157,   -39,   -42,  -160,   -45,   -46,   -47,
+   -41,   -52,  -109,  -112,  -111,  -160,  -160,  -122,   -56,   -58,
+   -70,   -77,   -72,   -76,  -160,  -160,  -160,  -160,  -160,  -160,
+  -160,  -160,  -100,  -102,  -103,  -160,  -160,   -68,  -160,   -11,
+   -16,   -18,   -34,  -123,  -124,  -125,  -160,  -127,  -145,  -141,
+  -137,  -147,   -44,   -48,  -110,  -120,  -160,  -160,  -160,  -160,
+  -160,  -160,  -160,  -160,  -160,  -160,  -160,  -160,  -160,  -160,
+  -104,  -105,  -160,  -107,  -126,  -115,  -119,  -120,  -120,  -160,
+   -88,   -89,   -90,   -91,   -92,   -93,   -94,   -95,   -96,   -97,
+   -98,   -99,   -67,  -116,  -117,  -120,  -118 ]
 
 racc_goto_table = [
-   117,    54,   142,    33,    84,    32,    58,    85,    64,    39,
-    23,    38,    45,    44,   130,    43,    49,     2,    48,     1,
-    50,   132,   138,   nil,   146,   nil,   nil,   nil,   nil,   149,
-   nil,   nil,   139,   150,   140,    60,   nil,    65,   nil,   144,
-    75,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   145,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    95,   148 ]
+   139,    79,   186,   188,   187,    70,    66,    65,    62,    47,
+    50,    57,   225,    95,   162,   163,    87,   168,    90,   100,
+   101,   102,   103,    53,    54,    55,   169,   203,    56,   108,
+    60,    51,     2,     4,   243,   244,    43,    44,    45,     1,
+   116,   196,   201,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   120,   156,   246,   nil,   nil,   nil,   155,   nil,   nil,   nil,
+   nil,   164,   nil,   nil,   197,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   205,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   242,   187,    66,    65,   192,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   224,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   227,
+   228,   204,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   245 ]
 
 racc_goto_check = [
-    26,    13,    27,     8,    14,    19,    12,    15,    17,     6,
-     2,    19,     7,     6,    26,    19,     6,     3,    19,     1,
-    19,    28,    31,   nil,    27,   nil,   nil,   nil,   nil,    27,
-   nil,   nil,    26,    27,    26,     2,   nil,     2,   nil,    26,
-     8,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    13,    26 ]
+    46,    27,    33,    37,    33,    24,    22,    21,    18,     8,
+     8,     9,    47,    36,    43,    43,    30,    31,    34,    36,
+    36,    36,    36,     7,     7,     7,    32,    28,     7,    38,
+     7,    10,     3,     2,    47,    47,     2,     2,     2,     1,
+     9,    48,    50,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     8,    27,    47,   nil,   nil,   nil,    24,   nil,   nil,   nil,
+   nil,    27,   nil,   nil,    46,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    46,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    37,    33,    22,    21,    18,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    46,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    46,
+    46,    27,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    46 ]
 
 racc_goto_pointer = [
-   nil,    19,     8,    17,   nil,   nil,    -3,    -5,    -5,   nil,
-   nil,   nil,   -19,   -20,   -55,   -57,   nil,   -20,   nil,     0,
-   nil,   nil,   nil,   nil,   nil,   nil,   -82,  -115,   -75,   nil,
-   nil,   -91,   nil,   nil,   nil,   nil,   nil ]
+   nil,    39,    31,    32,   nil,   nil,   nil,    11,    -1,    -7,
+    20,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   -12,   nil,
+   nil,   -13,   -14,   nil,   -16,   nil,   nil,   -22,  -132,   nil,
+    -8,   -72,   -64,  -110,    -9,   nil,   -15,  -111,   -11,   nil,
+   nil,   nil,   nil,   -67,   nil,   nil,   -67,  -193,   -90,   nil,
+  -101,   nil,   nil,   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,    27,    29,    30,   nil,   nil,    12,
-    16,    19,    21,   nil,    24,    26,    28,   nil,     5,     7,
-    11,    15,    18,    20,    53,    55,   nil,   nil,   nil,    96,
-    99,   101,   103,   106,   108,   111,   113 ]
+   nil,   nil,   nil,   nil,     5,     6,     7,     8,   nil,   nil,
+   132,    12,    13,    14,    15,    16,    17,    19,   nil,    63,
+    64,   138,   135,    21,   nil,    72,    73,   nil,    74,    75,
+    23,    25,    26,    27,   nil,    28,    29,   nil,    33,    34,
+    35,    36,    37,    83,    82,    84,   nil,   nil,   nil,   131,
+   133,   134,   136,   137,   143 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  0, 40, :_reduce_1,
-  2, 38, :_reduce_2,
-  2, 39, :_reduce_none,
-  2, 39, :_reduce_none,
-  1, 39, :_reduce_none,
-  1, 39, :_reduce_none,
-  1, 39, :_reduce_none,
-  3, 41, :_reduce_8,
-  4, 42, :_reduce_9,
-  3, 42, :_reduce_10,
-  2, 44, :_reduce_none,
-  1, 44, :_reduce_12,
-  1, 44, :_reduce_13,
-  3, 45, :_reduce_14,
-  1, 45, :_reduce_15,
-  2, 43, :_reduce_none,
-  2, 43, :_reduce_none,
-  1, 43, :_reduce_none,
-  1, 43, :_reduce_none,
-  3, 47, :_reduce_20,
-  3, 48, :_reduce_21,
-  2, 48, :_reduce_22,
-  3, 46, :_reduce_23,
-  2, 46, :_reduce_24,
-  2, 49, :_reduce_25,
-  2, 49, :_reduce_26,
-  3, 51, :_reduce_27,
-  1, 51, :_reduce_28,
-  3, 52, :_reduce_29,
+  0, 53, :_reduce_1,
+  2, 51, :_reduce_2,
+  2, 52, :_reduce_none,
+  2, 52, :_reduce_none,
+  2, 52, :_reduce_none,
+  1, 52, :_reduce_none,
   1, 52, :_reduce_none,
-  1, 54, :_reduce_31,
-  1, 54, :_reduce_32,
-  1, 54, :_reduce_33,
-  2, 53, :_reduce_34,
-  1, 53, :_reduce_35,
-  1, 53, :_reduce_36,
-  1, 55, :_reduce_37,
-  1, 55, :_reduce_38,
-  1, 56, :_reduce_39,
-  1, 56, :_reduce_40,
-  1, 56, :_reduce_41,
-  1, 56, :_reduce_42,
-  2, 56, :_reduce_43,
-  2, 56, :_reduce_44,
-  2, 56, :_reduce_45,
-  2, 56, :_reduce_46,
-  1, 57, :_reduce_47,
-  2, 58, :_reduce_48,
-  5, 59, :_reduce_49,
-  5, 59, :_reduce_50,
-  5, 59, :_reduce_51,
-  5, 59, :_reduce_52,
-  5, 59, :_reduce_53,
-  5, 59, :_reduce_54,
-  3, 59, :_reduce_55,
-  2, 60, :_reduce_56,
-  3, 60, :_reduce_57,
-  4, 60, :_reduce_58,
-  3, 50, :_reduce_none,
-  2, 50, :_reduce_none,
-  1, 50, :_reduce_none,
-  4, 61, :_reduce_62,
-  5, 61, :_reduce_63,
-  5, 61, :_reduce_64,
-  6, 61, :_reduce_65,
-  1, 64, :_reduce_66,
-  0, 64, :_reduce_67,
-  1, 62, :_reduce_68,
-  2, 62, :_reduce_69,
-  1, 65, :_reduce_none,
-  1, 65, :_reduce_none,
-  1, 65, :_reduce_none,
-  3, 63, :_reduce_73,
-  2, 63, :_reduce_74,
-  1, 63, :_reduce_75,
-  1, 66, :_reduce_none,
-  1, 66, :_reduce_none,
-  1, 66, :_reduce_none,
-  1, 66, :_reduce_none,
-  1, 66, :_reduce_none,
-  1, 66, :_reduce_none,
-  2, 72, :_reduce_82,
-  3, 72, :_reduce_83,
-  2, 71, :_reduce_84,
-  1, 71, :_reduce_85,
-  2, 70, :_reduce_86,
-  1, 70, :_reduce_87,
-  2, 69, :_reduce_88,
-  1, 69, :_reduce_89,
-  2, 68, :_reduce_90,
-  1, 68, :_reduce_91,
-  1, 68, :_reduce_92,
-  1, 68, :_reduce_93,
-  1, 68, :_reduce_94,
-  1, 68, :_reduce_95,
-  1, 68, :_reduce_96,
-  1, 68, :_reduce_97,
-  1, 68, :_reduce_98,
-  1, 73, :_reduce_99,
-  1, 73, :_reduce_100,
-  2, 67, :_reduce_101,
-  1, 67, :_reduce_102 ]
-
-racc_reduce_n = 103
-
-racc_shift_n = 151
+  1, 52, :_reduce_none,
+  1, 52, :_reduce_none,
+  3, 54, :_reduce_10,
+  4, 55, :_reduce_11,
+  3, 55, :_reduce_12,
+  2, 58, :_reduce_none,
+  1, 58, :_reduce_14,
+  1, 58, :_reduce_15,
+  4, 56, :_reduce_16,
+  3, 56, :_reduce_17,
+  3, 59, :_reduce_18,
+  1, 59, :_reduce_19,
+  2, 57, :_reduce_none,
+  2, 57, :_reduce_none,
+  2, 57, :_reduce_none,
+  1, 57, :_reduce_none,
+  1, 57, :_reduce_none,
+  1, 57, :_reduce_none,
+  1, 62, :_reduce_none,
+  1, 62, :_reduce_none,
+  3, 64, :_reduce_28,
+  3, 66, :_reduce_29,
+  2, 66, :_reduce_30,
+  3, 65, :_reduce_31,
+  2, 65, :_reduce_32,
+  3, 67, :_reduce_33,
+  3, 68, :_reduce_34,
+  1, 68, :_reduce_35,
+  1, 69, :_reduce_none,
+  1, 69, :_reduce_none,
+  1, 69, :_reduce_none,
+  3, 63, :_reduce_none,
+  2, 63, :_reduce_none,
+  3, 73, :_reduce_41,
+  2, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  3, 75, :_reduce_44,
+  2, 75, :_reduce_45,
+  2, 76, :_reduce_46,
+  0, 78, :_reduce_none,
+  3, 78, :_reduce_48,
+  1, 78, :_reduce_none,
+  1, 79, :_reduce_none,
+  1, 79, :_reduce_51,
+  3, 61, :_reduce_52,
+  2, 61, :_reduce_53,
+  2, 80, :_reduce_54,
+  2, 80, :_reduce_55,
+  3, 81, :_reduce_56,
+  1, 81, :_reduce_57,
+  3, 82, :_reduce_58,
+  1, 82, :_reduce_none,
+  1, 84, :_reduce_60,
+  1, 84, :_reduce_61,
+  1, 84, :_reduce_62,
+  1, 84, :_reduce_63,
+  2, 83, :_reduce_64,
+  1, 83, :_reduce_65,
+  1, 83, :_reduce_66,
+  3, 87, :_reduce_67,
+  1, 87, :_reduce_none,
+  1, 88, :_reduce_69,
+  3, 88, :_reduce_70,
+  2, 88, :_reduce_71,
+  3, 88, :_reduce_72,
+  1, 85, :_reduce_73,
+  1, 85, :_reduce_74,
+  2, 85, :_reduce_75,
+  3, 85, :_reduce_76,
+  3, 85, :_reduce_77,
+  1, 86, :_reduce_78,
+  1, 86, :_reduce_79,
+  1, 86, :_reduce_80,
+  1, 86, :_reduce_81,
+  2, 86, :_reduce_82,
+  2, 86, :_reduce_83,
+  2, 86, :_reduce_84,
+  2, 86, :_reduce_85,
+  1, 89, :_reduce_86,
+  2, 90, :_reduce_87,
+  5, 91, :_reduce_88,
+  5, 91, :_reduce_89,
+  5, 91, :_reduce_90,
+  5, 91, :_reduce_91,
+  5, 91, :_reduce_92,
+  5, 91, :_reduce_93,
+  5, 91, :_reduce_94,
+  5, 91, :_reduce_95,
+  5, 91, :_reduce_96,
+  5, 91, :_reduce_97,
+  5, 91, :_reduce_98,
+  5, 91, :_reduce_99,
+  3, 91, :_reduce_100,
+  2, 92, :_reduce_101,
+  3, 92, :_reduce_102,
+  3, 92, :_reduce_103,
+  4, 92, :_reduce_104,
+  4, 92, :_reduce_105,
+  2, 92, :_reduce_106,
+  4, 92, :_reduce_107,
+  1, 93, :_reduce_none,
+  2, 93, :_reduce_none,
+  3, 77, :_reduce_none,
+  2, 77, :_reduce_none,
+  2, 77, :_reduce_none,
+  1, 77, :_reduce_none,
+  1, 77, :_reduce_none,
+  4, 94, :_reduce_115,
+  5, 94, :_reduce_116,
+  5, 94, :_reduce_117,
+  6, 94, :_reduce_118,
+  1, 97, :_reduce_119,
+  0, 97, :_reduce_120,
+  1, 95, :_reduce_121,
+  2, 95, :_reduce_122,
+  1, 98, :_reduce_none,
+  1, 98, :_reduce_none,
+  1, 98, :_reduce_none,
+  3, 96, :_reduce_126,
+  2, 96, :_reduce_127,
+  1, 96, :_reduce_128,
+  1, 99, :_reduce_none,
+  1, 99, :_reduce_none,
+  1, 99, :_reduce_none,
+  1, 99, :_reduce_none,
+  1, 99, :_reduce_none,
+  1, 99, :_reduce_none,
+  1, 99, :_reduce_none,
+  2, 71, :_reduce_136,
+  3, 71, :_reduce_137,
+  2, 70, :_reduce_138,
+  1, 70, :_reduce_139,
+  1, 103, :_reduce_140,
+  2, 102, :_reduce_141,
+  1, 102, :_reduce_142,
+  2, 72, :_reduce_143,
+  1, 72, :_reduce_144,
+  2, 101, :_reduce_145,
+  1, 101, :_reduce_146,
+  2, 100, :_reduce_147,
+  1, 100, :_reduce_148,
+  1, 100, :_reduce_149,
+  1, 100, :_reduce_150,
+  1, 100, :_reduce_151,
+  1, 100, :_reduce_152,
+  1, 100, :_reduce_153,
+  1, 100, :_reduce_154,
+  1, 100, :_reduce_155,
+  1, 104, :_reduce_156,
+  1, 104, :_reduce_157,
+  2, 60, :_reduce_158,
+  1, 60, :_reduce_159 ]
+
+racc_reduce_n = 160
+
+racc_shift_n = 247
 
 racc_token_table = {
   false => 0,
@@ -328,10 +469,23 @@ racc_token_table = {
   :URI => 32,
   :IMPORTANT_SYM => 33,
   :MEDIA_SYM => 34,
-  "." => 35,
-  ":" => 36 }
-
-racc_nt_base = 37
+  :NTH_PSEUDO_CLASS => 35,
+  :DOCUMENT_QUERY_SYM => 36,
+  :FUNCTION_NO_QUOTE => 37,
+  :NAMESPACE_SYM => 38,
+  :TILDE => 39,
+  :PREFIXMATCH => 40,
+  :SUFFIXMATCH => 41,
+  :SUBSTRINGMATCH => 42,
+  :NOT_PSEUDO_CLASS => 43,
+  :KEYFRAMES_SYM => 44,
+  :MATCHES_PSEUDO_CLASS => 45,
+  :MATH => 46,
+  "|" => 47,
+  "." => 48,
+  ":" => 49 }
+
+racc_nt_base = 50
 
 racc_use_result_var = true
 
@@ -387,6 +541,19 @@ Racc_token_to_s_table = [
   "URI",
   "IMPORTANT_SYM",
   "MEDIA_SYM",
+  "NTH_PSEUDO_CLASS",
+  "DOCUMENT_QUERY_SYM",
+  "FUNCTION_NO_QUOTE",
+  "NAMESPACE_SYM",
+  "TILDE",
+  "PREFIXMATCH",
+  "SUFFIXMATCH",
+  "SUBSTRINGMATCH",
+  "NOT_PSEUDO_CLASS",
+  "KEYFRAMES_SYM",
+  "MATCHES_PSEUDO_CLASS",
+  "MATH",
+  "\"|\"",
   "\".\"",
   "\":\"",
   "$start",
@@ -395,36 +562,54 @@ Racc_token_to_s_table = [
   "@1",
   "charset",
   "import",
+  "namespace",
   "body",
   "import_location",
   "medium",
+  "ident",
   "ruleset",
+  "conditional_rule",
+  "keyframes_rule",
   "media",
+  "document_query",
   "start_media",
-  "start_selector",
+  "start_document_query",
+  "url_match_fns",
+  "url_match_fn",
+  "function_no_quote",
+  "function",
+  "uri",
+  "start_keyframes_rule",
+  "keyframes_blocks",
+  "keyframes_block",
+  "start_keyframes_block",
   "declarations",
+  "keyframes_selectors",
+  "keyframes_selector",
+  "start_selector",
   "selectors",
   "selector",
   "simple_selector",
   "combinator",
   "element_name",
   "hcap",
+  "simple_selectors",
+  "ident_with_namespace",
   "hash",
   "class",
   "attrib",
   "pseudo",
+  "one_or_more_semis",
   "declaration",
   "property",
   "expr",
   "prio",
   "operator",
   "term",
-  "ident",
   "numeric",
   "string",
-  "uri",
   "hexcolor",
-  "function",
+  "math",
   "unary_operator" ]
 
 Racc_debug_parser = false
@@ -433,14 +618,14 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'parser.y', 9)
+module_eval(<<'.,.,', 'parser.y', 17)
   def _reduce_1(val, _values, result)
      @handler.start_document 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 11)
+module_eval(<<'.,.,', 'parser.y', 19)
   def _reduce_2(val, _values, result)
      @handler.end_document 
     result
@@ -457,78 +642,106 @@ module_eval(<<'.,.,', 'parser.y', 11)
 
 # reduce 7 omitted
 
-module_eval(<<'.,.,', 'parser.y', 21)
-  def _reduce_8(val, _values, result)
+# reduce 8 omitted
+
+# reduce 9 omitted
+
+module_eval(<<'.,.,', 'parser.y', 31)
+  def _reduce_10(val, _values, result)
      @handler.charset interpret_string(val[1]), {} 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 25)
-  def _reduce_9(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 35)
+  def _reduce_11(val, _values, result)
             @handler.import_style [val[2]].flatten, val[1]
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 28)
-  def _reduce_10(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 38)
+  def _reduce_12(val, _values, result)
             @handler.import_style [], val[1]
       
     result
   end
 .,.,
 
-# reduce 11 omitted
+# reduce 13 omitted
 
-module_eval(<<'.,.,', 'parser.y', 33)
-  def _reduce_12(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 43)
+  def _reduce_14(val, _values, result)
      result = Terms::String.new interpret_string val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 34)
-  def _reduce_13(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 44)
+  def _reduce_15(val, _values, result)
      result = Terms::URI.new interpret_uri val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 38)
-  def _reduce_14(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 48)
+  def _reduce_16(val, _values, result)
+            @handler.namespace val[1], val[2]
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 51)
+  def _reduce_17(val, _values, result)
+            @handler.namespace nil, val[1]
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 56)
+  def _reduce_18(val, _values, result)
             result = [val.first, Terms::Ident.new(interpret_identifier val.last)]
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 41)
-  def _reduce_15(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 59)
+  def _reduce_19(val, _values, result)
             result = Terms::Ident.new interpret_identifier val.first
       
     result
   end
 .,.,
 
-# reduce 16 omitted
+# reduce 20 omitted
 
-# reduce 17 omitted
+# reduce 21 omitted
 
-# reduce 18 omitted
+# reduce 22 omitted
 
-# reduce 19 omitted
+# reduce 23 omitted
 
-module_eval(<<'.,.,', 'parser.y', 51)
-  def _reduce_20(val, _values, result)
+# reduce 24 omitted
+
+# reduce 25 omitted
+
+# reduce 26 omitted
+
+# reduce 27 omitted
+
+module_eval(<<'.,.,', 'parser.y', 75)
+  def _reduce_28(val, _values, result)
      @handler.end_media val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 55)
-  def _reduce_21(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 79)
+  def _reduce_29(val, _values, result)
             result = [val[1]].flatten
         @handler.start_media result
       
@@ -536,46 +749,149 @@ module_eval(<<'.,.,', 'parser.y', 55)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 58)
-  def _reduce_22(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 82)
+  def _reduce_30(val, _values, result)
      result = [] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 62)
-  def _reduce_23(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 85)
+  def _reduce_31(val, _values, result)
+     @handler.end_document_query 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 86)
+  def _reduce_32(val, _values, result)
+     @handler.end_document_query 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 90)
+  def _reduce_33(val, _values, result)
+            @handler.start_document_query val[1]
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 95)
+  def _reduce_34(val, _values, result)
+            result = [val[0], val[2]].flatten
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 98)
+  def _reduce_35(val, _values, result)
+            result = val
+      
+    result
+  end
+.,.,
+
+# reduce 36 omitted
+
+# reduce 37 omitted
+
+# reduce 38 omitted
+
+# reduce 39 omitted
+
+# reduce 40 omitted
+
+module_eval(<<'.,.,', 'parser.y', 112)
+  def _reduce_41(val, _values, result)
+            @handler.start_keyframes_rule val[1]
+      
+    result
+  end
+.,.,
+
+# reduce 42 omitted
+
+# reduce 43 omitted
+
+module_eval(<<'.,.,', 'parser.y', 120)
+  def _reduce_44(val, _values, result)
+     @handler.end_keyframes_block 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 121)
+  def _reduce_45(val, _values, result)
+     @handler.end_keyframes_block 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 125)
+  def _reduce_46(val, _values, result)
+            @handler.start_keyframes_block val[0]
+      
+    result
+  end
+.,.,
+
+# reduce 47 omitted
+
+module_eval(<<'.,.,', 'parser.y', 130)
+  def _reduce_48(val, _values, result)
+             result = val[0] + ', ' + val[2]
+      
+    result
+  end
+.,.,
+
+# reduce 49 omitted
+
+# reduce 50 omitted
+
+module_eval(<<'.,.,', 'parser.y', 136)
+  def _reduce_51(val, _values, result)
+     result = val[0].strip 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 140)
+  def _reduce_52(val, _values, result)
             @handler.end_selector val.first
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 65)
-  def _reduce_24(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 143)
+  def _reduce_53(val, _values, result)
             @handler.end_selector val.first
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 69)
-  def _reduce_25(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 147)
+  def _reduce_54(val, _values, result)
      result = val.last 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 71)
-  def _reduce_26(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 149)
+  def _reduce_55(val, _values, result)
             @handler.start_selector val.first
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 77)
-  def _reduce_27(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 155)
+  def _reduce_56(val, _values, result)
             # FIXME: should always garantee array
         sel = Selector.new(val.first, {})
         result = [sel, val[2]].flatten
@@ -584,16 +900,16 @@ module_eval(<<'.,.,', 'parser.y', 77)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 83)
-  def _reduce_28(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 161)
+  def _reduce_57(val, _values, result)
             result = [Selector.new(val.first, {})]
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 89)
-  def _reduce_29(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 167)
+  def _reduce_58(val, _values, result)
             val = val.flatten
         val[2].combinator = val.delete_at 1
         result = val
@@ -602,31 +918,38 @@ module_eval(<<'.,.,', 'parser.y', 89)
   end
 .,.,
 
-# reduce 30 omitted
+# reduce 59 omitted
 
-module_eval(<<'.,.,', 'parser.y', 96)
-  def _reduce_31(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 174)
+  def _reduce_60(val, _values, result)
      result = :s 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 97)
-  def _reduce_32(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 175)
+  def _reduce_61(val, _values, result)
      result = :> 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 98)
-  def _reduce_33(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 176)
+  def _reduce_62(val, _values, result)
      result = :+ 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 102)
-  def _reduce_34(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 177)
+  def _reduce_63(val, _values, result)
+     result = :~ 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 181)
+  def _reduce_64(val, _values, result)
             selector = val.first
         selector.additional_selectors = val.last
         result = [selector]
@@ -635,15 +958,15 @@ module_eval(<<'.,.,', 'parser.y', 102)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 106)
-  def _reduce_35(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 185)
+  def _reduce_65(val, _values, result)
      result = val 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 109)
-  def _reduce_36(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 188)
+  def _reduce_66(val, _values, result)
             ss = Selectors::Simple.new nil, nil
         ss.additional_selectors = val.flatten
         result = [ss]
@@ -652,188 +975,339 @@ module_eval(<<'.,.,', 'parser.y', 109)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 115)
-  def _reduce_37(val, _values, result)
-     result = Selectors::Type.new interpret_identifier val.first 
+module_eval(<<'.,.,', 'parser.y', 194)
+  def _reduce_67(val, _values, result)
+     result = [val[0], val[2]].flatten 
+    result
+  end
+.,.,
+
+# reduce 68 omitted
+
+module_eval(<<'.,.,', 'parser.y', 198)
+  def _reduce_69(val, _values, result)
+     result = [interpret_identifier(val[0]), nil] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 199)
+  def _reduce_70(val, _values, result)
+     result = [interpret_identifier(val[2]), interpret_identifier(val[0])] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 200)
+  def _reduce_71(val, _values, result)
+     result = [interpret_identifier(val[1]), nil] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 201)
+  def _reduce_72(val, _values, result)
+     result = [interpret_identifier(val[2]), '*'] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 204)
+  def _reduce_73(val, _values, result)
+     result = Selectors::Type.new val.first[0], nil, val.first[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 116)
-  def _reduce_38(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 205)
+  def _reduce_74(val, _values, result)
      result = Selectors::Universal.new val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 119)
-  def _reduce_39(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 206)
+  def _reduce_75(val, _values, result)
+     result = Selectors::Universal.new val[1] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 207)
+  def _reduce_76(val, _values, result)
+     result = Selectors::Universal.new val[2], nil, val[0] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 208)
+  def _reduce_77(val, _values, result)
+     result = Selectors::Universal.new val[2], nil, interpret_identifier(val[0]) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 211)
+  def _reduce_78(val, _values, result)
      result = val 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 120)
-  def _reduce_40(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 212)
+  def _reduce_79(val, _values, result)
      result = val 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 121)
-  def _reduce_41(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 213)
+  def _reduce_80(val, _values, result)
      result = val 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 122)
-  def _reduce_42(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 214)
+  def _reduce_81(val, _values, result)
      result = val 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 123)
-  def _reduce_43(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 215)
+  def _reduce_82(val, _values, result)
      result = val.flatten 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 124)
-  def _reduce_44(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 216)
+  def _reduce_83(val, _values, result)
      result = val.flatten 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 125)
-  def _reduce_45(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 217)
+  def _reduce_84(val, _values, result)
      result = val.flatten 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 126)
-  def _reduce_46(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 218)
+  def _reduce_85(val, _values, result)
      result = val.flatten 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 130)
-  def _reduce_47(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 222)
+  def _reduce_86(val, _values, result)
             result = Selectors::Id.new interpret_identifier val.first.sub(/^#/, '')
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 134)
-  def _reduce_48(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 226)
+  def _reduce_87(val, _values, result)
             result = Selectors::Class.new interpret_identifier val.last
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 139)
-  def _reduce_49(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 231)
+  def _reduce_88(val, _values, result)
             result = Selectors::Attribute.new(
-          interpret_identifier(val[1]),
+          val[1][0],
           interpret_identifier(val[3]),
-          Selectors::Attribute::EQUALS
+          Selectors::Attribute::EQUALS,
+          val[1][1]
         )
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 146)
-  def _reduce_50(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 239)
+  def _reduce_89(val, _values, result)
             result = Selectors::Attribute.new(
-          interpret_identifier(val[1]),
+          val[1][0],
           interpret_string(val[3]),
-          Selectors::Attribute::EQUALS
+          Selectors::Attribute::EQUALS,
+          val[1][1]
         )
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 153)
-  def _reduce_51(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 247)
+  def _reduce_90(val, _values, result)
             result = Selectors::Attribute.new(
-          interpret_identifier(val[1]),
+          val[1][0],
           interpret_string(val[3]),
-          Selectors::Attribute::INCLUDES
+          Selectors::Attribute::INCLUDES,
+          val[1][1]
         )
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 160)
-  def _reduce_52(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 255)
+  def _reduce_91(val, _values, result)
             result = Selectors::Attribute.new(
-          interpret_identifier(val[1]),
+          val[1][0],
           interpret_identifier(val[3]),
-          Selectors::Attribute::INCLUDES
+          Selectors::Attribute::INCLUDES,
+          val[1][1]
         )
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 167)
-  def _reduce_53(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 263)
+  def _reduce_92(val, _values, result)
             result = Selectors::Attribute.new(
-          interpret_identifier(val[1]),
+          val[1][0],
           interpret_identifier(val[3]),
-          Selectors::Attribute::DASHMATCH
+          Selectors::Attribute::DASHMATCH,
+          val[1][1]
         )
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 174)
-  def _reduce_54(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 271)
+  def _reduce_93(val, _values, result)
             result = Selectors::Attribute.new(
-          interpret_identifier(val[1]),
+          val[1][0],
           interpret_string(val[3]),
-          Selectors::Attribute::DASHMATCH
+          Selectors::Attribute::DASHMATCH,
+          val[1][1]
         )
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 181)
-  def _reduce_55(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 279)
+  def _reduce_94(val, _values, result)
             result = Selectors::Attribute.new(
-          interpret_identifier(val[1]),
+          val[1][0],
+          interpret_identifier(val[3]),
+          Selectors::Attribute::PREFIXMATCH,
+          val[1][1]
+        )
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 287)
+  def _reduce_95(val, _values, result)
+            result = Selectors::Attribute.new(
+          val[1][0],
+          interpret_string(val[3]),
+          Selectors::Attribute::PREFIXMATCH,
+          val[1][1]
+        )
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 295)
+  def _reduce_96(val, _values, result)
+            result = Selectors::Attribute.new(
+          val[1][0],
+          interpret_identifier(val[3]),
+          Selectors::Attribute::SUFFIXMATCH,
+          val[1][1]
+        )
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 303)
+  def _reduce_97(val, _values, result)
+            result = Selectors::Attribute.new(
+          val[1][0],
+          interpret_string(val[3]),
+          Selectors::Attribute::SUFFIXMATCH,
+          val[1][1]
+        )
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 311)
+  def _reduce_98(val, _values, result)
+            result = Selectors::Attribute.new(
+          val[1][0],
+          interpret_identifier(val[3]),
+          Selectors::Attribute::SUBSTRINGMATCH,
+          val[1][1]
+        )
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 319)
+  def _reduce_99(val, _values, result)
+            result = Selectors::Attribute.new(
+          val[1][0],
+          interpret_string(val[3]),
+          Selectors::Attribute::SUBSTRINGMATCH,
+          val[1][1]
+        )
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 327)
+  def _reduce_100(val, _values, result)
+            result = Selectors::Attribute.new(
+          val[1][0],
           nil,
-          Selectors::Attribute::SET
+          Selectors::Attribute::SET,
+          val[1][1]
         )
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 190)
-  def _reduce_56(val, _values, result)
-            result = Selectors::PseudoClass.new(
-          interpret_identifier(val[1])
+module_eval(<<'.,.,', 'parser.y', 337)
+  def _reduce_101(val, _values, result)
+            result = Selectors::pseudo interpret_identifier(val[1])
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 340)
+  def _reduce_102(val, _values, result)
+            result = Selectors::PseudoElement.new(
+          interpret_identifier(val[2])
         )
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 195)
-  def _reduce_57(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 345)
+  def _reduce_103(val, _values, result)
             result = Selectors::PseudoClass.new(
           interpret_identifier(val[1].sub(/\($/, '')),
           ''
@@ -843,8 +1317,8 @@ module_eval(<<'.,.,', 'parser.y', 195)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 201)
-  def _reduce_58(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 351)
+  def _reduce_104(val, _values, result)
             result = Selectors::PseudoClass.new(
           interpret_identifier(val[1].sub(/\($/, '')),
           interpret_identifier(val[2])
@@ -854,76 +1328,117 @@ module_eval(<<'.,.,', 'parser.y', 201)
   end
 .,.,
 
-# reduce 59 omitted
+module_eval(<<'.,.,', 'parser.y', 357)
+  def _reduce_105(val, _values, result)
+            result = Selectors::PseudoClass.new(
+          'not',
+          val[2].first.to_s
+        )
+      
+    result
+  end
+.,.,
 
-# reduce 60 omitted
+module_eval(<<'.,.,', 'parser.y', 363)
+  def _reduce_106(val, _values, result)
+            result = Selectors::PseudoClass.new(
+          interpret_identifier(val[1].sub(/\(.*/, '')),
+          interpret_identifier(val[1].sub(/.*\(/, '').sub(/\).*/, ''))
+        )
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 369)
+  def _reduce_107(val, _values, result)
+            result = Selectors::PseudoClass.new(
+          val[1].split('(').first.strip,
+          val[2].join(', ')
+        )
+      
+    result
+  end
+.,.,
 
-# reduce 61 omitted
+# reduce 108 omitted
 
-module_eval(<<'.,.,', 'parser.y', 214)
-  def _reduce_62(val, _values, result)
+# reduce 109 omitted
+
+# reduce 110 omitted
+
+# reduce 111 omitted
+
+# reduce 112 omitted
+
+# reduce 113 omitted
+
+# reduce 114 omitted
+
+module_eval(<<'.,.,', 'parser.y', 389)
+  def _reduce_115(val, _values, result)
      @handler.property val.first, val[2], val[3] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 216)
-  def _reduce_63(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 391)
+  def _reduce_116(val, _values, result)
      @handler.property val.first, val[3], val[4] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 218)
-  def _reduce_64(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 393)
+  def _reduce_117(val, _values, result)
      @handler.property val.first, val[3], val[4] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 220)
-  def _reduce_65(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 395)
+  def _reduce_118(val, _values, result)
      @handler.property val.first, val[4], val[5] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 223)
-  def _reduce_66(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 398)
+  def _reduce_119(val, _values, result)
      result = true 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 224)
-  def _reduce_67(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 399)
+  def _reduce_120(val, _values, result)
      result = false 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 227)
-  def _reduce_68(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 402)
+  def _reduce_121(val, _values, result)
      result = interpret_identifier val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 228)
-  def _reduce_69(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 403)
+  def _reduce_122(val, _values, result)
      result = interpret_identifier val.join 
     result
   end
 .,.,
 
-# reduce 70 omitted
+# reduce 123 omitted
 
-# reduce 71 omitted
+# reduce 124 omitted
 
-# reduce 72 omitted
+# reduce 125 omitted
 
-module_eval(<<'.,.,', 'parser.y', 237)
-  def _reduce_73(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 412)
+  def _reduce_126(val, _values, result)
             result = [val.first, val.last].flatten
         val.last.first.operator = val[1]
       
@@ -931,41 +1446,43 @@ module_eval(<<'.,.,', 'parser.y', 237)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 240)
-  def _reduce_74(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 415)
+  def _reduce_127(val, _values, result)
      result = val.flatten 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 241)
-  def _reduce_75(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 416)
+  def _reduce_128(val, _values, result)
      result = val 
     result
   end
 .,.,
 
-# reduce 76 omitted
+# reduce 129 omitted
 
-# reduce 77 omitted
+# reduce 130 omitted
 
-# reduce 78 omitted
+# reduce 131 omitted
 
-# reduce 79 omitted
+# reduce 132 omitted
 
-# reduce 80 omitted
+# reduce 133 omitted
 
-# reduce 81 omitted
+# reduce 134 omitted
 
-module_eval(<<'.,.,', 'parser.y', 252)
-  def _reduce_82(val, _values, result)
+# reduce 135 omitted
+
+module_eval(<<'.,.,', 'parser.y', 428)
+  def _reduce_136(val, _values, result)
      result = val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 254)
-  def _reduce_83(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 430)
+  def _reduce_137(val, _values, result)
             name = interpret_identifier val.first.sub(/\($/, '')
         if name == 'rgb'
           result = Terms::Rgb.new(*val[1])
@@ -977,50 +1494,78 @@ module_eval(<<'.,.,', 'parser.y', 254)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 263)
-  def _reduce_84(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 439)
+  def _reduce_138(val, _values, result)
      result = val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 264)
-  def _reduce_85(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 441)
+  def _reduce_139(val, _values, result)
+            parts = val.first.split('(')
+        name = interpret_identifier parts.first
+        result = Terms::Function.new(name, [Terms::String.new(interpret_string_no_quote(parts.last))])
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 448)
+  def _reduce_140(val, _values, result)
+            parts = val.first.split('(', 2)
+        name = parts[0].strip
+        expression = parts[1][0..parts[1].rindex(')')-1].strip
+        result = Terms::Math.new(name, expression)
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 455)
+  def _reduce_141(val, _values, result)
+     result = val.first 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 456)
+  def _reduce_142(val, _values, result)
      result = Terms::Hash.new val.first.sub(/^#/, '') 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 267)
-  def _reduce_86(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 459)
+  def _reduce_143(val, _values, result)
      result = val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 268)
-  def _reduce_87(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 460)
+  def _reduce_144(val, _values, result)
      result = Terms::URI.new interpret_uri val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 270)
-  def _reduce_88(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 463)
+  def _reduce_145(val, _values, result)
      result = val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 271)
-  def _reduce_89(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 464)
+  def _reduce_146(val, _values, result)
      result = Terms::String.new interpret_string val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 275)
-  def _reduce_90(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 468)
+  def _reduce_147(val, _values, result)
             result = val[1]
         val[1].unary_operator = val.first
       
@@ -1028,24 +1573,24 @@ module_eval(<<'.,.,', 'parser.y', 275)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 279)
-  def _reduce_91(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 472)
+  def _reduce_148(val, _values, result)
             result = Terms::Number.new numeric val.first
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 282)
-  def _reduce_92(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 475)
+  def _reduce_149(val, _values, result)
             result = Terms::Number.new numeric(val.first), nil, '%'
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 285)
-  def _reduce_93(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 478)
+  def _reduce_150(val, _values, result)
             unit    = val.first.gsub(/[\s\d.]/, '')
         result = Terms::Number.new numeric(val.first), nil, unit
       
@@ -1053,24 +1598,24 @@ module_eval(<<'.,.,', 'parser.y', 285)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 289)
-  def _reduce_94(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 482)
+  def _reduce_151(val, _values, result)
             result = Terms::Number.new numeric(val.first), nil, 'em'
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 292)
-  def _reduce_95(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 485)
+  def _reduce_152(val, _values, result)
             result = Terms::Number.new numeric(val.first), nil, 'ex'
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 295)
-  def _reduce_96(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 488)
+  def _reduce_153(val, _values, result)
             unit    = val.first.gsub(/[\s\d.]/, '')
         result = Terms::Number.new numeric(val.first), nil, unit
       
@@ -1078,8 +1623,8 @@ module_eval(<<'.,.,', 'parser.y', 295)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 299)
-  def _reduce_97(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 492)
+  def _reduce_154(val, _values, result)
             unit    = val.first.gsub(/[\s\d.]/, '')
         result = Terms::Number.new numeric(val.first), nil, unit
       
@@ -1087,8 +1632,8 @@ module_eval(<<'.,.,', 'parser.y', 299)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 303)
-  def _reduce_98(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 496)
+  def _reduce_155(val, _values, result)
             unit    = val.first.gsub(/[\s\d.]/, '')
         result = Terms::Number.new numeric(val.first), nil, unit
       
@@ -1096,29 +1641,29 @@ module_eval(<<'.,.,', 'parser.y', 303)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 308)
-  def _reduce_99(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 501)
+  def _reduce_156(val, _values, result)
      result = :minus 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 309)
-  def _reduce_100(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 502)
+  def _reduce_157(val, _values, result)
      result = :plus 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 312)
-  def _reduce_101(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 505)
+  def _reduce_158(val, _values, result)
      result = val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 313)
-  def _reduce_102(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 506)
+  def _reduce_159(val, _values, result)
      result = Terms::Ident.new interpret_identifier val.first 
     result
   end