diff --git a/change_log.txt b/change_log.txt
index d0f7bc88..7460697f 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,3 +1,6 @@
+10/19/2009
+- fixed modifier support on block tags
+
 10/17/2009
 - remove ?>\n<?php and ?><?php sequences from compiled template
 
diff --git a/libs/sysplugins/internal.templateparser.php b/libs/sysplugins/internal.templateparser.php
index 518148c2..d1c8389f 100644
--- a/libs/sysplugins/internal.templateparser.php
+++ b/libs/sysplugins/internal.templateparser.php
@@ -222,9 +222,9 @@ class Smarty_Internal_Templateparser#line 109 "internal.templateparser.php"
     const TP_SPACE                          = 68;
     const TP_INSTANCEOF                     = 69;
     const TP_QMARK                          = 70;
-    const YY_NO_ACTION = 468;
-    const YY_ACCEPT_ACTION = 467;
-    const YY_ERROR_ACTION = 466;
+    const YY_NO_ACTION = 472;
+    const YY_ACCEPT_ACTION = 471;
+    const YY_ERROR_ACTION = 470;
 
 /* Next are that tables used to determine what action to take based on the
 ** current state and lookahead token.  These tables are used to implement
@@ -276,291 +276,288 @@ class Smarty_Internal_Templateparser#line 109 "internal.templateparser.php"
 **                          shifting non-terminals after a reduce.
 **  self::$yy_default       Default action for each state.
 */
-    const YY_SZ_ACTTAB = 1114;
+    const YY_SZ_ACTTAB = 1095;
 static public $yy_action = array(
- /*     0 */   274,  280,  281,    8,    6,  267,  273,    9,    3,  265,
- /*    10 */   266,   13,   11,  214,  279,  274,  280,  281,    8,    6,
- /*    20 */   267,  273,    9,    3,  265,  266,   13,   11,  146,  274,
- /*    30 */   280,  281,    8,    6,  267,  273,    9,    3,  265,  266,
- /*    40 */    13,   11,  169,  164,  199,  289,  290,  122,  178,  289,
- /*    50 */   290,  146,   36,   60,  114,  338,  263,  276,  291,   16,
- /*    60 */   237,   37,  291,  254,  255,  274,  280,  281,    8,    6,
- /*    70 */   267,  273,    9,    3,  265,  266,   13,   11,  208,   46,
- /*    80 */    60,   27,   22,  166,  289,  290,   16,    5,   23,   14,
- /*    90 */   254,  255,  240,   27,  189,  109,   41,  291,   74,   98,
- /*   100 */    12,  269,   60,   50,   57,  247,  338,  121,   16,   78,
- /*   110 */    45,  201,  254,  255,    4,   24,   14,  249,  285,  155,
- /*   120 */   101,  189,  261,   41,  181,   74,   10,   26,  257,  275,
- /*   130 */    50,   57,  277,   43,  234,  284,   34,  160,   14,  217,
- /*   140 */   467,   93,  205,  189,  277,   41,   67,   67,  150,  201,
- /*   150 */    60,   50,   50,   57,  136,   35,   16,  118,  191,  152,
- /*   160 */   254,  255,  155,   60,   10,  156,  149,  237,   32,   16,
- /*   170 */    12,  203,   47,  254,  255,  206,  210,   63,  182,  207,
- /*   180 */   250,  155,   27,   62,    4,   69,   14,  220,  224,  128,
- /*   190 */    15,  189,   29,   41,  155,   73,   17,   34,   28,   14,
- /*   200 */    50,   57,   38,  156,  189,  155,   41,  151,   67,  235,
- /*   210 */    47,   60,  155,   50,   57,  247,   24,   16,  236,   78,
- /*   220 */   157,  254,  255,  155,   60,  174,   27,  297,  298,   78,
- /*   230 */    16,   67,  261,  277,  254,  255,   50,  231,  257,  146,
- /*   240 */   148,   67,  226,  115,   78,   34,   50,   14,  257,  222,
- /*   250 */   253,   27,  189,  244,   41,  226,   74,  227,   34,  219,
- /*   260 */    14,   50,   57,  257,  190,  189,  221,   41,  160,   74,
- /*   270 */   227,   37,   60,   44,   50,   57,  177,  277,   16,  184,
- /*   280 */    39,  153,  254,  255,  239,   60,  247,  264,   56,   46,
- /*   290 */    78,   16,   67,   92,  181,  254,  255,   50,  194,  285,
- /*   300 */   293,  101,  277,  261,  175,    2,    5,   22,   14,  257,
- /*   310 */   200,   22,  129,  189,  268,   41,  226,   74,   20,   34,
- /*   320 */   109,   14,   50,   57,  109,  230,  189,  195,   41,  160,
- /*   330 */    67,  227,  155,  155,   21,   50,   57,  247,  184,   56,
- /*   340 */   262,   78,  158,   22,   84,  168,  161,   60,   33,  154,
- /*   350 */   167,  226,  101,   16,  261,  209,  109,  254,  255,  173,
- /*   360 */   257,  250,   61,  133,   40,  268,  227,  146,  270,  271,
- /*   370 */   294,  295,  282,  225,  296,  283,  237,  287,  141,  184,
- /*   380 */   232,    5,  247,   14,   78,   51,   78,   30,  189,  107,
- /*   390 */    41,  163,   74,  226,  233,  226,  180,   50,   57,  261,
- /*   400 */    78,  155,  228,  257,   45,  257,   23,   40,  227,  155,
- /*   410 */   227,  270,  271,  294,  295,  282,  225,  296,  283,  257,
- /*   420 */    60,   27,  138,  142,  155,  216,   16,  147,  292,  184,
- /*   430 */   254,  255,   94,   40,  269,  237,  237,  270,  271,  294,
- /*   440 */   295,  282,  225,  296,  283,  127,  193,  204,  132,   60,
- /*   450 */    97,  256,  155,  260,   34,   16,   14,  102,  237,  254,
- /*   460 */   255,  189,   22,   60,   59,   67,  172,  137,  183,   16,
- /*   470 */    50,   57,  198,  254,  255,  109,  145,  158,  155,  287,
- /*   480 */   237,  155,  144,   34,  247,  234,    1,  103,   78,  237,
- /*   490 */   189,   39,  234,   99,   67,  237,  272,   34,  278,   50,
- /*   500 */    57,  261,  287,  184,  189,  288,  162,  257,   67,  119,
- /*   510 */   126,  108,  276,   50,   57,  260,  170,  187,  335,   71,
- /*   520 */   158,   49,   76,   66,  287,   44,  287,   18,  234,  243,
- /*   530 */   259,  249,  285,  247,  101,   56,  261,   78,   43,  134,
- /*   540 */    91,  252,  257,  188,  260,  194,  285,   58,  101,  135,
- /*   550 */   261,  215,  125,  247,  260,   56,  257,   78,  248,  223,
- /*   560 */    86,  268,  287,  202,  186,  194,  285,  247,  101,  184,
- /*   570 */   261,   78,   79,  171,   68,  238,  257,  325,   64,  246,
- /*   580 */   185,  268,  242,   71,  261,   52,   76,   66,   31,  211,
- /*   590 */   257,   65,   25,  213,   17,  249,  285,  197,  101,  247,
- /*   600 */   261,  104,  258,   78,  245,   75,  257,  218,   42,   44,
- /*   610 */   116,  249,  285,  256,  101,  229,  261,  106,  276,  251,
- /*   620 */   241,  247,  257,   56,    7,   78,   77,  176,   87,   72,
- /*   630 */   159,  300,  301,  194,  285,  247,  101,   56,  261,   78,
- /*   640 */    70,  279,   89,   19,  257,  279,  279,  194,  285,  268,
- /*   650 */   101,  279,  261,   48,  279,  247,  279,   56,  257,   78,
- /*   660 */   279,  279,   90,  268,  279,  279,  279,  194,  285,  279,
- /*   670 */   101,  279,  261,  279,  279,  247,  279,   56,  257,   78,
- /*   680 */   279,  279,   83,  268,  279,  279,  279,  194,  285,  279,
- /*   690 */   101,  279,  261,  247,  279,   54,  279,   78,  257,  279,
- /*   700 */    81,  279,  279,  268,  279,  194,  285,  247,  101,   55,
- /*   710 */   261,   78,  279,  279,   82,  279,  257,  279,  279,  194,
- /*   720 */   285,  268,  101,  279,  261,  279,  279,  247,  279,   56,
- /*   730 */   257,   78,  279,  279,   88,  268,  279,  279,  279,  194,
- /*   740 */   285,  279,  101,  279,  261,  279,  165,  279,  279,   71,
- /*   750 */   257,   52,   76,   66,  279,  268,  247,  279,   56,  279,
- /*   760 */    78,  249,  285,   85,  101,  279,  261,  279,  194,  285,
- /*   770 */   279,  101,  257,  261,  247,  279,  110,  279,   78,  257,
- /*   780 */   279,  279,  279,  279,  268,  279,  249,  285,  279,  101,
- /*   790 */   279,  261,  279,  279,  179,  279,  279,  257,  247,  279,
- /*   800 */   140,  212,   78,  279,  279,  279,  279,  279,  279,  279,
- /*   810 */   249,  285,  279,  101,  247,  261,  110,  279,   78,  279,
- /*   820 */   279,  257,  279,  279,  279,  279,  249,  285,  247,  101,
- /*   830 */   104,  261,   78,  279,  192,  279,  279,  257,  279,  279,
- /*   840 */   249,  285,  279,  101,  279,  261,  279,  279,  279,  279,
- /*   850 */   247,  257,   53,   80,   78,  279,  279,  247,  279,  110,
- /*   860 */   299,   78,  249,  285,  279,  101,  279,  261,  279,  249,
- /*   870 */   285,  279,  101,  257,  261,  279,  279,  196,  279,  247,
- /*   880 */   257,  110,  279,   78,  279,  279,  279,  279,  279,  279,
- /*   890 */   279,  249,  285,  247,  101,  113,  261,   78,  279,  286,
- /*   900 */   247,  279,  257,  279,   78,  249,  285,  247,  101,  105,
- /*   910 */   261,   78,  249,  285,  279,   96,  257,  261,  279,  249,
- /*   920 */   285,  279,  101,  257,  261,  279,  279,  279,  279,  247,
- /*   930 */   257,  143,  279,   78,  279,  279,  247,  279,  117,  279,
- /*   940 */    78,  249,  285,  279,  101,  279,  261,  279,  249,  285,
- /*   950 */   279,  101,  257,  261,  279,  279,  247,  279,  131,  257,
- /*   960 */    78,  279,  279,  279,  279,  279,  279,  279,  249,  285,
- /*   970 */   247,  101,  123,  261,   78,  279,  279,  279,  279,  257,
- /*   980 */   279,  279,  249,  285,  247,  101,  111,  261,   78,  279,
- /*   990 */   279,  279,  279,  257,  279,  279,  249,  285,  247,  101,
- /*  1000 */   124,  261,   78,  279,  279,  279,  279,  257,  279,  279,
- /*  1010 */   249,  285,  247,  101,  139,  261,   78,  279,  279,  279,
- /*  1020 */   279,  257,  279,  279,  249,  285,  279,  101,  247,  261,
- /*  1030 */   120,  279,   78,  279,  279,  257,  279,  279,  279,  279,
- /*  1040 */   249,  285,  279,  101,  279,  261,  279,  279,  247,  279,
- /*  1050 */   130,  257,   78,  279,  279,  279,  279,  279,  279,  279,
- /*  1060 */   249,  285,  247,  101,  112,  261,   78,  279,  279,  279,
- /*  1070 */   279,  257,  279,  279,  249,  285,  247,  101,  279,  261,
- /*  1080 */    78,  279,  279,  279,  279,  257,  279,  279,  249,  285,
- /*  1090 */   247,  100,  279,  261,   78,  279,  279,  279,  279,  257,
- /*  1100 */   279,  279,  249,  285,  279,   95,  279,  261,  279,  279,
- /*  1110 */   279,  279,  279,  257,
+ /*     0 */   277,  283,  284,   10,   13,  270,  276,    7,    6,  268,
+ /*    10 */   269,    2,    5,   27,  277,  283,  284,   10,   13,  270,
+ /*    20 */   276,    7,    6,  268,  269,    2,    5,  172,  282,  277,
+ /*    30 */   283,  284,   10,   13,  270,  276,    7,    6,  268,  269,
+ /*    40 */     2,    5,   63,  169,   44,   63,   27,   25,   14,  278,
+ /*    50 */   136,   14,  257,  258,  152,  257,  258,  202,  210,   75,
+ /*    60 */   175,  209,   11,  240,  280,   69,   37,   68,   44,  214,
+ /*    70 */   224,  135,   15,  471,   94,  204,   12,  151,   16,   29,
+ /*    80 */    33,   16,  205,  176,   46,   42,  176,   66,   42,  173,
+ /*    90 */    72,  229,   51,   59,   63,   51,   59,  280,  217,  161,
+ /*   100 */    14,   32,  155,  150,  257,  258,  230,   76,  277,  283,
+ /*   110 */   284,   10,   13,  270,  276,    7,    6,  268,  269,    2,
+ /*   120 */     5,   63,  206,  292,  293,  193,  260,   14,   29,   30,
+ /*   130 */    16,  257,  258,  266,  213,  176,  294,   42,   49,   66,
+ /*   140 */     9,   11,   37,   63,   51,   59,  250,  125,  127,   14,
+ /*   150 */    76,  161,  229,  257,  258,   12,  221,   16,  252,  288,
+ /*   160 */    46,  101,  176,  264,   42,  265,   65,  230,   72,  260,
+ /*   170 */   189,   51,   59,   51,   19,   35,  225,    4,  154,   16,
+ /*   180 */   120,  229,  164,   27,  176,  164,   42,  250,   66,  243,
+ /*   190 */   174,   76,  215,   51,   59,   63,  230,  151,  195,  236,
+ /*   200 */    45,   14,   76,  229,  264,  257,  258,  250,  256,   58,
+ /*   210 */   260,   76,  292,  293,   88,  179,  160,   63,  230,  159,
+ /*   220 */   178,  260,  101,   14,  264,  294,  173,  257,  258,   29,
+ /*   230 */   260,   16,  218,  239,  280,  271,  176,  342,   42,  130,
+ /*   240 */    66,  174,  259,   72,  263,   51,   59,    3,   51,   27,
+ /*   250 */   235,   29,  156,   16,   76,  192,  164,   26,  176,  211,
+ /*   260 */    42,  174,   72,  183,   17,  292,  293,   51,   59,   63,
+ /*   270 */    23,  164,  250,  260,  158,   14,   76,  106,  294,  257,
+ /*   280 */   258,   39,  253,   33,  252,  288,  157,   97,  342,  264,
+ /*   290 */   272,   63,  238,   47,  250,  260,  116,   14,   76,  242,
+ /*   300 */   280,  257,  258,    4,  114,   16,  252,  288,  164,  101,
+ /*   310 */   176,  264,   42,   43,   66,  281,   72,  260,  200,   51,
+ /*   320 */    59,   51,  218,   27,  229,    4,  161,   16,  171,  279,
+ /*   330 */   194,   17,  176,  233,   42,  188,   66,    3,  296,  230,
+ /*   340 */    31,   51,   59,   63,  106,   17,   17,  164,   45,   14,
+ /*   350 */   164,   24,  149,  257,  258,    1,   21,  186,  106,  106,
+ /*   360 */    40,   76,   52,  148,  228,  274,  297,  298,  285,  273,
+ /*   370 */   299,  286,   17,   54,  280,  227,  157,   29,  267,   16,
+ /*   380 */   260,  229,  212,   47,  176,  106,   42,  272,   72,  143,
+ /*   390 */   231,  144,  197,   51,   59,  153,  230,   63,  164,  287,
+ /*   400 */   165,  139,  240,   14,  240,  164,   36,  257,  258,  164,
+ /*   410 */   164,  164,   40,   20,   39,  253,  228,  274,  297,  298,
+ /*   420 */   285,  273,  299,  286,  164,   44,  174,   18,  110,  174,
+ /*   430 */    63,   29,  100,   16,   22,   43,   14,  115,  176,  182,
+ /*   440 */   257,  258,   72,  290,  109,  164,  250,   51,   59,  129,
+ /*   450 */    76,   27,  145,  151,  165,   60,  250,  164,  252,  288,
+ /*   460 */    76,  104,  240,  264,   29,  240,  295,  237,  275,  260,
+ /*   470 */   290,  176,  134,  264,  248,   72,  151,   38,  253,  260,
+ /*   480 */    51,   59,  250,  141,   58,  240,   76,  165,  263,   90,
+ /*   490 */   223,   62,   99,  339,  198,  288,  250,  101,   58,  264,
+ /*   500 */    76,  113,  199,   85,  279,  260,  290,  102,  198,  288,
+ /*   510 */   271,  101,  234,  264,   61,   23,   72,  111,  250,  260,
+ /*   520 */    58,   51,   76,  103,  271,   82,  138,  237,  247,  290,
+ /*   530 */   198,  288,  290,  101,  128,  264,  250,  207,   58,  240,
+ /*   540 */    76,  260,  237,   89,  174,   95,  271,  240,  198,  288,
+ /*   550 */   250,  101,   58,  264,   76,   34,   98,   93,  237,  260,
+ /*   560 */   219,  140,  198,  288,  271,  101,  263,  264,  250,  131,
+ /*   570 */    58,  290,   76,  260,  263,   91,  132,   70,  271,  196,
+ /*   580 */   198,  288,  133,  101,  191,  264,  246,  168,   81,  240,
+ /*   590 */    67,  260,   50,   79,   71,  240,  271,  250,  245,   56,
+ /*   600 */    22,   76,  252,  288,   84,  101,  208,  264,   80,  198,
+ /*   610 */   288,  216,  101,  260,  264,  250,  291,   58,  251,   76,
+ /*   620 */   260,  142,   86,  255,  261,  271,   73,  198,  288,  250,
+ /*   630 */   101,   58,  264,   76,  220,   28,   92,  226,  260,  241,
+ /*   640 */   262,  198,  288,  271,  101,  185,  264,  250,  328,  112,
+ /*   650 */   203,   76,  260,  184,  177,   63,   64,  271,  180,  252,
+ /*   660 */   288,   14,  101,  181,  264,  257,  258,  232,  170,   41,
+ /*   670 */   260,   67,  259,   53,   79,   71,   77,  279,  162,  303,
+ /*   680 */    74,  254,  304,  252,  288,    8,  101,  244,  264,   29,
+ /*   690 */    48,  250,  187,  280,  260,   76,  176,  119,  280,  280,
+ /*   700 */    72,  280,  280,  249,  166,   51,   59,   67,  264,   53,
+ /*   710 */    79,   71,  163,  280,  260,  280,  280,  280,  280,  252,
+ /*   720 */   288,  250,  101,   57,  264,   76,  280,  280,   83,  280,
+ /*   730 */   260,  280,  280,  198,  288,  280,  101,  280,  264,  250,
+ /*   740 */   280,   58,  280,   76,  260,  280,   87,  280,  280,  271,
+ /*   750 */   280,  198,  288,  280,  101,  280,  264,  280,  280,  280,
+ /*   760 */   280,  280,  260,  280,  280,   40,  280,  271,  280,  228,
+ /*   770 */   274,  297,  298,  285,  273,  299,  286,  280,  280,  250,
+ /*   780 */   280,  107,  280,   76,  280,  280,  280,  280,  280,  280,
+ /*   790 */   280,  252,  288,  280,  101,  280,  264,  280,  280,  289,
+ /*   800 */   280,  250,  260,   55,   78,   76,  280,  280,  280,  280,
+ /*   810 */   164,  280,  280,  252,  288,  250,  101,  107,  264,   76,
+ /*   820 */   280,  280,  280,  280,  260,  280,  280,  252,  288,  280,
+ /*   830 */   101,  280,  264,  280,  280,  167,  280,  280,  260,  280,
+ /*   840 */   280,  250,  280,  107,  280,   76,  280,  280,  280,  280,
+ /*   850 */   280,  280,  280,  252,  288,  250,  101,  112,  264,   76,
+ /*   860 */   280,  190,  280,  280,  260,  280,  280,  252,  288,  280,
+ /*   870 */   101,  250,  264,  107,  280,   76,  280,  280,  260,  280,
+ /*   880 */   280,  280,  280,  252,  288,  280,  101,  302,  264,  280,
+ /*   890 */   280,  201,  280,  250,  260,  137,  222,   76,  280,  280,
+ /*   900 */   280,  280,  280,  280,  280,  252,  288,  250,  101,  118,
+ /*   910 */   264,   76,  280,  280,  250,  280,  260,  280,   76,  252,
+ /*   920 */   288,  280,  101,  280,  264,  280,  252,  288,  280,   96,
+ /*   930 */   260,  264,  250,  280,  105,  280,   76,  260,  280,  280,
+ /*   940 */   280,  280,  280,  280,  252,  288,  250,  101,  117,  264,
+ /*   950 */    76,  280,  280,  280,  280,  260,  280,  280,  252,  288,
+ /*   960 */   280,  101,  250,  264,  124,  280,   76,  280,  280,  260,
+ /*   970 */   280,  280,  280,  280,  252,  288,  250,  101,  126,  264,
+ /*   980 */    76,  280,  280,  280,  280,  260,  280,  280,  252,  288,
+ /*   990 */   250,  101,  147,  264,   76,  280,  280,  250,  280,  260,
+ /*  1000 */   280,   76,  252,  288,  280,  101,  280,  264,  280,  300,
+ /*  1010 */   301,  280,  280,  260,  264,  250,  280,  122,  280,   76,
+ /*  1020 */   260,  280,  280,  280,  280,  280,  280,  252,  288,  250,
+ /*  1030 */   101,  123,  264,   76,  280,  280,  280,  280,  260,  280,
+ /*  1040 */   280,  252,  288,  250,  101,  146,  264,   76,  280,  280,
+ /*  1050 */   280,  280,  260,  280,  280,  252,  288,  250,  101,  121,
+ /*  1060 */   264,   76,  280,  280,  280,  280,  260,  280,  280,  252,
+ /*  1070 */   288,  250,  101,  108,  264,   76,  280,  280,  280,  280,
+ /*  1080 */   260,  280,  280,  252,  288,  280,  101,  280,  264,  280,
+ /*  1090 */   280,  280,  280,  280,  260,
     );
     static public $yy_lookahead = array(
  /*     0 */    31,   32,   33,   34,   35,   36,   37,   38,   39,   40,
- /*    10 */    41,   42,   43,   17,   45,   31,   32,   33,   34,   35,
- /*    20 */    36,   37,   38,   39,   40,   41,   42,   43,   83,   31,
+ /*    10 */    41,   42,   43,   16,   31,   32,   33,   34,   35,   36,
+ /*    20 */    37,   38,   39,   40,   41,   42,   43,   58,   45,   31,
  /*    30 */    32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
- /*    40 */    42,   43,   58,   45,    1,   53,   54,   79,   59,   53,
- /*    50 */    54,   83,  107,   10,  100,   17,   67,  103,   66,   16,
- /*    60 */    92,   46,   66,   20,   21,   31,   32,   33,   34,   35,
- /*    70 */    36,   37,   38,   39,   40,   41,   42,   43,   47,   64,
- /*    80 */    10,   16,   44,   19,   53,   54,   16,   44,   50,   46,
- /*    90 */    20,   21,    1,   16,   51,   57,   53,   66,   55,   77,
- /*   100 */    30,   45,   10,   60,   61,   78,   68,   80,   16,   82,
- /*   110 */    67,    1,   20,   21,   44,   50,   46,   90,   91,   63,
- /*   120 */    93,   51,   95,   53,   59,   55,   16,   50,  101,   52,
- /*   130 */    60,   61,   67,   69,  112,   17,   44,   67,   46,   47,
- /*   140 */    72,   73,   74,   51,   67,   53,   55,   55,   17,    1,
- /*   150 */    10,   60,   60,   61,   79,   56,   16,  100,   67,   67,
- /*   160 */    20,   21,   63,   10,   16,   55,   17,   92,   16,   16,
- /*   170 */    30,   61,   62,   20,   21,    1,    2,    3,    4,    5,
- /*   180 */   105,   63,   16,    9,   44,   11,   46,   13,   14,   15,
- /*   190 */    16,   51,   16,   53,   63,   55,   44,   44,   56,   46,
- /*   200 */    60,   61,   16,   55,   51,   63,   53,   67,   55,   61,
- /*   210 */    62,   10,   63,   60,   61,   78,   50,   16,    1,   82,
- /*   220 */    67,   20,   21,   63,   10,   78,   16,   90,   91,   82,
- /*   230 */    16,   55,   95,   67,   20,   21,   60,   51,  101,   83,
- /*   240 */    78,   55,    1,   67,   82,   44,   60,   46,  101,    8,
- /*   250 */    92,   16,   51,   67,   53,    1,   55,   16,   44,   97,
- /*   260 */    46,   60,   61,  101,   55,   51,   12,   53,   67,   55,
- /*   270 */    16,   46,   10,   48,   60,   61,   67,   67,   16,   68,
- /*   280 */    56,   67,   20,   21,   67,   10,   78,   17,   80,   64,
- /*   290 */    82,   16,   55,   85,   59,   20,   21,   60,   90,   91,
- /*   300 */    47,   93,   67,   95,   67,   58,   44,   44,   46,  101,
- /*   310 */    47,   44,   65,   51,  106,   53,    1,   55,   65,   44,
- /*   320 */    57,   46,   60,   61,   57,   10,   51,   64,   53,   67,
- /*   330 */    55,   16,   63,   63,   65,   60,   61,   78,   68,   80,
- /*   340 */   104,   82,   67,   44,   85,   86,   87,   10,   49,   90,
- /*   350 */    91,    1,   93,   16,   95,    5,   57,   20,   21,   48,
- /*   360 */   101,  105,   88,   79,   18,  106,   16,   83,   22,   23,
- /*   370 */    24,   25,   26,   27,   28,   29,   92,  103,   84,   68,
- /*   380 */    78,   44,   78,   46,   82,   84,   82,   49,   51,  100,
- /*   390 */    53,   45,   55,    1,   90,    1,   78,   60,   61,   95,
- /*   400 */    82,   63,   10,  101,   67,  101,   50,   18,   16,   63,
- /*   410 */    16,   22,   23,   24,   25,   26,   27,   28,   29,  101,
- /*   420 */    10,   16,   79,   79,   63,   17,   16,   83,   45,   68,
- /*   430 */    20,   21,   96,   18,   45,   92,   92,   22,   23,   24,
- /*   440 */    25,   26,   27,   28,   29,   79,   67,  111,   99,   10,
- /*   450 */    77,  102,   63,  104,   44,   16,   46,   77,   92,   20,
- /*   460 */    21,   51,   44,   10,   88,   55,   48,   79,   67,   16,
- /*   470 */    60,   61,   67,   20,   21,   57,   79,   67,   63,  103,
- /*   480 */    92,   63,   79,   44,   78,  112,   68,   88,   82,   92,
- /*   490 */    51,   56,  112,   77,   55,   92,   90,   44,   89,   60,
- /*   500 */    61,   95,  103,   68,   51,   67,   67,  101,   55,   88,
- /*   510 */    99,   88,  103,   60,   61,  104,   75,   55,   17,   78,
- /*   520 */    67,   80,   81,   82,  103,   48,  103,   50,  112,   62,
- /*   530 */    67,   90,   91,   78,   93,   80,   95,   82,   69,   99,
- /*   540 */    85,   17,  101,   64,  104,   90,   91,   88,   93,   99,
- /*   550 */    95,   45,   67,   78,  104,   80,  101,   82,   51,   47,
- /*   560 */    85,  106,  103,    5,   67,   90,   91,   78,   93,   68,
- /*   570 */    95,   82,   45,   19,   55,   67,  101,   17,   55,   90,
- /*   580 */    75,  106,   62,   78,   95,   80,   81,   82,   70,   17,
- /*   590 */   101,   55,   70,   17,   44,   90,   91,   56,   93,   78,
- /*   600 */    95,   80,   60,   82,   60,   67,  101,   67,   94,   48,
- /*   610 */   100,   90,   91,  102,   93,  112,   95,  100,  103,   74,
- /*   620 */   111,   78,  101,   80,  108,   82,   97,   76,   85,   55,
- /*   630 */   109,  110,   86,   90,   91,   78,   93,   80,   95,   82,
- /*   640 */    67,  113,   85,   44,  101,  113,  113,   90,   91,  106,
- /*   650 */    93,  113,   95,  100,  113,   78,  113,   80,  101,   82,
- /*   660 */   113,  113,   85,  106,  113,  113,  113,   90,   91,  113,
- /*   670 */    93,  113,   95,  113,  113,   78,  113,   80,  101,   82,
- /*   680 */   113,  113,   85,  106,  113,  113,  113,   90,   91,  113,
- /*   690 */    93,  113,   95,   78,  113,   80,  113,   82,  101,  113,
- /*   700 */    85,  113,  113,  106,  113,   90,   91,   78,   93,   80,
- /*   710 */    95,   82,  113,  113,   85,  113,  101,  113,  113,   90,
- /*   720 */    91,  106,   93,  113,   95,  113,  113,   78,  113,   80,
- /*   730 */   101,   82,  113,  113,   85,  106,  113,  113,  113,   90,
- /*   740 */    91,  113,   93,  113,   95,  113,   75,  113,  113,   78,
- /*   750 */   101,   80,   81,   82,  113,  106,   78,  113,   80,  113,
- /*   760 */    82,   90,   91,   85,   93,  113,   95,  113,   90,   91,
- /*   770 */   113,   93,  101,   95,   78,  113,   80,  113,   82,  101,
- /*   780 */   113,  113,  113,  113,  106,  113,   90,   91,  113,   93,
- /*   790 */   113,   95,  113,  113,   98,  113,  113,  101,   78,  113,
- /*   800 */    80,   81,   82,  113,  113,  113,  113,  113,  113,  113,
- /*   810 */    90,   91,  113,   93,   78,   95,   80,  113,   82,  113,
- /*   820 */   113,  101,  113,  113,  113,  113,   90,   91,   78,   93,
- /*   830 */    80,   95,   82,  113,   98,  113,  113,  101,  113,  113,
- /*   840 */    90,   91,  113,   93,  113,   95,  113,  113,  113,  113,
- /*   850 */    78,  101,   80,   81,   82,  113,  113,   78,  113,   80,
- /*   860 */   110,   82,   90,   91,  113,   93,  113,   95,  113,   90,
- /*   870 */    91,  113,   93,  101,   95,  113,  113,   98,  113,   78,
- /*   880 */   101,   80,  113,   82,  113,  113,  113,  113,  113,  113,
- /*   890 */   113,   90,   91,   78,   93,   80,   95,   82,  113,   98,
- /*   900 */    78,  113,  101,  113,   82,   90,   91,   78,   93,   80,
- /*   910 */    95,   82,   90,   91,  113,   93,  101,   95,  113,   90,
- /*   920 */    91,  113,   93,  101,   95,  113,  113,  113,  113,   78,
- /*   930 */   101,   80,  113,   82,  113,  113,   78,  113,   80,  113,
- /*   940 */    82,   90,   91,  113,   93,  113,   95,  113,   90,   91,
- /*   950 */   113,   93,  101,   95,  113,  113,   78,  113,   80,  101,
- /*   960 */    82,  113,  113,  113,  113,  113,  113,  113,   90,   91,
- /*   970 */    78,   93,   80,   95,   82,  113,  113,  113,  113,  101,
- /*   980 */   113,  113,   90,   91,   78,   93,   80,   95,   82,  113,
- /*   990 */   113,  113,  113,  101,  113,  113,   90,   91,   78,   93,
- /*  1000 */    80,   95,   82,  113,  113,  113,  113,  101,  113,  113,
- /*  1010 */    90,   91,   78,   93,   80,   95,   82,  113,  113,  113,
- /*  1020 */   113,  101,  113,  113,   90,   91,  113,   93,   78,   95,
- /*  1030 */    80,  113,   82,  113,  113,  101,  113,  113,  113,  113,
- /*  1040 */    90,   91,  113,   93,  113,   95,  113,  113,   78,  113,
- /*  1050 */    80,  101,   82,  113,  113,  113,  113,  113,  113,  113,
- /*  1060 */    90,   91,   78,   93,   80,   95,   82,  113,  113,  113,
- /*  1070 */   113,  101,  113,  113,   90,   91,   78,   93,  113,   95,
- /*  1080 */    82,  113,  113,  113,  113,  101,  113,  113,   90,   91,
- /*  1090 */    78,   93,  113,   95,   82,  113,  113,  113,  113,  101,
- /*  1100 */   113,  113,   90,   91,  113,   93,  113,   95,  113,  113,
- /*  1110 */   113,  113,  113,  101,
+ /*    40 */    42,   43,   10,   45,   48,   10,   16,   50,   16,   52,
+ /*    50 */    79,   16,   20,   21,   83,   20,   21,    1,    2,    3,
+ /*    60 */     4,    5,   30,   92,   67,    9,   46,   11,   48,   13,
+ /*    70 */    14,   15,   16,   72,   73,   74,   44,   83,   46,   44,
+ /*    80 */    50,   46,   47,   51,   64,   53,   51,   55,   53,   59,
+ /*    90 */    55,    1,   60,   61,   10,   60,   61,   67,    8,   67,
+ /*   100 */    16,  107,   67,   78,   20,   21,   16,   82,   31,   32,
+ /*   110 */    33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
+ /*   120 */    43,   10,   97,   53,   54,   59,  101,   16,   44,   16,
+ /*   130 */    46,   20,   21,   67,    1,   51,   66,   53,  100,   55,
+ /*   140 */    58,   30,   46,   10,   60,   61,   78,   65,   80,   16,
+ /*   150 */    82,   67,    1,   20,   21,   44,    5,   46,   90,   91,
+ /*   160 */    64,   93,   51,   95,   53,  104,   55,   16,   55,  101,
+ /*   170 */    48,   60,   61,   60,   44,   56,   17,   44,   67,   46,
+ /*   180 */    67,    1,   63,   16,   51,   63,   53,   78,   55,    1,
+ /*   190 */    68,   82,   12,   60,   61,   10,   16,   83,   78,   90,
+ /*   200 */    67,   16,   82,    1,   95,   20,   21,   78,   92,   80,
+ /*   210 */   101,   82,   53,   54,   85,   86,   87,   10,   16,   90,
+ /*   220 */    91,  101,   93,   16,   95,   66,   59,   20,   21,   44,
+ /*   230 */   101,   46,    1,    1,   67,  106,   51,   17,   53,   99,
+ /*   240 */    55,   68,  102,   55,  104,   60,   61,   16,   60,   16,
+ /*   250 */    78,   44,   67,   46,   82,   67,   63,   49,   51,   47,
+ /*   260 */    53,   68,   55,   19,   44,   53,   54,   60,   61,   10,
+ /*   270 */    50,   63,   78,  101,   67,   16,   82,   57,   66,   20,
+ /*   280 */    21,   56,  105,   50,   90,   91,   55,   93,   68,   95,
+ /*   290 */    45,   10,   61,   62,   78,  101,   80,   16,   82,   67,
+ /*   300 */    67,   20,   21,   44,  100,   46,   90,   91,   63,   93,
+ /*   310 */    51,   95,   53,   69,   55,   89,   55,  101,   55,   60,
+ /*   320 */    61,   60,    1,   16,    1,   44,   67,   46,   67,  103,
+ /*   330 */    67,   44,   51,   10,   53,   48,   55,   16,   47,   16,
+ /*   340 */    56,   60,   61,   10,   57,   44,   44,   63,   67,   16,
+ /*   350 */    63,   49,   17,   20,   21,   68,   65,   78,   57,   57,
+ /*   360 */    18,   82,   84,   17,   22,   23,   24,   25,   26,   27,
+ /*   370 */    28,   29,   44,   84,   67,   47,   55,   44,   17,   46,
+ /*   380 */   101,    1,   61,   62,   51,   57,   53,   45,   55,   79,
+ /*   390 */    10,   79,   64,   60,   61,   83,   16,   10,   63,   17,
+ /*   400 */    67,   84,   92,   16,   92,   63,   16,   20,   21,   63,
+ /*   410 */    63,   63,   18,   65,   56,  105,   22,   23,   24,   25,
+ /*   420 */    26,   27,   28,   29,   63,   48,   68,   50,   88,   68,
+ /*   430 */    10,   44,   77,   46,   44,   69,   16,  100,   51,   45,
+ /*   440 */    20,   21,   55,  103,  100,   63,   78,   60,   61,   79,
+ /*   450 */    82,   16,   79,   83,   67,   88,   78,   63,   90,   91,
+ /*   460 */    82,   93,   92,   95,   44,   92,   45,  112,   90,  101,
+ /*   470 */   103,   51,   79,   95,   60,   55,   83,   16,  105,  101,
+ /*   480 */    60,   61,   78,   99,   80,   92,   82,   67,  104,   85,
+ /*   490 */    17,   88,   77,   17,   90,   91,   78,   93,   80,   95,
+ /*   500 */    82,  100,   67,   85,  103,  101,  103,   77,   90,   91,
+ /*   510 */   106,   93,   51,   95,   88,   50,   55,   88,   78,  101,
+ /*   520 */    80,   60,   82,   77,  106,   85,   79,  112,   67,  103,
+ /*   530 */    90,   91,  103,   93,   79,   95,   78,    5,   80,   92,
+ /*   540 */    82,  101,  112,   85,   68,   96,  106,   92,   90,   91,
+ /*   550 */    78,   93,   80,   95,   82,   70,   88,   85,  112,  101,
+ /*   560 */   111,   99,   90,   91,  106,   93,  104,   95,   78,   99,
+ /*   570 */    80,  103,   82,  101,  104,   85,   79,   55,  106,   56,
+ /*   580 */    90,   91,   79,   93,   67,   95,   62,   75,   67,   92,
+ /*   590 */    78,  101,   80,   81,   82,   92,  106,   78,   62,   80,
+ /*   600 */    44,   82,   90,   91,   85,   93,   47,   95,   45,   90,
+ /*   610 */    91,   67,   93,  101,   95,   78,   67,   80,   51,   82,
+ /*   620 */   101,   67,   85,   17,   60,  106,   55,   90,   91,   78,
+ /*   630 */    93,   80,   95,   82,   17,   70,   85,   17,  101,   67,
+ /*   640 */    67,   90,   91,  106,   93,   67,   95,   78,   17,   80,
+ /*   650 */    45,   82,  101,   67,   19,   10,   55,  106,   55,   90,
+ /*   660 */    91,   16,   93,   64,   95,   20,   21,  112,   75,   94,
+ /*   670 */   101,   78,  102,   80,   81,   82,   97,  103,  109,  110,
+ /*   680 */    55,   74,   86,   90,   91,  108,   93,  111,   95,   44,
+ /*   690 */    67,   78,   76,  113,  101,   82,   51,  100,  113,  113,
+ /*   700 */    55,  113,  113,   90,   75,   60,   61,   78,   95,   80,
+ /*   710 */    81,   82,   67,  113,  101,  113,  113,  113,  113,   90,
+ /*   720 */    91,   78,   93,   80,   95,   82,  113,  113,   85,  113,
+ /*   730 */   101,  113,  113,   90,   91,  113,   93,  113,   95,   78,
+ /*   740 */   113,   80,  113,   82,  101,  113,   85,  113,  113,  106,
+ /*   750 */   113,   90,   91,  113,   93,  113,   95,  113,  113,  113,
+ /*   760 */   113,  113,  101,  113,  113,   18,  113,  106,  113,   22,
+ /*   770 */    23,   24,   25,   26,   27,   28,   29,  113,  113,   78,
+ /*   780 */   113,   80,  113,   82,  113,  113,  113,  113,  113,  113,
+ /*   790 */   113,   90,   91,  113,   93,  113,   95,  113,  113,   98,
+ /*   800 */   113,   78,  101,   80,   81,   82,  113,  113,  113,  113,
+ /*   810 */    63,  113,  113,   90,   91,   78,   93,   80,   95,   82,
+ /*   820 */   113,  113,  113,  113,  101,  113,  113,   90,   91,  113,
+ /*   830 */    93,  113,   95,  113,  113,   98,  113,  113,  101,  113,
+ /*   840 */   113,   78,  113,   80,  113,   82,  113,  113,  113,  113,
+ /*   850 */   113,  113,  113,   90,   91,   78,   93,   80,   95,   82,
+ /*   860 */   113,   98,  113,  113,  101,  113,  113,   90,   91,  113,
+ /*   870 */    93,   78,   95,   80,  113,   82,  113,  113,  101,  113,
+ /*   880 */   113,  113,  113,   90,   91,  113,   93,  110,   95,  113,
+ /*   890 */   113,   98,  113,   78,  101,   80,   81,   82,  113,  113,
+ /*   900 */   113,  113,  113,  113,  113,   90,   91,   78,   93,   80,
+ /*   910 */    95,   82,  113,  113,   78,  113,  101,  113,   82,   90,
+ /*   920 */    91,  113,   93,  113,   95,  113,   90,   91,  113,   93,
+ /*   930 */   101,   95,   78,  113,   80,  113,   82,  101,  113,  113,
+ /*   940 */   113,  113,  113,  113,   90,   91,   78,   93,   80,   95,
+ /*   950 */    82,  113,  113,  113,  113,  101,  113,  113,   90,   91,
+ /*   960 */   113,   93,   78,   95,   80,  113,   82,  113,  113,  101,
+ /*   970 */   113,  113,  113,  113,   90,   91,   78,   93,   80,   95,
+ /*   980 */    82,  113,  113,  113,  113,  101,  113,  113,   90,   91,
+ /*   990 */    78,   93,   80,   95,   82,  113,  113,   78,  113,  101,
+ /*  1000 */   113,   82,   90,   91,  113,   93,  113,   95,  113,   90,
+ /*  1010 */    91,  113,  113,  101,   95,   78,  113,   80,  113,   82,
+ /*  1020 */   101,  113,  113,  113,  113,  113,  113,   90,   91,   78,
+ /*  1030 */    93,   80,   95,   82,  113,  113,  113,  113,  101,  113,
+ /*  1040 */   113,   90,   91,   78,   93,   80,   95,   82,  113,  113,
+ /*  1050 */   113,  113,  101,  113,  113,   90,   91,   78,   93,   80,
+ /*  1060 */    95,   82,  113,  113,  113,  113,  101,  113,  113,   90,
+ /*  1070 */    91,   78,   93,   80,   95,   82,  113,  113,  113,  113,
+ /*  1080 */   101,  113,  113,   90,   91,  113,   93,  113,   95,  113,
+ /*  1090 */   113,  113,  113,  113,  101,
 );
     const YY_SHIFT_USE_DFLT = -32;
-    const YY_SHIFT_MAX = 198;
+    const YY_SHIFT_MAX = 201;
     static public $yy_shift_ofst = array(
- /*     0 */   174,  140,   70,   70,   70,   70,   70,   70,   70,   70,
- /*    10 */    43,   70,   70,   70,  214,  337,  337,  201,  262,  201,
- /*    20 */   214,  201,  201,  262,  201,  201,  201,  201,  201,  201,
- /*    30 */   201,  201,  201,  201,  201,  201,  201,   92,  275,  153,
- /*    40 */   410,  453,  453,  439,  176,  418,  186,   91,  225,  270,
- /*    50 */   237,  435,  361,  361,  389,  346,  415,  110,   77,   65,
- /*    60 */   392,  235,  394,  394,  210,  210,  477,  210,  210,  394,
- /*    70 */   311,  501,  210,  405,  405,  211,  211,  561,  561,  561,
- /*    80 */   211,  -31,   -2,  -16,   34,   34,   34,   34,   34,   34,
- /*    90 */    34,   34,   34,  174,  148,   -4,   31,  241,  254,  315,
- /*   100 */    -8,   -8,  350,  166,  338,  149,   15,   15,  210,  209,
- /*   110 */   269,  142,  131,  118,   15,  152,   15,   56,   15,  210,
- /*   120 */    99,  160,  211,  160,  160,  599,  561,  211,  573,  574,
- /*   130 */   160,  160,  561,  211,  561,  561,  211,  211,  211,  160,
- /*   140 */   160,  224,  211,  160,  211,  211,  -32,  -32,  -32,  -32,
- /*   150 */   -32,   38,  263,  299,   64,  -11,  217,  267,  267,  253,
- /*   160 */   267,  247,  267,  518,  522,  408,  523,  554,  560,  519,
- /*   170 */   572,  536,  538,  540,  544,  542,  576,  550,  508,  527,
- /*   180 */   467,  463,  462,  356,  401,  524,  558,  497,  507,  479,
- /*   190 */   485,  520,  506,  512,  469,  379,  383,  438,  541,
+ /*     0 */    56,  111,   32,  133,   32,   32,   32,   32,   32,   32,
+ /*    10 */    32,   32,   32,   32,  281,  281,  185,   84,  259,   84,
+ /*    20 */    84,  185,   84,  259,   84,   84,   84,   84,   84,   84,
+ /*    30 */    84,   84,   84,   84,   84,   84,   84,   35,  333,  207,
+ /*    40 */   387,  420,  420,  645,  113,  287,  461,  188,  122,   20,
+ /*    50 */   361,  261,  358,  193,  358,  193,  394,  342,  747,  321,
+ /*    60 */    -3,   30,  167,  380,  307,  435,  435,  476,  202,  202,
+ /*    70 */   307,  377,  307,  307,  307,  202,   -4,   -4,  173,  173,
+ /*    80 */    -4,  173,  -31,  -17,   -2,   77,   77,   77,   77,   77,
+ /*    90 */    77,   77,   77,   77,   56,  231,  212,  159,  233,  323,
+ /*   100 */    90,   70,  180,  151,   70,  119,  263,  348,  284,   96,
+ /*   110 */   307,  307,  208,   96,   96,   96,  245,  382,  335,   96,
+ /*   120 */   390,  346,  347,  347,  347,  625,  347,  347,  173,  173,
+ /*   130 */    -4,   -4,  173,  173,  173,  623,  173,  347,  173,  225,
+ /*   140 */    -4,   -4,  130,  173,  173,  173,  347,  347,  -32,  -32,
+ /*   150 */   -32,  -32,  -32,  -32,  220,  328,  302,  232,  301,  244,
+ /*   160 */    82,  301,  291,  301,   66,  301,  620,  421,  617,  565,
+ /*   170 */   606,  564,  571,  573,  578,  603,  599,  601,  635,  631,
+ /*   180 */   586,  567,  485,  522,  532,  465,  414,  473,  521,  544,
+ /*   190 */   563,  559,  536,  572,  556,  524,  549,  517,  366,  523,
+ /*   200 */   554,  605,
 );
-    const YY_REDUCE_USE_DFLT = -56;
-    const YY_REDUCE_MAX = 150;
+    const YY_REDUCE_USE_DFLT = -30;
+    const YY_REDUCE_MAX = 153;
     static public $yy_reduce_ofst = array(
- /*     0 */    68,  259,  597,  577,  615,  629,  649,  557,  543,  208,
- /*    10 */   441,  455,  475,  678,  521,  505,  671,  736,  772,  696,
- /*    20 */   750,  801,  779,  720,  920,  950,   27,  815,  851,  984,
- /*    30 */   892,  906,  829,  970,  858,  878,  934,  822, 1012,  998,
- /*    40 */   137,  489,  304,  406,  162,  344,  302,  318,  349,  -32,
- /*    50 */   147,   75,  -32,  284,  -55,  -55,  -55,  336,  409,  -46,
- /*    60 */   416,  -46,  373,  380,  421,  423,  440,  274,  459,   22,
- /*    70 */   366,  388,  399,  376,  274,  343,  397,  450,  440,  411,
- /*    80 */   403,  516,  516,  516,  516,  516,  516,  516,  516,  516,
- /*    90 */   516,  516,  516,  545,  509,  514,  514,  503,  503,  503,
- /*   100 */   514,  514,  503,  515,  156,  156,  511,  511,  515,  529,
- /*   110 */   156,  156,  156,  156,  511,  517,  511,  156,  511,  515,
- /*   120 */   156,  156,  158,  156,  156,  553,  236,  158,  551,  546,
- /*   130 */   156,  156,  236,  158,  236,  236,  158,  158,  158,  156,
- /*   140 */   156,  256,  158,  156,  158,  158,  294,  301,   57,  289,
- /*   150 */   510,
+ /*     0 */     1,  129,  490,  512,  519,  472,  458,  404,  418,  440,
+ /*    10 */   537,  551,  643,  661,  629,  593,  569,  737,  723,  763,
+ /*    20 */   701,  777,  793,  815,  884,   68,  898,  868,  854,  216,
+ /*    30 */   829,  937,  912,  951,  993,  965,  979,  836,  194,  368,
+ /*    40 */   919,  109,  613,  378,   25,  312,  172,  120,  -29,  140,
+ /*    50 */   370,  279,  373,  370,  310,  393,   -6,   -6,   -6,  449,
+ /*    60 */   226,  401,  401,  415,  429,  426,  403,  447,  430,  355,
+ /*    70 */   340,  384,  403,  367,  468,  446,  384,  462,  503,  497,
+ /*    80 */   470,  455,  577,  577,  577,  577,  577,  577,  577,  577,
+ /*    90 */   577,  577,  577,  577,  607,  576,  575,  575,  574,  555,
+ /*   100 */   555,  575,  555,  555,  575,  114,  579,  114,  114,  570,
+ /*   110 */   574,  574,  114,  570,  570,  570,  114,  114,  114,  570,
+ /*   120 */   597,  114,  114,  114,  114,  596,  114,  114,  116,  116,
+ /*   130 */    61,   61,  116,  116,  116,  616,  116,  114,  116,  177,
+ /*   140 */    61,   61,   38,  116,  116,  116,  114,  114,  204,  337,
+ /*   150 */   344,  317,  289,  278,
 );
     static public $yyExpectedTokens = array(
         /* 0 */ array(1, 2, 3, 4, 5, 9, 11, 13, 14, 15, 16, ),
         /* 1 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
         /* 2 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
-        /* 3 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
+        /* 3 */ array(1, 10, 16, 20, 21, 44, 46, 51, 53, 55, 60, 61, 67, ),
         /* 4 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
         /* 5 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
         /* 6 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
         /* 7 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
         /* 8 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
         /* 9 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
-        /* 10 */ array(1, 10, 16, 20, 21, 44, 46, 51, 53, 55, 60, 61, 67, ),
+        /* 10 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
         /* 11 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
         /* 12 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
         /* 13 */ array(10, 16, 20, 21, 30, 44, 46, 51, 53, 55, 60, 61, 67, ),
@@ -598,43 +595,43 @@ static public $yy_action = array(
         /* 45 */ array(44, 48, 57, 63, 68, ),
         /* 46 */ array(16, 51, 55, 60, 67, ),
         /* 47 */ array(1, 55, 60, 67, ),
-        /* 48 */ array(46, 48, 64, ),
-        /* 49 */ array(17, 63, 68, ),
-        /* 50 */ array(55, 60, 67, ),
-        /* 51 */ array(56, 68, ),
-        /* 52 */ array(63, 68, ),
+        /* 48 */ array(48, 63, 68, ),
+        /* 49 */ array(46, 48, 64, ),
+        /* 50 */ array(17, 63, 68, ),
+        /* 51 */ array(55, 60, 67, ),
+        /* 52 */ array(56, 68, ),
         /* 53 */ array(63, 68, ),
-        /* 54 */ array(18, 22, 23, 24, 25, 26, 27, 28, 29, 45, 63, ),
-        /* 55 */ array(18, 22, 23, 24, 25, 26, 27, 28, 29, 45, 63, ),
-        /* 56 */ array(18, 22, 23, 24, 25, 26, 27, 28, 29, 63, ),
-        /* 57 */ array(1, 16, 55, 61, 62, ),
-        /* 58 */ array(16, 50, 52, 67, ),
-        /* 59 */ array(16, 50, 59, 67, ),
-        /* 60 */ array(1, 10, 16, ),
-        /* 61 */ array(16, 59, 67, ),
-        /* 62 */ array(1, 16, ),
-        /* 63 */ array(1, 16, ),
+        /* 54 */ array(56, 68, ),
+        /* 55 */ array(63, 68, ),
+        /* 56 */ array(18, 22, 23, 24, 25, 26, 27, 28, 29, 45, 63, ),
+        /* 57 */ array(18, 22, 23, 24, 25, 26, 27, 28, 29, 45, 63, ),
+        /* 58 */ array(18, 22, 23, 24, 25, 26, 27, 28, 29, 63, ),
+        /* 59 */ array(1, 16, 55, 61, 62, ),
+        /* 60 */ array(16, 50, 52, 67, ),
+        /* 61 */ array(16, 50, 59, 67, ),
+        /* 62 */ array(16, 59, 67, ),
+        /* 63 */ array(1, 10, 16, ),
         /* 64 */ array(16, 67, ),
         /* 65 */ array(16, 67, ),
-        /* 66 */ array(48, 50, ),
-        /* 67 */ array(16, 67, ),
-        /* 68 */ array(16, 67, ),
+        /* 66 */ array(16, 67, ),
+        /* 67 */ array(17, 68, ),
+        /* 68 */ array(1, 16, ),
         /* 69 */ array(1, 16, ),
-        /* 70 */ array(48, 68, ),
-        /* 71 */ array(17, 68, ),
+        /* 70 */ array(16, 67, ),
+        /* 71 */ array(48, 50, ),
         /* 72 */ array(16, 67, ),
         /* 73 */ array(16, 67, ),
         /* 74 */ array(16, 67, ),
-        /* 75 */ array(68, ),
-        /* 76 */ array(68, ),
+        /* 75 */ array(1, 16, ),
+        /* 76 */ array(48, ),
         /* 77 */ array(48, ),
-        /* 78 */ array(48, ),
-        /* 79 */ array(48, ),
-        /* 80 */ array(68, ),
-        /* 81 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 45, ),
-        /* 82 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 45, ),
-        /* 83 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 58, ),
-        /* 84 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ),
+        /* 78 */ array(68, ),
+        /* 79 */ array(68, ),
+        /* 80 */ array(48, ),
+        /* 81 */ array(68, ),
+        /* 82 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 58, ),
+        /* 83 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 45, ),
+        /* 84 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 45, ),
         /* 85 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ),
         /* 86 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ),
         /* 87 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ),
@@ -643,115 +640,115 @@ static public $yy_action = array(
         /* 90 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ),
         /* 91 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ),
         /* 92 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ),
-        /* 93 */ array(1, 2, 3, 4, 5, 9, 11, 13, 14, 15, 16, ),
-        /* 94 */ array(1, 16, 55, 61, 62, ),
-        /* 95 */ array(17, 53, 54, 66, ),
+        /* 93 */ array(31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ),
+        /* 94 */ array(1, 2, 3, 4, 5, 9, 11, 13, 14, 15, 16, ),
+        /* 95 */ array(1, 16, 55, 61, 62, ),
         /* 96 */ array(47, 53, 54, 66, ),
-        /* 97 */ array(1, 8, 16, ),
-        /* 98 */ array(1, 12, 16, ),
+        /* 97 */ array(17, 53, 54, 66, ),
+        /* 98 */ array(16, 50, 67, ),
         /* 99 */ array(1, 10, 16, ),
-        /* 100 */ array(53, 54, 66, ),
+        /* 100 */ array(1, 8, 16, ),
         /* 101 */ array(53, 54, 66, ),
-        /* 102 */ array(1, 5, 16, ),
-        /* 103 */ array(16, 50, 67, ),
-        /* 104 */ array(49, 63, ),
-        /* 105 */ array(17, 63, ),
-        /* 106 */ array(46, 64, ),
-        /* 107 */ array(46, 64, ),
-        /* 108 */ array(16, 67, ),
-        /* 109 */ array(55, 67, ),
-        /* 110 */ array(63, 65, ),
-        /* 111 */ array(56, 63, ),
-        /* 112 */ array(17, 63, ),
-        /* 113 */ array(17, 63, ),
+        /* 102 */ array(1, 12, 16, ),
+        /* 103 */ array(1, 5, 16, ),
+        /* 104 */ array(53, 54, 66, ),
+        /* 105 */ array(56, 63, ),
+        /* 106 */ array(55, 67, ),
+        /* 107 */ array(63, 65, ),
+        /* 108 */ array(56, 63, ),
+        /* 109 */ array(46, 64, ),
+        /* 110 */ array(16, 67, ),
+        /* 111 */ array(16, 67, ),
+        /* 112 */ array(49, 63, ),
+        /* 113 */ array(46, 64, ),
         /* 114 */ array(46, 64, ),
-        /* 115 */ array(16, 44, ),
-        /* 116 */ array(46, 64, ),
-        /* 117 */ array(45, 63, ),
-        /* 118 */ array(46, 64, ),
-        /* 119 */ array(16, 67, ),
-        /* 120 */ array(56, 63, ),
-        /* 121 */ array(63, ),
-        /* 122 */ array(68, ),
+        /* 115 */ array(46, 64, ),
+        /* 116 */ array(45, 63, ),
+        /* 117 */ array(17, 63, ),
+        /* 118 */ array(17, 63, ),
+        /* 119 */ array(46, 64, ),
+        /* 120 */ array(16, 44, ),
+        /* 121 */ array(17, 63, ),
+        /* 122 */ array(63, ),
         /* 123 */ array(63, ),
         /* 124 */ array(63, ),
-        /* 125 */ array(44, ),
-        /* 126 */ array(48, ),
-        /* 127 */ array(68, ),
-        /* 128 */ array(67, ),
-        /* 129 */ array(55, ),
-        /* 130 */ array(63, ),
-        /* 131 */ array(63, ),
-        /* 132 */ array(48, ),
+        /* 125 */ array(55, ),
+        /* 126 */ array(63, ),
+        /* 127 */ array(63, ),
+        /* 128 */ array(68, ),
+        /* 129 */ array(68, ),
+        /* 130 */ array(48, ),
+        /* 131 */ array(48, ),
+        /* 132 */ array(68, ),
         /* 133 */ array(68, ),
-        /* 134 */ array(48, ),
-        /* 135 */ array(48, ),
+        /* 134 */ array(68, ),
+        /* 135 */ array(67, ),
         /* 136 */ array(68, ),
-        /* 137 */ array(68, ),
+        /* 137 */ array(63, ),
         /* 138 */ array(68, ),
-        /* 139 */ array(63, ),
-        /* 140 */ array(63, ),
-        /* 141 */ array(56, ),
-        /* 142 */ array(68, ),
-        /* 143 */ array(63, ),
+        /* 139 */ array(56, ),
+        /* 140 */ array(48, ),
+        /* 141 */ array(48, ),
+        /* 142 */ array(44, ),
+        /* 143 */ array(68, ),
         /* 144 */ array(68, ),
         /* 145 */ array(68, ),
-        /* 146 */ array(),
-        /* 147 */ array(),
+        /* 146 */ array(63, ),
+        /* 147 */ array(63, ),
         /* 148 */ array(),
         /* 149 */ array(),
         /* 150 */ array(),
-        /* 151 */ array(17, 44, 50, 57, 68, ),
-        /* 152 */ array(44, 47, 57, 64, ),
-        /* 153 */ array(44, 49, 57, ),
-        /* 154 */ array(19, 69, ),
-        /* 155 */ array(59, 67, ),
-        /* 156 */ array(1, 67, ),
-        /* 157 */ array(44, 57, ),
+        /* 151 */ array(),
+        /* 152 */ array(),
+        /* 153 */ array(),
+        /* 154 */ array(17, 44, 50, 57, 68, ),
+        /* 155 */ array(44, 47, 57, 64, ),
+        /* 156 */ array(44, 49, 57, ),
+        /* 157 */ array(1, 67, ),
         /* 158 */ array(44, 57, ),
-        /* 159 */ array(47, 65, ),
-        /* 160 */ array(44, 57, ),
-        /* 161 */ array(58, 65, ),
-        /* 162 */ array(44, 57, ),
-        /* 163 */ array(70, ),
-        /* 164 */ array(70, ),
-        /* 165 */ array(17, ),
-        /* 166 */ array(55, ),
-        /* 167 */ array(19, ),
+        /* 159 */ array(19, 69, ),
+        /* 160 */ array(58, 65, ),
+        /* 161 */ array(44, 57, ),
+        /* 162 */ array(47, 65, ),
+        /* 163 */ array(44, 57, ),
+        /* 164 */ array(59, 67, ),
+        /* 165 */ array(44, 57, ),
+        /* 166 */ array(17, ),
+        /* 167 */ array(45, ),
         /* 168 */ array(17, ),
-        /* 169 */ array(55, ),
+        /* 169 */ array(70, ),
         /* 170 */ array(17, ),
-        /* 171 */ array(55, ),
-        /* 172 */ array(67, ),
+        /* 171 */ array(60, ),
+        /* 172 */ array(55, ),
         /* 173 */ array(67, ),
-        /* 174 */ array(60, ),
-        /* 175 */ array(60, ),
-        /* 176 */ array(17, ),
-        /* 177 */ array(44, ),
-        /* 178 */ array(67, ),
-        /* 179 */ array(45, ),
-        /* 180 */ array(62, ),
-        /* 181 */ array(67, ),
-        /* 182 */ array(55, ),
-        /* 183 */ array(50, ),
-        /* 184 */ array(67, ),
-        /* 185 */ array(17, ),
-        /* 186 */ array(5, ),
-        /* 187 */ array(67, ),
-        /* 188 */ array(51, ),
-        /* 189 */ array(64, ),
-        /* 190 */ array(67, ),
-        /* 191 */ array(62, ),
-        /* 192 */ array(45, ),
-        /* 193 */ array(47, ),
-        /* 194 */ array(69, ),
-        /* 195 */ array(67, ),
-        /* 196 */ array(45, ),
+        /* 174 */ array(67, ),
+        /* 175 */ array(55, ),
+        /* 176 */ array(64, ),
+        /* 177 */ array(55, ),
+        /* 178 */ array(19, ),
+        /* 179 */ array(17, ),
+        /* 180 */ array(67, ),
+        /* 181 */ array(51, ),
+        /* 182 */ array(70, ),
+        /* 183 */ array(55, ),
+        /* 184 */ array(5, ),
+        /* 185 */ array(50, ),
+        /* 186 */ array(60, ),
+        /* 187 */ array(17, ),
+        /* 188 */ array(67, ),
+        /* 189 */ array(67, ),
+        /* 190 */ array(45, ),
+        /* 191 */ array(47, ),
+        /* 192 */ array(62, ),
+        /* 193 */ array(67, ),
+        /* 194 */ array(44, ),
+        /* 195 */ array(62, ),
+        /* 196 */ array(67, ),
         /* 197 */ array(67, ),
-        /* 198 */ array(56, ),
-        /* 199 */ array(),
-        /* 200 */ array(),
-        /* 201 */ array(),
+        /* 198 */ array(69, ),
+        /* 199 */ array(56, ),
+        /* 200 */ array(67, ),
+        /* 201 */ array(45, ),
         /* 202 */ array(),
         /* 203 */ array(),
         /* 204 */ array(),
@@ -852,39 +849,42 @@ static public $yy_action = array(
         /* 299 */ array(),
         /* 300 */ array(),
         /* 301 */ array(),
+        /* 302 */ array(),
+        /* 303 */ array(),
+        /* 304 */ array(),
 );
     static public $yy_default = array(
- /*     0 */   466,  466,  466,  466,  466,  466,  466,  466,  466,  466,
- /*    10 */   466,  466,  466,  466,  447,  466,  466,  406,  466,  406,
- /*    20 */   466,  406,  406,  466,  466,  466,  466,  466,  466,  466,
- /*    30 */   466,  466,  466,  466,  466,  466,  466,  466,  466,  466,
- /*    40 */   466,  466,  466,  466,  466,  335,  466,  466,  371,  466,
- /*    50 */   466,  335,  335,  335,  416,  416,  416,  466,  466,  381,
- /*    60 */   466,  381,  466,  466,  466,  466,  374,  466,  466,  466,
- /*    70 */   335,  355,  466,  466,  466,  335,  335,  366,  374,  367,
- /*    80 */   335,  466,  466,  466,  324,  421,  414,  429,  430,  420,
- /*    90 */   426,  422,  425,  302,  466,  466,  466,  466,  466,  466,
- /*   100 */   411,  343,  466,  466,  450,  466,  397,  400,  330,  466,
- /*   110 */   405,  466,  466,  466,  379,  381,  399,  466,  398,  329,
- /*   120 */   466,  327,  317,  448,  341,  381,  369,  331,  466,  466,
- /*   130 */   449,  350,  372,  319,  394,  368,  323,  316,  322,  417,
- /*   140 */   336,  345,  321,  351,  320,  318,  410,  410,  381,  381,
- /*   150 */   381,  342,  466,  342,  346,  466,  466,  412,  466,  466,
- /*   160 */   342,  466,  431,  361,  466,  466,  466,  349,  339,  466,
- /*   170 */   466,  466,  466,  466,  466,  466,  466,  370,  466,  466,
- /*   180 */   466,  466,  466,  338,  466,  466,  466,  466,  466,  356,
- /*   190 */   466,  466,  466,  466,  346,  466,  466,  466,  392,  459,
- /*   200 */   386,  461,  312,  365,  452,  303,  315,  314,  388,  311,
- /*   210 */   313,  457,  337,  306,  385,  403,  373,  389,  332,  401,
- /*   220 */   309,  308,  307,  387,  310,  438,  464,  465,  363,  462,
- /*   230 */   362,  383,  384,  348,  463,  364,  458,  334,  407,  455,
- /*   240 */   460,  451,  453,  454,  382,  378,  347,  355,  357,  346,
- /*   250 */   409,  304,  305,  333,  358,  359,  380,  376,  377,  375,
- /*   260 */   395,  360,  396,  408,  456,  423,  424,  427,  413,  361,
- /*   270 */   439,  440,  432,  428,  441,  328,  391,  392,  326,  415,
- /*   280 */   442,  443,  437,  436,  393,  349,  404,  390,  344,  352,
- /*   290 */   353,  354,  402,  444,  433,  434,  435,  419,  418,  446,
- /*   300 */   445,  340,
+ /*     0 */   470,  470,  470,  470,  470,  470,  470,  470,  470,  470,
+ /*    10 */   470,  470,  470,  470,  470,  470,  451,  410,  470,  410,
+ /*    20 */   410,  470,  410,  470,  470,  470,  470,  470,  470,  470,
+ /*    30 */   470,  470,  470,  470,  470,  470,  470,  470,  470,  470,
+ /*    40 */   470,  470,  470,  470,  470,  339,  470,  470,  339,  375,
+ /*    50 */   470,  470,  339,  339,  339,  339,  420,  420,  420,  470,
+ /*    60 */   470,  385,  385,  470,  470,  470,  470,  359,  470,  470,
+ /*    70 */   470,  378,  470,  470,  470,  470,  378,  370,  339,  339,
+ /*    80 */   371,  339,  470,  470,  470,  424,  433,  434,  327,  430,
+ /*    90 */   429,  425,  418,  426,  305,  470,  470,  470,  470,  470,
+ /*   100 */   470,  347,  470,  470,  415,  470,  470,  409,  470,  402,
+ /*   110 */   332,  333,  454,  383,  404,  403,  470,  470,  470,  401,
+ /*   120 */   385,  470,  355,  345,  453,  470,  452,  330,  325,  320,
+ /*   130 */   376,  373,  321,  323,  322,  470,  334,  340,  319,  349,
+ /*   140 */   372,  398,  385,  335,  324,  326,  354,  421,  385,  385,
+ /*   150 */   385,  414,  414,  414,  346,  470,  346,  470,  416,  350,
+ /*   160 */   470,  346,  470,  435,  470,  470,  470,  470,  470,  470,
+ /*   170 */   470,  470,  470,  470,  470,  470,  360,  470,  353,  343,
+ /*   180 */   470,  470,  365,  470,  470,  342,  470,  470,  470,  470,
+ /*   190 */   470,  470,  470,  470,  374,  470,  470,  470,  350,  396,
+ /*   200 */   470,  470,  318,  407,  306,  393,  405,  315,  391,  317,
+ /*   210 */   316,  392,  369,  463,  312,  311,  336,  310,  465,  456,
+ /*   220 */   461,  314,  341,  309,  313,  389,  377,  390,  443,  468,
+ /*   230 */   469,  367,  466,  366,  387,  388,  352,  467,  368,  462,
+ /*   240 */   338,  411,  459,  464,  455,  457,  458,  386,  382,  351,
+ /*   250 */   359,  361,  350,  413,  307,  308,  337,  362,  363,  384,
+ /*   260 */   380,  381,  379,  399,  364,  400,  412,  460,  427,  428,
+ /*   270 */   431,  417,  365,  442,  444,  436,  432,  445,  331,  395,
+ /*   280 */   396,  329,  419,  446,  447,  441,  440,  397,  353,  408,
+ /*   290 */   394,  348,  356,  357,  358,  406,  448,  437,  438,  439,
+ /*   300 */   423,  422,  450,  449,  344,
 );
 /* The next thing included is series of defines which control
 ** various aspects of the generated parser.
@@ -903,8 +903,8 @@ static public $yy_action = array(
 */
     const YYNOCODE = 114;
     const YYSTACKDEPTH = 100;
-    const YYNSTATE = 302;
-    const YYNRULE = 164;
+    const YYNSTATE = 305;
+    const YYNRULE = 165;
     const YYERRORSYMBOL = 71;
     const YYERRSYMDT = 'yy0';
     const YYFALLBACK = 1;
@@ -1124,140 +1124,141 @@ static public $yy_action = array(
  /*  27 */ "smartytag ::= ID SPACE value AS DOLLAR varvar",
  /*  28 */ "smartytag ::= ID SPACE array AS DOLLAR varvar",
  /*  29 */ "smartyclosetag ::= ID attributes",
- /*  30 */ "smartyclosetag ::= ID PTR ID",
- /*  31 */ "attributes ::= attributes attribute",
- /*  32 */ "attributes ::= attribute",
- /*  33 */ "attributes ::=",
- /*  34 */ "attribute ::= SPACE ID EQUAL expr",
- /*  35 */ "attribute ::= SPACE ID EQUAL ternary",
- /*  36 */ "attribute ::= SPACE ID",
- /*  37 */ "statements ::= statement",
- /*  38 */ "statements ::= statements COMMA statement",
- /*  39 */ "statement ::= DOLLAR varvar EQUAL expr",
- /*  40 */ "expr ::= ID",
- /*  41 */ "expr ::= exprs",
- /*  42 */ "expr ::= DOLLAR ID COLON ID",
- /*  43 */ "expr ::= expr modifier modparameters",
- /*  44 */ "exprs ::= value",
- /*  45 */ "exprs ::= UNIMATH value",
- /*  46 */ "exprs ::= exprs math value",
- /*  47 */ "exprs ::= array",
- /*  48 */ "ternary ::= OPENP ifexprs CLOSEP QMARK expr COLON expr",
- /*  49 */ "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
- /*  50 */ "math ::= UNIMATH",
- /*  51 */ "math ::= MATH",
- /*  52 */ "math ::= ANDSYM",
- /*  53 */ "value ::= variable",
- /*  54 */ "value ::= INTEGER",
- /*  55 */ "value ::= INTEGER DOT INTEGER",
- /*  56 */ "value ::= BOOLEAN",
- /*  57 */ "value ::= NULL",
- /*  58 */ "value ::= function",
- /*  59 */ "value ::= OPENP expr CLOSEP",
- /*  60 */ "value ::= SINGLEQUOTE text SINGLEQUOTE",
- /*  61 */ "value ::= SINGLEQUOTE SINGLEQUOTE",
- /*  62 */ "value ::= QUOTE doublequoted QUOTE",
- /*  63 */ "value ::= QUOTE QUOTE",
- /*  64 */ "value ::= ID DOUBLECOLON method",
- /*  65 */ "value ::= ID DOUBLECOLON DOLLAR ID OPENP params CLOSEP",
- /*  66 */ "value ::= ID DOUBLECOLON method objectchain",
- /*  67 */ "value ::= ID DOUBLECOLON DOLLAR ID OPENP params CLOSEP objectchain",
- /*  68 */ "value ::= ID DOUBLECOLON ID",
- /*  69 */ "value ::= ID DOUBLECOLON DOLLAR ID arrayindex",
- /*  70 */ "value ::= ID DOUBLECOLON DOLLAR ID arrayindex objectchain",
- /*  71 */ "value ::= LDEL smartytag RDEL",
- /*  72 */ "variable ::= varindexed",
- /*  73 */ "variable ::= DOLLAR varvar AT ID",
- /*  74 */ "variable ::= object",
- /*  75 */ "variable ::= HATCH ID HATCH",
- /*  76 */ "variable ::= HATCH variable HATCH",
- /*  77 */ "varindexed ::= DOLLAR varvar arrayindex",
- /*  78 */ "arrayindex ::= arrayindex indexdef",
- /*  79 */ "arrayindex ::=",
- /*  80 */ "indexdef ::= DOT ID",
- /*  81 */ "indexdef ::= DOT INTEGER",
- /*  82 */ "indexdef ::= DOT variable",
- /*  83 */ "indexdef ::= DOT LDEL exprs RDEL",
- /*  84 */ "indexdef ::= OPENB ID CLOSEB",
- /*  85 */ "indexdef ::= OPENB ID DOT ID CLOSEB",
- /*  86 */ "indexdef ::= OPENB exprs CLOSEB",
- /*  87 */ "indexdef ::= OPENB CLOSEB",
- /*  88 */ "varvar ::= varvarele",
- /*  89 */ "varvar ::= varvar varvarele",
- /*  90 */ "varvarele ::= ID",
- /*  91 */ "varvarele ::= LDEL expr RDEL",
- /*  92 */ "object ::= varindexed objectchain",
- /*  93 */ "objectchain ::= objectelement",
- /*  94 */ "objectchain ::= objectchain objectelement",
- /*  95 */ "objectelement ::= PTR ID arrayindex",
- /*  96 */ "objectelement ::= PTR variable arrayindex",
- /*  97 */ "objectelement ::= PTR LDEL expr RDEL arrayindex",
- /*  98 */ "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
- /*  99 */ "objectelement ::= PTR method",
- /* 100 */ "function ::= ID OPENP params CLOSEP",
- /* 101 */ "method ::= ID OPENP params CLOSEP",
- /* 102 */ "params ::= expr COMMA params",
- /* 103 */ "params ::= expr",
- /* 104 */ "params ::=",
- /* 105 */ "modifier ::= VERT AT ID",
- /* 106 */ "modifier ::= VERT ID",
- /* 107 */ "modparameters ::= modparameters modparameter",
- /* 108 */ "modparameters ::=",
- /* 109 */ "modparameter ::= COLON exprs",
- /* 110 */ "modparameter ::= COLON ID",
- /* 111 */ "ifexprs ::= ifexpr",
- /* 112 */ "ifexprs ::= NOT ifexprs",
- /* 113 */ "ifexprs ::= OPENP ifexprs CLOSEP",
- /* 114 */ "ifexpr ::= expr",
- /* 115 */ "ifexpr ::= expr ifcond expr",
- /* 116 */ "ifexpr ::= expr ISIN array",
- /* 117 */ "ifexpr ::= expr ISIN value",
- /* 118 */ "ifexpr ::= ifexprs lop ifexprs",
- /* 119 */ "ifexpr ::= ifexprs ISDIVBY ifexprs",
- /* 120 */ "ifexpr ::= ifexprs ISNOTDIVBY ifexprs",
- /* 121 */ "ifexpr ::= ifexprs ISEVEN",
- /* 122 */ "ifexpr ::= ifexprs ISNOTEVEN",
- /* 123 */ "ifexpr ::= ifexprs ISEVENBY ifexprs",
- /* 124 */ "ifexpr ::= ifexprs ISNOTEVENBY ifexprs",
- /* 125 */ "ifexpr ::= ifexprs ISODD",
- /* 126 */ "ifexpr ::= ifexprs ISNOTODD",
- /* 127 */ "ifexpr ::= ifexprs ISODDBY ifexprs",
- /* 128 */ "ifexpr ::= ifexprs ISNOTODDBY ifexprs",
- /* 129 */ "ifexpr ::= value INSTANCEOF ID",
- /* 130 */ "ifexpr ::= value INSTANCEOF value",
- /* 131 */ "ifcond ::= EQUALS",
- /* 132 */ "ifcond ::= NOTEQUALS",
- /* 133 */ "ifcond ::= GREATERTHAN",
- /* 134 */ "ifcond ::= LESSTHAN",
- /* 135 */ "ifcond ::= GREATEREQUAL",
- /* 136 */ "ifcond ::= LESSEQUAL",
- /* 137 */ "ifcond ::= IDENTITY",
- /* 138 */ "ifcond ::= NONEIDENTITY",
- /* 139 */ "lop ::= LAND",
- /* 140 */ "lop ::= LOR",
- /* 141 */ "lop ::= LXOR",
- /* 142 */ "array ::= OPENB arrayelements CLOSEB",
- /* 143 */ "arrayelements ::= arrayelement",
- /* 144 */ "arrayelements ::= arrayelements COMMA arrayelement",
- /* 145 */ "arrayelements ::=",
- /* 146 */ "arrayelement ::= expr APTR expr",
- /* 147 */ "arrayelement ::= ID APTR expr",
- /* 148 */ "arrayelement ::= expr",
- /* 149 */ "doublequoted ::= doublequoted doublequotedcontent",
- /* 150 */ "doublequoted ::= doublequotedcontent",
- /* 151 */ "doublequotedcontent ::= BACKTICK ID BACKTICK",
- /* 152 */ "doublequotedcontent ::= BACKTICK variable BACKTICK",
- /* 153 */ "doublequotedcontent ::= DOLLAR ID",
- /* 154 */ "doublequotedcontent ::= LDEL expr RDEL",
- /* 155 */ "doublequotedcontent ::= LDEL smartytag RDEL",
- /* 156 */ "doublequotedcontent ::= DOLLAR OTHER",
- /* 157 */ "doublequotedcontent ::= LDEL OTHER",
- /* 158 */ "doublequotedcontent ::= BACKTICK OTHER",
- /* 159 */ "doublequotedcontent ::= OTHER",
- /* 160 */ "text ::= text textelement",
- /* 161 */ "text ::= textelement",
- /* 162 */ "textelement ::= OTHER",
- /* 163 */ "textelement ::= LDEL",
+ /*  30 */ "smartyclosetag ::= ID modifier modparameters attributes",
+ /*  31 */ "smartyclosetag ::= ID PTR ID",
+ /*  32 */ "attributes ::= attributes attribute",
+ /*  33 */ "attributes ::= attribute",
+ /*  34 */ "attributes ::=",
+ /*  35 */ "attribute ::= SPACE ID EQUAL expr",
+ /*  36 */ "attribute ::= SPACE ID EQUAL ternary",
+ /*  37 */ "attribute ::= SPACE ID",
+ /*  38 */ "statements ::= statement",
+ /*  39 */ "statements ::= statements COMMA statement",
+ /*  40 */ "statement ::= DOLLAR varvar EQUAL expr",
+ /*  41 */ "expr ::= ID",
+ /*  42 */ "expr ::= exprs",
+ /*  43 */ "expr ::= DOLLAR ID COLON ID",
+ /*  44 */ "expr ::= expr modifier modparameters",
+ /*  45 */ "exprs ::= value",
+ /*  46 */ "exprs ::= UNIMATH value",
+ /*  47 */ "exprs ::= exprs math value",
+ /*  48 */ "exprs ::= array",
+ /*  49 */ "ternary ::= OPENP ifexprs CLOSEP QMARK expr COLON expr",
+ /*  50 */ "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
+ /*  51 */ "math ::= UNIMATH",
+ /*  52 */ "math ::= MATH",
+ /*  53 */ "math ::= ANDSYM",
+ /*  54 */ "value ::= variable",
+ /*  55 */ "value ::= INTEGER",
+ /*  56 */ "value ::= INTEGER DOT INTEGER",
+ /*  57 */ "value ::= BOOLEAN",
+ /*  58 */ "value ::= NULL",
+ /*  59 */ "value ::= function",
+ /*  60 */ "value ::= OPENP expr CLOSEP",
+ /*  61 */ "value ::= SINGLEQUOTE text SINGLEQUOTE",
+ /*  62 */ "value ::= SINGLEQUOTE SINGLEQUOTE",
+ /*  63 */ "value ::= QUOTE doublequoted QUOTE",
+ /*  64 */ "value ::= QUOTE QUOTE",
+ /*  65 */ "value ::= ID DOUBLECOLON method",
+ /*  66 */ "value ::= ID DOUBLECOLON DOLLAR ID OPENP params CLOSEP",
+ /*  67 */ "value ::= ID DOUBLECOLON method objectchain",
+ /*  68 */ "value ::= ID DOUBLECOLON DOLLAR ID OPENP params CLOSEP objectchain",
+ /*  69 */ "value ::= ID DOUBLECOLON ID",
+ /*  70 */ "value ::= ID DOUBLECOLON DOLLAR ID arrayindex",
+ /*  71 */ "value ::= ID DOUBLECOLON DOLLAR ID arrayindex objectchain",
+ /*  72 */ "value ::= LDEL smartytag RDEL",
+ /*  73 */ "variable ::= varindexed",
+ /*  74 */ "variable ::= DOLLAR varvar AT ID",
+ /*  75 */ "variable ::= object",
+ /*  76 */ "variable ::= HATCH ID HATCH",
+ /*  77 */ "variable ::= HATCH variable HATCH",
+ /*  78 */ "varindexed ::= DOLLAR varvar arrayindex",
+ /*  79 */ "arrayindex ::= arrayindex indexdef",
+ /*  80 */ "arrayindex ::=",
+ /*  81 */ "indexdef ::= DOT ID",
+ /*  82 */ "indexdef ::= DOT INTEGER",
+ /*  83 */ "indexdef ::= DOT variable",
+ /*  84 */ "indexdef ::= DOT LDEL exprs RDEL",
+ /*  85 */ "indexdef ::= OPENB ID CLOSEB",
+ /*  86 */ "indexdef ::= OPENB ID DOT ID CLOSEB",
+ /*  87 */ "indexdef ::= OPENB exprs CLOSEB",
+ /*  88 */ "indexdef ::= OPENB CLOSEB",
+ /*  89 */ "varvar ::= varvarele",
+ /*  90 */ "varvar ::= varvar varvarele",
+ /*  91 */ "varvarele ::= ID",
+ /*  92 */ "varvarele ::= LDEL expr RDEL",
+ /*  93 */ "object ::= varindexed objectchain",
+ /*  94 */ "objectchain ::= objectelement",
+ /*  95 */ "objectchain ::= objectchain objectelement",
+ /*  96 */ "objectelement ::= PTR ID arrayindex",
+ /*  97 */ "objectelement ::= PTR variable arrayindex",
+ /*  98 */ "objectelement ::= PTR LDEL expr RDEL arrayindex",
+ /*  99 */ "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
+ /* 100 */ "objectelement ::= PTR method",
+ /* 101 */ "function ::= ID OPENP params CLOSEP",
+ /* 102 */ "method ::= ID OPENP params CLOSEP",
+ /* 103 */ "params ::= expr COMMA params",
+ /* 104 */ "params ::= expr",
+ /* 105 */ "params ::=",
+ /* 106 */ "modifier ::= VERT AT ID",
+ /* 107 */ "modifier ::= VERT ID",
+ /* 108 */ "modparameters ::= modparameters modparameter",
+ /* 109 */ "modparameters ::=",
+ /* 110 */ "modparameter ::= COLON exprs",
+ /* 111 */ "modparameter ::= COLON ID",
+ /* 112 */ "ifexprs ::= ifexpr",
+ /* 113 */ "ifexprs ::= NOT ifexprs",
+ /* 114 */ "ifexprs ::= OPENP ifexprs CLOSEP",
+ /* 115 */ "ifexpr ::= expr",
+ /* 116 */ "ifexpr ::= expr ifcond expr",
+ /* 117 */ "ifexpr ::= expr ISIN array",
+ /* 118 */ "ifexpr ::= expr ISIN value",
+ /* 119 */ "ifexpr ::= ifexprs lop ifexprs",
+ /* 120 */ "ifexpr ::= ifexprs ISDIVBY ifexprs",
+ /* 121 */ "ifexpr ::= ifexprs ISNOTDIVBY ifexprs",
+ /* 122 */ "ifexpr ::= ifexprs ISEVEN",
+ /* 123 */ "ifexpr ::= ifexprs ISNOTEVEN",
+ /* 124 */ "ifexpr ::= ifexprs ISEVENBY ifexprs",
+ /* 125 */ "ifexpr ::= ifexprs ISNOTEVENBY ifexprs",
+ /* 126 */ "ifexpr ::= ifexprs ISODD",
+ /* 127 */ "ifexpr ::= ifexprs ISNOTODD",
+ /* 128 */ "ifexpr ::= ifexprs ISODDBY ifexprs",
+ /* 129 */ "ifexpr ::= ifexprs ISNOTODDBY ifexprs",
+ /* 130 */ "ifexpr ::= value INSTANCEOF ID",
+ /* 131 */ "ifexpr ::= value INSTANCEOF value",
+ /* 132 */ "ifcond ::= EQUALS",
+ /* 133 */ "ifcond ::= NOTEQUALS",
+ /* 134 */ "ifcond ::= GREATERTHAN",
+ /* 135 */ "ifcond ::= LESSTHAN",
+ /* 136 */ "ifcond ::= GREATEREQUAL",
+ /* 137 */ "ifcond ::= LESSEQUAL",
+ /* 138 */ "ifcond ::= IDENTITY",
+ /* 139 */ "ifcond ::= NONEIDENTITY",
+ /* 140 */ "lop ::= LAND",
+ /* 141 */ "lop ::= LOR",
+ /* 142 */ "lop ::= LXOR",
+ /* 143 */ "array ::= OPENB arrayelements CLOSEB",
+ /* 144 */ "arrayelements ::= arrayelement",
+ /* 145 */ "arrayelements ::= arrayelements COMMA arrayelement",
+ /* 146 */ "arrayelements ::=",
+ /* 147 */ "arrayelement ::= expr APTR expr",
+ /* 148 */ "arrayelement ::= ID APTR expr",
+ /* 149 */ "arrayelement ::= expr",
+ /* 150 */ "doublequoted ::= doublequoted doublequotedcontent",
+ /* 151 */ "doublequoted ::= doublequotedcontent",
+ /* 152 */ "doublequotedcontent ::= BACKTICK ID BACKTICK",
+ /* 153 */ "doublequotedcontent ::= BACKTICK variable BACKTICK",
+ /* 154 */ "doublequotedcontent ::= DOLLAR ID",
+ /* 155 */ "doublequotedcontent ::= LDEL expr RDEL",
+ /* 156 */ "doublequotedcontent ::= LDEL smartytag RDEL",
+ /* 157 */ "doublequotedcontent ::= DOLLAR OTHER",
+ /* 158 */ "doublequotedcontent ::= LDEL OTHER",
+ /* 159 */ "doublequotedcontent ::= BACKTICK OTHER",
+ /* 160 */ "doublequotedcontent ::= OTHER",
+ /* 161 */ "text ::= text textelement",
+ /* 162 */ "text ::= textelement",
+ /* 163 */ "textelement ::= OTHER",
+ /* 164 */ "textelement ::= LDEL",
     );
 
     /**
@@ -1652,6 +1653,7 @@ static public $yy_action = array(
   array( 'lhs' => 75, 'rhs' => 6 ),
   array( 'lhs' => 75, 'rhs' => 6 ),
   array( 'lhs' => 76, 'rhs' => 2 ),
+  array( 'lhs' => 76, 'rhs' => 4 ),
   array( 'lhs' => 76, 'rhs' => 3 ),
   array( 'lhs' => 79, 'rhs' => 2 ),
   array( 'lhs' => 79, 'rhs' => 1 ),
@@ -1796,31 +1798,31 @@ static public $yy_action = array(
      */
     static public $yyReduceMap = array(
         0 => 0,
-        44 => 0,
-        53 => 0,
+        45 => 0,
         54 => 0,
-        56 => 0,
+        55 => 0,
         57 => 0,
         58 => 0,
-        74 => 0,
-        143 => 0,
+        59 => 0,
+        75 => 0,
+        144 => 0,
         1 => 1,
-        41 => 1,
-        47 => 1,
-        50 => 1,
+        42 => 1,
+        48 => 1,
         51 => 1,
-        88 => 1,
-        111 => 1,
-        150 => 1,
-        159 => 1,
-        161 => 1,
+        52 => 1,
+        89 => 1,
+        112 => 1,
+        151 => 1,
+        160 => 1,
         162 => 1,
         163 => 1,
+        164 => 1,
         2 => 2,
-        78 => 2,
-        149 => 2,
-        157 => 2,
-        160 => 2,
+        79 => 2,
+        150 => 2,
+        158 => 2,
+        161 => 2,
         3 => 3,
         4 => 3,
         5 => 5,
@@ -1845,36 +1847,36 @@ static public $yy_action = array(
         24 => 24,
         25 => 25,
         26 => 26,
-        32 => 26,
-        103 => 26,
-        148 => 26,
+        33 => 26,
+        104 => 26,
+        149 => 26,
         27 => 27,
         28 => 28,
         29 => 29,
         30 => 30,
         31 => 31,
-        33 => 33,
+        32 => 32,
         34 => 34,
-        35 => 34,
-        36 => 36,
+        35 => 35,
+        36 => 35,
         37 => 37,
         38 => 38,
         39 => 39,
         40 => 40,
-        42 => 42,
+        41 => 41,
         43 => 43,
-        45 => 45,
+        44 => 44,
         46 => 46,
-        48 => 48,
-        49 => 48,
-        52 => 52,
-        55 => 55,
-        59 => 59,
+        47 => 47,
+        49 => 49,
+        50 => 49,
+        53 => 53,
+        56 => 56,
         60 => 60,
         61 => 61,
-        63 => 61,
         62 => 62,
-        64 => 64,
+        64 => 62,
+        63 => 63,
         65 => 65,
         66 => 66,
         67 => 67,
@@ -1884,24 +1886,24 @@ static public $yy_action = array(
         71 => 71,
         72 => 72,
         73 => 73,
-        75 => 75,
+        74 => 74,
         76 => 76,
         77 => 77,
-        79 => 79,
-        108 => 79,
+        78 => 78,
         80 => 80,
+        109 => 80,
         81 => 81,
         82 => 82,
         83 => 83,
-        86 => 83,
         84 => 84,
+        87 => 84,
         85 => 85,
-        87 => 87,
-        89 => 89,
+        86 => 86,
+        88 => 88,
         90 => 90,
         91 => 91,
-        113 => 91,
         92 => 92,
+        114 => 92,
         93 => 93,
         94 => 94,
         95 => 95,
@@ -1912,30 +1914,30 @@ static public $yy_action = array(
         100 => 100,
         101 => 101,
         102 => 102,
-        104 => 104,
+        103 => 103,
         105 => 105,
         106 => 106,
         107 => 107,
-        109 => 109,
+        108 => 108,
         110 => 110,
-        112 => 112,
-        114 => 114,
+        111 => 111,
+        113 => 113,
         115 => 115,
-        118 => 115,
-        129 => 115,
         116 => 116,
+        119 => 116,
+        130 => 116,
         117 => 117,
-        119 => 119,
+        118 => 118,
         120 => 120,
         121 => 121,
-        126 => 121,
         122 => 122,
-        125 => 122,
+        127 => 122,
         123 => 123,
-        128 => 123,
+        126 => 123,
         124 => 124,
-        127 => 124,
-        130 => 130,
+        129 => 124,
+        125 => 125,
+        128 => 125,
         131 => 131,
         132 => 132,
         133 => 133,
@@ -1948,17 +1950,18 @@ static public $yy_action = array(
         140 => 140,
         141 => 141,
         142 => 142,
-        144 => 144,
+        143 => 143,
         145 => 145,
         146 => 146,
         147 => 147,
-        151 => 151,
+        148 => 148,
         152 => 152,
         153 => 153,
         154 => 154,
         155 => 155,
         156 => 156,
-        158 => 158,
+        157 => 157,
+        159 => 159,
     );
     /* Beginning here are the reduction cases.  A typical example
     ** follows:
@@ -1968,32 +1971,32 @@ static public $yy_action = array(
     */
 #line 79 "internal.templateparser.y"
     function yy_r0(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;     }
-#line 1976 "internal.templateparser.php"
+#line 1979 "internal.templateparser.php"
 #line 85 "internal.templateparser.y"
     function yy_r1(){$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;    }
-#line 1979 "internal.templateparser.php"
+#line 1982 "internal.templateparser.php"
 #line 87 "internal.templateparser.y"
     function yy_r2(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 1982 "internal.templateparser.php"
+#line 1985 "internal.templateparser.php"
 #line 93 "internal.templateparser.y"
     function yy_r3(){preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); 
                                           if ($this->compiler->has_code) {
                                             $tmp =''; foreach ($this->prefix_code as $code) {$tmp.=$code;} $this->prefix_code=array();
                                             $this->_retvalue = $this->cacher->processNocacheCode($tmp.$s[0].$this->yystack[$this->yyidx + -1]->minor, $this->compiler,$this->nocache,true);
                                          } else { $this->_retvalue = $s[0].$this->yystack[$this->yyidx + -1]->minor;} $this->nocache=false;    }
-#line 1989 "internal.templateparser.php"
+#line 1992 "internal.templateparser.php"
 #line 105 "internal.templateparser.y"
     function yy_r5(){ preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); $this->_retvalue = $s[0];    }
-#line 1992 "internal.templateparser.php"
+#line 1995 "internal.templateparser.php"
 #line 108 "internal.templateparser.y"
     function yy_r6(){preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); preg_match('/\s*/',$this->yystack[$this->yyidx + 0]->minor,$s2); $this->_retvalue = $s[0].$this->cacher->processNocacheCode($this->yystack[$this->yyidx + -1]->minor.$s2[0], $this->compiler,false,false);    }
-#line 1995 "internal.templateparser.php"
+#line 1998 "internal.templateparser.php"
 #line 110 "internal.templateparser.y"
     function yy_r7(){preg_match('/\s*/',$this->yystack[$this->yyidx + 0]->minor,$s); $this->_retvalue = $s[0].$this->cacher->processNocacheCode($this->smarty->left_delimiter, $this->compiler,false,false);    }
-#line 1998 "internal.templateparser.php"
+#line 2001 "internal.templateparser.php"
 #line 112 "internal.templateparser.y"
     function yy_r8(){preg_match('/\s*/',$this->yystack[$this->yyidx + 0]->minor,$s); $this->_retvalue = $s[0].$this->cacher->processNocacheCode($this->smarty->right_delimiter, $this->compiler,false,false);    }
-#line 2001 "internal.templateparser.php"
+#line 2004 "internal.templateparser.php"
 #line 114 "internal.templateparser.y"
     function yy_r9(){if ($this->sec_obj->php_handling == SMARTY_PHP_PASSTHRU) {
                                        $this->_retvalue = $this->cacher->processNocacheCode("<?php echo '<?php".str_replace("'","\'",$this->yystack[$this->yyidx + -1]->minor)."?>';?>\n", $this->compiler, false, false);
@@ -2005,7 +2008,7 @@ static public $yy_action = array(
                                        $this->_retvalue = '';
                                       }
                                          }
-#line 2013 "internal.templateparser.php"
+#line 2016 "internal.templateparser.php"
 #line 125 "internal.templateparser.y"
     function yy_r10(){preg_match('/\s*/',$this->yystack[$this->yyidx + -3]->minor,$s); $this->_retvalue = $s[0];
                                       if ($this->sec_obj->php_handling == SMARTY_PHP_PASSTHRU || $this->sec_obj->php_handling == SMARTY_PHP_ALLOW) {
@@ -2016,28 +2019,28 @@ static public $yy_action = array(
                                        $this->_retvalue .= '';
                                       }
                                          }
-#line 2024 "internal.templateparser.php"
+#line 2027 "internal.templateparser.php"
 #line 136 "internal.templateparser.y"
     function yy_r11(){preg_match('/\s*/',$this->yystack[$this->yyidx + 0]->minor,$s); $this->_retvalue = $s[0].$this->cacher->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true, true);    }
-#line 2027 "internal.templateparser.php"
+#line 2030 "internal.templateparser.php"
 #line 137 "internal.templateparser.y"
     function yy_r12(){$this->_retvalue = $this->cacher->processNocacheCode("<?php echo '?>';?>\n", $this->compiler, true, true);    }
-#line 2030 "internal.templateparser.php"
+#line 2033 "internal.templateparser.php"
 #line 139 "internal.templateparser.y"
     function yy_r13(){$this->_retvalue = $this->cacher->processNocacheCode($this->yystack[$this->yyidx + 0]->minor, $this->compiler,false,false);    }
-#line 2033 "internal.templateparser.php"
+#line 2036 "internal.templateparser.php"
 #line 146 "internal.templateparser.y"
     function yy_r14(){ $this->_retvalue = $this->compiler->compileTag('print_expression',array_merge(array('value'=>$this->yystack[$this->yyidx + -1]->minor),$this->yystack[$this->yyidx + 0]->minor));    }
-#line 2036 "internal.templateparser.php"
+#line 2039 "internal.templateparser.php"
 #line 151 "internal.templateparser.y"
     function yy_r17(){ $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array('value'=>$this->yystack[$this->yyidx + -1]->minor),$this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + 0]->minor));    }
-#line 2039 "internal.templateparser.php"
+#line 2042 "internal.templateparser.php"
 #line 154 "internal.templateparser.y"
     function yy_r19(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2042 "internal.templateparser.php"
+#line 2045 "internal.templateparser.php"
 #line 156 "internal.templateparser.y"
     function yy_r20(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,array_merge(array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor),$this->yystack[$this->yyidx + 0]->minor));    }
-#line 2045 "internal.templateparser.php"
+#line 2048 "internal.templateparser.php"
 #line 158 "internal.templateparser.y"
     function yy_r21(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + 0]->minor).'<?php echo ';
 															                                   if ($this->smarty->plugin_handler->loadSmartyPlugin($this->yystack[$this->yyidx + -2]->minor[0],'modifier')) {
@@ -2052,81 +2055,96 @@ static public $yy_action = array(
                                                                  }
                                                               }
                                                                         }
-#line 2060 "internal.templateparser.php"
+#line 2063 "internal.templateparser.php"
 #line 172 "internal.templateparser.y"
     function yy_r22(){if (!in_array($this->yystack[$this->yyidx + -2]->minor,array('if','elseif','while'))) {
                                                             $this->compiler->trigger_template_error ("wrong syntax for tag \"" . $this->yystack[$this->yyidx + -2]->minor . "\""); 
                                                             }
                                                             $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));    }
-#line 2066 "internal.templateparser.php"
+#line 2069 "internal.templateparser.php"
 #line 176 "internal.templateparser.y"
     function yy_r23(){ if (!in_array($this->yystack[$this->yyidx + -2]->minor,array('if','elseif','while'))) {
                                                             $this->compiler->trigger_template_error ("wrong syntax for tag \"" . $this->yystack[$this->yyidx + -2]->minor . "\""); 
                                                             }
                                                             $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));    }
-#line 2072 "internal.templateparser.php"
+#line 2075 "internal.templateparser.php"
 #line 181 "internal.templateparser.y"
     function yy_r24(){
                                                             if ($this->yystack[$this->yyidx + -8]->minor != 'for') {
                                                                $this->compiler->trigger_template_error ("wrong syntax for tag \"" . $this->yystack[$this->yyidx + -8]->minor . "\""); 
                                                             }
                                                              $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -8]->minor,array('start'=>$this->yystack[$this->yyidx + -6]->minor,'ifexp'=>$this->yystack[$this->yyidx + -4]->minor,'varloop'=>$this->yystack[$this->yyidx + -1]->minor,'loop'=>$this->yystack[$this->yyidx + 0]->minor));    }
-#line 2079 "internal.templateparser.php"
+#line 2082 "internal.templateparser.php"
 #line 186 "internal.templateparser.y"
     function yy_r25(){ $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2082 "internal.templateparser.php"
+#line 2085 "internal.templateparser.php"
 #line 187 "internal.templateparser.y"
     function yy_r26(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;    }
-#line 2085 "internal.templateparser.php"
+#line 2088 "internal.templateparser.php"
 #line 189 "internal.templateparser.y"
     function yy_r27(){
                                                             if ($this->yystack[$this->yyidx + -5]->minor != 'foreach') {
                                                                $this->compiler->trigger_template_error ("wrong syntax for tag \"" . $this->yystack[$this->yyidx + -5]->minor . "\""); 
                                                             }
                                                             $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -5]->minor,array('from'=>$this->yystack[$this->yyidx + -3]->minor,'item'=>$this->yystack[$this->yyidx + 0]->minor));    }
-#line 2092 "internal.templateparser.php"
+#line 2095 "internal.templateparser.php"
 #line 194 "internal.templateparser.y"
     function yy_r28(){ 
                                                             if ($this->yystack[$this->yyidx + -5]->minor != 'foreach') {
                                                                $this->compiler->trigger_template_error ("wrong syntax for tag \"" . $this->yystack[$this->yyidx + -5]->minor . "\""); 
                                                             }
                                                             $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -5]->minor,array('from'=>$this->yystack[$this->yyidx + -3]->minor,'item'=>$this->yystack[$this->yyidx + 0]->minor));    }
-#line 2099 "internal.templateparser.php"
+#line 2102 "internal.templateparser.php"
 #line 201 "internal.templateparser.y"
     function yy_r29(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2102 "internal.templateparser.php"
-#line 203 "internal.templateparser.y"
-    function yy_r30(){  $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array('object_methode'=>$this->yystack[$this->yyidx + 0]->minor));    }
 #line 2105 "internal.templateparser.php"
-#line 210 "internal.templateparser.y"
-    function yy_r31(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2108 "internal.templateparser.php"
-#line 214 "internal.templateparser.y"
-    function yy_r33(){ $this->_retvalue = array();    }
-#line 2111 "internal.templateparser.php"
-#line 217 "internal.templateparser.y"
-    function yy_r34(){ $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2114 "internal.templateparser.php"
-#line 219 "internal.templateparser.y"
-    function yy_r36(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor=>'true');    }
-#line 2117 "internal.templateparser.php"
-#line 224 "internal.templateparser.y"
-    function yy_r37(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);    }
+#line 202 "internal.templateparser.y"
+    function yy_r30(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',$this->yystack[$this->yyidx + 0]->minor).'<?php echo ';
+															                                   if ($this->smarty->plugin_handler->loadSmartyPlugin($this->yystack[$this->yyidx + -2]->minor[0],'modifier')) {
+                                                                      $this->_retvalue .= "\$_smarty_tpl->smarty->plugin_handler->executeModifier('".$this->yystack[$this->yyidx + -2]->minor[0] . "',array(ob_get_clean()" . $this->yystack[$this->yyidx + -1]->minor. "),".$this->yystack[$this->yyidx + -2]->minor[1].");?>";
+                                                                 } else {
+                                                                   if (is_callable($this->yystack[$this->yyidx + -2]->minor[0])) {
+																					                            if (!$this->template->security || $this->smarty->security_handler->isTrustedModifier($this->yystack[$this->yyidx + -2]->minor[0], $this->compiler)) {
+                                                                         $this->_retvalue .= "\$_smarty_tpl->smarty->plugin_handler->executeModifier('".$this->yystack[$this->yyidx + -2]->minor[0] . "',array(ob_get_clean()" . $this->yystack[$this->yyidx + -1]->minor. "),".$this->yystack[$this->yyidx + -2]->minor[1].");?>";
+																					                            }
+																					                         } else {
+                                                                      $this->compiler->trigger_template_error ("unknown modifier \"" . $this->yystack[$this->yyidx + -2]->minor[0] . "\"");
+                                                                 }
+                                                              }
+                                                                        }
 #line 2120 "internal.templateparser.php"
-#line 225 "internal.templateparser.y"
-    function yy_r38(){ $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;    }
+#line 216 "internal.templateparser.y"
+    function yy_r31(){  $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array('object_methode'=>$this->yystack[$this->yyidx + 0]->minor));    }
 #line 2123 "internal.templateparser.php"
-#line 227 "internal.templateparser.y"
-    function yy_r39(){ $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);    }
+#line 223 "internal.templateparser.y"
+    function yy_r32(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);    }
 #line 2126 "internal.templateparser.php"
-#line 233 "internal.templateparser.y"
-    function yy_r40(){ $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';     }
+#line 227 "internal.templateparser.y"
+    function yy_r34(){ $this->_retvalue = array();    }
 #line 2129 "internal.templateparser.php"
-#line 236 "internal.templateparser.y"
-    function yy_r42(){$this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')';    }
+#line 230 "internal.templateparser.y"
+    function yy_r35(){ $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);    }
 #line 2132 "internal.templateparser.php"
+#line 232 "internal.templateparser.y"
+    function yy_r37(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor=>'true');    }
+#line 2135 "internal.templateparser.php"
 #line 237 "internal.templateparser.y"
-    function yy_r43(){            
+    function yy_r38(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);    }
+#line 2138 "internal.templateparser.php"
+#line 238 "internal.templateparser.y"
+    function yy_r39(){ $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;    }
+#line 2141 "internal.templateparser.php"
+#line 240 "internal.templateparser.y"
+    function yy_r40(){ $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);    }
+#line 2144 "internal.templateparser.php"
+#line 246 "internal.templateparser.y"
+    function yy_r41(){ $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';     }
+#line 2147 "internal.templateparser.php"
+#line 249 "internal.templateparser.y"
+    function yy_r43(){$this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')';    }
+#line 2150 "internal.templateparser.php"
+#line 250 "internal.templateparser.y"
+    function yy_r44(){            
                                                             if ($this->smarty->plugin_handler->loadSmartyPlugin($this->yystack[$this->yyidx + -1]->minor[0],'modifier')) {
                                                                       $this->_retvalue = "\$_smarty_tpl->smarty->plugin_handler->executeModifier('".$this->yystack[$this->yyidx + -1]->minor[0] . "',array(". $this->yystack[$this->yyidx + -2]->minor . $this->yystack[$this->yyidx + 0]->minor. "),".$this->yystack[$this->yyidx + -1]->minor[1].")";
                                                                  } else {
@@ -2139,270 +2157,270 @@ static public $yy_action = array(
                                                                  }
                                                               }
                                                                 }
-#line 2147 "internal.templateparser.php"
-#line 254 "internal.templateparser.y"
-    function yy_r45(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2150 "internal.templateparser.php"
-#line 256 "internal.templateparser.y"
-    function yy_r46(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + 0]->minor;     }
-#line 2153 "internal.templateparser.php"
-#line 263 "internal.templateparser.y"
-    function yy_r48(){ $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2156 "internal.templateparser.php"
-#line 277 "internal.templateparser.y"
-    function yy_r52(){$this->_retvalue = ' & ';    }
-#line 2159 "internal.templateparser.php"
-#line 283 "internal.templateparser.y"
-    function yy_r55(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2162 "internal.templateparser.php"
-#line 291 "internal.templateparser.y"
-    function yy_r59(){ $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")";     }
 #line 2165 "internal.templateparser.php"
-#line 293 "internal.templateparser.y"
-    function yy_r60(){ $this->_retvalue = "'".$this->yystack[$this->yyidx + -1]->minor."'";     }
+#line 267 "internal.templateparser.y"
+    function yy_r46(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
 #line 2168 "internal.templateparser.php"
-#line 294 "internal.templateparser.y"
-    function yy_r61(){ $this->_retvalue = "''";     }
+#line 269 "internal.templateparser.y"
+    function yy_r47(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + 0]->minor;     }
 #line 2171 "internal.templateparser.php"
-#line 296 "internal.templateparser.y"
-    function yy_r62(){ $this->_retvalue = '"'.$this->yystack[$this->yyidx + -1]->minor.'"';     }
+#line 276 "internal.templateparser.y"
+    function yy_r49(){ $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;    }
 #line 2174 "internal.templateparser.php"
-#line 299 "internal.templateparser.y"
-    function yy_r64(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 290 "internal.templateparser.y"
+    function yy_r53(){$this->_retvalue = ' & ';    }
 #line 2177 "internal.templateparser.php"
-#line 300 "internal.templateparser.y"
-    function yy_r65(){ $this->prefix_number++; $this->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -3]->minor .'\')->value;?>'; $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.'::$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -1]->minor .')';     }
+#line 296 "internal.templateparser.y"
+    function yy_r56(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;     }
 #line 2180 "internal.templateparser.php"
-#line 302 "internal.templateparser.y"
-    function yy_r66(){ $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.'::'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 304 "internal.templateparser.y"
+    function yy_r60(){ $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")";     }
 #line 2183 "internal.templateparser.php"
-#line 303 "internal.templateparser.y"
-    function yy_r67(){ $this->prefix_number++; $this->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -4]->minor .'\')->value;?>'; $this->_retvalue = $this->yystack[$this->yyidx + -7]->minor.'::$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -2]->minor .')'.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 306 "internal.templateparser.y"
+    function yy_r61(){ $this->_retvalue = "'".$this->yystack[$this->yyidx + -1]->minor."'";     }
 #line 2186 "internal.templateparser.php"
-#line 305 "internal.templateparser.y"
-    function yy_r68(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2189 "internal.templateparser.php"
 #line 307 "internal.templateparser.y"
-    function yy_r69(){ $this->_retvalue = $this->yystack[$this->yyidx + -4]->minor.'::$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2192 "internal.templateparser.php"
+    function yy_r62(){ $this->_retvalue = "''";     }
+#line 2189 "internal.templateparser.php"
 #line 309 "internal.templateparser.y"
-    function yy_r70(){ $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.'::$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+    function yy_r63(){ $this->_retvalue = '"'.$this->yystack[$this->yyidx + -1]->minor.'"';     }
+#line 2192 "internal.templateparser.php"
+#line 312 "internal.templateparser.y"
+    function yy_r65(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor;     }
 #line 2195 "internal.templateparser.php"
-#line 311 "internal.templateparser.y"
-    function yy_r71(){ $this->prefix_number++; $this->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + -1]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>'; $this->_retvalue = '$_tmp'.$this->prefix_number;     }
+#line 313 "internal.templateparser.y"
+    function yy_r66(){ $this->prefix_number++; $this->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -3]->minor .'\')->value;?>'; $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.'::$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -1]->minor .')';     }
 #line 2198 "internal.templateparser.php"
+#line 315 "internal.templateparser.y"
+    function yy_r67(){ $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.'::'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2201 "internal.templateparser.php"
+#line 316 "internal.templateparser.y"
+    function yy_r68(){ $this->prefix_number++; $this->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -4]->minor .'\')->value;?>'; $this->_retvalue = $this->yystack[$this->yyidx + -7]->minor.'::$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -2]->minor .')'.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2204 "internal.templateparser.php"
+#line 318 "internal.templateparser.y"
+    function yy_r69(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2207 "internal.templateparser.php"
 #line 320 "internal.templateparser.y"
-    function yy_r72(){if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('internal_smarty_var',$this->yystack[$this->yyidx + 0]->minor['index']);} else {
+    function yy_r70(){ $this->_retvalue = $this->yystack[$this->yyidx + -4]->minor.'::$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2210 "internal.templateparser.php"
+#line 322 "internal.templateparser.y"
+    function yy_r71(){ $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.'::$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2213 "internal.templateparser.php"
+#line 324 "internal.templateparser.y"
+    function yy_r72(){ $this->prefix_number++; $this->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + -1]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>'; $this->_retvalue = '$_tmp'.$this->prefix_number;     }
+#line 2216 "internal.templateparser.php"
+#line 333 "internal.templateparser.y"
+    function yy_r73(){if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('internal_smarty_var',$this->yystack[$this->yyidx + 0]->minor['index']);} else {
                                                          $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + 0]->minor['var'] .')->value'.$this->yystack[$this->yyidx + 0]->minor['index']; $this->nocache=$this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor['var'],"'"))->nocache;}    }
-#line 2202 "internal.templateparser.php"
-#line 323 "internal.templateparser.y"
-    function yy_r73(){ $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor; $this->nocache=$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"))->nocache;    }
-#line 2205 "internal.templateparser.php"
-#line 327 "internal.templateparser.y"
-    function yy_r75(){$this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')';    }
-#line 2208 "internal.templateparser.php"
-#line 328 "internal.templateparser.y"
-    function yy_r76(){$this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')';    }
-#line 2211 "internal.templateparser.php"
-#line 331 "internal.templateparser.y"
-    function yy_r77(){$this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'index'=>$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2214 "internal.templateparser.php"
-#line 339 "internal.templateparser.y"
-    function yy_r79(){return;    }
-#line 2217 "internal.templateparser.php"
-#line 343 "internal.templateparser.y"
-    function yy_r80(){ $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']";    }
 #line 2220 "internal.templateparser.php"
-#line 344 "internal.templateparser.y"
-    function yy_r81(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]";    }
+#line 336 "internal.templateparser.y"
+    function yy_r74(){ $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor; $this->nocache=$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"))->nocache;    }
 #line 2223 "internal.templateparser.php"
-#line 345 "internal.templateparser.y"
-    function yy_r82(){ $this->_retvalue = "[".$this->yystack[$this->yyidx + 0]->minor."]";    }
+#line 340 "internal.templateparser.y"
+    function yy_r76(){$this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')';    }
 #line 2226 "internal.templateparser.php"
-#line 346 "internal.templateparser.y"
-    function yy_r83(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]";    }
+#line 341 "internal.templateparser.y"
+    function yy_r77(){$this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')';    }
 #line 2229 "internal.templateparser.php"
-#line 348 "internal.templateparser.y"
-    function yy_r84(){ $this->_retvalue = '['.$this->compiler->compileTag('internal_smarty_var','[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';    }
+#line 344 "internal.templateparser.y"
+    function yy_r78(){$this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'index'=>$this->yystack[$this->yyidx + 0]->minor);    }
 #line 2232 "internal.templateparser.php"
-#line 349 "internal.templateparser.y"
-    function yy_r85(){ $this->_retvalue = '['.$this->compiler->compileTag('internal_smarty_var','[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';    }
+#line 352 "internal.templateparser.y"
+    function yy_r80(){return;    }
 #line 2235 "internal.templateparser.php"
-#line 353 "internal.templateparser.y"
-    function yy_r87(){$this->_retvalue = '';    }
+#line 356 "internal.templateparser.y"
+    function yy_r81(){ $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']";    }
 #line 2238 "internal.templateparser.php"
-#line 361 "internal.templateparser.y"
-    function yy_r89(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 357 "internal.templateparser.y"
+    function yy_r82(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]";    }
 #line 2241 "internal.templateparser.php"
-#line 363 "internal.templateparser.y"
-    function yy_r90(){$this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';    }
+#line 358 "internal.templateparser.y"
+    function yy_r83(){ $this->_retvalue = "[".$this->yystack[$this->yyidx + 0]->minor."]";    }
 #line 2244 "internal.templateparser.php"
-#line 365 "internal.templateparser.y"
-    function yy_r91(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 359 "internal.templateparser.y"
+    function yy_r84(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]";    }
 #line 2247 "internal.templateparser.php"
-#line 370 "internal.templateparser.y"
-    function yy_r92(){ if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('internal_smarty_var',$this->yystack[$this->yyidx + -1]->minor['index']).$this->yystack[$this->yyidx + 0]->minor;} else {
-                                                         $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -1]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -1]->minor['index'].$this->yystack[$this->yyidx + 0]->minor; $this->nocache=$this->template->getVariable(trim($this->yystack[$this->yyidx + -1]->minor['var'],"'"))->nocache;}    }
-#line 2251 "internal.templateparser.php"
-#line 373 "internal.templateparser.y"
-    function yy_r93(){$this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;     }
-#line 2254 "internal.templateparser.php"
-#line 375 "internal.templateparser.y"
-    function yy_r94(){$this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2257 "internal.templateparser.php"
-#line 377 "internal.templateparser.y"
-    function yy_r95(){ $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2260 "internal.templateparser.php"
+#line 361 "internal.templateparser.y"
+    function yy_r85(){ $this->_retvalue = '['.$this->compiler->compileTag('internal_smarty_var','[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';    }
+#line 2250 "internal.templateparser.php"
+#line 362 "internal.templateparser.y"
+    function yy_r86(){ $this->_retvalue = '['.$this->compiler->compileTag('internal_smarty_var','[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';    }
+#line 2253 "internal.templateparser.php"
+#line 366 "internal.templateparser.y"
+    function yy_r88(){$this->_retvalue = '';    }
+#line 2256 "internal.templateparser.php"
+#line 374 "internal.templateparser.y"
+    function yy_r90(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2259 "internal.templateparser.php"
+#line 376 "internal.templateparser.y"
+    function yy_r91(){$this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';    }
+#line 2262 "internal.templateparser.php"
 #line 378 "internal.templateparser.y"
-    function yy_r96(){ $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
-#line 2263 "internal.templateparser.php"
-#line 379 "internal.templateparser.y"
-    function yy_r97(){ $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
-#line 2266 "internal.templateparser.php"
-#line 380 "internal.templateparser.y"
-    function yy_r98(){ $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
+    function yy_r92(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 2265 "internal.templateparser.php"
+#line 383 "internal.templateparser.y"
+    function yy_r93(){ if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('internal_smarty_var',$this->yystack[$this->yyidx + -1]->minor['index']).$this->yystack[$this->yyidx + 0]->minor;} else {
+                                                         $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -1]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -1]->minor['index'].$this->yystack[$this->yyidx + 0]->minor; $this->nocache=$this->template->getVariable(trim($this->yystack[$this->yyidx + -1]->minor['var'],"'"))->nocache;}    }
 #line 2269 "internal.templateparser.php"
-#line 382 "internal.templateparser.y"
-    function yy_r99(){ $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 386 "internal.templateparser.y"
+    function yy_r94(){$this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;     }
 #line 2272 "internal.templateparser.php"
 #line 388 "internal.templateparser.y"
-    function yy_r100(){if (!$this->template->security || $this->smarty->security_handler->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) {
+    function yy_r95(){$this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2275 "internal.templateparser.php"
+#line 390 "internal.templateparser.y"
+    function yy_r96(){ $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2278 "internal.templateparser.php"
+#line 391 "internal.templateparser.y"
+    function yy_r97(){ $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
+#line 2281 "internal.templateparser.php"
+#line 392 "internal.templateparser.y"
+    function yy_r98(){ $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
+#line 2284 "internal.templateparser.php"
+#line 393 "internal.templateparser.y"
+    function yy_r99(){ $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
+#line 2287 "internal.templateparser.php"
+#line 395 "internal.templateparser.y"
+    function yy_r100(){ $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2290 "internal.templateparser.php"
+#line 401 "internal.templateparser.y"
+    function yy_r101(){if (!$this->template->security || $this->smarty->security_handler->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) {
 																					            if ($this->yystack[$this->yyidx + -3]->minor == 'isset' || $this->yystack[$this->yyidx + -3]->minor == 'empty' || $this->yystack[$this->yyidx + -3]->minor == 'array' || is_callable($this->yystack[$this->yyidx + -3]->minor)) {
 																					                $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $this->yystack[$this->yyidx + -1]->minor .")";
 																					            } else {
                                                        $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\"");
                                                       }
                                                     }    }
-#line 2281 "internal.templateparser.php"
-#line 399 "internal.templateparser.y"
-    function yy_r101(){ $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $this->yystack[$this->yyidx + -1]->minor .")";    }
-#line 2284 "internal.templateparser.php"
-#line 403 "internal.templateparser.y"
-    function yy_r102(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.",".$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2287 "internal.templateparser.php"
-#line 407 "internal.templateparser.y"
-    function yy_r104(){ return;    }
-#line 2290 "internal.templateparser.php"
-#line 412 "internal.templateparser.y"
-    function yy_r105(){ $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor,'false');    }
-#line 2293 "internal.templateparser.php"
-#line 413 "internal.templateparser.y"
-    function yy_r106(){ $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor,'true');    }
-#line 2296 "internal.templateparser.php"
-#line 425 "internal.templateparser.y"
-    function yy_r107(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
 #line 2299 "internal.templateparser.php"
-#line 429 "internal.templateparser.y"
-    function yy_r109(){$this->_retvalue = ','.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 412 "internal.templateparser.y"
+    function yy_r102(){ $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $this->yystack[$this->yyidx + -1]->minor .")";    }
 #line 2302 "internal.templateparser.php"
-#line 430 "internal.templateparser.y"
-    function yy_r110(){$this->_retvalue = ',\''.$this->yystack[$this->yyidx + 0]->minor.'\'';    }
+#line 416 "internal.templateparser.y"
+    function yy_r103(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.",".$this->yystack[$this->yyidx + 0]->minor;    }
 #line 2305 "internal.templateparser.php"
-#line 437 "internal.templateparser.y"
-    function yy_r112(){$this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 420 "internal.templateparser.y"
+    function yy_r105(){ return;    }
 #line 2308 "internal.templateparser.php"
-#line 442 "internal.templateparser.y"
-    function yy_r114(){$this->_retvalue =$this->yystack[$this->yyidx + 0]->minor;    }
+#line 425 "internal.templateparser.y"
+    function yy_r106(){ $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor,'false');    }
 #line 2311 "internal.templateparser.php"
-#line 444 "internal.templateparser.y"
-    function yy_r115(){$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 426 "internal.templateparser.y"
+    function yy_r107(){ $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor,'true');    }
 #line 2314 "internal.templateparser.php"
-#line 445 "internal.templateparser.y"
-    function yy_r116(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 438 "internal.templateparser.y"
+    function yy_r108(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
 #line 2317 "internal.templateparser.php"
-#line 446 "internal.templateparser.y"
-    function yy_r117(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 442 "internal.templateparser.y"
+    function yy_r110(){$this->_retvalue = ','.$this->yystack[$this->yyidx + 0]->minor;    }
 #line 2320 "internal.templateparser.php"
-#line 448 "internal.templateparser.y"
-    function yy_r119(){$this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 443 "internal.templateparser.y"
+    function yy_r111(){$this->_retvalue = ',\''.$this->yystack[$this->yyidx + 0]->minor.'\'';    }
 #line 2323 "internal.templateparser.php"
-#line 449 "internal.templateparser.y"
-    function yy_r120(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2326 "internal.templateparser.php"
 #line 450 "internal.templateparser.y"
-    function yy_r121(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
+    function yy_r113(){$this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2326 "internal.templateparser.php"
+#line 455 "internal.templateparser.y"
+    function yy_r115(){$this->_retvalue =$this->yystack[$this->yyidx + 0]->minor;    }
 #line 2329 "internal.templateparser.php"
-#line 451 "internal.templateparser.y"
-    function yy_r122(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 457 "internal.templateparser.y"
+    function yy_r116(){$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
 #line 2332 "internal.templateparser.php"
-#line 452 "internal.templateparser.y"
-    function yy_r123(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 458 "internal.templateparser.y"
+    function yy_r117(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';    }
 #line 2335 "internal.templateparser.php"
-#line 453 "internal.templateparser.y"
-    function yy_r124(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2338 "internal.templateparser.php"
 #line 459 "internal.templateparser.y"
-    function yy_r130(){$this->prefix_number++; $this->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>'; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number;    }
-#line 2341 "internal.templateparser.php"
+    function yy_r118(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2338 "internal.templateparser.php"
 #line 461 "internal.templateparser.y"
-    function yy_r131(){$this->_retvalue = '==';    }
-#line 2344 "internal.templateparser.php"
+    function yy_r120(){$this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2341 "internal.templateparser.php"
 #line 462 "internal.templateparser.y"
-    function yy_r132(){$this->_retvalue = '!=';    }
-#line 2347 "internal.templateparser.php"
+    function yy_r121(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2344 "internal.templateparser.php"
 #line 463 "internal.templateparser.y"
-    function yy_r133(){$this->_retvalue = '>';    }
-#line 2350 "internal.templateparser.php"
+    function yy_r122(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 2347 "internal.templateparser.php"
 #line 464 "internal.templateparser.y"
-    function yy_r134(){$this->_retvalue = '<';    }
-#line 2353 "internal.templateparser.php"
+    function yy_r123(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 2350 "internal.templateparser.php"
 #line 465 "internal.templateparser.y"
-    function yy_r135(){$this->_retvalue = '>=';    }
-#line 2356 "internal.templateparser.php"
+    function yy_r124(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2353 "internal.templateparser.php"
 #line 466 "internal.templateparser.y"
-    function yy_r136(){$this->_retvalue = '<=';    }
-#line 2359 "internal.templateparser.php"
-#line 467 "internal.templateparser.y"
-    function yy_r137(){$this->_retvalue = '===';    }
-#line 2362 "internal.templateparser.php"
-#line 468 "internal.templateparser.y"
-    function yy_r138(){$this->_retvalue = '!==';    }
-#line 2365 "internal.templateparser.php"
-#line 470 "internal.templateparser.y"
-    function yy_r139(){$this->_retvalue = '&&';    }
-#line 2368 "internal.templateparser.php"
-#line 471 "internal.templateparser.y"
-    function yy_r140(){$this->_retvalue = '||';    }
-#line 2371 "internal.templateparser.php"
+    function yy_r125(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2356 "internal.templateparser.php"
 #line 472 "internal.templateparser.y"
-    function yy_r141(){$this->_retvalue = ' XOR ';    }
-#line 2374 "internal.templateparser.php"
+    function yy_r131(){$this->prefix_number++; $this->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>'; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number;    }
+#line 2359 "internal.templateparser.php"
+#line 474 "internal.templateparser.y"
+    function yy_r132(){$this->_retvalue = '==';    }
+#line 2362 "internal.templateparser.php"
+#line 475 "internal.templateparser.y"
+    function yy_r133(){$this->_retvalue = '!=';    }
+#line 2365 "internal.templateparser.php"
+#line 476 "internal.templateparser.y"
+    function yy_r134(){$this->_retvalue = '>';    }
+#line 2368 "internal.templateparser.php"
 #line 477 "internal.templateparser.y"
-    function yy_r142(){ $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';    }
-#line 2377 "internal.templateparser.php"
+    function yy_r135(){$this->_retvalue = '<';    }
+#line 2371 "internal.templateparser.php"
+#line 478 "internal.templateparser.y"
+    function yy_r136(){$this->_retvalue = '>=';    }
+#line 2374 "internal.templateparser.php"
 #line 479 "internal.templateparser.y"
-    function yy_r144(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2380 "internal.templateparser.php"
+    function yy_r137(){$this->_retvalue = '<=';    }
+#line 2377 "internal.templateparser.php"
 #line 480 "internal.templateparser.y"
-    function yy_r145(){ return;     }
-#line 2383 "internal.templateparser.php"
+    function yy_r138(){$this->_retvalue = '===';    }
+#line 2380 "internal.templateparser.php"
 #line 481 "internal.templateparser.y"
-    function yy_r146(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
+    function yy_r139(){$this->_retvalue = '!==';    }
+#line 2383 "internal.templateparser.php"
+#line 483 "internal.templateparser.y"
+    function yy_r140(){$this->_retvalue = '&&';    }
 #line 2386 "internal.templateparser.php"
-#line 482 "internal.templateparser.y"
-    function yy_r147(){ $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 484 "internal.templateparser.y"
+    function yy_r141(){$this->_retvalue = '||';    }
 #line 2389 "internal.templateparser.php"
-#line 491 "internal.templateparser.y"
-    function yy_r151(){$this->_retvalue = "`".$this->yystack[$this->yyidx + -1]->minor."`";    }
+#line 485 "internal.templateparser.y"
+    function yy_r142(){$this->_retvalue = ' XOR ';    }
 #line 2392 "internal.templateparser.php"
-#line 492 "internal.templateparser.y"
-    function yy_r152(){$this->_retvalue = '".'.$this->yystack[$this->yyidx + -1]->minor.'."';    }
+#line 490 "internal.templateparser.y"
+    function yy_r143(){ $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';    }
 #line 2395 "internal.templateparser.php"
-#line 493 "internal.templateparser.y"
-    function yy_r153(){$this->_retvalue = '".'.'$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + 0]->minor .'\')->value'.'."'; $this->nocache=$this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor,"'"))->nocache;    }
+#line 492 "internal.templateparser.y"
+    function yy_r145(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;     }
 #line 2398 "internal.templateparser.php"
-#line 494 "internal.templateparser.y"
-    function yy_r154(){preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); $this->_retvalue = $s[0].'".('.$this->yystack[$this->yyidx + -1]->minor.')."';    }
+#line 493 "internal.templateparser.y"
+    function yy_r146(){ return;     }
 #line 2401 "internal.templateparser.php"
-#line 495 "internal.templateparser.y"
-    function yy_r155(){ preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); $this->prefix_number++; $this->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + -1]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>'; $this->_retvalue = $s[0].'".$_tmp'.$this->prefix_number.'."';     }
+#line 494 "internal.templateparser.y"
+    function yy_r147(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
 #line 2404 "internal.templateparser.php"
-#line 496 "internal.templateparser.y"
-    function yy_r156(){$this->_retvalue = '$'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 495 "internal.templateparser.y"
+    function yy_r148(){ $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
 #line 2407 "internal.templateparser.php"
-#line 498 "internal.templateparser.y"
-    function yy_r158(){$this->_retvalue = '`'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 504 "internal.templateparser.y"
+    function yy_r152(){$this->_retvalue = "`".$this->yystack[$this->yyidx + -1]->minor."`";    }
 #line 2410 "internal.templateparser.php"
+#line 505 "internal.templateparser.y"
+    function yy_r153(){$this->_retvalue = '".'.$this->yystack[$this->yyidx + -1]->minor.'."';    }
+#line 2413 "internal.templateparser.php"
+#line 506 "internal.templateparser.y"
+    function yy_r154(){$this->_retvalue = '".'.'$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + 0]->minor .'\')->value'.'."'; $this->nocache=$this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor,"'"))->nocache;    }
+#line 2416 "internal.templateparser.php"
+#line 507 "internal.templateparser.y"
+    function yy_r155(){preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); $this->_retvalue = $s[0].'".('.$this->yystack[$this->yyidx + -1]->minor.')."';    }
+#line 2419 "internal.templateparser.php"
+#line 508 "internal.templateparser.y"
+    function yy_r156(){ preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); $this->prefix_number++; $this->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + -1]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>'; $this->_retvalue = $s[0].'".$_tmp'.$this->prefix_number.'."';     }
+#line 2422 "internal.templateparser.php"
+#line 509 "internal.templateparser.y"
+    function yy_r157(){$this->_retvalue = '$'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2425 "internal.templateparser.php"
+#line 511 "internal.templateparser.y"
+    function yy_r159(){$this->_retvalue = '`'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2428 "internal.templateparser.php"
 
     /**
      * placeholder for the left hand side in a reduce operation.
@@ -2519,7 +2537,7 @@ static public $yy_action = array(
     $this->internalError = true;
     $this->yymajor = $yymajor;
     $this->compiler->trigger_template_error();
-#line 2528 "internal.templateparser.php"
+#line 2546 "internal.templateparser.php"
     }
 
     /**
@@ -2543,7 +2561,7 @@ static public $yy_action = array(
     $this->internalError = false;
     $this->retvalue = $this->_retvalue;
     //echo $this->retvalue."\n\n";
-#line 2553 "internal.templateparser.php"
+#line 2571 "internal.templateparser.php"
     }
 
     /**