From dcae51421577686364b151a50c8bb852566f2a42 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Sun, 19 Oct 2014 16:19:01 +0200
Subject: [PATCH] Smarty 3.1.21 upgrade (see changelog)

---
 ...OTES.txt => INHERITANCE_RELEASE_NOTES.txt} |    0
 bundled-libs/Smarty/README                    |    2 +-
 bundled-libs/Smarty/change_log.txt            |   27 +-
 bundled-libs/Smarty/libs/Smarty.class.php     |   20 +-
 .../smarty_internal_compile_break.php         |    2 +-
 .../smarty_internal_compile_continue.php      |    2 +-
 .../smarty_internal_compile_function.php      |    7 +-
 .../sysplugins/smarty_internal_parsetree.php  |  103 +-
 .../sysplugins/smarty_internal_template.php   |    1 +
 .../smarty_internal_templatebase.php          |    2 +-
 .../smarty_internal_templatelexer.php         |  123 +-
 .../smarty_internal_templateparser.php        | 3956 +++++++++--------
 docs/NEWS                                     |    4 +-
 13 files changed, 2113 insertions(+), 2136 deletions(-)
 rename bundled-libs/Smarty/{3.1.16_RELEASE_NOTES.txt => INHERITANCE_RELEASE_NOTES.txt} (100%)

diff --git a/bundled-libs/Smarty/3.1.16_RELEASE_NOTES.txt b/bundled-libs/Smarty/INHERITANCE_RELEASE_NOTES.txt
similarity index 100%
rename from bundled-libs/Smarty/3.1.16_RELEASE_NOTES.txt
rename to bundled-libs/Smarty/INHERITANCE_RELEASE_NOTES.txt
diff --git a/bundled-libs/Smarty/README b/bundled-libs/Smarty/README
index 93f763b7..6367f030 100644
--- a/bundled-libs/Smarty/README
+++ b/bundled-libs/Smarty/README
@@ -1,4 +1,4 @@
-Smarty 3.1.20
+Smarty 3.1.21
 
 Author: Monte Ohrt <monte at ohrt dot com >
 Author: Uwe Tews
diff --git a/bundled-libs/Smarty/change_log.txt b/bundled-libs/Smarty/change_log.txt
index 3f3c6456..a0161659 100644
--- a/bundled-libs/Smarty/change_log.txt
+++ b/bundled-libs/Smarty/change_log.txt
@@ -1,4 +1,29 @@
- ===== 3.1.20 ===== (10.09.2014)
+ ===== 3.1.22-dev ===== (xx.xx.2014)
+ ===== 3.1.21 ===== (18.10.2014)
+ 18.10.2014
+ - composer moved to github
+ - add COMPOSER_RELEASE_NOTES
+
+ 17.10.2014
+ - bugfix on $php_handling security and optimization of smarty_internal_parsetree (Thue Kristensen)
+
+ 16.10.2014
+ - bugfix composer.json update
+
+ 15.10.2014
+ - bugfix calling a new created cache file with fetch() and Smarty::CACHING_LIFETIME_SAVED multiple times did fail (forum 22350)
+
+ 14.10.2014
+ - bugfix any tag placed within "<script language=php>" will throw a security exception to close all thinkable holes
+ - bugfix classmap in root composer.json should start at "libs/..."
+ - improvement cache is_file(file_exists) results of loadPlugin() to avoid unnecessary calls during compilation (Issue 201}
+
+ 12.10.2014
+ - bugfix a comment like "<script{*foo*} language=php>" bypassed $php_handling checking (Thue Kristensen)
+ - bugfix change of 08.10.2014 could create E_NOTICE meassage when using "<?php" tags
+ - bugfix "<script language=php>" with $php_handling PHP_PASSTHRU was executed in {nocache} sections
+
+ ===== 3.1.20 ===== (09.10.2014)
  08.10.2014
  - bugfix security mode of "<script language=php>" must be controlled by $php_handling property (Thue Kristensen)
  
diff --git a/bundled-libs/Smarty/libs/Smarty.class.php b/bundled-libs/Smarty/libs/Smarty.class.php
index 4a53c364..832b0d30 100644
--- a/bundled-libs/Smarty/libs/Smarty.class.php
+++ b/bundled-libs/Smarty/libs/Smarty.class.php
@@ -2,7 +2,7 @@
 /**
  * Project:     Smarty: the PHP compiling template engine
  * File:        Smarty.class.php
- * SVN:         $Id: Smarty.class.php 4848 2014-06-08 18:12:09Z Uwe.Tews@googlemail.com $
+ * SVN:         $Id: Smarty.class.php 4897 2014-10-14 22:29:58Z Uwe.Tews@googlemail.com $
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -24,7 +24,7 @@
  * @author    Uwe Tews
  * @author    Rodney Rehm
  * @package   Smarty
- * @version   3.1-DEV
+ * @version   3.1.21
  */
 
 /**
@@ -110,7 +110,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = 'Smarty-3.1.20';
+    const SMARTY_VERSION = 'Smarty-3.1.21-dev';
 
     /**
      * define variable scopes
@@ -662,6 +662,14 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var array
      */
     public $merged_templates_func = array();
+
+    /**
+     * Cache of is_file results of loadPlugin()
+     * 
+     * @var array
+     */
+    public static $_is_file_cache= array();
+
     /**#@-*/
 
     /**
@@ -1372,9 +1380,8 @@ class Smarty extends Smarty_Internal_TemplateBase
         // if type is "internal", get plugin from sysplugins
         if (strtolower($_name_parts[1]) == 'internal') {
             $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
-            if (file_exists($file)) {
+            if (isset(self::$_is_file_cache[$file]) ? self::$_is_file_cache[$file] : self::$_is_file_cache[$file] = is_file($file)) {
                 require_once($file);
-
                 return $file;
             } else {
                 return false;
@@ -1392,9 +1399,8 @@ class Smarty extends Smarty_Internal_TemplateBase
                 $_plugin_dir . strtolower($_plugin_filename),
             );
             foreach ($names as $file) {
-                if (file_exists($file)) {
+                if (isset(self::$_is_file_cache[$file]) ? self::$_is_file_cache[$file] : self::$_is_file_cache[$file] = is_file($file)) {
                     require_once($file);
-
                     return $file;
                 }
                 if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_break.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_break.php
index b470234b..b51e9e8f 100644
--- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_break.php
+++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_break.php
@@ -70,6 +70,6 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
             $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);
         }
 
-        return "<?php break {$_levels}?>";
+        return "<?php break {$_levels};?>";
     }
 }
diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_continue.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_continue.php
index 7038bfb4..af376512 100644
--- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_continue.php
+++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_continue.php
@@ -70,6 +70,6 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase
             $compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno);
         }
 
-        return "<?php continue {$_levels}?>";
+        return "<?php continue {$_levels};?>";
     }
 }
diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_function.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_function.php
index e161bac1..298eb16f 100644
--- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_function.php
+++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_function.php
@@ -135,12 +135,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
             }
             $plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n";
         }
-        // remove last line break from function definition
-        $last = count($compiler->parser->current_buffer->subtrees) - 1;
-        if ($compiler->parser->current_buffer->subtrees[$last] instanceof _smarty_linebreak) {
-            unset($compiler->parser->current_buffer->subtrees[$last]);
-        }
-        // if caching save template function for possible nocache call
+         // if caching save template function for possible nocache call
         if ($compiler->template->caching) {
             $compiler->template->properties['function'][$_name]['compiled'] .= $plugins_string
                 . $compiler->parser->current_buffer->to_smarty_php();
diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_parsetree.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_parsetree.php
index 4044e4c0..18667102 100644
--- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_parsetree.php
+++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_parsetree.php
@@ -91,7 +91,7 @@ class _smarty_tag extends _smarty_parsetree
     public function assign_to_var()
     {
         $var = sprintf('$_tmp%d', ++Smarty_Internal_Templateparser::$prefix_number);
-        $this->parser->compiler->prefix_code[] = sprintf('<?php ob_start();?>%s<?php %s=ob_get_clean();?>', $this->data, $var);
+        $this->parser->compiler->prefix_code[] = sprintf("<?php ob_start();\n%s\n%s=ob_get_clean();?>", preg_replace(array('/^\s*<\?php\s+/','/\s*\?>\s*$/'), '', $this->data), $var);
 
         return $var;
     }
@@ -271,7 +271,9 @@ class _smarty_template_buffer extends _smarty_parsetree
      */
     public function append_subtree(_smarty_parsetree $subtree)
     {
-        $this->subtrees[] = $subtree;
+        if ($subtree->data !== '') {
+            $this->subtrees[] = $subtree;
+        }
     }
 
     /**
@@ -283,50 +285,47 @@ class _smarty_template_buffer extends _smarty_parsetree
     {
         $code = '';
         for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key ++) {
-            if ($key + 2 < $cnt) {
-                if ($this->subtrees[$key] instanceof _smarty_linebreak && $this->subtrees[$key + 1] instanceof _smarty_tag && $this->subtrees[$key + 1]->data == '' && $this->subtrees[$key + 2] instanceof _smarty_linebreak) {
-                    $key = $key + 1;
+            if ($this->subtrees[$key] instanceof _smarty_text) {
+                $subtree = $this->subtrees[$key]->to_smarty_php();
+                while ($key + 1 < $cnt && ($this->subtrees[$key+1] instanceof _smarty_text || $this->subtrees[$key +1]->data == '')) {
+                    $key++;
+                    if ($this->subtrees[$key]->data == '') {
+                        continue;
+                    }
+                    $subtree .= $this->subtrees[$key]->to_smarty_php();
+                }
+                if ($subtree == '') {
                     continue;
                 }
-                if (substr($this->subtrees[$key]->data, - 1) == '<' && $this->subtrees[$key + 1]->data == '' && substr($this->subtrees[$key + 2]->data, - 1) == '?') {
-                    $key = $key + 2;
+                $code .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<\/?script)/', "<?php echo '\$1'; ?>\n", $subtree);
+                continue;
+            }
+            if ($this->subtrees[$key] instanceof _smarty_tag) {
+                $subtree = $this->subtrees[$key]->to_smarty_php();
+                while ($key + 1 < $cnt && ($this->subtrees[$key+1] instanceof _smarty_tag || $this->subtrees[$key +1]->data == '')) {
+                    $key++;
+                    if ($this->subtrees[$key]->data == '') {
+                        continue;
+                    }
+                    $newCode = $this->subtrees[$key]->to_smarty_php();
+                    if ((preg_match('/^\s*<\?php\s+/', $newCode) &&  preg_match('/\s*\?>\s*$/', $subtree))) {
+                        $subtree = preg_replace('/\s*\?>\s*$/', "\n", $subtree);
+                        $subtree .= preg_replace('/^\s*<\?php\s+/', '', $newCode);
+                    } else {
+                        $subtree .= $newCode;
+                    }
+                }
+                if ($subtree == '') {
                     continue;
                 }
-            }
-            if (substr($code, - 1) == '<') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '?') {
-                    $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>?' . substr($subtree, 1);
-                } elseif ($this->parser->asp_tags && substr($subtree, 0, 1) == '%') {
-                    $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>%' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
-                continue;
-            }
-            if ($this->parser->asp_tags && substr($code, - 1) == '%') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '>') {
-                    $code = substr($code, 0, strlen($code) - 1) . '%<?php ?>>' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
-                continue;
-            }
-            if (substr($code, - 1) == '?') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '>') {
-                    $code = substr($code, 0, strlen($code) - 1) . '?<?php ?>>' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
+                $code .= $subtree;
                 continue;
             }
             $code .= $this->subtrees[$key]->to_smarty_php();
         }
-
         return $code;
     }
+
 }
 
 /**
@@ -360,35 +359,3 @@ class _smarty_text extends _smarty_parsetree
         return $this->data;
     }
 }
-
-/**
- * template linebreaks
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_linebreak extends _smarty_parsetree
-{
-    /**
-     * Create buffer with linebreak content
-     *
-     * @param object $parser parser object
-     * @param string $data   linebreak string
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return linebrak
-     *
-     * @return string linebreak
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-}
diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_template.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_template.php
index e905c1e4..f1a73a4a 100644
--- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_template.php
+++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_template.php
@@ -231,6 +231,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
             // don't write cache file
             return false;
         }
+        $this->cached->timestamp = time();
         $this->properties['cache_lifetime'] = $this->cache_lifetime;
         $this->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
         $content = $this->createTemplateCodeFrame($content, true);
diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatebase.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatebase.php
index 74332bd4..a1e561cb 100644
--- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatebase.php
+++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatebase.php
@@ -245,7 +245,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
                 // loop over items, stitch back together
                 foreach ($cache_split as $curr_idx => $curr_split) {
                     // escape PHP tags in template content
-                    $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>)/', "<?php echo '\$1'; ?>\n", $curr_split);
+                    $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/', "<?php echo '\$1'; ?>\n", $curr_split);
                     if (isset($cache_parts[0][$curr_idx])) {
                         $_template->properties['has_nocache_code'] = true;
                         // remove nocache tags from cache output
diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatelexer.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatelexer.php
index 534df2f8..4de8a9c0 100644
--- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatelexer.php
+++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatelexer.php
@@ -23,6 +23,7 @@ class Smarty_Internal_Templatelexer
     public $is_phpScript = false;
     public $state = 1;
     public $smarty;
+    public $literal_cnt = 0;
     private $heredoc_id_stack = Array();
     public $yyTraceFILE;
     public $yyTracePrompt;
@@ -164,12 +165,11 @@ class Smarty_Internal_Templatelexer
             20 => 0,
             21 => 0,
             22 => 0,
-            23 => 0,
         );
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G((<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|(<\\?(?:php\\w+|=|[a-zA-Z]+)?))|\G(\\?>)|\G(<\/script>)|\G(<\/script>)|\G(\\s*" . $this->rdel . ")|\G(<%)|\G(%>)|\G([\S\s])/iS";
+        $yy_global_pattern = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G((<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|(<\\?(?:php\\w+|=|[a-zA-Z]+)?))|\G(\\?>)|\G(<\/script>)|\G(\\s*" . $this->rdel . ")|\G(<%)|\G(%>)|\G([\S\s])/iS";
 
         do {
             if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
@@ -337,7 +337,7 @@ class Smarty_Internal_Templatelexer
     function yy_r1_14($yy_subpatterns)
     {
 
-        if (in_array($this->value, Array('<?', '<?=', '<?php')) || $script = strpos($this->value, '<s') === 0) {
+        if (($script = strpos($this->value, '<s') === 0) || in_array($this->value, Array('<?', '<?=', '<?php'))) {
             if ($script) {
                 $this->is_phpScript = true;
             }
@@ -345,8 +345,8 @@ class Smarty_Internal_Templatelexer
         } elseif ($this->value == '<?xml') {
             $this->token = Smarty_Internal_Templateparser::TP_XMLTAG;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
-            $this->value = substr($this->value, 0, 2);
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+            //$this->value = substr($this->value, 0, 2);
         }
     }
 
@@ -365,28 +365,22 @@ class Smarty_Internal_Templatelexer
     function yy_r1_19($yy_subpatterns)
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_PHPENDSCRIPT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
     function yy_r1_20($yy_subpatterns)
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
     }
 
     function yy_r1_21($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-
-    function yy_r1_22($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
     }
 
-    function yy_r1_23($yy_subpatterns)
+    function yy_r1_22($yy_subpatterns)
     {
 
         $phpEndScript = $this->is_phpScript ? '|<\\/script>' : '';
@@ -962,19 +956,14 @@ class Smarty_Internal_Templatelexer
     public function yylex3()
     {
         $tokenMap = array(
-            1  => 0,
-            2  => 0,
-            3  => 2,
-            6  => 0,
-            7  => 0,
-            8  => 0,
-            9  => 0,
-            10 => 0,
+            1 => 0,
+            2 => 0,
+            3 => 0,
         );
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G((<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|(<\\?(?:php\\w+|=|[a-zA-Z]+)?))|\G(\\?>)|\G(<\/script>)|\G(<%)|\G(%>)|\G([\S\s])/iS";
+        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
 
         do {
             if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
@@ -1027,19 +1016,16 @@ class Smarty_Internal_Templatelexer
     function yy_r3_1($yy_subpatterns)
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-            $this->yypushstate(self::LITERAL);
-        }
+        $this->literal_cnt ++;
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
 
     function yy_r3_2($yy_subpatterns)
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        if ($this->literal_cnt) {
+            $this->literal_cnt --;
+            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
         } else {
             $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
             $this->yypopstate();
@@ -1049,47 +1035,8 @@ class Smarty_Internal_Templatelexer
     function yy_r3_3($yy_subpatterns)
     {
 
-        if (in_array($this->value, Array('<?', '<?=', '<?php')) || $script = strpos($this->value, '<s') === 0) {
-            if ($script) {
-                $this->is_phpScript = true;
-            }
-            $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
-            $this->value = substr($this->value, 0, 2);
-        }
-    }
-
-    function yy_r3_6($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-    }
-
-    function yy_r3_7($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_PHPENDSCRIPT;
-    }
-
-    function yy_r3_8($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-
-    function yy_r3_9($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-    }
-
-    function yy_r3_10($yy_subpatterns)
-    {
-
-        $phpEndScript = $this->is_phpScript ? '|<\\/script>' : '';
         $to = strlen($this->data);
-        preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>{$phpEndScript}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        preg_match("/{$this->ldel}\/?literal{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         } else {
@@ -1111,13 +1058,15 @@ class Smarty_Internal_Templatelexer
             8  => 0,
             9  => 0,
             10 => 0,
-            11 => 3,
-            15 => 0,
+            11 => 0,
+            12 => 0,
+            13 => 3,
+            17 => 0,
         );
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS";
+        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS";
 
         do {
             if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
@@ -1204,6 +1153,18 @@ class Smarty_Internal_Templatelexer
     }
 
     function yy_r4_5($yy_subpatterns)
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+
+    function yy_r4_6($yy_subpatterns)
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+
+    function yy_r4_7($yy_subpatterns)
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1215,7 +1176,7 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r4_6($yy_subpatterns)
+    function yy_r4_8($yy_subpatterns)
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1227,14 +1188,14 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r4_7($yy_subpatterns)
+    function yy_r4_9($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
         $this->yypopstate();
     }
 
-    function yy_r4_8($yy_subpatterns)
+    function yy_r4_10($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
@@ -1243,25 +1204,25 @@ class Smarty_Internal_Templatelexer
         $this->taglineno = $this->line;
     }
 
-    function yy_r4_9($yy_subpatterns)
+    function yy_r4_11($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
     }
 
-    function yy_r4_10($yy_subpatterns)
+    function yy_r4_12($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r4_11($yy_subpatterns)
+    function yy_r4_13($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r4_15($yy_subpatterns)
+    function yy_r4_17($yy_subpatterns)
     {
 
         $to = strlen($this->data);
diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templateparser.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templateparser.php
index 90a38818..98b9fc7f 100644
--- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templateparser.php
+++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templateparser.php
@@ -126,17 +126,6 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         $this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this);
     }
 
-    public static function escape_start_tag($tag_text)
-    {
-        $tag = preg_replace(array('/\A<\?(.*)\z/', '/(language\s*=\s*[\"\']?\s*php\s*[\"\']?)/'), array('<<?php ?>?\1', '<?php echo \'\1\'; ?>'), addcslashes($tag_text, "'"), - 1, $count); //Escape tag
-        return $tag;
-    }
-
-    public static function escape_end_tag($tag_text)
-    {
-        return '?<?php ?>>';
-    }
-
     public function compileVariable($variable)
     {
         if (strpos($variable, '(') == 0) {
@@ -149,7 +138,7 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
     }
 
-    #line 139 "smarty_internal_templateparser.php"
+    #line 130 "smarty_internal_templateparser.php"
 
     const TP_VERT = 1;
     const TP_COLON = 2;
@@ -160,1527 +149,1618 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
     const TP_PHPENDSCRIPT = 7;
     const TP_ASPSTARTTAG = 8;
     const TP_ASPENDTAG = 9;
-    const TP_FAKEPHPSTARTTAG = 10;
-    const TP_XMLTAG = 11;
-    const TP_TEXT = 12;
-    const TP_STRIPON = 13;
-    const TP_STRIPOFF = 14;
-    const TP_BLOCKSOURCE = 15;
-    const TP_LITERALSTART = 16;
-    const TP_LITERALEND = 17;
-    const TP_LITERAL = 18;
-    const TP_LDEL = 19;
-    const TP_DOLLAR = 20;
-    const TP_ID = 21;
-    const TP_EQUAL = 22;
-    const TP_PTR = 23;
-    const TP_LDELIF = 24;
-    const TP_LDELFOR = 25;
-    const TP_SEMICOLON = 26;
-    const TP_INCDEC = 27;
-    const TP_TO = 28;
-    const TP_STEP = 29;
-    const TP_LDELFOREACH = 30;
-    const TP_SPACE = 31;
-    const TP_AS = 32;
-    const TP_APTR = 33;
-    const TP_LDELSETFILTER = 34;
-    const TP_SMARTYBLOCKCHILDPARENT = 35;
-    const TP_LDELSLASH = 36;
-    const TP_ATTR = 37;
-    const TP_INTEGER = 38;
-    const TP_COMMA = 39;
-    const TP_OPENP = 40;
-    const TP_CLOSEP = 41;
-    const TP_MATH = 42;
-    const TP_UNIMATH = 43;
-    const TP_ANDSYM = 44;
-    const TP_ISIN = 45;
-    const TP_ISDIVBY = 46;
-    const TP_ISNOTDIVBY = 47;
-    const TP_ISEVEN = 48;
-    const TP_ISNOTEVEN = 49;
-    const TP_ISEVENBY = 50;
-    const TP_ISNOTEVENBY = 51;
-    const TP_ISODD = 52;
-    const TP_ISNOTODD = 53;
-    const TP_ISODDBY = 54;
-    const TP_ISNOTODDBY = 55;
-    const TP_INSTANCEOF = 56;
-    const TP_QMARK = 57;
-    const TP_NOT = 58;
-    const TP_TYPECAST = 59;
-    const TP_HEX = 60;
-    const TP_DOT = 61;
-    const TP_SINGLEQUOTESTRING = 62;
-    const TP_DOUBLECOLON = 63;
-    const TP_AT = 64;
-    const TP_HATCH = 65;
-    const TP_OPENB = 66;
-    const TP_CLOSEB = 67;
-    const TP_EQUALS = 68;
-    const TP_NOTEQUALS = 69;
-    const TP_GREATERTHAN = 70;
-    const TP_LESSTHAN = 71;
-    const TP_GREATEREQUAL = 72;
-    const TP_LESSEQUAL = 73;
-    const TP_IDENTITY = 74;
-    const TP_NONEIDENTITY = 75;
-    const TP_MOD = 76;
-    const TP_LAND = 77;
-    const TP_LOR = 78;
-    const TP_LXOR = 79;
-    const TP_QUOTE = 80;
-    const TP_BACKTICK = 81;
-    const TP_DOLLARID = 82;
-    const YY_NO_ACTION = 572;
-    const YY_ACCEPT_ACTION = 571;
-    const YY_ERROR_ACTION = 570;
+    const TP_XMLTAG = 10;
+    const TP_TEXT = 11;
+    const TP_STRIPON = 12;
+    const TP_STRIPOFF = 13;
+    const TP_BLOCKSOURCE = 14;
+    const TP_LITERALSTART = 15;
+    const TP_LITERALEND = 16;
+    const TP_LITERAL = 17;
+    const TP_LDEL = 18;
+    const TP_DOLLAR = 19;
+    const TP_ID = 20;
+    const TP_EQUAL = 21;
+    const TP_PTR = 22;
+    const TP_LDELIF = 23;
+    const TP_LDELFOR = 24;
+    const TP_SEMICOLON = 25;
+    const TP_INCDEC = 26;
+    const TP_TO = 27;
+    const TP_STEP = 28;
+    const TP_LDELFOREACH = 29;
+    const TP_SPACE = 30;
+    const TP_AS = 31;
+    const TP_APTR = 32;
+    const TP_LDELSETFILTER = 33;
+    const TP_SMARTYBLOCKCHILDPARENT = 34;
+    const TP_LDELSLASH = 35;
+    const TP_ATTR = 36;
+    const TP_INTEGER = 37;
+    const TP_COMMA = 38;
+    const TP_OPENP = 39;
+    const TP_CLOSEP = 40;
+    const TP_MATH = 41;
+    const TP_UNIMATH = 42;
+    const TP_ANDSYM = 43;
+    const TP_ISIN = 44;
+    const TP_ISDIVBY = 45;
+    const TP_ISNOTDIVBY = 46;
+    const TP_ISEVEN = 47;
+    const TP_ISNOTEVEN = 48;
+    const TP_ISEVENBY = 49;
+    const TP_ISNOTEVENBY = 50;
+    const TP_ISODD = 51;
+    const TP_ISNOTODD = 52;
+    const TP_ISODDBY = 53;
+    const TP_ISNOTODDBY = 54;
+    const TP_INSTANCEOF = 55;
+    const TP_QMARK = 56;
+    const TP_NOT = 57;
+    const TP_TYPECAST = 58;
+    const TP_HEX = 59;
+    const TP_DOT = 60;
+    const TP_SINGLEQUOTESTRING = 61;
+    const TP_DOUBLECOLON = 62;
+    const TP_AT = 63;
+    const TP_HATCH = 64;
+    const TP_OPENB = 65;
+    const TP_CLOSEB = 66;
+    const TP_EQUALS = 67;
+    const TP_NOTEQUALS = 68;
+    const TP_GREATERTHAN = 69;
+    const TP_LESSTHAN = 70;
+    const TP_GREATEREQUAL = 71;
+    const TP_LESSEQUAL = 72;
+    const TP_IDENTITY = 73;
+    const TP_NONEIDENTITY = 74;
+    const TP_MOD = 75;
+    const TP_LAND = 76;
+    const TP_LOR = 77;
+    const TP_LXOR = 78;
+    const TP_QUOTE = 79;
+    const TP_BACKTICK = 80;
+    const TP_DOLLARID = 81;
+    const YY_NO_ACTION = 560;
+    const YY_ACCEPT_ACTION = 559;
+    const YY_ERROR_ACTION = 558;
 
-    const YY_SZ_ACTTAB = 2314;
+    const YY_SZ_ACTTAB = 2541;
     static public $yy_action = array(
         /*     0 */
-        216, 3, 322, 202, 323, 309, 305, 301, 302, 303,
+        225, 35, 312, 333, 198, 272, 273, 275, 283, 292,
         /*    10 */
-        304, 310, 311, 317, 318, 319, 316, 196, 200, 323,
+        293, 294, 295, 287, 288, 267, 190, 43, 19, 8,
         /*    20 */
-        9, 23, 251, 281, 138, 4, 107, 216, 273, 436,
+        204, 14, 212, 299, 2, 108, 225, 9, 424, 41,
         /*    30 */
-        18, 136, 216, 18, 398, 232, 24, 234, 289, 24,
+        139, 208, 225, 41, 250, 32, 228, 13, 159, 32,
         /*    40 */
-        296, 46, 48, 52, 45, 20, 28, 354, 360, 39,
+        51, 52, 50, 44, 11, 12, 298, 300, 21, 23,
         /*    50 */
-        37, 278, 361, 40, 43, 216, 216, 436, 237, 216,
+        303, 302, 25, 17, 225, 424, 234, 225, 225, 381,
         /*    60 */
-        5, 430, 23, 436, 281, 12, 201, 362, 359, 358,
+        421, 424, 45, 38, 145, 357, 313, 323, 322, 324,
         /*    70 */
-        355, 356, 357, 343, 342, 328, 329, 330, 327, 11,
+        325, 326, 320, 315, 314, 316, 317, 319, 127, 41,
         /*    80 */
-        25, 229, 49, 41, 18, 18, 18, 49, 335, 18,
+        46, 42, 338, 41, 168, 32, 41, 421, 14, 32,
         /*    90 */
-        24, 24, 24, 204, 341, 24, 46, 48, 52, 45,
+        299, 34, 32, 421, 51, 52, 50, 44, 11, 12,
         /*   100 */
-        20, 28, 354, 360, 39, 37, 278, 361, 40, 43,
+        298, 300, 21, 23, 303, 302, 25, 17, 225, 104,
         /*   110 */
-        216, 571, 95, 265, 238, 306, 22, 140, 350, 31,
+        185, 46, 46, 559, 95, 279, 242, 271, 3, 321,
         /*   120 */
-        129, 185, 362, 359, 358, 355, 356, 357, 343, 342,
+        313, 323, 322, 324, 325, 326, 320, 315, 314, 316,
         /*   130 */
-        328, 329, 330, 327, 23, 351, 281, 15, 233, 23,
+        317, 319, 14, 241, 299, 34, 208, 41, 225, 14,
         /*   140 */
-        18, 281, 266, 34, 3, 33, 24, 271, 216, 195,
+        418, 299, 28, 32, 179, 7, 356, 285, 51, 52,
         /*   150 */
-        3, 46, 48, 52, 45, 20, 28, 354, 360, 39,
+        50, 44, 11, 12, 298, 300, 21, 23, 303, 302,
         /*   160 */
-        37, 278, 361, 40, 43, 14, 158, 138, 23, 158,
+        25, 17, 225, 225, 274, 424, 240, 41, 134, 190,
         /*   170 */
-        281, 12, 353, 138, 109, 334, 204, 362, 359, 358,
+        332, 343, 340, 32, 313, 323, 322, 324, 325, 326,
         /*   180 */
-        355, 356, 357, 343, 342, 328, 329, 330, 327, 46,
+        320, 315, 314, 316, 317, 319, 37, 122, 182, 31,
         /*   190 */
-        48, 52, 45, 20, 28, 354, 360, 39, 37, 278,
+        202, 225, 424, 352, 225, 14, 7, 299, 424, 225,
         /*   200 */
-        361, 40, 43, 216, 207, 274, 124, 216, 216, 393,
+        150, 386, 51, 52, 50, 44, 11, 12, 298, 300,
         /*   210 */
-        307, 238, 306, 249, 270, 362, 359, 358, 355, 356,
+        21, 23, 303, 302, 25, 17, 225, 46, 349, 134,
         /*   220 */
-        357, 343, 342, 328, 329, 330, 327, 299, 286, 216,
+        41, 278, 242, 271, 7, 29, 32, 341, 313, 323,
         /*   230 */
-        287, 284, 285, 216, 180, 436, 325, 18, 196, 312,
+        322, 324, 325, 326, 320, 315, 314, 316, 317, 319,
         /*   240 */
-        300, 26, 158, 24, 46, 48, 52, 45, 20, 28,
+        226, 227, 197, 304, 103, 184, 232, 134, 46, 14,
         /*   250 */
-        354, 360, 39, 37, 278, 361, 40, 43, 216, 32,
+        35, 299, 265, 46, 321, 18, 51, 52, 50, 44,
         /*   260 */
-        296, 36, 49, 436, 293, 193, 203, 323, 16, 436,
+        11, 12, 298, 300, 21, 23, 303, 302, 25, 17,
         /*   270 */
-        362, 359, 358, 355, 356, 357, 343, 342, 328, 329,
+        225, 208, 264, 259, 258, 218, 6, 109, 345, 35,
         /*   280 */
-        330, 327, 124, 19, 49, 254, 255, 223, 49, 6,
+        193, 263, 313, 323, 322, 324, 325, 326, 320, 315,
         /*   290 */
-        194, 344, 23, 23, 281, 281, 137, 231, 153, 46,
+        314, 316, 317, 319, 241, 192, 304, 107, 102, 175,
         /*   300 */
-        48, 52, 45, 20, 28, 354, 360, 39, 37, 278,
+        269, 201, 191, 304, 203, 142, 253, 208, 321, 335,
         /*   310 */
-        361, 40, 43, 216, 216, 208, 433, 204, 282, 197,
+        51, 52, 50, 44, 11, 12, 298, 300, 21, 23,
         /*   320 */
-        172, 33, 245, 264, 99, 362, 359, 358, 355, 356,
+        303, 302, 25, 17, 225, 208, 268, 196, 208, 305,
         /*   330 */
-        357, 343, 342, 328, 329, 330, 327, 244, 249, 321,
+        485, 208, 230, 200, 308, 485, 313, 323, 322, 324,
         /*   340 */
-        211, 105, 497, 108, 433, 8, 204, 497, 199, 33,
+        325, 326, 320, 315, 314, 316, 317, 319, 30, 159,
         /*   350 */
-        433, 276, 142, 247, 46, 48, 52, 45, 20, 28,
+        105, 20, 233, 161, 186, 305, 301, 274, 256, 247,
         /*   360 */
-        354, 360, 39, 37, 278, 361, 40, 43, 216, 49,
+        208, 225, 321, 36, 51, 52, 50, 44, 11, 12,
         /*   370 */
-        263, 250, 128, 27, 235, 253, 174, 291, 280, 101,
+        298, 300, 21, 23, 303, 302, 25, 17, 225, 204,
         /*   380 */
-        362, 359, 358, 355, 356, 357, 343, 342, 328, 329,
+        207, 14, 254, 299, 131, 259, 249, 225, 158, 127,
         /*   390 */
-        330, 327, 192, 158, 321, 254, 230, 104, 161, 162,
+        313, 323, 322, 324, 325, 326, 320, 315, 314, 316,
         /*   400 */
-        23, 23, 246, 226, 182, 139, 280, 279, 279, 46,
+        317, 319, 237, 262, 130, 225, 45, 183, 187, 14,
         /*   410 */
-        48, 52, 45, 20, 28, 354, 360, 39, 37, 278,
+        169, 223, 301, 342, 274, 334, 321, 321, 51, 52,
         /*   420 */
-        361, 40, 43, 216, 204, 207, 216, 44, 314, 23,
+        50, 44, 11, 12, 298, 300, 21, 23, 303, 302,
         /*   430 */
-        313, 241, 98, 124, 117, 362, 359, 358, 355, 356,
+        25, 17, 225, 204, 204, 14, 6, 244, 141, 259,
         /*   440 */
-        357, 343, 342, 328, 329, 330, 327, 321, 173, 321,
+        291, 46, 98, 194, 313, 323, 322, 324, 325, 326,
         /*   450 */
-        216, 233, 103, 160, 254, 268, 23, 279, 220, 216,
+        320, 315, 314, 316, 317, 319, 132, 262, 227, 166,
         /*   460 */
-        261, 292, 279, 260, 46, 48, 52, 45, 20, 28,
+        163, 189, 14, 284, 231, 26, 237, 27, 321, 321,
         /*   470 */
-        354, 360, 39, 37, 278, 361, 40, 43, 216, 204,
+        321, 32, 51, 52, 50, 44, 11, 12, 298, 300,
         /*   480 */
-        183, 256, 191, 247, 298, 295, 320, 131, 339, 279,
+        21, 23, 303, 302, 25, 17, 225, 204, 14, 276,
         /*   490 */
-        362, 359, 358, 355, 356, 357, 343, 342, 328, 329,
+        245, 206, 22, 4, 144, 328, 150, 120, 313, 323,
         /*   500 */
-        330, 327, 321, 294, 123, 49, 207, 100, 181, 204,
+        322, 324, 325, 326, 320, 315, 314, 316, 317, 319,
         /*   510 */
-        153, 269, 245, 296, 94, 132, 42, 279, 280, 46,
+        195, 348, 262, 176, 171, 39, 30, 199, 143, 180,
         /*   520 */
-        48, 52, 45, 20, 28, 354, 360, 39, 37, 278,
+        148, 281, 321, 260, 159, 230, 51, 52, 50, 44,
         /*   530 */
-        361, 40, 43, 216, 204, 205, 151, 13, 14, 35,
+        11, 12, 298, 300, 21, 23, 303, 302, 25, 17,
         /*   540 */
-        29, 6, 97, 24, 115, 362, 359, 358, 355, 356,
+        225, 296, 205, 129, 346, 289, 124, 329, 125, 339,
         /*   550 */
-        357, 343, 342, 328, 329, 330, 327, 321, 340, 321,
+        97, 119, 313, 323, 322, 324, 325, 326, 320, 315,
         /*   560 */
-        168, 175, 277, 189, 164, 206, 288, 179, 346, 279,
+        314, 316, 317, 319, 127, 262, 262, 239, 277, 282,
         /*   570 */
-        279, 7, 279, 279, 46, 48, 52, 45, 20, 28,
+        307, 94, 266, 351, 269, 170, 159, 181, 172, 106,
         /*   580 */
-        354, 360, 39, 37, 278, 361, 40, 43, 216, 207,
+        51, 52, 50, 44, 11, 12, 298, 300, 21, 23,
         /*   590 */
-        207, 171, 337, 133, 122, 145, 308, 159, 116, 114,
+        303, 302, 25, 17, 225, 330, 270, 301, 15, 115,
         /*   600 */
-        362, 359, 358, 355, 356, 357, 343, 342, 328, 329,
+        331, 310, 326, 255, 140, 126, 313, 323, 322, 324,
         /*   610 */
-        330, 327, 321, 321, 321, 125, 283, 198, 126, 169,
+        325, 326, 320, 315, 314, 316, 317, 319, 301, 326,
         /*   620 */
-        44, 293, 184, 282, 178, 280, 275, 21, 242, 46,
+        262, 326, 326, 326, 326, 326, 326, 326, 326, 326,
         /*   630 */
-        48, 52, 45, 20, 28, 354, 360, 39, 37, 278,
+        326, 326, 326, 243, 51, 52, 50, 44, 11, 12,
         /*   640 */
-        361, 40, 43, 216, 272, 106, 315, 110, 259, 333,
+        298, 300, 21, 23, 303, 302, 25, 17, 225, 40,
         /*   650 */
-        333, 333, 333, 333, 333, 362, 359, 358, 355, 356,
+        326, 326, 326, 326, 326, 326, 326, 113, 99, 100,
         /*   660 */
-        357, 343, 342, 328, 329, 330, 327, 333, 190, 333,
+        313, 323, 322, 324, 325, 326, 320, 315, 314, 316,
         /*   670 */
-        333, 333, 333, 333, 333, 333, 333, 333, 333, 333,
+        317, 319, 262, 262, 262, 326, 326, 326, 326, 326,
         /*   680 */
-        333, 333, 333, 333, 46, 48, 52, 45, 20, 28,
+        326, 326, 326, 326, 326, 326, 326, 326, 51, 52,
         /*   690 */
-        354, 360, 39, 37, 278, 361, 40, 43, 216, 333,
+        50, 44, 11, 12, 298, 300, 21, 23, 303, 302,
         /*   700 */
-        333, 333, 333, 333, 333, 333, 333, 333, 333, 333,
+        25, 17, 225, 326, 326, 326, 326, 326, 326, 326,
         /*   710 */
-        362, 359, 358, 355, 356, 357, 343, 342, 328, 329,
+        326, 114, 326, 326, 313, 323, 322, 324, 325, 326,
         /*   720 */
-        330, 327, 333, 333, 333, 333, 333, 333, 333, 239,
+        320, 315, 314, 316, 317, 319, 262, 326, 326, 326,
         /*   730 */
-        333, 333, 333, 333, 333, 333, 333, 333, 333, 46,
+        326, 326, 326, 326, 326, 326, 326, 326, 326, 326,
         /*   740 */
-        48, 52, 45, 20, 28, 354, 360, 39, 37, 278,
+        326, 286, 51, 52, 50, 44, 11, 12, 298, 300,
         /*   750 */
-        361, 40, 43, 216, 333, 333, 333, 333, 333, 333,
+        21, 23, 303, 302, 25, 17, 225, 326, 326, 326,
         /*   760 */
-        333, 333, 333, 333, 333, 362, 359, 358, 355, 356,
+        326, 326, 326, 326, 326, 326, 326, 326, 313, 323,
         /*   770 */
-        357, 343, 342, 328, 329, 330, 327, 333, 333, 333,
+        322, 324, 325, 326, 320, 315, 314, 316, 317, 319,
         /*   780 */
-        333, 333, 333, 333, 333, 333, 333, 333, 333, 333,
+        326, 326, 326, 326, 326, 326, 326, 326, 326, 326,
         /*   790 */
-        333, 333, 333, 333, 46, 48, 52, 45, 20, 28,
+        326, 326, 326, 326, 326, 326, 51, 52, 50, 44,
         /*   800 */
-        354, 360, 39, 37, 278, 361, 40, 43, 333, 333,
+        11, 12, 298, 300, 21, 23, 303, 302, 25, 17,
         /*   810 */
-        333, 333, 333, 333, 333, 333, 333, 333, 333, 158,
+        326, 326, 326, 326, 326, 326, 326, 326, 326, 326,
         /*   820 */
-        362, 359, 358, 355, 356, 357, 343, 342, 328, 329,
+        159, 326, 313, 323, 322, 324, 325, 326, 320, 315,
         /*   830 */
-        330, 327, 333, 333, 333, 333, 333, 46, 48, 52,
+        314, 316, 317, 319, 326, 326, 326, 326, 51, 52,
         /*   840 */
-        45, 20, 28, 354, 360, 39, 37, 278, 361, 40,
+        50, 44, 11, 12, 298, 300, 21, 23, 303, 302,
         /*   850 */
-        43, 333, 333, 333, 333, 333, 333, 211, 333, 333,
+        25, 17, 326, 326, 326, 326, 326, 326, 212, 326,
         /*   860 */
-        333, 333, 8, 362, 359, 358, 355, 356, 357, 343,
+        326, 326, 326, 9, 313, 323, 322, 324, 325, 326,
         /*   870 */
-        342, 328, 329, 330, 327, 333, 333, 333, 333, 333,
+        320, 315, 314, 316, 317, 319, 326, 326, 326, 326,
         /*   880 */
-        333, 333, 333, 9, 134, 92, 333, 333, 4, 107,
+        326, 326, 326, 8, 138, 211, 326, 326, 2, 108,
         /*   890 */
-        333, 333, 186, 333, 136, 333, 177, 333, 232, 324,
+        326, 235, 326, 326, 139, 157, 165, 326, 250, 128,
         /*   900 */
-        234, 279, 252, 333, 38, 279, 333, 51, 333, 333,
+        228, 326, 246, 326, 24, 321, 326, 48, 261, 326,
         /*   910 */
-        333, 228, 333, 280, 333, 144, 333, 280, 86, 127,
+        326, 251, 336, 353, 326, 311, 326, 301, 174, 173,
         /*   920 */
-        333, 333, 50, 47, 297, 243, 349, 290, 326, 105,
+        326, 326, 49, 47, 280, 238, 297, 321, 321, 105,
         /*   930 */
-        1, 257, 352, 348, 188, 347, 333, 333, 333, 333,
+        1, 337, 326, 147, 326, 326, 326, 326, 326, 301,
         /*   940 */
-        333, 333, 224, 279, 96, 9, 130, 212, 333, 333,
+        301, 8, 123, 92, 96, 257, 2, 108, 326, 311,
         /*   950 */
-        4, 107, 333, 228, 333, 280, 136, 157, 333, 228,
+        326, 326, 139, 326, 326, 235, 250, 309, 228, 146,
         /*   960 */
-        232, 127, 234, 146, 252, 333, 38, 127, 333, 51,
+        246, 326, 24, 128, 162, 48, 326, 326, 326, 326,
         /*   970 */
-        267, 333, 333, 257, 352, 348, 345, 347, 333, 257,
+        235, 326, 350, 321, 155, 251, 336, 353, 128, 311,
         /*   980 */
-        352, 348, 333, 347, 50, 47, 297, 243, 349, 333,
+        49, 47, 280, 238, 297, 301, 326, 105, 1, 326,
         /*   990 */
-        333, 105, 1, 262, 333, 228, 333, 333, 155, 154,
+        251, 336, 353, 326, 311, 14, 326, 299, 326, 8,
         /*  1000 */
-        333, 333, 333, 127, 333, 333, 96, 9, 130, 214,
+        138, 224, 96, 326, 2, 108, 326, 41, 326, 252,
         /*  1010 */
-        227, 176, 4, 107, 347, 257, 352, 348, 136, 347,
+        139, 235, 326, 32, 250, 153, 228, 326, 246, 128,
         /*  1020 */
-        279, 333, 232, 333, 234, 333, 252, 333, 38, 333,
+        24, 326, 326, 48, 326, 326, 326, 326, 326, 326,
         /*  1030 */
-        333, 51, 280, 333, 333, 228, 333, 333, 333, 144,
+        326, 251, 336, 353, 326, 311, 326, 326, 49, 47,
         /*  1040 */
-        333, 333, 56, 120, 143, 333, 50, 47, 297, 243,
+        280, 238, 297, 326, 326, 105, 1, 326, 326, 326,
         /*  1050 */
-        349, 290, 326, 105, 1, 257, 352, 348, 333, 347,
+        326, 326, 14, 326, 299, 326, 326, 8, 142, 224,
         /*  1060 */
-        333, 333, 333, 333, 23, 333, 281, 333, 96, 9,
+        96, 326, 2, 108, 41, 235, 248, 326, 139, 154,
         /*  1070 */
-        141, 214, 333, 333, 4, 107, 18, 23, 240, 281,
+        32, 235, 250, 128, 228, 156, 246, 326, 33, 128,
         /*  1080 */
-        136, 333, 24, 333, 232, 333, 234, 333, 252, 18,
+        326, 48, 326, 326, 326, 251, 336, 353, 326, 311,
         /*  1090 */
-        38, 236, 333, 51, 333, 24, 333, 228, 333, 333,
+        326, 251, 336, 353, 326, 311, 49, 47, 280, 238,
         /*  1100 */
-        333, 144, 333, 333, 86, 127, 333, 333, 50, 47,
+        297, 326, 326, 105, 1, 326, 326, 326, 326, 326,
         /*  1110 */
-        297, 243, 349, 290, 326, 105, 1, 257, 352, 348,
+        326, 326, 326, 326, 326, 8, 138, 213, 96, 326,
         /*  1120 */
-        333, 347, 333, 333, 333, 333, 333, 333, 217, 333,
+        2, 108, 326, 326, 326, 326, 139, 235, 326, 326,
         /*  1130 */
-        96, 9, 137, 214, 333, 333, 4, 107, 333, 333,
+        250, 149, 228, 326, 246, 128, 24, 326, 326, 48,
         /*  1140 */
-        333, 333, 136, 333, 333, 333, 232, 333, 234, 333,
+        326, 326, 326, 326, 326, 326, 326, 251, 336, 353,
         /*  1150 */
-        252, 333, 17, 333, 333, 51, 333, 333, 333, 228,
+        326, 311, 326, 326, 49, 47, 280, 238, 297, 326,
         /*  1160 */
-        333, 333, 333, 144, 333, 333, 86, 127, 333, 333,
+        326, 105, 1, 326, 326, 326, 326, 326, 326, 326,
         /*  1170 */
-        50, 47, 297, 243, 349, 290, 326, 105, 1, 257,
+        326, 326, 326, 8, 138, 210, 96, 326, 2, 108,
         /*  1180 */
-        352, 348, 333, 347, 333, 333, 333, 333, 333, 333,
+        326, 326, 326, 326, 139, 235, 326, 326, 250, 151,
         /*  1190 */
-        218, 333, 96, 9, 130, 213, 333, 333, 4, 107,
+        228, 326, 219, 128, 24, 326, 326, 48, 326, 326,
         /*  1200 */
-        333, 333, 333, 333, 136, 333, 333, 333, 232, 333,
+        326, 326, 326, 326, 326, 251, 336, 353, 326, 311,
         /*  1210 */
-        234, 333, 252, 333, 38, 333, 333, 51, 333, 333,
+        326, 326, 49, 47, 280, 238, 297, 326, 326, 105,
         /*  1220 */
-        333, 228, 333, 333, 333, 144, 333, 333, 63, 120,
+        1, 326, 326, 326, 326, 326, 326, 326, 326, 326,
         /*  1230 */
-        230, 333, 50, 47, 297, 243, 349, 290, 326, 105,
+        326, 8, 136, 224, 96, 326, 2, 108, 326, 326,
         /*  1240 */
-        1, 257, 352, 348, 333, 347, 333, 333, 333, 333,
+        326, 326, 139, 235, 326, 326, 250, 152, 228, 326,
         /*  1250 */
-        333, 333, 333, 333, 96, 9, 135, 214, 333, 333,
+        246, 128, 24, 326, 326, 48, 326, 326, 326, 326,
         /*  1260 */
-        4, 107, 333, 333, 333, 333, 136, 333, 333, 333,
+        326, 326, 326, 251, 336, 353, 326, 311, 326, 326,
         /*  1270 */
-        232, 333, 234, 333, 252, 333, 2, 333, 333, 51,
+        49, 47, 280, 238, 297, 326, 326, 105, 1, 326,
         /*  1280 */
-        333, 333, 333, 228, 333, 333, 333, 93, 333, 333,
+        225, 326, 391, 326, 422, 326, 326, 326, 326, 8,
         /*  1290 */
-        53, 118, 333, 333, 50, 47, 297, 243, 349, 290,
+        135, 224, 96, 326, 2, 108, 326, 326, 326, 326,
         /*  1300 */
-        326, 105, 1, 222, 352, 348, 333, 347, 333, 333,
+        139, 236, 229, 326, 250, 326, 228, 326, 246, 41,
         /*  1310 */
-        333, 333, 333, 333, 333, 333, 96, 9, 130, 210,
+        5, 422, 326, 48, 326, 32, 326, 422, 7, 326,
         /*  1320 */
-        333, 333, 4, 107, 333, 333, 333, 333, 136, 333,
+        7, 326, 326, 326, 198, 178, 326, 326, 49, 47,
         /*  1330 */
-        333, 333, 232, 333, 234, 333, 225, 333, 38, 333,
+        280, 238, 297, 326, 321, 105, 1, 43, 19, 326,
         /*  1340 */
-        333, 51, 333, 333, 333, 228, 333, 333, 333, 144,
+        326, 134, 326, 134, 326, 326, 326, 8, 138, 209,
         /*  1350 */
-        333, 333, 66, 127, 333, 333, 50, 47, 297, 243,
+        96, 208, 2, 108, 326, 326, 326, 326, 139, 326,
         /*  1360 */
-        349, 290, 326, 105, 1, 257, 352, 348, 333, 347,
+        326, 326, 250, 326, 228, 326, 246, 326, 24, 198,
         /*  1370 */
-        333, 333, 333, 333, 333, 333, 333, 333, 96, 9,
+        164, 48, 326, 326, 326, 326, 326, 326, 326, 321,
         /*  1380 */
-        130, 209, 333, 333, 4, 107, 333, 333, 333, 333,
+        326, 326, 43, 19, 326, 326, 49, 47, 280, 238,
         /*  1390 */
-        136, 333, 333, 333, 232, 333, 234, 333, 252, 333,
+        297, 326, 326, 105, 1, 326, 208, 326, 326, 326,
         /*  1400 */
-        38, 333, 333, 51, 333, 333, 333, 228, 333, 333,
+        326, 326, 326, 326, 326, 8, 142, 224, 96, 326,
         /*  1410 */
-        333, 144, 333, 333, 68, 127, 333, 333, 50, 47,
+        2, 108, 326, 326, 326, 326, 139, 326, 326, 326,
         /*  1420 */
-        297, 243, 349, 290, 326, 105, 1, 257, 352, 348,
+        250, 326, 228, 326, 246, 326, 33, 198, 177, 48,
         /*  1430 */
-        333, 347, 333, 333, 333, 333, 333, 333, 333, 333,
+        326, 326, 326, 326, 326, 326, 326, 321, 326, 326,
         /*  1440 */
-        96, 9, 137, 214, 333, 333, 4, 107, 333, 333,
+        43, 19, 326, 326, 49, 47, 280, 238, 297, 326,
         /*  1450 */
-        333, 333, 136, 333, 333, 333, 232, 333, 234, 333,
+        326, 105, 326, 326, 208, 326, 326, 326, 326, 326,
         /*  1460 */
-        252, 333, 17, 333, 333, 51, 333, 333, 333, 228,
+        326, 326, 326, 8, 142, 222, 96, 326, 2, 108,
         /*  1470 */
-        333, 333, 333, 144, 333, 333, 65, 127, 333, 333,
+        326, 326, 326, 326, 139, 326, 326, 326, 250, 326,
         /*  1480 */
-        50, 47, 297, 243, 349, 290, 326, 105, 333, 257,
+        228, 326, 246, 326, 33, 326, 467, 48, 326, 326,
         /*  1490 */
-        352, 348, 333, 347, 333, 333, 333, 333, 333, 333,
+        326, 326, 326, 326, 326, 326, 326, 326, 326, 326,
         /*  1500 */
-        333, 333, 96, 9, 137, 221, 333, 333, 4, 107,
+        326, 326, 49, 47, 280, 238, 297, 326, 467, 105,
         /*  1510 */
-        333, 333, 333, 228, 136, 333, 333, 148, 232, 333,
+        467, 467, 326, 467, 467, 326, 326, 326, 326, 467,
         /*  1520 */
-        234, 127, 252, 333, 17, 333, 333, 51, 333, 333,
+        326, 467, 7, 467, 96, 326, 326, 326, 326, 326,
         /*  1530 */
-        333, 479, 333, 257, 352, 348, 333, 347, 333, 333,
+        326, 326, 326, 326, 326, 235, 326, 326, 467, 121,
         /*  1540 */
-        333, 333, 50, 47, 297, 243, 349, 333, 333, 105,
+        326, 326, 86, 128, 326, 134, 326, 326, 326, 467,
         /*  1550 */
-        333, 333, 333, 333, 479, 333, 479, 479, 333, 479,
+        326, 290, 318, 326, 326, 251, 336, 353, 326, 311,
         /*  1560 */
-        479, 333, 333, 333, 96, 479, 333, 479, 3, 479,
+        326, 326, 326, 467, 326, 326, 326, 235, 326, 216,
         /*  1570 */
-        333, 333, 228, 333, 333, 333, 119, 333, 228, 84,
+        354, 133, 326, 326, 68, 117, 249, 326, 326, 326,
         /*  1580 */
-        127, 333, 152, 333, 479, 333, 127, 333, 290, 326,
+        326, 326, 326, 290, 318, 326, 326, 251, 336, 353,
         /*  1590 */
-        333, 138, 257, 352, 348, 479, 347, 228, 257, 352,
+        235, 311, 326, 326, 133, 326, 326, 76, 128, 326,
         /*  1600 */
-        348, 119, 347, 333, 84, 127, 219, 363, 333, 479,
+        326, 326, 326, 326, 326, 326, 290, 318, 326, 235,
         /*  1610 */
-        333, 333, 333, 290, 326, 201, 187, 257, 352, 348,
+        251, 336, 353, 133, 311, 326, 76, 128, 326, 326,
         /*  1620 */
-        333, 347, 333, 333, 333, 279, 333, 333, 11, 25,
+        326, 221, 326, 326, 326, 290, 318, 326, 326, 251,
         /*  1630 */
-        228, 333, 336, 333, 121, 333, 333, 57, 127, 333,
+        336, 353, 326, 311, 326, 326, 326, 326, 235, 326,
         /*  1640 */
-        333, 333, 204, 333, 333, 333, 290, 326, 333, 333,
+        215, 326, 121, 326, 326, 86, 128, 326, 326, 326,
         /*  1650 */
-        257, 352, 348, 228, 347, 333, 333, 144, 333, 333,
+        326, 326, 326, 326, 290, 318, 326, 326, 251, 336,
         /*  1660 */
-        87, 127, 333, 333, 228, 333, 333, 333, 144, 290,
+        353, 235, 311, 326, 326, 133, 326, 326, 59, 117,
         /*  1670 */
-        326, 89, 127, 257, 352, 348, 333, 347, 333, 333,
+        137, 326, 326, 355, 326, 326, 326, 290, 318, 326,
         /*  1680 */
-        290, 326, 333, 228, 257, 352, 348, 93, 347, 333,
+        326, 251, 336, 353, 235, 311, 326, 326, 133, 326,
         /*  1690 */
-        55, 118, 333, 333, 228, 333, 333, 333, 144, 290,
+        326, 76, 128, 326, 326, 326, 326, 326, 326, 326,
         /*  1700 */
-        326, 80, 127, 257, 352, 348, 333, 347, 333, 228,
+        290, 318, 326, 235, 251, 336, 353, 110, 311, 326,
         /*  1710 */
-        290, 326, 333, 147, 257, 352, 348, 127, 347, 333,
+        69, 128, 326, 326, 326, 217, 326, 326, 326, 290,
         /*  1720 */
-        228, 333, 333, 333, 144, 333, 333, 60, 127, 257,
+        318, 326, 326, 251, 336, 353, 326, 311, 326, 235,
         /*  1730 */
-        352, 348, 333, 347, 333, 333, 290, 326, 333, 228,
+        101, 160, 326, 133, 326, 326, 57, 128, 326, 326,
         /*  1740 */
-        257, 352, 348, 144, 347, 333, 88, 127, 333, 333,
+        321, 326, 326, 43, 19, 290, 318, 326, 235, 251,
         /*  1750 */
-        333, 333, 333, 333, 333, 290, 326, 333, 228, 257,
+        336, 353, 133, 311, 326, 73, 128, 208, 326, 326,
         /*  1760 */
-        352, 348, 111, 347, 333, 67, 127, 333, 333, 228,
+        326, 326, 326, 326, 290, 318, 326, 326, 251, 336,
         /*  1770 */
-        333, 333, 333, 144, 290, 326, 72, 127, 257, 352,
+        353, 235, 311, 326, 326, 133, 326, 326, 78, 128,
         /*  1780 */
-        348, 333, 347, 333, 333, 290, 326, 333, 228, 257,
+        326, 326, 326, 326, 326, 326, 326, 290, 318, 326,
         /*  1790 */
-        352, 348, 144, 347, 333, 90, 127, 333, 333, 228,
+        235, 251, 336, 353, 133, 311, 326, 70, 128, 326,
         /*  1800 */
-        333, 333, 333, 144, 290, 326, 73, 127, 257, 352,
+        326, 326, 326, 326, 326, 326, 290, 318, 326, 326,
         /*  1810 */
-        348, 333, 347, 333, 333, 290, 326, 333, 333, 257,
+        251, 336, 353, 326, 311, 326, 235, 198, 167, 326,
         /*  1820 */
-        352, 348, 333, 347, 228, 333, 333, 333, 144, 333,
+        133, 326, 326, 64, 128, 326, 326, 321, 326, 326,
         /*  1830 */
-        333, 91, 127, 333, 333, 228, 333, 333, 333, 144,
+        43, 19, 290, 318, 326, 235, 251, 336, 353, 133,
         /*  1840 */
-        290, 326, 82, 127, 257, 352, 348, 333, 347, 333,
+        311, 326, 67, 128, 208, 326, 326, 326, 326, 326,
         /*  1850 */
-        333, 290, 326, 333, 228, 257, 352, 348, 144, 347,
+        326, 290, 318, 326, 326, 251, 336, 353, 235, 311,
         /*  1860 */
-        333, 58, 127, 333, 333, 228, 333, 333, 333, 144,
+        326, 326, 133, 326, 326, 88, 128, 326, 326, 326,
         /*  1870 */
-        290, 326, 78, 127, 257, 352, 348, 333, 347, 333,
+        326, 326, 326, 326, 290, 318, 326, 235, 251, 336,
         /*  1880 */
-        333, 290, 326, 333, 228, 257, 352, 348, 144, 347,
+        353, 133, 311, 326, 82, 128, 326, 326, 326, 326,
         /*  1890 */
-        333, 64, 127, 333, 333, 228, 333, 333, 333, 144,
+        326, 326, 326, 290, 318, 326, 326, 251, 336, 353,
         /*  1900 */
-        290, 326, 76, 127, 257, 352, 348, 333, 347, 333,
+        326, 311, 326, 235, 198, 188, 326, 133, 326, 326,
         /*  1910 */
-        333, 290, 326, 333, 333, 257, 352, 348, 333, 347,
+        72, 128, 326, 326, 321, 326, 326, 43, 19, 290,
         /*  1920 */
-        228, 333, 333, 333, 144, 333, 333, 63, 127, 333,
+        318, 326, 235, 251, 336, 353, 93, 311, 326, 55,
         /*  1930 */
-        333, 228, 333, 333, 333, 144, 290, 326, 75, 127,
+        116, 208, 326, 326, 326, 326, 326, 326, 290, 318,
         /*  1940 */
-        257, 352, 348, 333, 347, 333, 333, 290, 326, 333,
+        326, 326, 251, 336, 353, 235, 311, 326, 326, 112,
         /*  1950 */
-        228, 257, 352, 348, 144, 347, 333, 70, 127, 333,
+        326, 326, 87, 128, 326, 326, 326, 326, 326, 326,
         /*  1960 */
-        333, 228, 333, 333, 333, 113, 290, 326, 74, 127,
+        326, 290, 318, 326, 235, 251, 336, 353, 133, 311,
         /*  1970 */
-        257, 352, 348, 333, 347, 333, 333, 290, 326, 333,
+        326, 77, 128, 326, 326, 326, 326, 326, 326, 326,
         /*  1980 */
-        228, 257, 352, 348, 144, 347, 333, 59, 127, 333,
+        290, 318, 326, 326, 251, 336, 353, 326, 311, 326,
         /*  1990 */
-        333, 228, 333, 333, 333, 144, 290, 326, 54, 127,
+        235, 326, 326, 326, 133, 326, 326, 89, 128, 326,
         /*  2000 */
-        257, 352, 348, 333, 347, 333, 333, 290, 326, 333,
+        326, 326, 326, 326, 326, 326, 290, 318, 326, 235,
         /*  2010 */
-        333, 257, 352, 348, 333, 347, 228, 333, 333, 333,
+        251, 336, 353, 133, 311, 326, 75, 128, 326, 326,
         /*  2020 */
-        144, 333, 333, 62, 127, 333, 333, 228, 333, 333,
+        326, 326, 326, 326, 326, 290, 318, 326, 326, 251,
         /*  2030 */
-        333, 144, 290, 326, 79, 127, 215, 352, 348, 333,
+        336, 353, 235, 311, 326, 326, 133, 326, 326, 91,
         /*  2040 */
-        347, 333, 333, 290, 326, 333, 333, 257, 352, 348,
+        128, 326, 326, 326, 326, 326, 326, 326, 290, 318,
         /*  2050 */
-        333, 347, 10, 333, 333, 333, 228, 4, 107, 333,
+        326, 235, 251, 336, 353, 133, 311, 326, 62, 128,
         /*  2060 */
-        149, 333, 333, 136, 127, 333, 228, 232, 333, 234,
+        326, 326, 326, 326, 326, 326, 326, 290, 318, 326,
         /*  2070 */
-        144, 333, 333, 71, 127, 333, 257, 352, 348, 333,
+        326, 251, 336, 353, 326, 311, 326, 235, 326, 326,
         /*  2080 */
-        347, 333, 290, 326, 333, 228, 257, 352, 348, 144,
+        326, 93, 326, 326, 53, 116, 326, 326, 326, 326,
         /*  2090 */
-        347, 333, 69, 127, 333, 333, 333, 333, 333, 333,
+        326, 326, 326, 290, 318, 326, 235, 220, 336, 353,
         /*  2100 */
-        333, 290, 326, 333, 228, 257, 352, 348, 144, 347,
+        133, 311, 326, 63, 128, 326, 326, 326, 326, 326,
         /*  2110 */
-        333, 77, 127, 331, 30, 338, 333, 333, 333, 333,
+        326, 326, 290, 318, 326, 326, 251, 336, 353, 235,
         /*  2120 */
-        290, 326, 333, 228, 257, 352, 348, 144, 347, 333,
+        311, 326, 326, 133, 326, 326, 61, 128, 326, 326,
         /*  2130 */
-        83, 127, 333, 333, 333, 333, 333, 333, 333, 290,
+        326, 326, 326, 326, 326, 290, 318, 326, 235, 214,
         /*  2140 */
-        326, 333, 333, 257, 352, 348, 333, 347, 10, 333,
+        336, 353, 133, 311, 326, 71, 128, 326, 326, 326,
         /*  2150 */
-        333, 333, 333, 4, 107, 333, 333, 333, 333, 136,
+        326, 326, 326, 326, 290, 318, 326, 326, 251, 336,
         /*  2160 */
-        333, 333, 228, 232, 333, 234, 144, 333, 333, 81,
+        353, 326, 311, 326, 235, 326, 326, 326, 133, 326,
         /*  2170 */
-        127, 333, 333, 228, 333, 333, 333, 144, 290, 326,
+        326, 85, 128, 326, 326, 326, 326, 326, 326, 326,
         /*  2180 */
-        61, 127, 257, 352, 348, 216, 347, 403, 333, 290,
+        290, 318, 326, 235, 251, 336, 353, 133, 311, 326,
         /*  2190 */
-        326, 333, 333, 257, 352, 348, 228, 347, 333, 333,
+        65, 128, 326, 326, 326, 326, 326, 326, 326, 290,
         /*  2200 */
-        112, 333, 333, 85, 127, 333, 333, 258, 333, 332,
+        318, 326, 326, 251, 336, 353, 235, 311, 326, 326,
         /*  2210 */
-        30, 338, 290, 326, 333, 18, 257, 352, 348, 228,
+        111, 326, 326, 74, 128, 326, 326, 326, 326, 326,
         /*  2220 */
-        347, 24, 333, 156, 3, 434, 333, 127, 228, 333,
+        326, 326, 290, 318, 326, 235, 251, 336, 353, 118,
         /*  2230 */
-        333, 333, 150, 333, 333, 333, 127, 333, 333, 257,
+        311, 326, 58, 128, 326, 326, 326, 326, 326, 326,
         /*  2240 */
-        352, 348, 333, 347, 248, 333, 333, 138, 257, 352,
+        326, 290, 318, 326, 326, 251, 336, 353, 326, 311,
         /*  2250 */
-        348, 333, 347, 434, 333, 201, 166, 333, 333, 434,
+        326, 235, 326, 326, 326, 133, 326, 326, 56, 128,
         /*  2260 */
-        333, 333, 3, 201, 163, 279, 333, 333, 11, 25,
+        326, 326, 326, 326, 326, 326, 326, 290, 318, 326,
         /*  2270 */
-        102, 165, 333, 279, 333, 333, 11, 25, 201, 170,
+        235, 251, 336, 353, 133, 311, 326, 79, 128, 326,
         /*  2280 */
-        279, 333, 204, 11, 25, 138, 201, 167, 279, 333,
+        326, 326, 326, 326, 326, 326, 290, 318, 326, 326,
         /*  2290 */
-        204, 11, 25, 333, 333, 333, 279, 204, 333, 11,
+        251, 336, 353, 235, 311, 326, 326, 133, 326, 326,
         /*  2300 */
-        25, 333, 333, 333, 333, 204, 333, 333, 333, 333,
+        80, 128, 326, 326, 326, 326, 326, 326, 326, 290,
         /*  2310 */
-        333, 333, 333, 204,
+        318, 326, 235, 251, 336, 353, 133, 311, 326, 84,
+        /*  2320 */
+        128, 326, 326, 326, 326, 326, 326, 326, 290, 318,
+        /*  2330 */
+        326, 326, 251, 336, 353, 326, 311, 326, 235, 326,
+        /*  2340 */
+        326, 326, 133, 326, 326, 66, 128, 326, 326, 326,
+        /*  2350 */
+        326, 326, 326, 326, 290, 318, 326, 344, 251, 336,
+        /*  2360 */
+        353, 326, 311, 326, 10, 326, 326, 326, 326, 2,
+        /*  2370 */
+        108, 344, 326, 326, 326, 139, 326, 326, 10, 250,
+        /*  2380 */
+        326, 228, 326, 2, 108, 326, 326, 326, 326, 139,
+        /*  2390 */
+        326, 326, 326, 250, 326, 228, 235, 326, 326, 326,
+        /*  2400 */
+        133, 326, 326, 60, 128, 326, 326, 326, 326, 326,
+        /*  2410 */
+        326, 326, 290, 318, 326, 326, 251, 336, 353, 326,
+        /*  2420 */
+        311, 326, 326, 326, 326, 306, 16, 347, 326, 235,
+        /*  2430 */
+        326, 326, 326, 133, 326, 326, 81, 128, 326, 327,
+        /*  2440 */
+        16, 347, 326, 326, 326, 290, 318, 326, 326, 251,
+        /*  2450 */
+        336, 353, 326, 311, 326, 326, 235, 326, 326, 326,
+        /*  2460 */
+        133, 326, 326, 68, 128, 326, 326, 326, 326, 326,
+        /*  2470 */
+        326, 326, 290, 318, 326, 326, 251, 336, 353, 326,
+        /*  2480 */
+        311, 326, 235, 326, 326, 326, 133, 326, 326, 54,
+        /*  2490 */
+        128, 326, 326, 326, 326, 326, 326, 326, 290, 318,
+        /*  2500 */
+        326, 326, 251, 336, 353, 235, 311, 326, 326, 133,
+        /*  2510 */
+        326, 326, 83, 128, 326, 326, 235, 326, 326, 326,
+        /*  2520 */
+        133, 290, 318, 90, 128, 251, 336, 353, 326, 311,
+        /*  2530 */
+        326, 326, 290, 318, 326, 326, 251, 336, 353, 326,
+        /*  2540 */
+        311,
     );
     static public $yy_lookahead = array(
         /*     0 */
-        1, 40, 3, 115, 116, 4, 5, 6, 7, 8,
+        1, 38, 3, 40, 91, 4, 5, 6, 7, 8,
         /*    10 */
-        9, 10, 11, 12, 13, 14, 15, 16, 115, 116,
+        9, 10, 11, 12, 13, 14, 15, 104, 105, 18,
         /*    20 */
-        19, 19, 61, 21, 63, 24, 25, 1, 67, 3,
+        118, 18, 60, 20, 23, 24, 1, 65, 3, 30,
         /*    30 */
-        31, 30, 1, 31, 3, 34, 37, 36, 21, 37,
+        29, 118, 1, 30, 33, 36, 35, 21, 22, 36,
         /*    40 */
-        27, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
         /*    50 */
-        51, 52, 53, 54, 55, 1, 1, 31, 32, 1,
+        51, 52, 53, 54, 1, 30, 31, 1, 1, 3,
         /*    60 */
-        39, 3, 19, 37, 21, 22, 92, 68, 69, 70,
+        3, 36, 2, 18, 19, 20, 67, 68, 69, 70,
         /*    70 */
-        71, 72, 73, 74, 75, 76, 77, 78, 79, 105,
+        71, 72, 73, 74, 75, 76, 77, 78, 62, 30,
         /*    80 */
-        106, 64, 56, 29, 31, 31, 31, 56, 67, 31,
+        55, 28, 37, 30, 111, 36, 30, 30, 18, 36,
         /*    90 */
-        37, 37, 37, 119, 81, 37, 42, 43, 44, 45,
+        20, 21, 36, 36, 41, 42, 43, 44, 45, 46,
         /*   100 */
-        46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+        47, 48, 49, 50, 51, 52, 53, 54, 1, 91,
         /*   110 */
-        1, 84, 85, 86, 87, 88, 19, 20, 21, 19,
+        92, 55, 55, 83, 84, 85, 86, 87, 38, 101,
         /*   120 */
-        20, 21, 68, 69, 70, 71, 72, 73, 74, 75,
+        67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
         /*   130 */
-        76, 77, 78, 79, 19, 38, 21, 22, 87, 19,
+        77, 78, 18, 63, 20, 21, 118, 30, 1, 18,
         /*   140 */
-        31, 21, 27, 33, 40, 39, 37, 41, 1, 92,
+        3, 20, 21, 36, 111, 39, 66, 26, 41, 42,
         /*   150 */
-        40, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
         /*   160 */
-        51, 52, 53, 54, 55, 22, 23, 63, 19, 23,
+        53, 54, 1, 1, 26, 3, 60, 30, 62, 15,
         /*   170 */
-        21, 22, 116, 63, 123, 124, 119, 68, 69, 70,
+        16, 17, 66, 36, 67, 68, 69, 70, 71, 72,
         /*   180 */
-        71, 72, 73, 74, 75, 76, 77, 78, 79, 42,
+        73, 74, 75, 76, 77, 78, 18, 19, 20, 32,
         /*   190 */
-        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+        100, 1, 30, 109, 1, 18, 39, 20, 36, 1,
         /*   200 */
-        53, 54, 55, 1, 119, 3, 63, 1, 1, 3,
+        116, 3, 41, 42, 43, 44, 45, 46, 47, 48,
         /*   210 */
-        86, 87, 88, 64, 67, 68, 69, 70, 71, 72,
+        49, 50, 51, 52, 53, 54, 1, 55, 80, 62,
         /*   220 */
-        73, 74, 75, 76, 77, 78, 79, 5, 6, 1,
+        30, 85, 86, 87, 39, 32, 36, 66, 67, 68,
         /*   230 */
-        8, 9, 10, 1, 112, 3, 3, 31, 16, 17,
+        69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
         /*   240 */
-        18, 22, 23, 37, 42, 43, 44, 45, 46, 47,
+        63, 86, 114, 115, 91, 92, 31, 62, 55, 18,
         /*   250 */
-        48, 49, 50, 51, 52, 53, 54, 55, 1, 2,
+        38, 20, 40, 55, 101, 18, 41, 42, 43, 44,
         /*   260 */
-        27, 33, 56, 31, 113, 101, 115, 116, 19, 37,
-        /*   270 */
-        68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-        /*   280 */
-        78, 79, 63, 22, 56, 95, 96, 97, 56, 40,
-        /*   290 */
-        92, 110, 19, 19, 21, 21, 20, 21, 117, 42,
-        /*   300 */
-        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-        /*   310 */
-        53, 54, 55, 1, 1, 3, 3, 119, 120, 92,
-        /*   320 */
-        112, 39, 61, 41, 99, 68, 69, 70, 71, 72,
-        /*   330 */
-        73, 74, 75, 76, 77, 78, 79, 64, 64, 114,
-        /*   340 */
-        61, 65, 61, 101, 31, 66, 119, 66, 101, 39,
-        /*   350 */
-        37, 41, 20, 2, 42, 43, 44, 45, 46, 47,
-        /*   360 */
-        48, 49, 50, 51, 52, 53, 54, 55, 1, 56,
-        /*   370 */
-        3, 21, 40, 22, 20, 21, 112, 21, 114, 99,
-        /*   380 */
-        68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-        /*   390 */
-        78, 79, 26, 23, 114, 95, 96, 92, 93, 93,
-        /*   400 */
-        19, 19, 21, 21, 112, 39, 114, 102, 102, 42,
-        /*   410 */
-        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-        /*   420 */
-        53, 54, 55, 1, 119, 119, 1, 2, 88, 19,
-        /*   430 */
-        90, 21, 99, 63, 99, 68, 69, 70, 71, 72,
-        /*   440 */
-        73, 74, 75, 76, 77, 78, 79, 114, 93, 114,
-        /*   450 */
-        1, 87, 92, 93, 95, 96, 19, 102, 21, 1,
-        /*   460 */
-        21, 21, 102, 41, 42, 43, 44, 45, 46, 47,
-        /*   470 */
-        48, 49, 50, 51, 52, 53, 54, 55, 1, 119,
-        /*   480 */
-        93, 23, 92, 2, 38, 38, 21, 99, 124, 102,
-        /*   490 */
-        68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-        /*   500 */
-        78, 79, 114, 110, 100, 56, 119, 92, 93, 119,
-        /*   510 */
-        117, 67, 61, 27, 21, 20, 28, 102, 114, 42,
-        /*   520 */
-        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-        /*   530 */
-        53, 54, 55, 1, 119, 3, 21, 31, 22, 57,
-        /*   540 */
-        2, 40, 99, 37, 99, 68, 69, 70, 71, 72,
-        /*   550 */
-        73, 74, 75, 76, 77, 78, 79, 114, 81, 114,
-        /*   560 */
-        93, 93, 41, 93, 93, 21, 21, 65, 3, 102,
-        /*   570 */
-        102, 40, 102, 102, 42, 43, 44, 45, 46, 47,
-        /*   580 */
-        48, 49, 50, 51, 52, 53, 54, 55, 1, 119,
-        /*   590 */
-        119, 65, 3, 21, 20, 20, 3, 99, 99, 99,
-        /*   600 */
-        68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-        /*   610 */
-        78, 79, 114, 114, 114, 20, 102, 21, 20, 112,
-        /*   620 */
-        2, 113, 112, 120, 112, 114, 117, 98, 41, 42,
-        /*   630 */
-        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-        /*   640 */
-        53, 54, 55, 1, 31, 112, 17, 89, 98, 125,
-        /*   650 */
-        125, 125, 125, 125, 125, 68, 69, 70, 71, 72,
-        /*   660 */
-        73, 74, 75, 76, 77, 78, 79, 125, 26, 125,
-        /*   670 */
-        125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-        /*   680 */
-        125, 125, 125, 125, 42, 43, 44, 45, 46, 47,
-        /*   690 */
-        48, 49, 50, 51, 52, 53, 54, 55, 1, 125,
-        /*   700 */
-        125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-        /*   710 */
-        68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-        /*   720 */
-        78, 79, 125, 125, 125, 125, 125, 125, 125, 32,
-        /*   730 */
-        125, 125, 125, 125, 125, 125, 125, 125, 125, 42,
-        /*   740 */
-        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-        /*   750 */
-        53, 54, 55, 1, 125, 125, 125, 125, 125, 125,
-        /*   760 */
-        125, 125, 125, 125, 125, 68, 69, 70, 71, 72,
-        /*   770 */
-        73, 74, 75, 76, 77, 78, 79, 125, 125, 125,
-        /*   780 */
-        125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-        /*   790 */
-        125, 125, 125, 125, 42, 43, 44, 45, 46, 47,
-        /*   800 */
-        48, 49, 50, 51, 52, 53, 54, 55, 125, 125,
-        /*   810 */
-        125, 125, 125, 125, 125, 125, 125, 125, 125, 23,
-        /*   820 */
-        68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-        /*   830 */
-        78, 79, 125, 125, 125, 125, 125, 42, 43, 44,
-        /*   840 */
         45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+        /*   270 */
+        1, 118, 3, 94, 95, 96, 39, 122, 123, 38,
+        /*   280 */
+        91, 40, 67, 68, 69, 70, 71, 72, 73, 74,
+        /*   290 */
+        75, 76, 77, 78, 63, 114, 115, 100, 91, 92,
+        /*   300 */
+        112, 91, 114, 115, 91, 19, 20, 118, 101, 20,
+        /*   310 */
+        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+        /*   320 */
+        51, 52, 53, 54, 1, 118, 3, 100, 118, 119,
+        /*   330 */
+        60, 118, 2, 91, 3, 65, 67, 68, 69, 70,
+        /*   340 */
+        71, 72, 73, 74, 75, 76, 77, 78, 21, 22,
+        /*   350 */
+        64, 21, 63, 92, 111, 119, 113, 26, 19, 20,
+        /*   360 */
+        118, 1, 101, 21, 41, 42, 43, 44, 45, 46,
+        /*   370 */
+        47, 48, 49, 50, 51, 52, 53, 54, 1, 118,
+        /*   380 */
+        3, 18, 22, 20, 19, 94, 95, 1, 98, 62,
+        /*   390 */
+        67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+        /*   400 */
+        77, 78, 60, 113, 39, 1, 2, 92, 92, 18,
+        /*   410 */
+        111, 20, 113, 87, 26, 89, 101, 101, 41, 42,
+        /*   420 */
+        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+        /*   430 */
+        53, 54, 1, 118, 118, 18, 39, 20, 19, 94,
+        /*   440 */
+        95, 55, 98, 25, 67, 68, 69, 70, 71, 72,
+        /*   450 */
+        73, 74, 75, 76, 77, 78, 38, 113, 86, 92,
+        /*   460 */
+        92, 92, 18, 40, 20, 30, 60, 2, 101, 101,
+        /*   470 */
+        101, 36, 41, 42, 43, 44, 45, 46, 47, 48,
+        /*   480 */
+        49, 50, 51, 52, 53, 54, 1, 118, 18, 109,
+        /*   490 */
+        20, 20, 56, 39, 19, 123, 116, 98, 67, 68,
+        /*   500 */
+        69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+        /*   510 */
+        25, 80, 113, 92, 64, 27, 21, 20, 19, 64,
+        /*   520 */
+        20, 3, 101, 20, 22, 2, 41, 42, 43, 44,
+        /*   530 */
+        45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+        /*   540 */
+        1, 20, 3, 19, 3, 20, 20, 20, 19, 66,
+        /*   550 */
+        98, 98, 67, 68, 69, 70, 71, 72, 73, 74,
+        /*   560 */
+        75, 76, 77, 78, 62, 113, 113, 20, 37, 37,
+        /*   570 */
+        3, 20, 20, 101, 112, 111, 22, 111, 111, 111,
+        /*   580 */
+        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+        /*   590 */
+        51, 52, 53, 54, 1, 116, 30, 113, 97, 88,
+        /*   600 */
+        16, 115, 124, 97, 99, 98, 67, 68, 69, 70,
+        /*   610 */
+        71, 72, 73, 74, 75, 76, 77, 78, 113, 124,
+        /*   620 */
+        113, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+        /*   630 */
+        124, 124, 124, 40, 41, 42, 43, 44, 45, 46,
+        /*   640 */
+        47, 48, 49, 50, 51, 52, 53, 54, 1, 2,
+        /*   650 */
+        124, 124, 124, 124, 124, 124, 124, 98, 98, 98,
+        /*   660 */
+        67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+        /*   670 */
+        77, 78, 113, 113, 113, 124, 124, 124, 124, 124,
+        /*   680 */
+        124, 124, 124, 124, 124, 124, 124, 124, 41, 42,
+        /*   690 */
+        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+        /*   700 */
+        53, 54, 1, 124, 124, 124, 124, 124, 124, 124,
+        /*   710 */
+        124, 98, 124, 124, 67, 68, 69, 70, 71, 72,
+        /*   720 */
+        73, 74, 75, 76, 77, 78, 113, 124, 124, 124,
+        /*   730 */
+        124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+        /*   740 */
+        124, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+        /*   750 */
+        49, 50, 51, 52, 53, 54, 1, 124, 124, 124,
+        /*   760 */
+        124, 124, 124, 124, 124, 124, 124, 124, 67, 68,
+        /*   770 */
+        69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+        /*   780 */
+        124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+        /*   790 */
+        124, 124, 124, 124, 124, 124, 41, 42, 43, 44,
+        /*   800 */
+        45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+        /*   810 */
+        124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+        /*   820 */
+        22, 124, 67, 68, 69, 70, 71, 72, 73, 74,
+        /*   830 */
+        75, 76, 77, 78, 124, 124, 124, 124, 41, 42,
+        /*   840 */
+        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
         /*   850 */
-        55, 125, 125, 125, 125, 125, 125, 61, 125, 125,
+        53, 54, 124, 124, 124, 124, 124, 124, 60, 124,
         /*   860 */
-        125, 125, 66, 68, 69, 70, 71, 72, 73, 74,
+        124, 124, 124, 65, 67, 68, 69, 70, 71, 72,
         /*   870 */
-        75, 76, 77, 78, 79, 125, 125, 125, 125, 125,
+        73, 74, 75, 76, 77, 78, 124, 124, 124, 124,
         /*   880 */
-        125, 125, 125, 19, 20, 21, 125, 125, 24, 25,
+        124, 124, 124, 18, 19, 20, 124, 124, 23, 24,
         /*   890 */
-        125, 125, 93, 125, 30, 125, 93, 125, 34, 35,
+        124, 86, 124, 124, 29, 90, 92, 124, 33, 94,
         /*   900 */
-        36, 102, 38, 125, 40, 102, 125, 43, 125, 125,
+        35, 124, 37, 124, 39, 101, 124, 42, 103, 124,
         /*   910 */
-        125, 87, 125, 114, 125, 91, 125, 114, 94, 95,
+        124, 106, 107, 108, 124, 110, 124, 113, 92, 92,
         /*   920 */
-        125, 125, 58, 59, 60, 61, 62, 103, 104, 65,
+        124, 124, 57, 58, 59, 60, 61, 101, 101, 64,
         /*   930 */
-        66, 107, 108, 109, 93, 111, 125, 125, 125, 125,
+        65, 66, 124, 94, 124, 124, 124, 124, 124, 113,
         /*   940 */
-        125, 125, 118, 102, 80, 19, 20, 21, 125, 125,
+        113, 18, 19, 20, 79, 106, 23, 24, 124, 110,
         /*   950 */
-        24, 25, 125, 87, 125, 114, 30, 91, 125, 87,
+        124, 124, 29, 124, 124, 86, 33, 34, 35, 90,
         /*   960 */
-        34, 95, 36, 91, 38, 125, 40, 95, 125, 43,
+        37, 124, 39, 94, 92, 42, 124, 124, 124, 124,
         /*   970 */
-        104, 125, 125, 107, 108, 109, 104, 111, 125, 107,
+        86, 124, 103, 101, 90, 106, 107, 108, 94, 110,
         /*   980 */
-        108, 109, 125, 111, 58, 59, 60, 61, 62, 125,
+        57, 58, 59, 60, 61, 113, 124, 64, 65, 124,
         /*   990 */
-        125, 65, 66, 67, 125, 87, 125, 125, 95, 91,
+        106, 107, 108, 124, 110, 18, 124, 20, 124, 18,
         /*  1000 */
-        125, 125, 125, 95, 125, 125, 80, 19, 20, 21,
+        19, 20, 79, 124, 23, 24, 124, 30, 124, 32,
         /*  1010 */
-        107, 93, 24, 25, 111, 107, 108, 109, 30, 111,
+        29, 86, 124, 36, 33, 90, 35, 124, 37, 94,
         /*  1020 */
-        102, 125, 34, 125, 36, 125, 38, 125, 40, 125,
+        39, 124, 124, 42, 124, 124, 124, 124, 124, 124,
         /*  1030 */
-        125, 43, 114, 125, 125, 87, 125, 125, 125, 91,
+        124, 106, 107, 108, 124, 110, 124, 124, 57, 58,
         /*  1040 */
-        125, 125, 94, 95, 96, 125, 58, 59, 60, 61,
+        59, 60, 61, 124, 124, 64, 65, 124, 124, 124,
         /*  1050 */
-        62, 103, 104, 65, 66, 107, 108, 109, 125, 111,
+        124, 124, 18, 124, 20, 124, 124, 18, 19, 20,
         /*  1060 */
-        125, 125, 125, 125, 19, 125, 21, 125, 80, 19,
+        79, 124, 23, 24, 30, 86, 32, 124, 29, 90,
         /*  1070 */
-        20, 21, 125, 125, 24, 25, 31, 19, 33, 21,
+        36, 86, 33, 94, 35, 90, 37, 124, 39, 94,
         /*  1080 */
-        30, 125, 37, 125, 34, 125, 36, 125, 38, 31,
+        124, 42, 124, 124, 124, 106, 107, 108, 124, 110,
         /*  1090 */
-        40, 33, 125, 43, 125, 37, 125, 87, 125, 125,
+        124, 106, 107, 108, 124, 110, 57, 58, 59, 60,
         /*  1100 */
-        125, 91, 125, 125, 94, 95, 125, 125, 58, 59,
+        61, 124, 124, 64, 65, 124, 124, 124, 124, 124,
         /*  1110 */
-        60, 61, 62, 103, 104, 65, 66, 107, 108, 109,
+        124, 124, 124, 124, 124, 18, 19, 20, 79, 124,
         /*  1120 */
-        125, 111, 125, 125, 125, 125, 125, 125, 118, 125,
+        23, 24, 124, 124, 124, 124, 29, 86, 124, 124,
         /*  1130 */
-        80, 19, 20, 21, 125, 125, 24, 25, 125, 125,
+        33, 90, 35, 124, 37, 94, 39, 124, 124, 42,
         /*  1140 */
-        125, 125, 30, 125, 125, 125, 34, 125, 36, 125,
+        124, 124, 124, 124, 124, 124, 124, 106, 107, 108,
         /*  1150 */
-        38, 125, 40, 125, 125, 43, 125, 125, 125, 87,
+        124, 110, 124, 124, 57, 58, 59, 60, 61, 124,
         /*  1160 */
-        125, 125, 125, 91, 125, 125, 94, 95, 125, 125,
+        124, 64, 65, 124, 124, 124, 124, 124, 124, 124,
         /*  1170 */
-        58, 59, 60, 61, 62, 103, 104, 65, 66, 107,
+        124, 124, 124, 18, 19, 20, 79, 124, 23, 24,
         /*  1180 */
-        108, 109, 125, 111, 125, 125, 125, 125, 125, 125,
+        124, 124, 124, 124, 29, 86, 124, 124, 33, 90,
         /*  1190 */
-        118, 125, 80, 19, 20, 21, 125, 125, 24, 25,
+        35, 124, 37, 94, 39, 124, 124, 42, 124, 124,
         /*  1200 */
-        125, 125, 125, 125, 30, 125, 125, 125, 34, 125,
+        124, 124, 124, 124, 124, 106, 107, 108, 124, 110,
         /*  1210 */
-        36, 125, 38, 125, 40, 125, 125, 43, 125, 125,
+        124, 124, 57, 58, 59, 60, 61, 124, 124, 64,
         /*  1220 */
-        125, 87, 125, 125, 125, 91, 125, 125, 94, 95,
+        65, 124, 124, 124, 124, 124, 124, 124, 124, 124,
         /*  1230 */
-        96, 125, 58, 59, 60, 61, 62, 103, 104, 65,
+        124, 18, 19, 20, 79, 124, 23, 24, 124, 124,
         /*  1240 */
-        66, 107, 108, 109, 125, 111, 125, 125, 125, 125,
+        124, 124, 29, 86, 124, 124, 33, 90, 35, 124,
         /*  1250 */
-        125, 125, 125, 125, 80, 19, 20, 21, 125, 125,
+        37, 94, 39, 124, 124, 42, 124, 124, 124, 124,
         /*  1260 */
-        24, 25, 125, 125, 125, 125, 30, 125, 125, 125,
+        124, 124, 124, 106, 107, 108, 124, 110, 124, 124,
         /*  1270 */
-        34, 125, 36, 125, 38, 125, 40, 125, 125, 43,
+        57, 58, 59, 60, 61, 124, 124, 64, 65, 124,
         /*  1280 */
-        125, 125, 125, 87, 125, 125, 125, 91, 125, 125,
+        1, 124, 3, 124, 3, 124, 124, 124, 124, 18,
         /*  1290 */
-        94, 95, 125, 125, 58, 59, 60, 61, 62, 103,
+        19, 20, 79, 124, 23, 24, 124, 124, 124, 124,
         /*  1300 */
-        104, 65, 66, 107, 108, 109, 125, 111, 125, 125,
+        29, 22, 21, 124, 33, 124, 35, 124, 37, 30,
         /*  1310 */
-        125, 125, 125, 125, 125, 125, 80, 19, 20, 21,
+        39, 30, 124, 42, 124, 36, 124, 36, 39, 124,
         /*  1320 */
-        125, 125, 24, 25, 125, 125, 125, 125, 30, 125,
+        39, 124, 124, 124, 91, 92, 124, 124, 57, 58,
         /*  1330 */
-        125, 125, 34, 125, 36, 125, 38, 125, 40, 125,
+        59, 60, 61, 124, 101, 64, 65, 104, 105, 124,
         /*  1340 */
-        125, 43, 125, 125, 125, 87, 125, 125, 125, 91,
+        124, 62, 124, 62, 124, 124, 124, 18, 19, 20,
         /*  1350 */
-        125, 125, 94, 95, 125, 125, 58, 59, 60, 61,
+        79, 118, 23, 24, 124, 124, 124, 124, 29, 124,
         /*  1360 */
-        62, 103, 104, 65, 66, 107, 108, 109, 125, 111,
+        124, 124, 33, 124, 35, 124, 37, 124, 39, 91,
         /*  1370 */
-        125, 125, 125, 125, 125, 125, 125, 125, 80, 19,
+        92, 42, 124, 124, 124, 124, 124, 124, 124, 101,
         /*  1380 */
-        20, 21, 125, 125, 24, 25, 125, 125, 125, 125,
+        124, 124, 104, 105, 124, 124, 57, 58, 59, 60,
         /*  1390 */
-        30, 125, 125, 125, 34, 125, 36, 125, 38, 125,
+        61, 124, 124, 64, 65, 124, 118, 124, 124, 124,
         /*  1400 */
-        40, 125, 125, 43, 125, 125, 125, 87, 125, 125,
+        124, 124, 124, 124, 124, 18, 19, 20, 79, 124,
         /*  1410 */
-        125, 91, 125, 125, 94, 95, 125, 125, 58, 59,
+        23, 24, 124, 124, 124, 124, 29, 124, 124, 124,
         /*  1420 */
-        60, 61, 62, 103, 104, 65, 66, 107, 108, 109,
+        33, 124, 35, 124, 37, 124, 39, 91, 92, 42,
         /*  1430 */
-        125, 111, 125, 125, 125, 125, 125, 125, 125, 125,
+        124, 124, 124, 124, 124, 124, 124, 101, 124, 124,
         /*  1440 */
-        80, 19, 20, 21, 125, 125, 24, 25, 125, 125,
+        104, 105, 124, 124, 57, 58, 59, 60, 61, 124,
         /*  1450 */
-        125, 125, 30, 125, 125, 125, 34, 125, 36, 125,
+        124, 64, 124, 124, 118, 124, 124, 124, 124, 124,
         /*  1460 */
-        38, 125, 40, 125, 125, 43, 125, 125, 125, 87,
+        124, 124, 124, 18, 19, 20, 79, 124, 23, 24,
         /*  1470 */
-        125, 125, 125, 91, 125, 125, 94, 95, 125, 125,
+        124, 124, 124, 124, 29, 124, 124, 124, 33, 124,
         /*  1480 */
-        58, 59, 60, 61, 62, 103, 104, 65, 125, 107,
+        35, 124, 37, 124, 39, 124, 3, 42, 124, 124,
         /*  1490 */
-        108, 109, 125, 111, 125, 125, 125, 125, 125, 125,
+        124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
         /*  1500 */
-        125, 125, 80, 19, 20, 21, 125, 125, 24, 25,
+        124, 124, 57, 58, 59, 60, 61, 124, 25, 64,
         /*  1510 */
-        125, 125, 125, 87, 30, 125, 125, 91, 34, 125,
+        27, 28, 124, 30, 31, 124, 124, 124, 124, 36,
         /*  1520 */
-        36, 95, 38, 125, 40, 125, 125, 43, 125, 125,
+        124, 38, 39, 40, 79, 124, 124, 124, 124, 124,
         /*  1530 */
-        125, 3, 125, 107, 108, 109, 125, 111, 125, 125,
+        124, 124, 124, 124, 124, 86, 124, 124, 55, 90,
         /*  1540 */
-        125, 125, 58, 59, 60, 61, 62, 125, 125, 65,
+        124, 124, 93, 94, 124, 62, 124, 124, 124, 66,
         /*  1550 */
-        125, 125, 125, 125, 26, 125, 28, 29, 125, 31,
+        124, 102, 103, 124, 124, 106, 107, 108, 124, 110,
         /*  1560 */
-        32, 125, 125, 125, 80, 37, 125, 39, 40, 41,
+        124, 124, 124, 80, 124, 124, 124, 86, 124, 120,
         /*  1570 */
-        125, 125, 87, 125, 125, 125, 91, 125, 87, 94,
+        121, 90, 124, 124, 93, 94, 95, 124, 124, 124,
         /*  1580 */
-        95, 125, 91, 125, 56, 125, 95, 125, 103, 104,
+        124, 124, 124, 102, 103, 124, 124, 106, 107, 108,
         /*  1590 */
-        125, 63, 107, 108, 109, 67, 111, 87, 107, 108,
+        86, 110, 124, 124, 90, 124, 124, 93, 94, 124,
         /*  1600 */
-        109, 91, 111, 125, 94, 95, 121, 122, 125, 81,
+        124, 124, 124, 124, 124, 124, 102, 103, 124, 86,
         /*  1610 */
-        125, 125, 125, 103, 104, 92, 93, 107, 108, 109,
+        106, 107, 108, 90, 110, 124, 93, 94, 124, 124,
         /*  1620 */
-        125, 111, 125, 125, 125, 102, 125, 125, 105, 106,
+        124, 117, 124, 124, 124, 102, 103, 124, 124, 106,
         /*  1630 */
-        87, 125, 122, 125, 91, 125, 125, 94, 95, 125,
+        107, 108, 124, 110, 124, 124, 124, 124, 86, 124,
         /*  1640 */
-        125, 125, 119, 125, 125, 125, 103, 104, 125, 125,
+        117, 124, 90, 124, 124, 93, 94, 124, 124, 124,
         /*  1650 */
-        107, 108, 109, 87, 111, 125, 125, 91, 125, 125,
+        124, 124, 124, 124, 102, 103, 124, 124, 106, 107,
         /*  1660 */
-        94, 95, 125, 125, 87, 125, 125, 125, 91, 103,
+        108, 86, 110, 124, 124, 90, 124, 124, 93, 94,
         /*  1670 */
-        104, 94, 95, 107, 108, 109, 125, 111, 125, 125,
+        95, 124, 124, 121, 124, 124, 124, 102, 103, 124,
         /*  1680 */
-        103, 104, 125, 87, 107, 108, 109, 91, 111, 125,
+        124, 106, 107, 108, 86, 110, 124, 124, 90, 124,
         /*  1690 */
-        94, 95, 125, 125, 87, 125, 125, 125, 91, 103,
+        124, 93, 94, 124, 124, 124, 124, 124, 124, 124,
         /*  1700 */
-        104, 94, 95, 107, 108, 109, 125, 111, 125, 87,
+        102, 103, 124, 86, 106, 107, 108, 90, 110, 124,
         /*  1710 */
-        103, 104, 125, 91, 107, 108, 109, 95, 111, 125,
+        93, 94, 124, 124, 124, 117, 124, 124, 124, 102,
         /*  1720 */
-        87, 125, 125, 125, 91, 125, 125, 94, 95, 107,
+        103, 124, 124, 106, 107, 108, 124, 110, 124, 86,
         /*  1730 */
-        108, 109, 125, 111, 125, 125, 103, 104, 125, 87,
+        91, 92, 124, 90, 124, 124, 93, 94, 124, 124,
         /*  1740 */
-        107, 108, 109, 91, 111, 125, 94, 95, 125, 125,
+        101, 124, 124, 104, 105, 102, 103, 124, 86, 106,
         /*  1750 */
-        125, 125, 125, 125, 125, 103, 104, 125, 87, 107,
+        107, 108, 90, 110, 124, 93, 94, 118, 124, 124,
         /*  1760 */
-        108, 109, 91, 111, 125, 94, 95, 125, 125, 87,
+        124, 124, 124, 124, 102, 103, 124, 124, 106, 107,
         /*  1770 */
-        125, 125, 125, 91, 103, 104, 94, 95, 107, 108,
+        108, 86, 110, 124, 124, 90, 124, 124, 93, 94,
         /*  1780 */
-        109, 125, 111, 125, 125, 103, 104, 125, 87, 107,
+        124, 124, 124, 124, 124, 124, 124, 102, 103, 124,
         /*  1790 */
-        108, 109, 91, 111, 125, 94, 95, 125, 125, 87,
+        86, 106, 107, 108, 90, 110, 124, 93, 94, 124,
         /*  1800 */
-        125, 125, 125, 91, 103, 104, 94, 95, 107, 108,
+        124, 124, 124, 124, 124, 124, 102, 103, 124, 124,
         /*  1810 */
-        109, 125, 111, 125, 125, 103, 104, 125, 125, 107,
+        106, 107, 108, 124, 110, 124, 86, 91, 92, 124,
         /*  1820 */
-        108, 109, 125, 111, 87, 125, 125, 125, 91, 125,
+        90, 124, 124, 93, 94, 124, 124, 101, 124, 124,
         /*  1830 */
-        125, 94, 95, 125, 125, 87, 125, 125, 125, 91,
+        104, 105, 102, 103, 124, 86, 106, 107, 108, 90,
         /*  1840 */
-        103, 104, 94, 95, 107, 108, 109, 125, 111, 125,
+        110, 124, 93, 94, 118, 124, 124, 124, 124, 124,
         /*  1850 */
-        125, 103, 104, 125, 87, 107, 108, 109, 91, 111,
+        124, 102, 103, 124, 124, 106, 107, 108, 86, 110,
         /*  1860 */
-        125, 94, 95, 125, 125, 87, 125, 125, 125, 91,
+        124, 124, 90, 124, 124, 93, 94, 124, 124, 124,
         /*  1870 */
-        103, 104, 94, 95, 107, 108, 109, 125, 111, 125,
+        124, 124, 124, 124, 102, 103, 124, 86, 106, 107,
         /*  1880 */
-        125, 103, 104, 125, 87, 107, 108, 109, 91, 111,
+        108, 90, 110, 124, 93, 94, 124, 124, 124, 124,
         /*  1890 */
-        125, 94, 95, 125, 125, 87, 125, 125, 125, 91,
+        124, 124, 124, 102, 103, 124, 124, 106, 107, 108,
         /*  1900 */
-        103, 104, 94, 95, 107, 108, 109, 125, 111, 125,
+        124, 110, 124, 86, 91, 92, 124, 90, 124, 124,
         /*  1910 */
-        125, 103, 104, 125, 125, 107, 108, 109, 125, 111,
+        93, 94, 124, 124, 101, 124, 124, 104, 105, 102,
         /*  1920 */
-        87, 125, 125, 125, 91, 125, 125, 94, 95, 125,
+        103, 124, 86, 106, 107, 108, 90, 110, 124, 93,
         /*  1930 */
-        125, 87, 125, 125, 125, 91, 103, 104, 94, 95,
+        94, 118, 124, 124, 124, 124, 124, 124, 102, 103,
         /*  1940 */
-        107, 108, 109, 125, 111, 125, 125, 103, 104, 125,
+        124, 124, 106, 107, 108, 86, 110, 124, 124, 90,
         /*  1950 */
-        87, 107, 108, 109, 91, 111, 125, 94, 95, 125,
+        124, 124, 93, 94, 124, 124, 124, 124, 124, 124,
         /*  1960 */
-        125, 87, 125, 125, 125, 91, 103, 104, 94, 95,
+        124, 102, 103, 124, 86, 106, 107, 108, 90, 110,
         /*  1970 */
-        107, 108, 109, 125, 111, 125, 125, 103, 104, 125,
+        124, 93, 94, 124, 124, 124, 124, 124, 124, 124,
         /*  1980 */
-        87, 107, 108, 109, 91, 111, 125, 94, 95, 125,
+        102, 103, 124, 124, 106, 107, 108, 124, 110, 124,
         /*  1990 */
-        125, 87, 125, 125, 125, 91, 103, 104, 94, 95,
+        86, 124, 124, 124, 90, 124, 124, 93, 94, 124,
         /*  2000 */
-        107, 108, 109, 125, 111, 125, 125, 103, 104, 125,
+        124, 124, 124, 124, 124, 124, 102, 103, 124, 86,
         /*  2010 */
-        125, 107, 108, 109, 125, 111, 87, 125, 125, 125,
+        106, 107, 108, 90, 110, 124, 93, 94, 124, 124,
         /*  2020 */
-        91, 125, 125, 94, 95, 125, 125, 87, 125, 125,
+        124, 124, 124, 124, 124, 102, 103, 124, 124, 106,
         /*  2030 */
-        125, 91, 103, 104, 94, 95, 107, 108, 109, 125,
+        107, 108, 86, 110, 124, 124, 90, 124, 124, 93,
         /*  2040 */
-        111, 125, 125, 103, 104, 12, 125, 107, 108, 109,
+        94, 124, 124, 124, 124, 124, 124, 124, 102, 103,
         /*  2050 */
-        125, 111, 19, 125, 125, 125, 87, 24, 25, 125,
+        124, 86, 106, 107, 108, 90, 110, 124, 93, 94,
         /*  2060 */
-        91, 125, 125, 30, 95, 125, 87, 34, 125, 36,
+        124, 124, 124, 124, 124, 124, 124, 102, 103, 124,
         /*  2070 */
-        91, 125, 125, 94, 95, 125, 107, 108, 109, 125,
+        124, 106, 107, 108, 124, 110, 124, 86, 124, 124,
         /*  2080 */
-        111, 125, 103, 104, 125, 87, 107, 108, 109, 91,
+        124, 90, 124, 124, 93, 94, 124, 124, 124, 124,
         /*  2090 */
-        111, 125, 94, 95, 125, 125, 125, 125, 125, 125,
+        124, 124, 124, 102, 103, 124, 86, 106, 107, 108,
         /*  2100 */
-        125, 103, 104, 125, 87, 107, 108, 109, 91, 111,
+        90, 110, 124, 93, 94, 124, 124, 124, 124, 124,
         /*  2110 */
-        125, 94, 95, 80, 81, 82, 125, 125, 125, 125,
+        124, 124, 102, 103, 124, 124, 106, 107, 108, 86,
         /*  2120 */
-        103, 104, 125, 87, 107, 108, 109, 91, 111, 125,
+        110, 124, 124, 90, 124, 124, 93, 94, 124, 124,
         /*  2130 */
-        94, 95, 125, 125, 125, 125, 125, 125, 125, 103,
+        124, 124, 124, 124, 124, 102, 103, 124, 86, 106,
         /*  2140 */
-        104, 12, 125, 107, 108, 109, 125, 111, 19, 125,
+        107, 108, 90, 110, 124, 93, 94, 124, 124, 124,
         /*  2150 */
-        125, 125, 125, 24, 25, 125, 125, 125, 125, 30,
+        124, 124, 124, 124, 102, 103, 124, 124, 106, 107,
         /*  2160 */
-        125, 125, 87, 34, 125, 36, 91, 125, 125, 94,
+        108, 124, 110, 124, 86, 124, 124, 124, 90, 124,
         /*  2170 */
-        95, 125, 125, 87, 125, 125, 125, 91, 103, 104,
+        124, 93, 94, 124, 124, 124, 124, 124, 124, 124,
         /*  2180 */
-        94, 95, 107, 108, 109, 1, 111, 3, 125, 103,
+        102, 103, 124, 86, 106, 107, 108, 90, 110, 124,
         /*  2190 */
-        104, 125, 125, 107, 108, 109, 87, 111, 125, 125,
+        93, 94, 124, 124, 124, 124, 124, 124, 124, 102,
         /*  2200 */
-        91, 125, 125, 94, 95, 125, 125, 23, 125, 80,
+        103, 124, 124, 106, 107, 108, 86, 110, 124, 124,
         /*  2210 */
-        81, 82, 103, 104, 125, 31, 107, 108, 109, 87,
+        90, 124, 124, 93, 94, 124, 124, 124, 124, 124,
         /*  2220 */
-        111, 37, 125, 91, 40, 3, 125, 95, 87, 125,
+        124, 124, 102, 103, 124, 86, 106, 107, 108, 90,
         /*  2230 */
-        125, 125, 91, 125, 125, 125, 95, 125, 125, 107,
+        110, 124, 93, 94, 124, 124, 124, 124, 124, 124,
         /*  2240 */
-        108, 109, 125, 111, 22, 125, 125, 63, 107, 108,
+        124, 102, 103, 124, 124, 106, 107, 108, 124, 110,
         /*  2250 */
-        109, 125, 111, 31, 125, 92, 93, 125, 125, 37,
+        124, 86, 124, 124, 124, 90, 124, 124, 93, 94,
         /*  2260 */
-        125, 125, 40, 92, 93, 102, 125, 125, 105, 106,
+        124, 124, 124, 124, 124, 124, 124, 102, 103, 124,
         /*  2270 */
-        92, 93, 125, 102, 125, 125, 105, 106, 92, 93,
+        86, 106, 107, 108, 90, 110, 124, 93, 94, 124,
         /*  2280 */
-        102, 125, 119, 105, 106, 63, 92, 93, 102, 125,
+        124, 124, 124, 124, 124, 124, 102, 103, 124, 124,
         /*  2290 */
-        119, 105, 106, 125, 125, 125, 102, 119, 125, 105,
+        106, 107, 108, 86, 110, 124, 124, 90, 124, 124,
         /*  2300 */
-        106, 125, 125, 125, 125, 119, 125, 125, 125, 125,
+        93, 94, 124, 124, 124, 124, 124, 124, 124, 102,
         /*  2310 */
-        125, 125, 125, 119,
+        103, 124, 86, 106, 107, 108, 90, 110, 124, 93,
+        /*  2320 */
+        94, 124, 124, 124, 124, 124, 124, 124, 102, 103,
+        /*  2330 */
+        124, 124, 106, 107, 108, 124, 110, 124, 86, 124,
+        /*  2340 */
+        124, 124, 90, 124, 124, 93, 94, 124, 124, 124,
+        /*  2350 */
+        124, 124, 124, 124, 102, 103, 124, 11, 106, 107,
+        /*  2360 */
+        108, 124, 110, 124, 18, 124, 124, 124, 124, 23,
+        /*  2370 */
+        24, 11, 124, 124, 124, 29, 124, 124, 18, 33,
+        /*  2380 */
+        124, 35, 124, 23, 24, 124, 124, 124, 124, 29,
+        /*  2390 */
+        124, 124, 124, 33, 124, 35, 86, 124, 124, 124,
+        /*  2400 */
+        90, 124, 124, 93, 94, 124, 124, 124, 124, 124,
+        /*  2410 */
+        124, 124, 102, 103, 124, 124, 106, 107, 108, 124,
+        /*  2420 */
+        110, 124, 124, 124, 124, 79, 80, 81, 124, 86,
+        /*  2430 */
+        124, 124, 124, 90, 124, 124, 93, 94, 124, 79,
+        /*  2440 */
+        80, 81, 124, 124, 124, 102, 103, 124, 124, 106,
+        /*  2450 */
+        107, 108, 124, 110, 124, 124, 86, 124, 124, 124,
+        /*  2460 */
+        90, 124, 124, 93, 94, 124, 124, 124, 124, 124,
+        /*  2470 */
+        124, 124, 102, 103, 124, 124, 106, 107, 108, 124,
+        /*  2480 */
+        110, 124, 86, 124, 124, 124, 90, 124, 124, 93,
+        /*  2490 */
+        94, 124, 124, 124, 124, 124, 124, 124, 102, 103,
+        /*  2500 */
+        124, 124, 106, 107, 108, 86, 110, 124, 124, 90,
+        /*  2510 */
+        124, 124, 93, 94, 124, 124, 86, 124, 124, 124,
+        /*  2520 */
+        90, 102, 103, 93, 94, 106, 107, 108, 124, 110,
+        /*  2530 */
+        124, 124, 102, 103, 124, 124, 106, 107, 108, 124,
+        /*  2540 */
+        110,
     );
-    const YY_SHIFT_USE_DFLT = - 40;
+    const YY_SHIFT_USE_DFLT = - 39;
     const YY_SHIFT_MAX = 259;
     static public $yy_shift_ofst = array(
         /*     0 */
-        1, 1174, 1236, 988, 1236, 1174, 988, 988, 926, 864,
+        1, 1097, 1271, 1097, 981, 1271, 981, 981, 923, 865,
         /*    10 */
-        864, 988, 988, 1298, 988, 988, 988, 988, 1298, 988,
+        923, 981, 981, 981, 981, 981, 981, 981, 981, 981,
         /*    20 */
-        988, 988, 988, 988, 988, 988, 988, 988, 988, 1360,
+        981, 981, 1213, 981, 981, 981, 1155, 1329, 981, 981,
         /*    30 */
-        988, 988, 988, 988, 988, 1050, 988, 988, 988, 988,
+        981, 981, 981, 981, 981, 981, 981, 981, 981, 981,
         /*    40 */
-        988, 988, 988, 988, 1112, 1112, 1422, 1422, 1422, 1484,
+        981, 1155, 981, 981, 1039, 1039, 1445, 1387, 1387, 1387,
         /*    50 */
-        1422, 1422, 1422, - 1, 54, 109, 109, 109, 109, 109,
+        1387, 1387, 1387, - 1, 53, 107, 107, 107, 107, 107,
         /*    60 */
-        532, 642, 477, 587, 367, 147, 312, 697, 422, 257,
+        539, 431, 701, 161, 377, 269, 647, 485, 593, 215,
         /*    70 */
-        202, 752, 752, 752, 752, 752, 752, 752, 752, 752,
+        323, 755, 755, 755, 755, 755, 755, 755, 755, 755,
         /*    80 */
-        752, 752, 752, 752, 752, 752, 752, 752, 752, 752,
+        755, 755, 755, 755, 755, 755, 755, 755, 755, 755,
         /*    90 */
-        795, 795, 2184, 206, 55, 1, 2033, 1045, 1058, 2,
+        797, 797, 1279, 56, 190, 1, 2346, 977, 1034, 3,
         /*   100 */
-        58, 2, 58, 55, 55, 276, 796, 332, 425, 2129,
+        3, 137, 137, 190, 190, 286, 798, 404, 365, 2360,
         /*   110 */
-        222, 26, 232, 313, 149, 115, 43, 274, 219, 228,
+        25, 162, 57, 121, 70, 154, 16, 327, 198, 231,
         /*   120 */
-        143, 31, 120, 53, 354, 120, 120, 370, 332, 382,
+        114, 193, 417, 391, 360, 363, 363, 339, 502, 363,
         /*   130 */
-        381, 120, 120, 458, 437, 381, 506, 120, 354, 332,
+        365, 363, 365, 386, 339, 444, 470, 49, 444, 435,
         /*   140 */
-        120, 410, 120, 53, 449, 120, 207, 207, 207, 207,
+        49, 363, 363, 363, 363, 363, 31, 554, 31, 31,
         /*   150 */
-        207, 207, 207, 146, 207, 146, 207, - 40, 100, 273,
+        554, 31, 31, 31, 31, 31, 31, - 39, 177, 168,
         /*   160 */
-        53, 53, 53, 53, 53, 53, 53, 53, 53, 279,
+        49, 49, 49, 49, 49, 49, 49, 49, - 38, - 38,
         /*   170 */
-        53, 281, 279, 53, 279, 53, 53, 53, 279, 281,
+        - 38, 270, - 38, 49, 49, 49, 49, 49, 49, - 38,
         /*   180 */
-        279, 53, 279, 53, 279, 249, 53, 53, 53, 53,
+        270, - 38, 237, 49, 49, 49, - 38, 49, 49, 49,
         /*   190 */
-        613, 207, 613, 618, 207, 207, 629, 207, 531, 618,
+        584, 554, 554, 31, 566, 566, 60, 554, 31, 454,
         /*   200 */
-        146, 207, 146, 146, - 40, - 40, - 40, - 40, - 40, 1528,
+        31, 31, 60, 31, - 39, - 39, - 39, - 39, - 39, 1483,
         /*   210 */
-        2222, 97, - 39, 110, 104, 13, 17, 310, 282, 21,
+        1281, 106, 45, 157, 138, - 37, 80, 241, 418, 342,
         /*   220 */
-        351, 104, 233, 366, 106, 261, 531, 526, 565, 545,
+        331, 212, 185, 330, 185, 289, 552, 541, 526, 525,
         /*   230 */
-        521, 502, 544, 589, 572, 596, 598, 595, 593, 574,
+        521, 523, 524, 527, 529, 567, 551, 532, 531, 483,
         /*   240 */
-        575, 538, 482, 447, 465, 446, 481, 356, 439, 440,
+        547, 503, 518, 436, 454, 465, 406, 397, 419, 423,
         /*   250 */
-        444, 350, 451, 501, 516, 488, 515, 486, 493, 495,
+        471, 388, 475, 455, 500, 499, 497, 450, 488, 495,
     );
-    const YY_REDUCE_USE_DFLT = - 113;
+    const YY_REDUCE_USE_DFLT = - 99;
     const YY_REDUCE_MAX = 208;
     static public $yy_reduce_ofst = array(
         /*     0 */
-        27, 1485, 1134, 1072, 948, 1510, 824, 1010, 1382, 1596,
+        30, 1449, 1575, 1552, 1523, 1481, 1504, 1598, 1836, 2010,
         /*    10 */
-        1196, 1682, 1652, 1671, 1712, 1748, 1258, 1320, 2109, 1979,
+        1991, 1791, 1685, 1643, 1704, 1749, 2033, 2078, 2310, 2419,
         /*    20 */
-        2017, 2086, 1797, 1863, 1874, 1808, 1767, 1543, 1607, 1701,
+        2139, 2207, 2252, 2343, 2370, 1772, 1617, 1946, 1904, 2184,
         /*    30 */
-        1929, 1633, 1737, 1577, 1566, 1998, 2036, 1940, 1833, 1778,
+        1923, 1878, 1859, 1965, 2052, 1662, 1817, 1730, 2097, 2396,
         /*    40 */
-        2075, 1893, 1904, 1844, 866, 872, 1491, 1426, 908, 1622,
+        2430, 2120, 2165, 2226, 869, 805, 985, 925, 884, 979,
         /*    50 */
-        1969, 2141, 2132, 2178, 1523, 2178, 2194, 2186, 2171, 2163,
+        1099, 1041, 1157, 1639, 1233, 1639, 1336, 1278, 1726, 1813,
         /*    60 */
-        - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26,
+        - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87,
         /*    70 */
-        - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26,
+        - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87,
         /*    80 */
-        - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26,
+        - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87,
         /*    90 */
-        - 26, - 26, 360, 415, 305, 124, 51, 841, 918, 799,
+        - 87, - 87, 18, 207, 153, 136, 155, 827, 872, 804,
         /*   100 */
-        470, 803, 387, 471, 306, 903, 151, 190, 198, 364,
+        826, 261, 316, 369, 315, 839, 188, 210, 179, 372,
         /*   110 */
-        340, 57, 57, 57, 292, 404, 292, 292, - 112, 57,
+        189, 189, 189, 505, 299, 326, 128, 128, 189, 299,
         /*   120 */
-        - 112, 57, 443, 355, 181, 333, 280, - 112, 300, 388,
+        299, 189, 507, 453, 242, 344, 243, 84, 128, 452,
         /*   130 */
-        335, 264, 445, 390, 335, 500, 468, 335, 393, 359,
+        291, 399, 345, 189, 380, 613, 453, 421, 453, 368,
         /*   140 */
-        498, 335, 499, 467, 57, 225, 57, 57, 57, 57,
+        367, 560, 453, 559, 561, 290, 189, 128, 213, 189,
         /*   150 */
-        57, 227, 57, - 97, 57, - 112, 57, 57, 509, 511,
+        181, 189, 189, 189, 189, 189, 189, 189, 484, 479,
         /*   160 */
-        514, 514, 514, 514, 514, 514, 514, 514, 514, 508,
+        472, 472, 472, 472, 472, 472, 472, 472, 462, 462,
         /*   170 */
-        514, 507, 508, 514, 508, 514, 514, 514, 508, 512,
+        462, 464, 462, 472, 472, 472, 472, 472, 472, 462,
         /*   180 */
-        508, 514, 508, 514, 508, 510, 514, 514, 514, 514,
+        467, 462, 466, 472, 472, 472, 462, 472, 472, 472,
         /*   190 */
-        550, 85, 529, 503, 85, 85, 558, 85, 533, 503,
+        511, 486, 486, - 98, 501, 506, 236, 486, - 98, 468,
         /*   200 */
-        56, 85, 56, 56, 247, 122, 242, 164, 208,
+        - 98, - 98, 236, - 98, 227, - 27, 197, 33, 90,
     );
     static public $yyExpectedTokens = array(
         /* 0 */
-        array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 19, 24, 25, 30, 34, 36,),
+        array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 23, 24, 29, 33, 35,),
         /* 1 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 2 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 3 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 4 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 5 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 6 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 7 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 8 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 67, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 34, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 9 */
-        array(19, 20, 21, 24, 25, 30, 34, 35, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 66, 79,),
         /* 10 */
-        array(19, 20, 21, 24, 25, 30, 34, 35, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 34, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 11 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 12 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 13 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 14 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 15 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 16 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 17 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 18 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 19 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 20 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 21 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 22 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 23 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 24 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 25 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 26 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 27 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 28 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 29 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 30 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 31 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 32 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 33 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 34 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 35 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 36 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 37 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 38 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 39 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 40 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 41 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 42 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 43 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 44 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 45 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 66, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
         /* 46 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
         /* 47 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
         /* 48 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
         /* 49 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
         /* 50 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
         /* 51 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
         /* 52 */
-        array(19, 20, 21, 24, 25, 30, 34, 36, 38, 40, 43, 58, 59, 60, 61, 62, 65, 80,),
+        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
         /* 53 */
-        array(1, 3, 31, 37, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 3, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 54 */
-        array(1, 29, 31, 37, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 28, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 55 */
-        array(1, 31, 37, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 56 */
-        array(1, 31, 37, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 57 */
-        array(1, 31, 37, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 58 */
-        array(1, 31, 37, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 59 */
-        array(1, 31, 37, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 60 */
-        array(1, 3, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 61 */
-        array(1, 26, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 80,),
         /* 62 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 81,),
+        array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 63 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 64 */
-        array(1, 3, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 65 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 66 */
-        array(1, 3, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 2, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 67 */
-        array(1, 32, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 25, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 68 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 69 */
-        array(1, 2, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 31, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 70 */
-        array(1, 3, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 71 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 72 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 73 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 74 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 75 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 76 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 77 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 78 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 79 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 80 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 81 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 82 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 83 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 84 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 85 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 86 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 87 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 88 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 89 */
-        array(1, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 90 */
-        array(42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 91 */
-        array(42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
+        array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
         /* 92 */
-        array(1, 3, 23, 31, 37, 40, 63,),
+        array(1, 3, 22, 30, 36, 39, 62,),
         /* 93 */
-        array(1, 3, 31, 37, 56,),
+        array(1, 3, 30, 36, 55,),
         /* 94 */
-        array(1, 31, 37,),
+        array(1, 30, 36,),
         /* 95 */
-        array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 19, 24, 25, 30, 34, 36,),
+        array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 23, 24, 29, 33, 35,),
         /* 96 */
-        array(12, 19, 24, 25, 30, 34, 36, 80, 81, 82,),
+        array(11, 18, 23, 24, 29, 33, 35, 79, 80, 81,),
         /* 97 */
-        array(19, 21, 31, 33, 37,),
+        array(18, 20, 30, 32, 36,),
         /* 98 */
-        array(19, 21, 31, 33, 37,),
+        array(18, 20, 30, 32, 36,),
         /* 99 */
-        array(19, 21, 31, 37,),
+        array(18, 20, 30, 36,),
         /* 100 */
-        array(1, 3, 31, 37,),
+        array(18, 20, 30, 36,),
         /* 101 */
-        array(19, 21, 31, 37,),
+        array(1, 3, 30, 36,),
         /* 102 */
-        array(1, 3, 31, 37,),
+        array(1, 3, 30, 36,),
         /* 103 */
-        array(1, 31, 37,),
+        array(1, 30, 36,),
         /* 104 */
-        array(1, 31, 37,),
+        array(1, 30, 36,),
         /* 105 */
-        array(20, 21, 65,),
+        array(19, 20, 64,),
         /* 106 */
-        array(23, 61, 66,),
+        array(22, 60, 65,),
         /* 107 */
-        array(20, 40,),
-        /* 108 */
         array(1, 2,),
+        /* 108 */
+        array(19, 39,),
         /* 109 */
-        array(12, 19, 24, 25, 30, 34, 36, 80, 81, 82,),
+        array(11, 18, 23, 24, 29, 33, 35, 79, 80, 81,),
         /* 110 */
-        array(5, 6, 8, 9, 10, 16, 17, 18,),
+        array(1, 3, 30, 31, 36, 55,),
         /* 111 */
-        array(1, 3, 31, 32, 37, 56,),
+        array(1, 3, 30, 36, 55,),
         /* 112 */
-        array(1, 3, 31, 37, 56,),
+        array(1, 3, 30, 36, 55,),
         /* 113 */
-        array(1, 3, 31, 37, 56,),
+        array(18, 20, 21, 26,),
         /* 114 */
-        array(19, 21, 22, 64,),
+        array(18, 20, 21, 63,),
         /* 115 */
-        array(19, 21, 22, 27,),
+        array(15, 16, 17,),
         /* 116 */
-        array(19, 21, 22,),
+        array(21, 22, 62,),
         /* 117 */
-        array(19, 21, 64,),
+        array(21, 22, 62,),
         /* 118 */
-        array(22, 23, 63,),
+        array(1, 3, 55,),
         /* 119 */
-        array(1, 33, 56,),
+        array(18, 20, 63,),
         /* 120 */
-        array(22, 23, 63,),
+        array(18, 20, 21,),
         /* 121 */
-        array(1, 3, 56,),
+        array(1, 32, 55,),
         /* 122 */
-        array(19, 21,),
+        array(18, 20,),
         /* 123 */
-        array(31, 37,),
+        array(18, 20,),
         /* 124 */
-        array(20, 21,),
+        array(1, 22,),
         /* 125 */
-        array(19, 21,),
+        array(18, 20,),
         /* 126 */
-        array(19, 21,),
+        array(18, 20,),
         /* 127 */
-        array(23, 63,),
+        array(19, 20,),
         /* 128 */
-        array(20, 40,),
+        array(22, 62,),
         /* 129 */
-        array(19, 21,),
+        array(18, 20,),
         /* 130 */
-        array(19, 21,),
+        array(19, 39,),
         /* 131 */
-        array(19, 21,),
+        array(18, 20,),
         /* 132 */
-        array(19, 21,),
+        array(19, 39,),
         /* 133 */
-        array(1, 23,),
+        array(1, 55,),
         /* 134 */
-        array(19, 21,),
+        array(19, 20,),
         /* 135 */
-        array(19, 21,),
+        array(18, 20,),
         /* 136 */
-        array(31, 37,),
+        array(18, 20,),
         /* 137 */
-        array(19, 21,),
+        array(30, 36,),
         /* 138 */
-        array(20, 21,),
+        array(18, 20,),
         /* 139 */
-        array(20, 40,),
+        array(30, 36,),
         /* 140 */
-        array(19, 21,),
+        array(30, 36,),
         /* 141 */
-        array(19, 21,),
+        array(18, 20,),
         /* 142 */
-        array(19, 21,),
+        array(18, 20,),
         /* 143 */
-        array(31, 37,),
+        array(18, 20,),
         /* 144 */
-        array(1, 56,),
+        array(18, 20,),
         /* 145 */
-        array(19, 21,),
+        array(18, 20,),
         /* 146 */
         array(1,),
         /* 147 */
-        array(1,),
+        array(22,),
         /* 148 */
         array(1,),
         /* 149 */
         array(1,),
         /* 150 */
-        array(1,),
+        array(22,),
         /* 151 */
         array(1,),
         /* 152 */
         array(1,),
         /* 153 */
-        array(23,),
+        array(1,),
         /* 154 */
         array(1,),
         /* 155 */
-        array(23,),
+        array(1,),
         /* 156 */
         array(1,),
         /* 157 */
         array(),
         /* 158 */
-        array(19, 20, 21,),
+        array(18, 20, 63,),
         /* 159 */
-        array(19, 21, 64,),
+        array(18, 19, 20,),
         /* 160 */
-        array(31, 37,),
+        array(30, 36,),
         /* 161 */
-        array(31, 37,),
+        array(30, 36,),
         /* 162 */
-        array(31, 37,),
+        array(30, 36,),
         /* 163 */
-        array(31, 37,),
+        array(30, 36,),
         /* 164 */
-        array(31, 37,),
+        array(30, 36,),
         /* 165 */
-        array(31, 37,),
+        array(30, 36,),
         /* 166 */
-        array(31, 37,),
+        array(30, 36,),
         /* 167 */
-        array(31, 37,),
+        array(30, 36,),
         /* 168 */
-        array(31, 37,),
+        array(60, 65,),
         /* 169 */
-        array(61, 66,),
+        array(60, 65,),
         /* 170 */
-        array(31, 37,),
+        array(60, 65,),
         /* 171 */
-        array(61, 66,),
+        array(60, 65,),
         /* 172 */
-        array(61, 66,),
+        array(60, 65,),
         /* 173 */
-        array(31, 37,),
+        array(30, 36,),
         /* 174 */
-        array(61, 66,),
+        array(30, 36,),
         /* 175 */
-        array(31, 37,),
+        array(30, 36,),
         /* 176 */
-        array(31, 37,),
+        array(30, 36,),
         /* 177 */
-        array(31, 37,),
+        array(30, 36,),
         /* 178 */
-        array(61, 66,),
+        array(30, 36,),
         /* 179 */
-        array(61, 66,),
+        array(60, 65,),
         /* 180 */
-        array(61, 66,),
+        array(60, 65,),
         /* 181 */
-        array(31, 37,),
+        array(60, 65,),
         /* 182 */
-        array(61, 66,),
+        array(18, 39,),
         /* 183 */
-        array(31, 37,),
+        array(30, 36,),
         /* 184 */
-        array(61, 66,),
+        array(30, 36,),
         /* 185 */
-        array(19, 40,),
+        array(30, 36,),
         /* 186 */
-        array(31, 37,),
+        array(60, 65,),
         /* 187 */
-        array(31, 37,),
+        array(30, 36,),
         /* 188 */
-        array(31, 37,),
+        array(30, 36,),
         /* 189 */
-        array(31, 37,),
+        array(30, 36,),
         /* 190 */
-        array(31,),
+        array(16,),
         /* 191 */
-        array(1,),
+        array(22,),
         /* 192 */
-        array(31,),
+        array(22,),
         /* 193 */
-        array(2,),
+        array(1,),
         /* 194 */
-        array(1,),
+        array(30,),
         /* 195 */
-        array(1,),
+        array(30,),
         /* 196 */
-        array(17,),
-        /* 197 */
-        array(1,),
-        /* 198 */
-        array(40,),
-        /* 199 */
         array(2,),
+        /* 197 */
+        array(22,),
+        /* 198 */
+        array(1,),
+        /* 199 */
+        array(39,),
         /* 200 */
-        array(23,),
+        array(1,),
         /* 201 */
         array(1,),
         /* 202 */
-        array(23,),
+        array(2,),
         /* 203 */
-        array(23,),
+        array(1,),
         /* 204 */
         array(),
         /* 205 */
@@ -1692,107 +1772,107 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         /* 208 */
         array(),
         /* 209 */
-        array(3, 26, 28, 29, 31, 32, 37, 39, 40, 41, 56, 63, 67, 81,),
+        array(3, 25, 27, 28, 30, 31, 36, 38, 39, 40, 55, 62, 66, 80,),
         /* 210 */
-        array(3, 22, 31, 37, 40, 63,),
+        array(3, 21, 30, 36, 39, 62,),
         /* 211 */
-        array(19, 20, 21, 38,),
+        array(39, 60, 62, 66,),
         /* 212 */
-        array(40, 61, 63, 67,),
+        array(18, 19, 20, 37,),
         /* 213 */
-        array(33, 40, 63,),
+        array(32, 39, 62,),
         /* 214 */
-        array(40, 63,),
+        array(26, 80,),
         /* 215 */
-        array(27, 81,),
+        array(38, 40,),
         /* 216 */
-        array(21, 64,),
+        array(38, 66,),
         /* 217 */
-        array(39, 41,),
+        array(38, 40,),
         /* 218 */
-        array(39, 41,),
+        array(25, 38,),
         /* 219 */
-        array(39, 67,),
+        array(21, 60,),
         /* 220 */
-        array(2, 22,),
+        array(3, 26,),
         /* 221 */
-        array(40, 63,),
+        array(38, 40,),
         /* 222 */
-        array(3, 27,),
+        array(39, 62,),
         /* 223 */
-        array(26, 39,),
+        array(2, 21,),
         /* 224 */
-        array(39, 41,),
+        array(39, 62,),
         /* 225 */
-        array(22, 61,),
+        array(20, 63,),
         /* 226 */
-        array(40,),
+        array(20,),
         /* 227 */
-        array(65,),
+        array(3,),
         /* 228 */
-        array(3,),
+        array(20,),
         /* 229 */
-        array(21,),
+        array(20,),
         /* 230 */
-        array(41,),
+        array(20,),
         /* 231 */
-        array(65,),
+        array(2,),
         /* 232 */
-        array(21,),
+        array(19,),
         /* 233 */
-        array(3,),
+        array(20,),
         /* 234 */
-        array(21,),
+        array(19,),
         /* 235 */
-        array(21,),
+        array(3,),
         /* 236 */
         array(20,),
         /* 237 */
-        array(20,),
+        array(37,),
         /* 238 */
-        array(3,),
+        array(37,),
         /* 239 */
-        array(20,),
+        array(66,),
         /* 240 */
         array(20,),
         /* 241 */
-        array(2,),
-        /* 242 */
-        array(57,),
-        /* 243 */
-        array(38,),
-        /* 244 */
-        array(21,),
-        /* 245 */
-        array(38,),
-        /* 246 */
-        array(2,),
-        /* 247 */
-        array(21,),
-        /* 248 */
-        array(21,),
-        /* 249 */
-        array(21,),
-        /* 250 */
-        array(67,),
-        /* 251 */
-        array(21,),
-        /* 252 */
-        array(61,),
-        /* 253 */
-        array(40,),
-        /* 254 */
-        array(22,),
-        /* 255 */
-        array(28,),
-        /* 256 */
-        array(21,),
-        /* 257 */
-        array(27,),
-        /* 258 */
-        array(21,),
-        /* 259 */
         array(20,),
+        /* 242 */
+        array(3,),
+        /* 243 */
+        array(56,),
+        /* 244 */
+        array(39,),
+        /* 245 */
+        array(2,),
+        /* 246 */
+        array(60,),
+        /* 247 */
+        array(39,),
+        /* 248 */
+        array(19,),
+        /* 249 */
+        array(40,),
+        /* 250 */
+        array(20,),
+        /* 251 */
+        array(26,),
+        /* 252 */
+        array(19,),
+        /* 253 */
+        array(64,),
+        /* 254 */
+        array(20,),
+        /* 255 */
+        array(19,),
+        /* 256 */
+        array(20,),
+        /* 257 */
+        array(64,),
+        /* 258 */
+        array(27,),
+        /* 259 */
+        array(21,),
         /* 260 */
         array(),
         /* 261 */
@@ -1989,100 +2069,86 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         array(),
         /* 357 */
         array(),
-        /* 358 */
-        array(),
-        /* 359 */
-        array(),
-        /* 360 */
-        array(),
-        /* 361 */
-        array(),
-        /* 362 */
-        array(),
-        /* 363 */
-        array(),
     );
     static public $yy_default = array(
         /*     0 */
-        367, 553, 570, 524, 570, 570, 524, 524, 570, 570,
+        361, 541, 558, 558, 512, 558, 512, 512, 558, 558,
         /*    10 */
-        570, 570, 570, 570, 570, 570, 570, 570, 570, 570,
+        558, 558, 558, 558, 558, 558, 558, 558, 558, 558,
         /*    20 */
-        570, 570, 570, 570, 570, 570, 570, 570, 570, 570,
+        558, 558, 558, 558, 558, 558, 558, 558, 558, 558,
         /*    30 */
-        570, 570, 570, 570, 570, 570, 570, 570, 570, 570,
+        558, 558, 558, 558, 558, 558, 558, 558, 558, 558,
         /*    40 */
-        570, 570, 570, 570, 570, 570, 570, 570, 570, 570,
+        558, 558, 558, 558, 558, 558, 558, 558, 558, 558,
         /*    50 */
-        570, 570, 570, 570, 430, 430, 407, 399, 430, 430,
+        558, 558, 558, 558, 418, 418, 418, 418, 387, 395,
         /*    60 */
-        570, 570, 570, 570, 570, 570, 570, 435, 570, 570,
+        558, 558, 558, 558, 558, 558, 558, 558, 558, 423,
         /*    70 */
-        570, 437, 451, 441, 432, 464, 454, 455, 459, 460,
+        558, 428, 425, 510, 423, 429, 511, 543, 444, 542,
         /*    80 */
-        456, 463, 412, 554, 556, 435, 523, 555, 440, 522,
+        447, 448, 443, 442, 439, 452, 544, 420, 451, 400,
         /*    90 */
-        467, 468, 479, 443, 430, 364, 570, 430, 430, 430,
+        456, 455, 467, 431, 418, 358, 558, 418, 418, 418,
         /*   100 */
-        487, 430, 450, 430, 430, 570, 536, 570, 421, 570,
+        418, 438, 475, 418, 418, 558, 524, 409, 558, 558,
         /*   110 */
-        570, 443, 443, 443, 497, 570, 497, 497, 488, 443,
+        431, 431, 431, 558, 485, 558, 476, 476, 431, 485,
         /*   120 */
-        488, 443, 570, 430, 570, 570, 570, 488, 570, 570,
+        485, 431, 558, 558, 412, 558, 485, 558, 476, 558,
         /*   130 */
-        570, 497, 570, 424, 570, 570, 430, 570, 570, 570,
+        558, 558, 558, 431, 558, 558, 558, 397, 558, 418,
         /*   140 */
-        570, 570, 570, 409, 443, 570, 453, 466, 472, 471,
+        418, 558, 558, 558, 558, 558, 441, 476, 414, 434,
         /*   150 */
-        470, 426, 446, 533, 447, 488, 448, 531, 570, 498,
+        521, 436, 435, 460, 459, 458, 454, 519, 486, 558,
         /*   160 */
-        402, 404, 406, 401, 405, 397, 415, 408, 410, 494,
+        385, 384, 405, 404, 389, 406, 399, 388, 505, 483,
         /*   170 */
-        400, 493, 517, 411, 515, 416, 417, 418, 492, 491,
+        482, 481, 480, 407, 408, 383, 398, 403, 402, 504,
         /*   180 */
-        516, 395, 495, 396, 514, 497, 420, 414, 419, 394,
+        479, 502, 485, 393, 392, 390, 503, 382, 396, 394,
         /*   190 */
-        569, 425, 569, 525, 422, 487, 385, 427, 497, 526,
+        378, 525, 522, 475, 557, 557, 513, 499, 438, 485,
         /*   200 */
-        534, 450, 511, 537, 530, 497, 530, 530, 497, 445,
+        413, 410, 514, 415, 518, 485, 518, 485, 518, 433,
         /*   210 */
-        479, 570, 479, 479, 479, 469, 570, 570, 570, 570,
+        467, 467, 558, 467, 457, 558, 558, 558, 558, 463,
         /*   220 */
-        509, 465, 469, 570, 570, 475, 509, 570, 570, 570,
+        457, 558, 453, 497, 467, 558, 558, 558, 558, 558,
         /*   230 */
-        570, 570, 570, 570, 570, 570, 570, 570, 570, 570,
+        558, 497, 558, 558, 558, 558, 558, 465, 558, 558,
         /*   240 */
-        570, 509, 481, 570, 570, 477, 509, 570, 570, 570,
+        558, 558, 558, 469, 497, 497, 463, 523, 558, 558,
         /*   250 */
-        570, 570, 475, 535, 570, 438, 570, 469, 570, 570,
+        558, 457, 558, 558, 558, 558, 558, 558, 426, 558,
         /*   260 */
-        481, 431, 506, 502, 519, 365, 413, 532, 439, 504,
+        477, 520, 495, 507, 490, 508, 487, 374, 498, 484,
         /*   270 */
-        505, 520, 568, 503, 510, 518, 521, 442, 461, 429,
+        556, 364, 363, 365, 461, 366, 472, 466, 360, 359,
         /*   280 */
-        508, 509, 529, 428, 392, 389, 390, 391, 527, 528,
+        462, 362, 464, 367, 430, 401, 469, 372, 373, 419,
         /*   290 */
-        444, 445, 489, 496, 484, 478, 473, 474, 476, 388,
+        432, 427, 368, 369, 370, 371, 433, 470, 445, 497,
         /*   300 */
-        387, 372, 373, 374, 375, 371, 370, 366, 368, 369,
+        446, 496, 450, 449, 500, 517, 545, 474, 552, 411,
         /*   310 */
-        376, 377, 383, 384, 386, 382, 381, 378, 379, 380,
+        501, 478, 553, 526, 534, 533, 535, 536, 437, 537,
         /*   320 */
-        499, 507, 565, 512, 423, 564, 449, 549, 546, 547,
+        532, 417, 528, 527, 529, 530, 531, 546, 547, 515,
         /*   330 */
-        548, 557, 558, 567, 560, 550, 552, 566, 563, 559,
+        506, 375, 376, 509, 377, 516, 468, 494, 489, 492,
         /*   340 */
-        562, 561, 545, 544, 485, 452, 486, 490, 483, 482,
+        491, 493, 379, 380, 555, 548, 554, 551, 550, 549,
         /*   350 */
-        500, 501, 480, 513, 457, 541, 542, 543, 540, 539,
-        /*   360 */
-        458, 462, 538, 551,
+        440, 416, 473, 471, 539, 540, 538, 488,
     );
-    const YYNOCODE = 126;
+    const YYNOCODE = 125;
     const YYSTACKDEPTH = 500;
-    const YYNSTATE = 364;
-    const YYNRULE = 206;
-    const YYERRORSYMBOL = 83;
+    const YYNSTATE = 358;
+    const YYNRULE = 200;
+    const YYERRORSYMBOL = 82;
     const YYERRSYMDT = 'yy0';
     const YYFALLBACK = 0;
     public static $yyFallback = array();
@@ -2113,36 +2179,35 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
     public $yyTokenName = array(
         '$', 'VERT', 'COLON', 'RDEL',
         'COMMENT', 'PHPSTARTTAG', 'PHPENDTAG', 'PHPENDSCRIPT',
-        'ASPSTARTTAG', 'ASPENDTAG', 'FAKEPHPSTARTTAG', 'XMLTAG',
-        'TEXT', 'STRIPON', 'STRIPOFF', 'BLOCKSOURCE',
-        'LITERALSTART', 'LITERALEND', 'LITERAL', 'LDEL',
-        'DOLLAR', 'ID', 'EQUAL', 'PTR',
-        'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC',
-        'TO', 'STEP', 'LDELFOREACH', 'SPACE',
-        'AS', 'APTR', 'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT',
-        'LDELSLASH', 'ATTR', 'INTEGER', 'COMMA',
-        'OPENP', 'CLOSEP', 'MATH', 'UNIMATH',
-        'ANDSYM', 'ISIN', 'ISDIVBY', 'ISNOTDIVBY',
-        'ISEVEN', 'ISNOTEVEN', 'ISEVENBY', 'ISNOTEVENBY',
-        'ISODD', 'ISNOTODD', 'ISODDBY', 'ISNOTODDBY',
-        'INSTANCEOF', 'QMARK', 'NOT', 'TYPECAST',
-        'HEX', 'DOT', 'SINGLEQUOTESTRING', 'DOUBLECOLON',
-        'AT', 'HATCH', 'OPENB', 'CLOSEB',
-        'EQUALS', 'NOTEQUALS', 'GREATERTHAN', 'LESSTHAN',
-        'GREATEREQUAL', 'LESSEQUAL', 'IDENTITY', 'NONEIDENTITY',
-        'MOD', 'LAND', 'LOR', 'LXOR',
-        'QUOTE', 'BACKTICK', 'DOLLARID', 'error',
-        'start', 'template', 'template_element', 'smartytag',
-        'literal', 'literal_elements', 'literal_element', 'value',
-        'modifierlist', 'attributes', 'expr', 'varindexed',
-        'statement', 'statements', 'optspace', 'varvar',
-        'foraction', 'modparameters', 'attribute', 'ternary',
-        'array', 'ifcond', 'lop', 'variable',
-        'function', 'doublequoted_with_quotes', 'static_class_access', 'object',
-        'arrayindex', 'indexdef', 'varvarele', 'objectchain',
-        'objectelement', 'method', 'params', 'modifier',
-        'modparameter', 'arrayelements', 'arrayelement', 'doublequoted',
-        'doublequotedcontent',
+        'ASPSTARTTAG', 'ASPENDTAG', 'XMLTAG', 'TEXT',
+        'STRIPON', 'STRIPOFF', 'BLOCKSOURCE', 'LITERALSTART',
+        'LITERALEND', 'LITERAL', 'LDEL', 'DOLLAR',
+        'ID', 'EQUAL', 'PTR', 'LDELIF',
+        'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO',
+        'STEP', 'LDELFOREACH', 'SPACE', 'AS',
+        'APTR', 'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT', 'LDELSLASH',
+        'ATTR', 'INTEGER', 'COMMA', 'OPENP',
+        'CLOSEP', 'MATH', 'UNIMATH', 'ANDSYM',
+        'ISIN', 'ISDIVBY', 'ISNOTDIVBY', 'ISEVEN',
+        'ISNOTEVEN', 'ISEVENBY', 'ISNOTEVENBY', 'ISODD',
+        'ISNOTODD', 'ISODDBY', 'ISNOTODDBY', 'INSTANCEOF',
+        'QMARK', 'NOT', 'TYPECAST', 'HEX',
+        'DOT', 'SINGLEQUOTESTRING', 'DOUBLECOLON', 'AT',
+        'HATCH', 'OPENB', 'CLOSEB', 'EQUALS',
+        'NOTEQUALS', 'GREATERTHAN', 'LESSTHAN', 'GREATEREQUAL',
+        'LESSEQUAL', 'IDENTITY', 'NONEIDENTITY', 'MOD',
+        'LAND', 'LOR', 'LXOR', 'QUOTE',
+        'BACKTICK', 'DOLLARID', 'error', 'start',
+        'template', 'template_element', 'smartytag', 'literal',
+        'literal_elements', 'literal_element', 'value', 'modifierlist',
+        'attributes', 'expr', 'varindexed', 'statement',
+        'statements', 'optspace', 'varvar', 'foraction',
+        'modparameters', 'attribute', 'ternary', 'array',
+        'ifcond', 'lop', 'variable', 'function',
+        'doublequoted_with_quotes', 'static_class_access', 'object', 'arrayindex',
+        'indexdef', 'varvarele', 'objectchain', 'objectelement',
+        'method', 'params', 'modifier', 'modparameter',
+        'arrayelements', 'arrayelement', 'doublequoted', 'doublequotedcontent',
     );
 
     public static $yyRuleName = array(
@@ -2171,392 +2236,380 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         /*  11 */
         "template_element ::= ASPENDTAG",
         /*  12 */
-        "template_element ::= FAKEPHPSTARTTAG",
-        /*  13 */
         "template_element ::= XMLTAG",
-        /*  14 */
+        /*  13 */
         "template_element ::= TEXT",
-        /*  15 */
+        /*  14 */
         "template_element ::= STRIPON",
-        /*  16 */
+        /*  15 */
         "template_element ::= STRIPOFF",
-        /*  17 */
+        /*  16 */
         "template_element ::= BLOCKSOURCE",
-        /*  18 */
+        /*  17 */
         "literal ::= LITERALSTART LITERALEND",
-        /*  19 */
+        /*  18 */
         "literal ::= LITERALSTART literal_elements LITERALEND",
-        /*  20 */
+        /*  19 */
         "literal_elements ::= literal_elements literal_element",
-        /*  21 */
+        /*  20 */
         "literal_elements ::=",
-        /*  22 */
+        /*  21 */
         "literal_element ::= literal",
-        /*  23 */
+        /*  22 */
         "literal_element ::= LITERAL",
-        /*  24 */
-        "literal_element ::= PHPSTARTTAG",
-        /*  25 */
-        "literal_element ::= FAKEPHPSTARTTAG",
-        /*  26 */
-        "literal_element ::= PHPENDTAG",
-        /*  27 */
-        "literal_element ::= ASPSTARTTAG",
-        /*  28 */
-        "literal_element ::= ASPENDTAG",
-        /*  29 */
+        /*  23 */
         "smartytag ::= LDEL value",
-        /*  30 */
+        /*  24 */
         "smartytag ::= LDEL value modifierlist attributes",
-        /*  31 */
+        /*  25 */
         "smartytag ::= LDEL value attributes",
-        /*  32 */
+        /*  26 */
         "smartytag ::= LDEL expr modifierlist attributes",
-        /*  33 */
+        /*  27 */
         "smartytag ::= LDEL expr attributes",
-        /*  34 */
+        /*  28 */
         "smartytag ::= LDEL DOLLAR ID EQUAL value",
-        /*  35 */
+        /*  29 */
         "smartytag ::= LDEL DOLLAR ID EQUAL expr",
-        /*  36 */
+        /*  30 */
         "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes",
-        /*  37 */
+        /*  31 */
         "smartytag ::= LDEL varindexed EQUAL expr attributes",
-        /*  38 */
+        /*  32 */
         "smartytag ::= LDEL ID attributes",
-        /*  39 */
+        /*  33 */
         "smartytag ::= LDEL ID",
-        /*  40 */
+        /*  34 */
         "smartytag ::= LDEL ID PTR ID attributes",
-        /*  41 */
+        /*  35 */
         "smartytag ::= LDEL ID modifierlist attributes",
-        /*  42 */
+        /*  36 */
         "smartytag ::= LDEL ID PTR ID modifierlist attributes",
-        /*  43 */
+        /*  37 */
         "smartytag ::= LDELIF expr",
-        /*  44 */
+        /*  38 */
         "smartytag ::= LDELIF expr attributes",
-        /*  45 */
+        /*  39 */
         "smartytag ::= LDELIF statement",
-        /*  46 */
+        /*  40 */
         "smartytag ::= LDELIF statement attributes",
-        /*  47 */
+        /*  41 */
         "smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes",
-        /*  48 */
+        /*  42 */
         "foraction ::= EQUAL expr",
-        /*  49 */
+        /*  43 */
         "foraction ::= INCDEC",
-        /*  50 */
+        /*  44 */
         "smartytag ::= LDELFOR statement TO expr attributes",
-        /*  51 */
+        /*  45 */
         "smartytag ::= LDELFOR statement TO expr STEP expr attributes",
-        /*  52 */
+        /*  46 */
         "smartytag ::= LDELFOREACH attributes",
-        /*  53 */
+        /*  47 */
         "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes",
-        /*  54 */
+        /*  48 */
         "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes",
-        /*  55 */
+        /*  49 */
         "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes",
-        /*  56 */
+        /*  50 */
         "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes",
-        /*  57 */
+        /*  51 */
         "smartytag ::= LDELSETFILTER ID modparameters",
-        /*  58 */
+        /*  52 */
         "smartytag ::= LDELSETFILTER ID modparameters modifierlist",
-        /*  59 */
+        /*  53 */
         "smartytag ::= LDEL SMARTYBLOCKCHILDPARENT",
-        /*  60 */
+        /*  54 */
         "smartytag ::= LDELSLASH ID",
-        /*  61 */
+        /*  55 */
         "smartytag ::= LDELSLASH ID modifierlist",
-        /*  62 */
+        /*  56 */
         "smartytag ::= LDELSLASH ID PTR ID",
-        /*  63 */
+        /*  57 */
         "smartytag ::= LDELSLASH ID PTR ID modifierlist",
-        /*  64 */
+        /*  58 */
         "attributes ::= attributes attribute",
-        /*  65 */
+        /*  59 */
         "attributes ::= attribute",
-        /*  66 */
+        /*  60 */
         "attributes ::=",
-        /*  67 */
+        /*  61 */
         "attribute ::= SPACE ID EQUAL ID",
-        /*  68 */
+        /*  62 */
         "attribute ::= ATTR expr",
-        /*  69 */
+        /*  63 */
         "attribute ::= ATTR value",
-        /*  70 */
+        /*  64 */
         "attribute ::= SPACE ID",
-        /*  71 */
+        /*  65 */
         "attribute ::= SPACE expr",
-        /*  72 */
+        /*  66 */
         "attribute ::= SPACE value",
-        /*  73 */
+        /*  67 */
         "attribute ::= SPACE INTEGER EQUAL expr",
-        /*  74 */
+        /*  68 */
         "statements ::= statement",
-        /*  75 */
+        /*  69 */
         "statements ::= statements COMMA statement",
-        /*  76 */
+        /*  70 */
         "statement ::= DOLLAR varvar EQUAL expr",
-        /*  77 */
+        /*  71 */
         "statement ::= varindexed EQUAL expr",
-        /*  78 */
+        /*  72 */
         "statement ::= OPENP statement CLOSEP",
-        /*  79 */
+        /*  73 */
         "expr ::= value",
-        /*  80 */
+        /*  74 */
         "expr ::= ternary",
-        /*  81 */
+        /*  75 */
         "expr ::= DOLLAR ID COLON ID",
-        /*  82 */
+        /*  76 */
         "expr ::= expr MATH value",
-        /*  83 */
+        /*  77 */
         "expr ::= expr UNIMATH value",
-        /*  84 */
+        /*  78 */
         "expr ::= expr ANDSYM value",
-        /*  85 */
+        /*  79 */
         "expr ::= array",
-        /*  86 */
+        /*  80 */
         "expr ::= expr modifierlist",
-        /*  87 */
+        /*  81 */
         "expr ::= expr ifcond expr",
-        /*  88 */
+        /*  82 */
         "expr ::= expr ISIN array",
-        /*  89 */
+        /*  83 */
         "expr ::= expr ISIN value",
-        /*  90 */
+        /*  84 */
         "expr ::= expr lop expr",
-        /*  91 */
+        /*  85 */
         "expr ::= expr ISDIVBY expr",
-        /*  92 */
+        /*  86 */
         "expr ::= expr ISNOTDIVBY expr",
-        /*  93 */
+        /*  87 */
         "expr ::= expr ISEVEN",
-        /*  94 */
+        /*  88 */
         "expr ::= expr ISNOTEVEN",
-        /*  95 */
+        /*  89 */
         "expr ::= expr ISEVENBY expr",
-        /*  96 */
+        /*  90 */
         "expr ::= expr ISNOTEVENBY expr",
-        /*  97 */
+        /*  91 */
         "expr ::= expr ISODD",
-        /*  98 */
+        /*  92 */
         "expr ::= expr ISNOTODD",
-        /*  99 */
+        /*  93 */
         "expr ::= expr ISODDBY expr",
-        /* 100 */
+        /*  94 */
         "expr ::= expr ISNOTODDBY expr",
-        /* 101 */
+        /*  95 */
         "expr ::= value INSTANCEOF ID",
-        /* 102 */
+        /*  96 */
         "expr ::= value INSTANCEOF value",
-        /* 103 */
+        /*  97 */
         "ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr",
-        /* 104 */
+        /*  98 */
         "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
-        /* 105 */
+        /*  99 */
         "value ::= variable",
-        /* 106 */
+        /* 100 */
         "value ::= UNIMATH value",
-        /* 107 */
+        /* 101 */
         "value ::= NOT value",
-        /* 108 */
+        /* 102 */
         "value ::= TYPECAST value",
-        /* 109 */
+        /* 103 */
         "value ::= variable INCDEC",
-        /* 110 */
+        /* 104 */
         "value ::= HEX",
-        /* 111 */
+        /* 105 */
         "value ::= INTEGER",
-        /* 112 */
+        /* 106 */
         "value ::= INTEGER DOT INTEGER",
-        /* 113 */
+        /* 107 */
         "value ::= INTEGER DOT",
-        /* 114 */
+        /* 108 */
         "value ::= DOT INTEGER",
-        /* 115 */
+        /* 109 */
         "value ::= ID",
-        /* 116 */
+        /* 110 */
         "value ::= function",
-        /* 117 */
+        /* 111 */
         "value ::= OPENP expr CLOSEP",
-        /* 118 */
+        /* 112 */
         "value ::= SINGLEQUOTESTRING",
-        /* 119 */
+        /* 113 */
         "value ::= doublequoted_with_quotes",
-        /* 120 */
+        /* 114 */
         "value ::= ID DOUBLECOLON static_class_access",
-        /* 121 */
+        /* 115 */
         "value ::= varindexed DOUBLECOLON static_class_access",
-        /* 122 */
+        /* 116 */
         "value ::= smartytag RDEL",
-        /* 123 */
+        /* 117 */
         "value ::= value modifierlist",
-        /* 124 */
+        /* 118 */
         "variable ::= varindexed",
-        /* 125 */
+        /* 119 */
         "variable ::= DOLLAR varvar AT ID",
-        /* 126 */
+        /* 120 */
         "variable ::= object",
-        /* 127 */
+        /* 121 */
         "variable ::= HATCH ID HATCH",
-        /* 128 */
+        /* 122 */
         "variable ::= HATCH ID HATCH arrayindex",
-        /* 129 */
+        /* 123 */
         "variable ::= HATCH variable HATCH",
-        /* 130 */
+        /* 124 */
         "variable ::= HATCH variable HATCH arrayindex",
-        /* 131 */
+        /* 125 */
         "varindexed ::= DOLLAR varvar arrayindex",
-        /* 132 */
+        /* 126 */
         "arrayindex ::= arrayindex indexdef",
-        /* 133 */
+        /* 127 */
         "arrayindex ::=",
-        /* 134 */
+        /* 128 */
         "indexdef ::= DOT DOLLAR varvar",
-        /* 135 */
+        /* 129 */
         "indexdef ::= DOT DOLLAR varvar AT ID",
-        /* 136 */
+        /* 130 */
         "indexdef ::= DOT ID",
-        /* 137 */
+        /* 131 */
         "indexdef ::= DOT INTEGER",
-        /* 138 */
+        /* 132 */
         "indexdef ::= DOT LDEL expr RDEL",
-        /* 139 */
+        /* 133 */
         "indexdef ::= OPENB ID CLOSEB",
-        /* 140 */
+        /* 134 */
         "indexdef ::= OPENB ID DOT ID CLOSEB",
-        /* 141 */
+        /* 135 */
         "indexdef ::= OPENB expr CLOSEB",
-        /* 142 */
+        /* 136 */
         "indexdef ::= OPENB CLOSEB",
-        /* 143 */
+        /* 137 */
         "varvar ::= varvarele",
-        /* 144 */
+        /* 138 */
         "varvar ::= varvar varvarele",
-        /* 145 */
+        /* 139 */
         "varvarele ::= ID",
-        /* 146 */
+        /* 140 */
         "varvarele ::= LDEL expr RDEL",
-        /* 147 */
+        /* 141 */
         "object ::= varindexed objectchain",
-        /* 148 */
+        /* 142 */
         "objectchain ::= objectelement",
-        /* 149 */
+        /* 143 */
         "objectchain ::= objectchain objectelement",
-        /* 150 */
+        /* 144 */
         "objectelement ::= PTR ID arrayindex",
-        /* 151 */
+        /* 145 */
         "objectelement ::= PTR DOLLAR varvar arrayindex",
-        /* 152 */
+        /* 146 */
         "objectelement ::= PTR LDEL expr RDEL arrayindex",
-        /* 153 */
+        /* 147 */
         "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
-        /* 154 */
+        /* 148 */
         "objectelement ::= PTR method",
-        /* 155 */
+        /* 149 */
         "function ::= ID OPENP params CLOSEP",
-        /* 156 */
+        /* 150 */
         "method ::= ID OPENP params CLOSEP",
-        /* 157 */
+        /* 151 */
         "method ::= DOLLAR ID OPENP params CLOSEP",
-        /* 158 */
+        /* 152 */
         "params ::= params COMMA expr",
-        /* 159 */
+        /* 153 */
         "params ::= expr",
-        /* 160 */
+        /* 154 */
         "params ::=",
-        /* 161 */
+        /* 155 */
         "modifierlist ::= modifierlist modifier modparameters",
-        /* 162 */
+        /* 156 */
         "modifierlist ::= modifier modparameters",
-        /* 163 */
+        /* 157 */
         "modifier ::= VERT AT ID",
-        /* 164 */
+        /* 158 */
         "modifier ::= VERT ID",
-        /* 165 */
+        /* 159 */
         "modparameters ::= modparameters modparameter",
-        /* 166 */
+        /* 160 */
         "modparameters ::=",
-        /* 167 */
+        /* 161 */
         "modparameter ::= COLON value",
-        /* 168 */
+        /* 162 */
         "modparameter ::= COLON array",
-        /* 169 */
+        /* 163 */
         "static_class_access ::= method",
-        /* 170 */
+        /* 164 */
         "static_class_access ::= method objectchain",
-        /* 171 */
+        /* 165 */
         "static_class_access ::= ID",
-        /* 172 */
+        /* 166 */
         "static_class_access ::= DOLLAR ID arrayindex",
-        /* 173 */
+        /* 167 */
         "static_class_access ::= DOLLAR ID arrayindex objectchain",
-        /* 174 */
+        /* 168 */
         "ifcond ::= EQUALS",
-        /* 175 */
+        /* 169 */
         "ifcond ::= NOTEQUALS",
-        /* 176 */
+        /* 170 */
         "ifcond ::= GREATERTHAN",
-        /* 177 */
+        /* 171 */
         "ifcond ::= LESSTHAN",
-        /* 178 */
+        /* 172 */
         "ifcond ::= GREATEREQUAL",
-        /* 179 */
+        /* 173 */
         "ifcond ::= LESSEQUAL",
-        /* 180 */
+        /* 174 */
         "ifcond ::= IDENTITY",
-        /* 181 */
+        /* 175 */
         "ifcond ::= NONEIDENTITY",
-        /* 182 */
+        /* 176 */
         "ifcond ::= MOD",
-        /* 183 */
+        /* 177 */
         "lop ::= LAND",
-        /* 184 */
+        /* 178 */
         "lop ::= LOR",
-        /* 185 */
+        /* 179 */
         "lop ::= LXOR",
-        /* 186 */
+        /* 180 */
         "array ::= OPENB arrayelements CLOSEB",
-        /* 187 */
+        /* 181 */
         "arrayelements ::= arrayelement",
-        /* 188 */
+        /* 182 */
         "arrayelements ::= arrayelements COMMA arrayelement",
-        /* 189 */
+        /* 183 */
         "arrayelements ::=",
-        /* 190 */
+        /* 184 */
         "arrayelement ::= value APTR expr",
-        /* 191 */
+        /* 185 */
         "arrayelement ::= ID APTR expr",
-        /* 192 */
+        /* 186 */
         "arrayelement ::= expr",
-        /* 193 */
+        /* 187 */
         "doublequoted_with_quotes ::= QUOTE QUOTE",
-        /* 194 */
+        /* 188 */
         "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
-        /* 195 */
+        /* 189 */
         "doublequoted ::= doublequoted doublequotedcontent",
-        /* 196 */
+        /* 190 */
         "doublequoted ::= doublequotedcontent",
-        /* 197 */
+        /* 191 */
         "doublequotedcontent ::= BACKTICK variable BACKTICK",
-        /* 198 */
+        /* 192 */
         "doublequotedcontent ::= BACKTICK expr BACKTICK",
-        /* 199 */
+        /* 193 */
         "doublequotedcontent ::= DOLLARID",
-        /* 200 */
+        /* 194 */
         "doublequotedcontent ::= LDEL variable RDEL",
-        /* 201 */
+        /* 195 */
         "doublequotedcontent ::= LDEL expr RDEL",
-        /* 202 */
+        /* 196 */
         "doublequotedcontent ::= smartytag RDEL",
-        /* 203 */
+        /* 197 */
         "doublequotedcontent ::= TEXT",
-        /* 204 */
+        /* 198 */
         "optspace ::= SPACE",
-        /* 205 */
+        /* 199 */
         "optspace ::=",
     );
 
@@ -2825,11 +2878,11 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-            #line 91 "smarty_internal_templateparser.y"
+            #line 82 "smarty_internal_templateparser.y"
 
             $this->internalError = true;
             $this->compiler->trigger_template_error("Stack overflow in template parser");
-            #line 1699 "smarty_internal_templateparser.php"
+            #line 1721 "smarty_internal_templateparser.php"
 
             return;
         }
@@ -2851,218 +2904,212 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
     }
 
     public static $yyRuleInfo = array(
+        array('lhs' => 83, 'rhs' => 1),
         array('lhs' => 84, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 84, 'rhs' => 2),
+        array('lhs' => 84, 'rhs' => 0),
         array('lhs' => 85, 'rhs' => 2),
-        array('lhs' => 85, 'rhs' => 0),
-        array('lhs' => 86, 'rhs' => 2),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 85, 'rhs' => 1),
+        array('lhs' => 87, 'rhs' => 2),
+        array('lhs' => 87, 'rhs' => 3),
         array('lhs' => 88, 'rhs' => 2),
-        array('lhs' => 88, 'rhs' => 3),
-        array('lhs' => 89, 'rhs' => 2),
-        array('lhs' => 89, 'rhs' => 0),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 87, 'rhs' => 2),
-        array('lhs' => 87, 'rhs' => 4),
-        array('lhs' => 87, 'rhs' => 3),
-        array('lhs' => 87, 'rhs' => 4),
-        array('lhs' => 87, 'rhs' => 3),
-        array('lhs' => 87, 'rhs' => 5),
-        array('lhs' => 87, 'rhs' => 5),
-        array('lhs' => 87, 'rhs' => 6),
-        array('lhs' => 87, 'rhs' => 5),
-        array('lhs' => 87, 'rhs' => 3),
-        array('lhs' => 87, 'rhs' => 2),
-        array('lhs' => 87, 'rhs' => 5),
-        array('lhs' => 87, 'rhs' => 4),
-        array('lhs' => 87, 'rhs' => 6),
-        array('lhs' => 87, 'rhs' => 2),
-        array('lhs' => 87, 'rhs' => 3),
-        array('lhs' => 87, 'rhs' => 2),
-        array('lhs' => 87, 'rhs' => 3),
-        array('lhs' => 87, 'rhs' => 11),
-        array('lhs' => 100, 'rhs' => 2),
-        array('lhs' => 100, 'rhs' => 1),
-        array('lhs' => 87, 'rhs' => 5),
-        array('lhs' => 87, 'rhs' => 7),
-        array('lhs' => 87, 'rhs' => 2),
-        array('lhs' => 87, 'rhs' => 7),
-        array('lhs' => 87, 'rhs' => 10),
-        array('lhs' => 87, 'rhs' => 7),
-        array('lhs' => 87, 'rhs' => 10),
-        array('lhs' => 87, 'rhs' => 3),
-        array('lhs' => 87, 'rhs' => 4),
-        array('lhs' => 87, 'rhs' => 2),
-        array('lhs' => 87, 'rhs' => 2),
-        array('lhs' => 87, 'rhs' => 3),
-        array('lhs' => 87, 'rhs' => 4),
-        array('lhs' => 87, 'rhs' => 5),
-        array('lhs' => 93, 'rhs' => 2),
-        array('lhs' => 93, 'rhs' => 1),
-        array('lhs' => 93, 'rhs' => 0),
-        array('lhs' => 102, 'rhs' => 4),
-        array('lhs' => 102, 'rhs' => 2),
-        array('lhs' => 102, 'rhs' => 2),
-        array('lhs' => 102, 'rhs' => 2),
-        array('lhs' => 102, 'rhs' => 2),
-        array('lhs' => 102, 'rhs' => 2),
-        array('lhs' => 102, 'rhs' => 4),
-        array('lhs' => 97, 'rhs' => 1),
-        array('lhs' => 97, 'rhs' => 3),
-        array('lhs' => 96, 'rhs' => 4),
-        array('lhs' => 96, 'rhs' => 3),
-        array('lhs' => 96, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 1),
-        array('lhs' => 94, 'rhs' => 1),
-        array('lhs' => 94, 'rhs' => 4),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 1),
-        array('lhs' => 94, 'rhs' => 2),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 2),
-        array('lhs' => 94, 'rhs' => 2),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 2),
-        array('lhs' => 94, 'rhs' => 2),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 103, 'rhs' => 8),
-        array('lhs' => 103, 'rhs' => 7),
-        array('lhs' => 91, 'rhs' => 1),
-        array('lhs' => 91, 'rhs' => 2),
-        array('lhs' => 91, 'rhs' => 2),
-        array('lhs' => 91, 'rhs' => 2),
-        array('lhs' => 91, 'rhs' => 2),
-        array('lhs' => 91, 'rhs' => 1),
-        array('lhs' => 91, 'rhs' => 1),
-        array('lhs' => 91, 'rhs' => 3),
-        array('lhs' => 91, 'rhs' => 2),
-        array('lhs' => 91, 'rhs' => 2),
-        array('lhs' => 91, 'rhs' => 1),
-        array('lhs' => 91, 'rhs' => 1),
-        array('lhs' => 91, 'rhs' => 3),
-        array('lhs' => 91, 'rhs' => 1),
-        array('lhs' => 91, 'rhs' => 1),
-        array('lhs' => 91, 'rhs' => 3),
-        array('lhs' => 91, 'rhs' => 3),
-        array('lhs' => 91, 'rhs' => 2),
-        array('lhs' => 91, 'rhs' => 2),
-        array('lhs' => 107, 'rhs' => 1),
-        array('lhs' => 107, 'rhs' => 4),
-        array('lhs' => 107, 'rhs' => 1),
-        array('lhs' => 107, 'rhs' => 3),
-        array('lhs' => 107, 'rhs' => 4),
-        array('lhs' => 107, 'rhs' => 3),
-        array('lhs' => 107, 'rhs' => 4),
-        array('lhs' => 95, 'rhs' => 3),
-        array('lhs' => 112, 'rhs' => 2),
-        array('lhs' => 112, 'rhs' => 0),
-        array('lhs' => 113, 'rhs' => 3),
-        array('lhs' => 113, 'rhs' => 5),
-        array('lhs' => 113, 'rhs' => 2),
-        array('lhs' => 113, 'rhs' => 2),
-        array('lhs' => 113, 'rhs' => 4),
-        array('lhs' => 113, 'rhs' => 3),
-        array('lhs' => 113, 'rhs' => 5),
-        array('lhs' => 113, 'rhs' => 3),
-        array('lhs' => 113, 'rhs' => 2),
-        array('lhs' => 99, 'rhs' => 1),
+        array('lhs' => 88, 'rhs' => 0),
+        array('lhs' => 89, 'rhs' => 1),
+        array('lhs' => 89, 'rhs' => 1),
+        array('lhs' => 86, 'rhs' => 2),
+        array('lhs' => 86, 'rhs' => 4),
+        array('lhs' => 86, 'rhs' => 3),
+        array('lhs' => 86, 'rhs' => 4),
+        array('lhs' => 86, 'rhs' => 3),
+        array('lhs' => 86, 'rhs' => 5),
+        array('lhs' => 86, 'rhs' => 5),
+        array('lhs' => 86, 'rhs' => 6),
+        array('lhs' => 86, 'rhs' => 5),
+        array('lhs' => 86, 'rhs' => 3),
+        array('lhs' => 86, 'rhs' => 2),
+        array('lhs' => 86, 'rhs' => 5),
+        array('lhs' => 86, 'rhs' => 4),
+        array('lhs' => 86, 'rhs' => 6),
+        array('lhs' => 86, 'rhs' => 2),
+        array('lhs' => 86, 'rhs' => 3),
+        array('lhs' => 86, 'rhs' => 2),
+        array('lhs' => 86, 'rhs' => 3),
+        array('lhs' => 86, 'rhs' => 11),
         array('lhs' => 99, 'rhs' => 2),
-        array('lhs' => 114, 'rhs' => 1),
-        array('lhs' => 114, 'rhs' => 3),
+        array('lhs' => 99, 'rhs' => 1),
+        array('lhs' => 86, 'rhs' => 5),
+        array('lhs' => 86, 'rhs' => 7),
+        array('lhs' => 86, 'rhs' => 2),
+        array('lhs' => 86, 'rhs' => 7),
+        array('lhs' => 86, 'rhs' => 10),
+        array('lhs' => 86, 'rhs' => 7),
+        array('lhs' => 86, 'rhs' => 10),
+        array('lhs' => 86, 'rhs' => 3),
+        array('lhs' => 86, 'rhs' => 4),
+        array('lhs' => 86, 'rhs' => 2),
+        array('lhs' => 86, 'rhs' => 2),
+        array('lhs' => 86, 'rhs' => 3),
+        array('lhs' => 86, 'rhs' => 4),
+        array('lhs' => 86, 'rhs' => 5),
+        array('lhs' => 92, 'rhs' => 2),
+        array('lhs' => 92, 'rhs' => 1),
+        array('lhs' => 92, 'rhs' => 0),
+        array('lhs' => 101, 'rhs' => 4),
+        array('lhs' => 101, 'rhs' => 2),
+        array('lhs' => 101, 'rhs' => 2),
+        array('lhs' => 101, 'rhs' => 2),
+        array('lhs' => 101, 'rhs' => 2),
+        array('lhs' => 101, 'rhs' => 2),
+        array('lhs' => 101, 'rhs' => 4),
+        array('lhs' => 96, 'rhs' => 1),
+        array('lhs' => 96, 'rhs' => 3),
+        array('lhs' => 95, 'rhs' => 4),
+        array('lhs' => 95, 'rhs' => 3),
+        array('lhs' => 95, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 1),
+        array('lhs' => 93, 'rhs' => 1),
+        array('lhs' => 93, 'rhs' => 4),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 1),
+        array('lhs' => 93, 'rhs' => 2),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 2),
+        array('lhs' => 93, 'rhs' => 2),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 2),
+        array('lhs' => 93, 'rhs' => 2),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 93, 'rhs' => 3),
+        array('lhs' => 102, 'rhs' => 8),
+        array('lhs' => 102, 'rhs' => 7),
+        array('lhs' => 90, 'rhs' => 1),
+        array('lhs' => 90, 'rhs' => 2),
+        array('lhs' => 90, 'rhs' => 2),
+        array('lhs' => 90, 'rhs' => 2),
+        array('lhs' => 90, 'rhs' => 2),
+        array('lhs' => 90, 'rhs' => 1),
+        array('lhs' => 90, 'rhs' => 1),
+        array('lhs' => 90, 'rhs' => 3),
+        array('lhs' => 90, 'rhs' => 2),
+        array('lhs' => 90, 'rhs' => 2),
+        array('lhs' => 90, 'rhs' => 1),
+        array('lhs' => 90, 'rhs' => 1),
+        array('lhs' => 90, 'rhs' => 3),
+        array('lhs' => 90, 'rhs' => 1),
+        array('lhs' => 90, 'rhs' => 1),
+        array('lhs' => 90, 'rhs' => 3),
+        array('lhs' => 90, 'rhs' => 3),
+        array('lhs' => 90, 'rhs' => 2),
+        array('lhs' => 90, 'rhs' => 2),
+        array('lhs' => 106, 'rhs' => 1),
+        array('lhs' => 106, 'rhs' => 4),
+        array('lhs' => 106, 'rhs' => 1),
+        array('lhs' => 106, 'rhs' => 3),
+        array('lhs' => 106, 'rhs' => 4),
+        array('lhs' => 106, 'rhs' => 3),
+        array('lhs' => 106, 'rhs' => 4),
+        array('lhs' => 94, 'rhs' => 3),
         array('lhs' => 111, 'rhs' => 2),
-        array('lhs' => 115, 'rhs' => 1),
+        array('lhs' => 111, 'rhs' => 0),
+        array('lhs' => 112, 'rhs' => 3),
+        array('lhs' => 112, 'rhs' => 5),
+        array('lhs' => 112, 'rhs' => 2),
+        array('lhs' => 112, 'rhs' => 2),
+        array('lhs' => 112, 'rhs' => 4),
+        array('lhs' => 112, 'rhs' => 3),
+        array('lhs' => 112, 'rhs' => 5),
+        array('lhs' => 112, 'rhs' => 3),
+        array('lhs' => 112, 'rhs' => 2),
+        array('lhs' => 98, 'rhs' => 1),
+        array('lhs' => 98, 'rhs' => 2),
+        array('lhs' => 113, 'rhs' => 1),
+        array('lhs' => 113, 'rhs' => 3),
+        array('lhs' => 110, 'rhs' => 2),
+        array('lhs' => 114, 'rhs' => 1),
+        array('lhs' => 114, 'rhs' => 2),
+        array('lhs' => 115, 'rhs' => 3),
+        array('lhs' => 115, 'rhs' => 4),
+        array('lhs' => 115, 'rhs' => 5),
+        array('lhs' => 115, 'rhs' => 6),
         array('lhs' => 115, 'rhs' => 2),
-        array('lhs' => 116, 'rhs' => 3),
+        array('lhs' => 107, 'rhs' => 4),
         array('lhs' => 116, 'rhs' => 4),
         array('lhs' => 116, 'rhs' => 5),
-        array('lhs' => 116, 'rhs' => 6),
-        array('lhs' => 116, 'rhs' => 2),
-        array('lhs' => 108, 'rhs' => 4),
-        array('lhs' => 117, 'rhs' => 4),
-        array('lhs' => 117, 'rhs' => 5),
+        array('lhs' => 117, 'rhs' => 3),
+        array('lhs' => 117, 'rhs' => 1),
+        array('lhs' => 117, 'rhs' => 0),
+        array('lhs' => 91, 'rhs' => 3),
+        array('lhs' => 91, 'rhs' => 2),
         array('lhs' => 118, 'rhs' => 3),
-        array('lhs' => 118, 'rhs' => 1),
-        array('lhs' => 118, 'rhs' => 0),
-        array('lhs' => 92, 'rhs' => 3),
-        array('lhs' => 92, 'rhs' => 2),
-        array('lhs' => 119, 'rhs' => 3),
+        array('lhs' => 118, 'rhs' => 2),
+        array('lhs' => 100, 'rhs' => 2),
+        array('lhs' => 100, 'rhs' => 0),
         array('lhs' => 119, 'rhs' => 2),
-        array('lhs' => 101, 'rhs' => 2),
-        array('lhs' => 101, 'rhs' => 0),
-        array('lhs' => 120, 'rhs' => 2),
-        array('lhs' => 120, 'rhs' => 2),
-        array('lhs' => 110, 'rhs' => 1),
-        array('lhs' => 110, 'rhs' => 2),
-        array('lhs' => 110, 'rhs' => 1),
-        array('lhs' => 110, 'rhs' => 3),
-        array('lhs' => 110, 'rhs' => 4),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 106, 'rhs' => 1),
-        array('lhs' => 106, 'rhs' => 1),
-        array('lhs' => 106, 'rhs' => 1),
-        array('lhs' => 104, 'rhs' => 3),
-        array('lhs' => 121, 'rhs' => 1),
-        array('lhs' => 121, 'rhs' => 3),
-        array('lhs' => 121, 'rhs' => 0),
-        array('lhs' => 122, 'rhs' => 3),
-        array('lhs' => 122, 'rhs' => 3),
-        array('lhs' => 122, 'rhs' => 1),
+        array('lhs' => 119, 'rhs' => 2),
+        array('lhs' => 109, 'rhs' => 1),
         array('lhs' => 109, 'rhs' => 2),
+        array('lhs' => 109, 'rhs' => 1),
         array('lhs' => 109, 'rhs' => 3),
+        array('lhs' => 109, 'rhs' => 4),
+        array('lhs' => 104, 'rhs' => 1),
+        array('lhs' => 104, 'rhs' => 1),
+        array('lhs' => 104, 'rhs' => 1),
+        array('lhs' => 104, 'rhs' => 1),
+        array('lhs' => 104, 'rhs' => 1),
+        array('lhs' => 104, 'rhs' => 1),
+        array('lhs' => 104, 'rhs' => 1),
+        array('lhs' => 104, 'rhs' => 1),
+        array('lhs' => 104, 'rhs' => 1),
+        array('lhs' => 105, 'rhs' => 1),
+        array('lhs' => 105, 'rhs' => 1),
+        array('lhs' => 105, 'rhs' => 1),
+        array('lhs' => 103, 'rhs' => 3),
+        array('lhs' => 120, 'rhs' => 1),
+        array('lhs' => 120, 'rhs' => 3),
+        array('lhs' => 120, 'rhs' => 0),
+        array('lhs' => 121, 'rhs' => 3),
+        array('lhs' => 121, 'rhs' => 3),
+        array('lhs' => 121, 'rhs' => 1),
+        array('lhs' => 108, 'rhs' => 2),
+        array('lhs' => 108, 'rhs' => 3),
+        array('lhs' => 122, 'rhs' => 2),
+        array('lhs' => 122, 'rhs' => 1),
+        array('lhs' => 123, 'rhs' => 3),
+        array('lhs' => 123, 'rhs' => 3),
+        array('lhs' => 123, 'rhs' => 1),
+        array('lhs' => 123, 'rhs' => 3),
+        array('lhs' => 123, 'rhs' => 3),
         array('lhs' => 123, 'rhs' => 2),
         array('lhs' => 123, 'rhs' => 1),
-        array('lhs' => 124, 'rhs' => 3),
-        array('lhs' => 124, 'rhs' => 3),
-        array('lhs' => 124, 'rhs' => 1),
-        array('lhs' => 124, 'rhs' => 3),
-        array('lhs' => 124, 'rhs' => 3),
-        array('lhs' => 124, 'rhs' => 2),
-        array('lhs' => 124, 'rhs' => 1),
-        array('lhs' => 98, 'rhs' => 1),
-        array('lhs' => 98, 'rhs' => 0),
+        array('lhs' => 97, 'rhs' => 1),
+        array('lhs' => 97, 'rhs' => 0),
     );
 
     public static $yyReduceMap = array(
         0   => 0,
         1   => 1,
-        2   => 1,
+        2   => 2,
         4   => 4,
         5   => 5,
         6   => 6,
@@ -3077,146 +3124,146 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         15  => 15,
         16  => 16,
         17  => 17,
+        20  => 17,
+        199 => 17,
         18  => 18,
-        21  => 18,
-        205 => 18,
+        72  => 18,
         19  => 19,
-        78  => 19,
-        20  => 20,
-        106 => 20,
-        108 => 20,
-        109 => 20,
-        132 => 20,
-        170 => 20,
-        22  => 22,
-        23  => 22,
-        49  => 22,
-        71  => 22,
-        72  => 22,
-        79  => 22,
-        80  => 22,
-        85  => 22,
-        105 => 22,
-        110 => 22,
-        111 => 22,
-        116 => 22,
-        118 => 22,
-        119 => 22,
-        126 => 22,
-        143 => 22,
-        169 => 22,
-        171 => 22,
-        187 => 22,
-        192 => 22,
-        204 => 22,
+        100 => 19,
+        102 => 19,
+        103 => 19,
+        126 => 19,
+        164 => 19,
+        21  => 21,
+        22  => 21,
+        43  => 21,
+        65  => 21,
+        66  => 21,
+        73  => 21,
+        74  => 21,
+        79  => 21,
+        99  => 21,
+        104 => 21,
+        105 => 21,
+        110 => 21,
+        112 => 21,
+        113 => 21,
+        120 => 21,
+        137 => 21,
+        163 => 21,
+        165 => 21,
+        181 => 21,
+        186 => 21,
+        198 => 21,
+        23  => 23,
         24  => 24,
-        25  => 24,
+        25  => 25,
+        27  => 25,
         26  => 26,
-        27  => 27,
         28  => 28,
-        29  => 29,
+        29  => 28,
         30  => 30,
         31  => 31,
-        33  => 31,
         32  => 32,
+        33  => 33,
         34  => 34,
-        35  => 34,
+        35  => 35,
         36  => 36,
         37  => 37,
         38  => 38,
+        40  => 38,
         39  => 39,
-        40  => 40,
         41  => 41,
         42  => 42,
-        43  => 43,
         44  => 44,
-        46  => 44,
         45  => 45,
+        46  => 46,
         47  => 47,
+        49  => 47,
         48  => 48,
-        50  => 50,
+        50  => 48,
         51  => 51,
         52  => 52,
         53  => 53,
-        55  => 53,
         54  => 54,
-        56  => 54,
+        55  => 55,
+        56  => 56,
         57  => 57,
         58  => 58,
         59  => 59,
+        68  => 59,
+        153 => 59,
+        157 => 59,
+        161 => 59,
+        162 => 59,
         60  => 60,
+        154 => 60,
+        160 => 60,
         61  => 61,
         62  => 62,
-        63  => 63,
+        63  => 62,
         64  => 64,
-        65  => 65,
-        74  => 65,
-        159 => 65,
-        163 => 65,
-        167 => 65,
-        168 => 65,
-        66  => 66,
-        160 => 66,
-        166 => 66,
         67  => 67,
-        68  => 68,
-        69  => 68,
+        69  => 69,
         70  => 70,
-        73  => 73,
+        71  => 70,
         75  => 75,
         76  => 76,
         77  => 76,
+        78  => 76,
+        80  => 80,
+        117 => 80,
         81  => 81,
+        84  => 81,
+        95  => 81,
         82  => 82,
-        83  => 82,
-        84  => 82,
+        83  => 83,
+        85  => 85,
         86  => 86,
-        123 => 86,
         87  => 87,
-        90  => 87,
-        101 => 87,
+        92  => 87,
         88  => 88,
+        91  => 88,
         89  => 89,
-        91  => 91,
-        92  => 92,
-        93  => 93,
-        98  => 93,
-        94  => 94,
-        97  => 94,
-        95  => 95,
-        100 => 95,
+        94  => 89,
+        90  => 90,
+        93  => 90,
         96  => 96,
-        99  => 96,
-        102 => 102,
-        103 => 103,
-        104 => 104,
+        97  => 97,
+        98  => 98,
+        101 => 101,
+        106 => 106,
         107 => 107,
-        112 => 112,
-        113 => 113,
+        108 => 108,
+        109 => 109,
+        111 => 111,
         114 => 114,
         115 => 115,
-        117 => 117,
-        120 => 120,
+        116 => 116,
+        118 => 118,
+        119 => 119,
         121 => 121,
         122 => 122,
+        123 => 123,
         124 => 124,
         125 => 125,
         127 => 127,
+        183 => 127,
         128 => 128,
         129 => 129,
         130 => 130,
         131 => 131,
+        132 => 132,
+        135 => 132,
         133 => 133,
-        189 => 133,
         134 => 134,
-        135 => 135,
         136 => 136,
-        137 => 137,
         138 => 138,
-        141 => 138,
         139 => 139,
         140 => 140,
+        141 => 141,
         142 => 142,
+        143 => 143,
         144 => 144,
         145 => 145,
         146 => 146,
@@ -3226,16 +3273,16 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         150 => 150,
         151 => 151,
         152 => 152,
-        153 => 153,
-        154 => 154,
         155 => 155,
         156 => 156,
-        157 => 157,
         158 => 158,
-        161 => 161,
-        162 => 162,
-        164 => 164,
-        165 => 165,
+        159 => 159,
+        166 => 166,
+        167 => 167,
+        168 => 168,
+        169 => 169,
+        170 => 170,
+        171 => 171,
         172 => 172,
         173 => 173,
         174 => 174,
@@ -3245,43 +3292,46 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         178 => 178,
         179 => 179,
         180 => 180,
-        181 => 181,
         182 => 182,
-        183 => 183,
         184 => 184,
         185 => 185,
-        186 => 186,
+        187 => 187,
         188 => 188,
+        189 => 189,
         190 => 190,
         191 => 191,
+        192 => 191,
+        194 => 191,
         193 => 193,
-        194 => 194,
         195 => 195,
         196 => 196,
         197 => 197,
-        198 => 197,
-        200 => 197,
-        199 => 199,
-        201 => 201,
-        202 => 202,
-        203 => 203,
     );
 
-    #line 102 "smarty_internal_templateparser.y"
+    #line 93 "smarty_internal_templateparser.y"
     function yy_r0()
     {
         $this->_retvalue = $this->root_buffer->to_smarty_php();
     }
-    #line 2140 "smarty_internal_templateparser.php"
-    #line 110 "smarty_internal_templateparser.y"
+    #line 2150 "smarty_internal_templateparser.php"
+    #line 101 "smarty_internal_templateparser.y"
     function yy_r1()
     {
         if ($this->yystack[$this->yyidx + 0]->minor != null) {
             $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);
         }
     }
-    #line 2147 "smarty_internal_templateparser.php"
-    #line 130 "smarty_internal_templateparser.y"
+    #line 2157 "smarty_internal_templateparser.php"
+    #line 108 "smarty_internal_templateparser.y"
+    function yy_r2()
+    {
+        if ($this->yystack[$this->yyidx + 0]->minor != null) {
+            // because of possible code injection
+            $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);
+        }
+    }
+    #line 2165 "smarty_internal_templateparser.php"
+    #line 122 "smarty_internal_templateparser.y"
     function yy_r4()
     {
         if ($this->compiler->has_code) {
@@ -3297,60 +3347,65 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         $this->compiler->has_variable_string = false;
         $this->block_nesting_level = count($this->compiler->_tag_stack);
     }
-    #line 2159 "smarty_internal_templateparser.php"
-    #line 142 "smarty_internal_templateparser.y"
+    #line 2177 "smarty_internal_templateparser.php"
+    #line 134 "smarty_internal_templateparser.y"
     function yy_r5()
     {
         $this->_retvalue = null;
     }
-    #line 2164 "smarty_internal_templateparser.php"
-    #line 147 "smarty_internal_templateparser.y"
+    #line 2182 "smarty_internal_templateparser.php"
+    #line 139 "smarty_internal_templateparser.y"
     function yy_r6()
     {
         $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2169 "smarty_internal_templateparser.php"
-    #line 152 "smarty_internal_templateparser.y"
+    #line 2187 "smarty_internal_templateparser.php"
+    #line 144 "smarty_internal_templateparser.y"
     function yy_r7()
     {
         if (strpos($this->yystack[$this->yyidx + 0]->minor, '<s') === 0) {
             $this->lex->is_phpScript = true;
         }
         if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
+            if ($this->lex->is_phpScript) {
+                $s = addcslashes($this->yystack[$this->yyidx + 0]->minor, "'");
+                $this->_retvalue = new _smarty_text($this, $s);
+            } else {
+                $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
+            }
         } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
             $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
         } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
             if (!($this->smarty instanceof SmartyBC)) {
                 $this->compiler->trigger_template_error(self::Err3);
             }
-            $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<?php ', true));
+            $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('<?php ', true));
         } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
             $this->_retvalue = null;
         }
     }
-    #line 2188 "smarty_internal_templateparser.php"
-    #line 171 "smarty_internal_templateparser.y"
+    #line 2211 "smarty_internal_templateparser.php"
+    #line 168 "smarty_internal_templateparser.y"
     function yy_r8()
     {
         if ($this->is_xml) {
             $this->compiler->tag_nocache = true;
             $this->is_xml = false;
             $save = $this->template->has_nocache_code;
-            $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '?>';?>\n", $this->compiler, true));
+            $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode("<?php echo '?>';?>\n", $this->compiler, true));
             $this->template->has_nocache_code = $save;
         } elseif ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            $this->_retvalue = new _smarty_text($this, '?<?php ?>>');
+            $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
         } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
             $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES));
         } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-            $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true));
+            $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('?>', true));
         } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
             $this->_retvalue = null;
         }
     }
-    #line 2207 "smarty_internal_templateparser.php"
-    #line 189 "smarty_internal_templateparser.y"
+    #line 2230 "smarty_internal_templateparser.php"
+    #line 186 "smarty_internal_templateparser.y"
     function yy_r9()
     {
         if (!$this->lex->is_phpScript) {
@@ -3362,18 +3417,18 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
                 $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
             } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-                $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true));
+                $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('?>', true));
             } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
                 $this->_retvalue = null;
             }
         }
     }
-    #line 2225 "smarty_internal_templateparser.php"
-    #line 207 "smarty_internal_templateparser.y"
+    #line 2248 "smarty_internal_templateparser.php"
+    #line 204 "smarty_internal_templateparser.y"
     function yy_r10()
     {
         if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
+            $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
         } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
             $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
         } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
@@ -3381,63 +3436,53 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
                 if (!($this->smarty instanceof SmartyBC)) {
                     $this->compiler->trigger_template_error(self::Err3);
                 }
-                $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<%', true));
+                $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('<%', true));
             } else {
-                $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
+                $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
             }
         } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
             if ($this->asp_tags) {
                 $this->_retvalue = null;
             } else {
-                $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
+                $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
             }
         }
     }
-    #line 2249 "smarty_internal_templateparser.php"
-    #line 231 "smarty_internal_templateparser.y"
+    #line 2272 "smarty_internal_templateparser.php"
+    #line 228 "smarty_internal_templateparser.y"
     function yy_r11()
     {
         if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
+            $this->_retvalue = new _smarty_text($this, st);
         } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
             $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES));
         } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
             if ($this->asp_tags) {
-                $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('%>', true));
+                $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('%>', true));
             } else {
-                $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
+                $this->_retvalue = new _smarty_text($this, st);
             }
         } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
             if ($this->asp_tags) {
                 $this->_retvalue = null;
             } else {
-                $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
+                $this->_retvalue = new _smarty_text($this, st);
             }
         }
     }
-    #line 2270 "smarty_internal_templateparser.php"
-    #line 251 "smarty_internal_templateparser.y"
+    #line 2293 "smarty_internal_templateparser.php"
+    #line 250 "smarty_internal_templateparser.y"
     function yy_r12()
-    {
-        if ($this->strip) {
-            $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)));
-        } else {
-            $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
-        }
-    }
-    #line 2279 "smarty_internal_templateparser.php"
-    #line 260 "smarty_internal_templateparser.y"
-    function yy_r13()
     {
         $this->compiler->tag_nocache = true;
         $this->is_xml = true;
         $save = $this->template->has_nocache_code;
-        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true));
+        $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true));
         $this->template->has_nocache_code = $save;
     }
-    #line 2288 "smarty_internal_templateparser.php"
-    #line 269 "smarty_internal_templateparser.y"
-    function yy_r14()
+    #line 2302 "smarty_internal_templateparser.php"
+    #line 259 "smarty_internal_templateparser.y"
+    function yy_r13()
     {
         if ($this->strip) {
             $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));
@@ -3445,21 +3490,21 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
         }
     }
-    #line 2297 "smarty_internal_templateparser.php"
-    #line 278 "smarty_internal_templateparser.y"
-    function yy_r15()
+    #line 2311 "smarty_internal_templateparser.php"
+    #line 268 "smarty_internal_templateparser.y"
+    function yy_r14()
     {
         $this->strip = true;
     }
-    #line 2302 "smarty_internal_templateparser.php"
-    #line 282 "smarty_internal_templateparser.y"
-    function yy_r16()
+    #line 2316 "smarty_internal_templateparser.php"
+    #line 272 "smarty_internal_templateparser.y"
+    function yy_r15()
     {
         $this->strip = false;
     }
-    #line 2307 "smarty_internal_templateparser.php"
-    #line 286 "smarty_internal_templateparser.y"
-    function yy_r17()
+    #line 2321 "smarty_internal_templateparser.php"
+    #line 276 "smarty_internal_templateparser.y"
+    function yy_r16()
     {
         if ($this->strip) {
             SMARTY_INTERNAL_COMPILE_BLOCK::blockSource($this->compiler, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));
@@ -3467,206 +3512,182 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             SMARTY_INTERNAL_COMPILE_BLOCK::blockSource($this->compiler, $this->yystack[$this->yyidx + 0]->minor);
         }
     }
-    #line 2316 "smarty_internal_templateparser.php"
-    #line 295 "smarty_internal_templateparser.y"
-    function yy_r18()
+    #line 2330 "smarty_internal_templateparser.php"
+    #line 285 "smarty_internal_templateparser.y"
+    function yy_r17()
     {
         $this->_retvalue = '';
     }
-    #line 2321 "smarty_internal_templateparser.php"
-    #line 299 "smarty_internal_templateparser.y"
-    function yy_r19()
+    #line 2335 "smarty_internal_templateparser.php"
+    #line 289 "smarty_internal_templateparser.y"
+    function yy_r18()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
-    #line 2326 "smarty_internal_templateparser.php"
-    #line 303 "smarty_internal_templateparser.y"
-    function yy_r20()
+    #line 2340 "smarty_internal_templateparser.php"
+    #line 293 "smarty_internal_templateparser.y"
+    function yy_r19()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2331 "smarty_internal_templateparser.php"
-    #line 311 "smarty_internal_templateparser.y"
-    function yy_r22()
+    #line 2345 "smarty_internal_templateparser.php"
+    #line 301 "smarty_internal_templateparser.y"
+    function yy_r21()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2336 "smarty_internal_templateparser.php"
-    #line 319 "smarty_internal_templateparser.y"
-    function yy_r24()
-    {
-        $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);
-    }
-    #line 2341 "smarty_internal_templateparser.php"
-    #line 327 "smarty_internal_templateparser.y"
-    function yy_r26()
-    {
-        $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor);
-    }
-    #line 2346 "smarty_internal_templateparser.php"
-    #line 331 "smarty_internal_templateparser.y"
-    function yy_r27()
-    {
-        $this->_retvalue = '<<?php ?>%';
-    }
-    #line 2351 "smarty_internal_templateparser.php"
-    #line 335 "smarty_internal_templateparser.y"
-    function yy_r28()
-    {
-        $this->_retvalue = '%<?php ?>>';
-    }
-    #line 2356 "smarty_internal_templateparser.php"
-    #line 344 "smarty_internal_templateparser.y"
-    function yy_r29()
+    #line 2350 "smarty_internal_templateparser.php"
+    #line 314 "smarty_internal_templateparser.y"
+    function yy_r23()
     {
         $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2361 "smarty_internal_templateparser.php"
-    #line 348 "smarty_internal_templateparser.y"
-    function yy_r30()
+    #line 2355 "smarty_internal_templateparser.php"
+    #line 318 "smarty_internal_templateparser.y"
+    function yy_r24()
     {
         $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
     }
-    #line 2366 "smarty_internal_templateparser.php"
-    #line 352 "smarty_internal_templateparser.y"
-    function yy_r31()
+    #line 2360 "smarty_internal_templateparser.php"
+    #line 322 "smarty_internal_templateparser.y"
+    function yy_r25()
     {
         $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 1]->minor));
     }
-    #line 2371 "smarty_internal_templateparser.php"
-    #line 356 "smarty_internal_templateparser.y"
-    function yy_r32()
+    #line 2365 "smarty_internal_templateparser.php"
+    #line 326 "smarty_internal_templateparser.y"
+    function yy_r26()
     {
         $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
     }
-    #line 2376 "smarty_internal_templateparser.php"
-    #line 369 "smarty_internal_templateparser.y"
-    function yy_r34()
+    #line 2370 "smarty_internal_templateparser.php"
+    #line 339 "smarty_internal_templateparser.y"
+    function yy_r28()
     {
         $this->_retvalue = $this->compiler->compileTag('assign', array(array('value' => $this->yystack[$this->yyidx + 0]->minor), array('var' => "'" . $this->yystack[$this->yyidx + - 2]->minor . "'")));
     }
-    #line 2381 "smarty_internal_templateparser.php"
-    #line 377 "smarty_internal_templateparser.y"
-    function yy_r36()
+    #line 2375 "smarty_internal_templateparser.php"
+    #line 347 "smarty_internal_templateparser.y"
+    function yy_r30()
     {
         $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor), array('var' => "'" . $this->yystack[$this->yyidx + - 3]->minor . "'")), $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2386 "smarty_internal_templateparser.php"
-    #line 381 "smarty_internal_templateparser.y"
-    function yy_r37()
+    #line 2380 "smarty_internal_templateparser.php"
+    #line 351 "smarty_internal_templateparser.y"
+    function yy_r31()
     {
         $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor), array('var' => $this->yystack[$this->yyidx + - 3]->minor['var'])), $this->yystack[$this->yyidx + 0]->minor), array('smarty_internal_index' => $this->yystack[$this->yyidx + - 3]->minor['smarty_internal_index']));
     }
-    #line 2391 "smarty_internal_templateparser.php"
-    #line 386 "smarty_internal_templateparser.y"
-    function yy_r38()
+    #line 2385 "smarty_internal_templateparser.php"
+    #line 356 "smarty_internal_templateparser.y"
+    function yy_r32()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2396 "smarty_internal_templateparser.php"
-    #line 390 "smarty_internal_templateparser.y"
-    function yy_r39()
+    #line 2390 "smarty_internal_templateparser.php"
+    #line 360 "smarty_internal_templateparser.y"
+    function yy_r33()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor, array());
     }
-    #line 2401 "smarty_internal_templateparser.php"
-    #line 395 "smarty_internal_templateparser.y"
-    function yy_r40()
+    #line 2395 "smarty_internal_templateparser.php"
+    #line 365 "smarty_internal_templateparser.y"
+    function yy_r34()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 1]->minor));
     }
-    #line 2406 "smarty_internal_templateparser.php"
-    #line 400 "smarty_internal_templateparser.y"
-    function yy_r41()
+    #line 2400 "smarty_internal_templateparser.php"
+    #line 370 "smarty_internal_templateparser.y"
+    function yy_r35()
     {
         $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + 0]->minor) . '<?php echo ';
         $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . '?>';
     }
-    #line 2412 "smarty_internal_templateparser.php"
-    #line 406 "smarty_internal_templateparser.y"
-    function yy_r42()
+    #line 2406 "smarty_internal_templateparser.php"
+    #line 376 "smarty_internal_templateparser.y"
+    function yy_r36()
     {
         $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 4]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 2]->minor)) . '<?php echo ';
         $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . '?>';
     }
-    #line 2418 "smarty_internal_templateparser.php"
-    #line 412 "smarty_internal_templateparser.y"
-    function yy_r43()
+    #line 2412 "smarty_internal_templateparser.php"
+    #line 382 "smarty_internal_templateparser.y"
+    function yy_r37()
     {
         $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length));
         $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2424 "smarty_internal_templateparser.php"
-    #line 417 "smarty_internal_templateparser.y"
-    function yy_r44()
+    #line 2418 "smarty_internal_templateparser.php"
+    #line 387 "smarty_internal_templateparser.y"
+    function yy_r38()
     {
         $tag = trim(substr($this->yystack[$this->yyidx + - 2]->minor, $this->lex->ldel_length));
         $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, $this->yystack[$this->yyidx + 0]->minor, array('if condition' => $this->yystack[$this->yyidx + - 1]->minor));
     }
-    #line 2430 "smarty_internal_templateparser.php"
-    #line 422 "smarty_internal_templateparser.y"
-    function yy_r45()
+    #line 2424 "smarty_internal_templateparser.php"
+    #line 392 "smarty_internal_templateparser.y"
+    function yy_r39()
     {
         $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length));
         $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2436 "smarty_internal_templateparser.php"
-    #line 433 "smarty_internal_templateparser.y"
-    function yy_r47()
+    #line 2430 "smarty_internal_templateparser.php"
+    #line 403 "smarty_internal_templateparser.y"
+    function yy_r41()
     {
         $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 9]->minor), array('ifexp' => $this->yystack[$this->yyidx + - 6]->minor), array('var' => $this->yystack[$this->yyidx + - 2]->minor), array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 1);
     }
-    #line 2441 "smarty_internal_templateparser.php"
-    #line 437 "smarty_internal_templateparser.y"
-    function yy_r48()
+    #line 2435 "smarty_internal_templateparser.php"
+    #line 407 "smarty_internal_templateparser.y"
+    function yy_r42()
     {
         $this->_retvalue = '=' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2446 "smarty_internal_templateparser.php"
-    #line 445 "smarty_internal_templateparser.y"
-    function yy_r50()
+    #line 2440 "smarty_internal_templateparser.php"
+    #line 415 "smarty_internal_templateparser.y"
+    function yy_r44()
     {
         $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 3]->minor), array('to' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
     }
-    #line 2451 "smarty_internal_templateparser.php"
-    #line 449 "smarty_internal_templateparser.y"
-    function yy_r51()
+    #line 2445 "smarty_internal_templateparser.php"
+    #line 419 "smarty_internal_templateparser.y"
+    function yy_r45()
     {
         $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 5]->minor), array('to' => $this->yystack[$this->yyidx + - 3]->minor), array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
     }
-    #line 2456 "smarty_internal_templateparser.php"
-    #line 454 "smarty_internal_templateparser.y"
-    function yy_r52()
+    #line 2450 "smarty_internal_templateparser.php"
+    #line 424 "smarty_internal_templateparser.y"
+    function yy_r46()
     {
         $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2461 "smarty_internal_templateparser.php"
-    #line 459 "smarty_internal_templateparser.y"
-    function yy_r53()
+    #line 2455 "smarty_internal_templateparser.php"
+    #line 429 "smarty_internal_templateparser.y"
+    function yy_r47()
     {
         $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 4]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor))));
     }
-    #line 2466 "smarty_internal_templateparser.php"
-    #line 463 "smarty_internal_templateparser.y"
-    function yy_r54()
+    #line 2460 "smarty_internal_templateparser.php"
+    #line 433 "smarty_internal_templateparser.y"
+    function yy_r48()
     {
         $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 7]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor), array('key' => $this->yystack[$this->yyidx + - 4]->minor))));
     }
-    #line 2471 "smarty_internal_templateparser.php"
-    #line 476 "smarty_internal_templateparser.y"
-    function yy_r57()
+    #line 2465 "smarty_internal_templateparser.php"
+    #line 446 "smarty_internal_templateparser.y"
+    function yy_r51()
     {
         $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array(array_merge(array($this->yystack[$this->yyidx + - 1]->minor), $this->yystack[$this->yyidx + 0]->minor))));
     }
-    #line 2476 "smarty_internal_templateparser.php"
-    #line 480 "smarty_internal_templateparser.y"
-    function yy_r58()
+    #line 2470 "smarty_internal_templateparser.php"
+    #line 450 "smarty_internal_templateparser.y"
+    function yy_r52()
     {
         $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array_merge(array(array_merge(array($this->yystack[$this->yyidx + - 2]->minor), $this->yystack[$this->yyidx + - 1]->minor)), $this->yystack[$this->yyidx + 0]->minor)));
     }
-    #line 2481 "smarty_internal_templateparser.php"
-    #line 485 "smarty_internal_templateparser.y"
-    function yy_r59()
+    #line 2475 "smarty_internal_templateparser.php"
+    #line 455 "smarty_internal_templateparser.y"
+    function yy_r53()
     {
         $j = strrpos($this->yystack[$this->yyidx + 0]->minor, '.');
         if ($this->yystack[$this->yyidx + 0]->minor[$j + 1] == 'c') {
@@ -3677,52 +3698,52 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileParentBlock($this->compiler);
         }
     }
-    #line 2493 "smarty_internal_templateparser.php"
-    #line 498 "smarty_internal_templateparser.y"
-    function yy_r60()
+    #line 2487 "smarty_internal_templateparser.php"
+    #line 468 "smarty_internal_templateparser.y"
+    function yy_r54()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor . 'close', array());
     }
-    #line 2498 "smarty_internal_templateparser.php"
-    #line 502 "smarty_internal_templateparser.y"
-    function yy_r61()
+    #line 2492 "smarty_internal_templateparser.php"
+    #line 472 "smarty_internal_templateparser.y"
+    function yy_r55()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor . 'close', array(), array('modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2503 "smarty_internal_templateparser.php"
-    #line 507 "smarty_internal_templateparser.y"
-    function yy_r62()
+    #line 2497 "smarty_internal_templateparser.php"
+    #line 477 "smarty_internal_templateparser.y"
+    function yy_r56()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2508 "smarty_internal_templateparser.php"
-    #line 511 "smarty_internal_templateparser.y"
-    function yy_r63()
+    #line 2502 "smarty_internal_templateparser.php"
+    #line 481 "smarty_internal_templateparser.y"
+    function yy_r57()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + - 1]->minor, 'modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2513 "smarty_internal_templateparser.php"
-    #line 519 "smarty_internal_templateparser.y"
-    function yy_r64()
+    #line 2507 "smarty_internal_templateparser.php"
+    #line 489 "smarty_internal_templateparser.y"
+    function yy_r58()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
         $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2519 "smarty_internal_templateparser.php"
-    #line 525 "smarty_internal_templateparser.y"
-    function yy_r65()
+    #line 2513 "smarty_internal_templateparser.php"
+    #line 495 "smarty_internal_templateparser.y"
+    function yy_r59()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2524 "smarty_internal_templateparser.php"
-    #line 530 "smarty_internal_templateparser.y"
-    function yy_r66()
+    #line 2518 "smarty_internal_templateparser.php"
+    #line 500 "smarty_internal_templateparser.y"
+    function yy_r60()
     {
         $this->_retvalue = array();
     }
-    #line 2529 "smarty_internal_templateparser.php"
-    #line 535 "smarty_internal_templateparser.y"
-    function yy_r67()
+    #line 2523 "smarty_internal_templateparser.php"
+    #line 505 "smarty_internal_templateparser.y"
+    function yy_r61()
     {
         if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
             $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => 'true');
@@ -3734,156 +3755,156 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => "'" . $this->yystack[$this->yyidx + 0]->minor . "'");
         }
     }
-    #line 2542 "smarty_internal_templateparser.php"
-    #line 547 "smarty_internal_templateparser.y"
-    function yy_r68()
+    #line 2536 "smarty_internal_templateparser.php"
+    #line 517 "smarty_internal_templateparser.y"
+    function yy_r62()
     {
         $this->_retvalue = array(trim($this->yystack[$this->yyidx + - 1]->minor, " =\n\r\t") => $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2547 "smarty_internal_templateparser.php"
-    #line 555 "smarty_internal_templateparser.y"
-    function yy_r70()
+    #line 2541 "smarty_internal_templateparser.php"
+    #line 525 "smarty_internal_templateparser.y"
+    function yy_r64()
     {
         $this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'";
     }
-    #line 2552 "smarty_internal_templateparser.php"
-    #line 567 "smarty_internal_templateparser.y"
-    function yy_r73()
+    #line 2546 "smarty_internal_templateparser.php"
+    #line 537 "smarty_internal_templateparser.y"
+    function yy_r67()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2557 "smarty_internal_templateparser.php"
-    #line 580 "smarty_internal_templateparser.y"
-    function yy_r75()
+    #line 2551 "smarty_internal_templateparser.php"
+    #line 550 "smarty_internal_templateparser.y"
+    function yy_r69()
     {
         $this->yystack[$this->yyidx + - 2]->minor[] = $this->yystack[$this->yyidx + 0]->minor;
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor;
     }
-    #line 2563 "smarty_internal_templateparser.php"
-    #line 585 "smarty_internal_templateparser.y"
-    function yy_r76()
+    #line 2557 "smarty_internal_templateparser.php"
+    #line 555 "smarty_internal_templateparser.y"
+    function yy_r70()
     {
         $this->_retvalue = array('var' => $this->yystack[$this->yyidx + - 2]->minor, 'value' => $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2568 "smarty_internal_templateparser.php"
-    #line 613 "smarty_internal_templateparser.y"
-    function yy_r81()
+    #line 2562 "smarty_internal_templateparser.php"
+    #line 583 "smarty_internal_templateparser.y"
+    function yy_r75()
     {
         $this->_retvalue = '$_smarty_tpl->getStreamVariable(\'' . $this->yystack[$this->yyidx + - 2]->minor . '://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
     }
-    #line 2573 "smarty_internal_templateparser.php"
-    #line 618 "smarty_internal_templateparser.y"
-    function yy_r82()
+    #line 2567 "smarty_internal_templateparser.php"
+    #line 588 "smarty_internal_templateparser.y"
+    function yy_r76()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . trim($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2578 "smarty_internal_templateparser.php"
-    #line 637 "smarty_internal_templateparser.y"
-    function yy_r86()
+    #line 2572 "smarty_internal_templateparser.php"
+    #line 607 "smarty_internal_templateparser.y"
+    function yy_r80()
     {
         $this->_retvalue = $this->compiler->compileTag('private_modifier', array(), array('value' => $this->yystack[$this->yyidx + - 1]->minor, 'modifierlist' => $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2583 "smarty_internal_templateparser.php"
-    #line 643 "smarty_internal_templateparser.y"
-    function yy_r87()
+    #line 2577 "smarty_internal_templateparser.php"
+    #line 613 "smarty_internal_templateparser.y"
+    function yy_r81()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2588 "smarty_internal_templateparser.php"
-    #line 647 "smarty_internal_templateparser.y"
-    function yy_r88()
+    #line 2582 "smarty_internal_templateparser.php"
+    #line 617 "smarty_internal_templateparser.y"
+    function yy_r82()
     {
         $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor . ')';
     }
-    #line 2593 "smarty_internal_templateparser.php"
-    #line 651 "smarty_internal_templateparser.y"
-    function yy_r89()
+    #line 2587 "smarty_internal_templateparser.php"
+    #line 621 "smarty_internal_templateparser.y"
+    function yy_r83()
     {
         $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',(array)' . $this->yystack[$this->yyidx + 0]->minor . ')';
     }
-    #line 2598 "smarty_internal_templateparser.php"
-    #line 659 "smarty_internal_templateparser.y"
-    function yy_r91()
+    #line 2592 "smarty_internal_templateparser.php"
+    #line 629 "smarty_internal_templateparser.y"
+    function yy_r85()
     {
         $this->_retvalue = '!(' . $this->yystack[$this->yyidx + - 2]->minor . ' % ' . $this->yystack[$this->yyidx + 0]->minor . ')';
     }
-    #line 2603 "smarty_internal_templateparser.php"
-    #line 663 "smarty_internal_templateparser.y"
-    function yy_r92()
+    #line 2597 "smarty_internal_templateparser.php"
+    #line 633 "smarty_internal_templateparser.y"
+    function yy_r86()
     {
         $this->_retvalue = '(' . $this->yystack[$this->yyidx + - 2]->minor . ' % ' . $this->yystack[$this->yyidx + 0]->minor . ')';
     }
-    #line 2608 "smarty_internal_templateparser.php"
-    #line 667 "smarty_internal_templateparser.y"
-    function yy_r93()
+    #line 2602 "smarty_internal_templateparser.php"
+    #line 637 "smarty_internal_templateparser.y"
+    function yy_r87()
     {
         $this->_retvalue = '!(1 & ' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
-    #line 2613 "smarty_internal_templateparser.php"
-    #line 671 "smarty_internal_templateparser.y"
-    function yy_r94()
+    #line 2607 "smarty_internal_templateparser.php"
+    #line 641 "smarty_internal_templateparser.y"
+    function yy_r88()
     {
         $this->_retvalue = '(1 & ' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
-    #line 2618 "smarty_internal_templateparser.php"
-    #line 675 "smarty_internal_templateparser.y"
-    function yy_r95()
+    #line 2612 "smarty_internal_templateparser.php"
+    #line 645 "smarty_internal_templateparser.y"
+    function yy_r89()
     {
         $this->_retvalue = '!(1 & ' . $this->yystack[$this->yyidx + - 2]->minor . ' / ' . $this->yystack[$this->yyidx + 0]->minor . ')';
     }
-    #line 2623 "smarty_internal_templateparser.php"
-    #line 679 "smarty_internal_templateparser.y"
-    function yy_r96()
+    #line 2617 "smarty_internal_templateparser.php"
+    #line 649 "smarty_internal_templateparser.y"
+    function yy_r90()
     {
         $this->_retvalue = '(1 & ' . $this->yystack[$this->yyidx + - 2]->minor . ' / ' . $this->yystack[$this->yyidx + 0]->minor . ')';
     }
-    #line 2628 "smarty_internal_templateparser.php"
-    #line 703 "smarty_internal_templateparser.y"
-    function yy_r102()
+    #line 2622 "smarty_internal_templateparser.php"
+    #line 673 "smarty_internal_templateparser.y"
+    function yy_r96()
     {
         self::$prefix_number ++;
         $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->yystack[$this->yyidx + 0]->minor . ';?>';
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . '$_tmp' . self::$prefix_number;
     }
-    #line 2635 "smarty_internal_templateparser.php"
-    #line 712 "smarty_internal_templateparser.y"
-    function yy_r103()
+    #line 2629 "smarty_internal_templateparser.php"
+    #line 682 "smarty_internal_templateparser.y"
+    function yy_r97()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 6]->minor . ' ? ' . $this->compileVariable("'" . $this->yystack[$this->yyidx + - 2]->minor . "'") . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2640 "smarty_internal_templateparser.php"
-    #line 716 "smarty_internal_templateparser.y"
-    function yy_r104()
+    #line 2634 "smarty_internal_templateparser.php"
+    #line 686 "smarty_internal_templateparser.y"
+    function yy_r98()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 5]->minor . ' ? ' . $this->yystack[$this->yyidx + - 2]->minor . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2645 "smarty_internal_templateparser.php"
-    #line 731 "smarty_internal_templateparser.y"
-    function yy_r107()
+    #line 2639 "smarty_internal_templateparser.php"
+    #line 701 "smarty_internal_templateparser.y"
+    function yy_r101()
     {
         $this->_retvalue = '!' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2650 "smarty_internal_templateparser.php"
-    #line 752 "smarty_internal_templateparser.y"
-    function yy_r112()
+    #line 2644 "smarty_internal_templateparser.php"
+    #line 722 "smarty_internal_templateparser.y"
+    function yy_r106()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2655 "smarty_internal_templateparser.php"
-    #line 756 "smarty_internal_templateparser.y"
-    function yy_r113()
+    #line 2649 "smarty_internal_templateparser.php"
+    #line 726 "smarty_internal_templateparser.y"
+    function yy_r107()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.';
     }
-    #line 2660 "smarty_internal_templateparser.php"
-    #line 760 "smarty_internal_templateparser.y"
-    function yy_r114()
+    #line 2654 "smarty_internal_templateparser.php"
+    #line 730 "smarty_internal_templateparser.y"
+    function yy_r108()
     {
         $this->_retvalue = '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2665 "smarty_internal_templateparser.php"
-    #line 765 "smarty_internal_templateparser.y"
-    function yy_r115()
+    #line 2659 "smarty_internal_templateparser.php"
+    #line 735 "smarty_internal_templateparser.y"
+    function yy_r109()
     {
         if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
             $this->_retvalue = 'true';
@@ -3895,15 +3916,15 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             $this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'";
         }
     }
-    #line 2678 "smarty_internal_templateparser.php"
-    #line 783 "smarty_internal_templateparser.y"
-    function yy_r117()
+    #line 2672 "smarty_internal_templateparser.php"
+    #line 753 "smarty_internal_templateparser.y"
+    function yy_r111()
     {
         $this->_retvalue = "(" . $this->yystack[$this->yyidx + - 1]->minor . ")";
     }
-    #line 2683 "smarty_internal_templateparser.php"
-    #line 798 "smarty_internal_templateparser.y"
-    function yy_r120()
+    #line 2677 "smarty_internal_templateparser.php"
+    #line 768 "smarty_internal_templateparser.y"
+    function yy_r114()
     {
         if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + - 2]->minor, $this->compiler)) {
             if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor])) {
@@ -3915,9 +3936,9 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             $this->compiler->trigger_template_error("static class '" . $this->yystack[$this->yyidx + - 2]->minor . "' is undefined or not allowed by security setting");
         }
     }
-    #line 2696 "smarty_internal_templateparser.php"
-    #line 810 "smarty_internal_templateparser.y"
-    function yy_r121()
+    #line 2690 "smarty_internal_templateparser.php"
+    #line 780 "smarty_internal_templateparser.y"
+    function yy_r115()
     {
         if ($this->yystack[$this->yyidx + - 2]->minor['var'] == '\'smarty\'') {
             $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index']) . '::' . $this->yystack[$this->yyidx + 0]->minor;
@@ -3925,17 +3946,17 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + - 2]->minor['var']) . $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index'] . '::' . $this->yystack[$this->yyidx + 0]->minor;
         }
     }
-    #line 2705 "smarty_internal_templateparser.php"
-    #line 819 "smarty_internal_templateparser.y"
-    function yy_r122()
+    #line 2699 "smarty_internal_templateparser.php"
+    #line 789 "smarty_internal_templateparser.y"
+    function yy_r116()
     {
         self::$prefix_number ++;
         $this->compiler->prefix_code[] = '<?php ob_start();?>' . $this->yystack[$this->yyidx + - 1]->minor . '<?php $_tmp' . self::$prefix_number . '=ob_get_clean();?>';
         $this->_retvalue = '$_tmp' . self::$prefix_number;
     }
-    #line 2712 "smarty_internal_templateparser.php"
-    #line 834 "smarty_internal_templateparser.y"
-    function yy_r124()
+    #line 2706 "smarty_internal_templateparser.php"
+    #line 804 "smarty_internal_templateparser.y"
+    function yy_r118()
     {
         if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
             $smarty_var = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
@@ -3947,117 +3968,117 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']) . $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
         }
     }
-    #line 2725 "smarty_internal_templateparser.php"
-    #line 847 "smarty_internal_templateparser.y"
-    function yy_r125()
+    #line 2719 "smarty_internal_templateparser.php"
+    #line 817 "smarty_internal_templateparser.y"
+    function yy_r119()
     {
         $this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[$this->yyidx + - 2]->minor . ']->' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2730 "smarty_internal_templateparser.php"
-    #line 857 "smarty_internal_templateparser.y"
-    function yy_r127()
+    #line 2724 "smarty_internal_templateparser.php"
+    #line 827 "smarty_internal_templateparser.y"
+    function yy_r121()
     {
         $this->_retvalue = '$_smarty_tpl->getConfigVariable(\'' . $this->yystack[$this->yyidx + - 1]->minor . '\')';
     }
-    #line 2735 "smarty_internal_templateparser.php"
-    #line 861 "smarty_internal_templateparser.y"
-    function yy_r128()
+    #line 2729 "smarty_internal_templateparser.php"
+    #line 831 "smarty_internal_templateparser.y"
+    function yy_r122()
     {
         $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable(\'' . $this->yystack[$this->yyidx + - 2]->minor . '\')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' :null)';
     }
-    #line 2740 "smarty_internal_templateparser.php"
-    #line 865 "smarty_internal_templateparser.y"
-    function yy_r129()
+    #line 2734 "smarty_internal_templateparser.php"
+    #line 835 "smarty_internal_templateparser.y"
+    function yy_r123()
     {
         $this->_retvalue = '$_smarty_tpl->getConfigVariable(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
-    #line 2745 "smarty_internal_templateparser.php"
-    #line 869 "smarty_internal_templateparser.y"
-    function yy_r130()
+    #line 2739 "smarty_internal_templateparser.php"
+    #line 839 "smarty_internal_templateparser.y"
+    function yy_r124()
     {
         $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable(' . $this->yystack[$this->yyidx + - 2]->minor . ')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' : null)';
     }
-    #line 2750 "smarty_internal_templateparser.php"
-    #line 873 "smarty_internal_templateparser.y"
-    function yy_r131()
+    #line 2744 "smarty_internal_templateparser.php"
+    #line 843 "smarty_internal_templateparser.y"
+    function yy_r125()
     {
         $this->_retvalue = array('var' => $this->yystack[$this->yyidx + - 1]->minor, 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2755 "smarty_internal_templateparser.php"
-    #line 886 "smarty_internal_templateparser.y"
-    function yy_r133()
+    #line 2749 "smarty_internal_templateparser.php"
+    #line 856 "smarty_internal_templateparser.y"
+    function yy_r127()
     {
         return;
     }
-    #line 2760 "smarty_internal_templateparser.php"
-    #line 892 "smarty_internal_templateparser.y"
-    function yy_r134()
+    #line 2754 "smarty_internal_templateparser.php"
+    #line 862 "smarty_internal_templateparser.y"
+    function yy_r128()
     {
         $this->_retvalue = '[' . $this->compileVariable($this->yystack[$this->yyidx + 0]->minor) . ']';
     }
-    #line 2765 "smarty_internal_templateparser.php"
-    #line 896 "smarty_internal_templateparser.y"
-    function yy_r135()
+    #line 2759 "smarty_internal_templateparser.php"
+    #line 866 "smarty_internal_templateparser.y"
+    function yy_r129()
     {
         $this->_retvalue = '[' . $this->compileVariable($this->yystack[$this->yyidx + - 2]->minor) . '->' . $this->yystack[$this->yyidx + 0]->minor . ']';
     }
-    #line 2770 "smarty_internal_templateparser.php"
-    #line 900 "smarty_internal_templateparser.y"
-    function yy_r136()
+    #line 2764 "smarty_internal_templateparser.php"
+    #line 870 "smarty_internal_templateparser.y"
+    function yy_r130()
     {
         $this->_retvalue = "['" . $this->yystack[$this->yyidx + 0]->minor . "']";
     }
-    #line 2775 "smarty_internal_templateparser.php"
-    #line 904 "smarty_internal_templateparser.y"
-    function yy_r137()
+    #line 2769 "smarty_internal_templateparser.php"
+    #line 874 "smarty_internal_templateparser.y"
+    function yy_r131()
     {
         $this->_retvalue = "[" . $this->yystack[$this->yyidx + 0]->minor . "]";
     }
-    #line 2780 "smarty_internal_templateparser.php"
-    #line 908 "smarty_internal_templateparser.y"
-    function yy_r138()
+    #line 2774 "smarty_internal_templateparser.php"
+    #line 878 "smarty_internal_templateparser.y"
+    function yy_r132()
     {
         $this->_retvalue = "[" . $this->yystack[$this->yyidx + - 1]->minor . "]";
     }
-    #line 2785 "smarty_internal_templateparser.php"
-    #line 913 "smarty_internal_templateparser.y"
-    function yy_r139()
+    #line 2779 "smarty_internal_templateparser.php"
+    #line 883 "smarty_internal_templateparser.y"
+    function yy_r133()
     {
         $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\'][\'index\']') . ']';
     }
-    #line 2790 "smarty_internal_templateparser.php"
-    #line 917 "smarty_internal_templateparser.y"
-    function yy_r140()
+    #line 2784 "smarty_internal_templateparser.php"
+    #line 887 "smarty_internal_templateparser.y"
+    function yy_r134()
     {
         $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 3]->minor . '\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\']') . ']';
     }
-    #line 2795 "smarty_internal_templateparser.php"
-    #line 927 "smarty_internal_templateparser.y"
-    function yy_r142()
+    #line 2789 "smarty_internal_templateparser.php"
+    #line 897 "smarty_internal_templateparser.y"
+    function yy_r136()
     {
         $this->_retvalue = '[]';
     }
-    #line 2800 "smarty_internal_templateparser.php"
-    #line 940 "smarty_internal_templateparser.y"
-    function yy_r144()
+    #line 2794 "smarty_internal_templateparser.php"
+    #line 910 "smarty_internal_templateparser.y"
+    function yy_r138()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2805 "smarty_internal_templateparser.php"
-    #line 945 "smarty_internal_templateparser.y"
-    function yy_r145()
+    #line 2799 "smarty_internal_templateparser.php"
+    #line 915 "smarty_internal_templateparser.y"
+    function yy_r139()
     {
         $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
     }
-    #line 2810 "smarty_internal_templateparser.php"
-    #line 950 "smarty_internal_templateparser.y"
-    function yy_r146()
+    #line 2804 "smarty_internal_templateparser.php"
+    #line 920 "smarty_internal_templateparser.y"
+    function yy_r140()
     {
         $this->_retvalue = '(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
-    #line 2815 "smarty_internal_templateparser.php"
-    #line 957 "smarty_internal_templateparser.y"
-    function yy_r147()
+    #line 2809 "smarty_internal_templateparser.php"
+    #line 927 "smarty_internal_templateparser.y"
+    function yy_r141()
     {
         if ($this->yystack[$this->yyidx + - 1]->minor['var'] == '\'smarty\'') {
             $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + - 1]->minor['smarty_internal_index']) . $this->yystack[$this->yyidx + 0]->minor;
@@ -4065,63 +4086,63 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + - 1]->minor['var']) . $this->yystack[$this->yyidx + - 1]->minor['smarty_internal_index'] . $this->yystack[$this->yyidx + 0]->minor;
         }
     }
-    #line 2824 "smarty_internal_templateparser.php"
-    #line 966 "smarty_internal_templateparser.y"
-    function yy_r148()
+    #line 2818 "smarty_internal_templateparser.php"
+    #line 936 "smarty_internal_templateparser.y"
+    function yy_r142()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2829 "smarty_internal_templateparser.php"
-    #line 971 "smarty_internal_templateparser.y"
-    function yy_r149()
+    #line 2823 "smarty_internal_templateparser.php"
+    #line 941 "smarty_internal_templateparser.y"
+    function yy_r143()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2834 "smarty_internal_templateparser.php"
-    #line 976 "smarty_internal_templateparser.y"
-    function yy_r150()
+    #line 2828 "smarty_internal_templateparser.php"
+    #line 946 "smarty_internal_templateparser.y"
+    function yy_r144()
     {
         if ($this->security && substr($this->yystack[$this->yyidx + - 1]->minor, 0, 1) == '_') {
             $this->compiler->trigger_template_error(self::Err1);
         }
         $this->_retvalue = '->' . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2842 "smarty_internal_templateparser.php"
-    #line 983 "smarty_internal_templateparser.y"
-    function yy_r151()
+    #line 2836 "smarty_internal_templateparser.php"
+    #line 953 "smarty_internal_templateparser.y"
+    function yy_r145()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
         }
         $this->_retvalue = '->{' . $this->compileVariable($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor . '}';
     }
-    #line 2850 "smarty_internal_templateparser.php"
-    #line 990 "smarty_internal_templateparser.y"
-    function yy_r152()
+    #line 2844 "smarty_internal_templateparser.php"
+    #line 960 "smarty_internal_templateparser.y"
+    function yy_r146()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
         }
         $this->_retvalue = '->{' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
     }
-    #line 2858 "smarty_internal_templateparser.php"
-    #line 997 "smarty_internal_templateparser.y"
-    function yy_r153()
+    #line 2852 "smarty_internal_templateparser.php"
+    #line 967 "smarty_internal_templateparser.y"
+    function yy_r147()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
         }
         $this->_retvalue = '->{\'' . $this->yystack[$this->yyidx + - 4]->minor . '\'.' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
     }
-    #line 2866 "smarty_internal_templateparser.php"
-    #line 1005 "smarty_internal_templateparser.y"
-    function yy_r154()
+    #line 2860 "smarty_internal_templateparser.php"
+    #line 975 "smarty_internal_templateparser.y"
+    function yy_r148()
     {
         $this->_retvalue = '->' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2871 "smarty_internal_templateparser.php"
-    #line 1013 "smarty_internal_templateparser.y"
-    function yy_r155()
+    #line 2865 "smarty_internal_templateparser.php"
+    #line 983 "smarty_internal_templateparser.y"
+    function yy_r149()
     {
         if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + - 3]->minor, $this->compiler)) {
             if (strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'array') === 0 || is_callable($this->yystack[$this->yyidx + - 3]->minor)) {
@@ -4156,18 +4177,18 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             }
         }
     }
-    #line 2907 "smarty_internal_templateparser.php"
-    #line 1051 "smarty_internal_templateparser.y"
-    function yy_r156()
+    #line 2901 "smarty_internal_templateparser.php"
+    #line 1021 "smarty_internal_templateparser.y"
+    function yy_r150()
     {
         if ($this->security && substr($this->yystack[$this->yyidx + - 3]->minor, 0, 1) == '_') {
             $this->compiler->trigger_template_error(self::Err1);
         }
         $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ")";
     }
-    #line 2915 "smarty_internal_templateparser.php"
-    #line 1058 "smarty_internal_templateparser.y"
-    function yy_r157()
+    #line 2909 "smarty_internal_templateparser.php"
+    #line 1028 "smarty_internal_templateparser.y"
+    function yy_r151()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
@@ -4176,201 +4197,201 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->compileVariable("'" . $this->yystack[$this->yyidx + - 3]->minor . "'") . ';?>';
         $this->_retvalue = '$_tmp' . self::$prefix_number . '(' . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ')';
     }
-    #line 2925 "smarty_internal_templateparser.php"
-    #line 1069 "smarty_internal_templateparser.y"
-    function yy_r158()
+    #line 2919 "smarty_internal_templateparser.php"
+    #line 1039 "smarty_internal_templateparser.y"
+    function yy_r152()
     {
         $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array($this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2930 "smarty_internal_templateparser.php"
-    #line 1086 "smarty_internal_templateparser.y"
-    function yy_r161()
+    #line 2924 "smarty_internal_templateparser.php"
+    #line 1056 "smarty_internal_templateparser.y"
+    function yy_r155()
     {
         $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor)));
     }
-    #line 2935 "smarty_internal_templateparser.php"
-    #line 1090 "smarty_internal_templateparser.y"
-    function yy_r162()
+    #line 2929 "smarty_internal_templateparser.php"
+    #line 1060 "smarty_internal_templateparser.y"
+    function yy_r156()
     {
         $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2940 "smarty_internal_templateparser.php"
-    #line 1098 "smarty_internal_templateparser.y"
-    function yy_r164()
+    #line 2934 "smarty_internal_templateparser.php"
+    #line 1068 "smarty_internal_templateparser.y"
+    function yy_r158()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2945 "smarty_internal_templateparser.php"
-    #line 1106 "smarty_internal_templateparser.y"
-    function yy_r165()
+    #line 2939 "smarty_internal_templateparser.php"
+    #line 1076 "smarty_internal_templateparser.y"
+    function yy_r159()
     {
         $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2950 "smarty_internal_templateparser.php"
-    #line 1140 "smarty_internal_templateparser.y"
-    function yy_r172()
+    #line 2944 "smarty_internal_templateparser.php"
+    #line 1110 "smarty_internal_templateparser.y"
+    function yy_r166()
     {
         $this->_retvalue = '$' . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2955 "smarty_internal_templateparser.php"
-    #line 1145 "smarty_internal_templateparser.y"
-    function yy_r173()
+    #line 2949 "smarty_internal_templateparser.php"
+    #line 1115 "smarty_internal_templateparser.y"
+    function yy_r167()
     {
         $this->_retvalue = '$' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2960 "smarty_internal_templateparser.php"
-    #line 1151 "smarty_internal_templateparser.y"
-    function yy_r174()
+    #line 2954 "smarty_internal_templateparser.php"
+    #line 1121 "smarty_internal_templateparser.y"
+    function yy_r168()
     {
         $this->_retvalue = '==';
     }
-    #line 2965 "smarty_internal_templateparser.php"
-    #line 1155 "smarty_internal_templateparser.y"
-    function yy_r175()
+    #line 2959 "smarty_internal_templateparser.php"
+    #line 1125 "smarty_internal_templateparser.y"
+    function yy_r169()
     {
         $this->_retvalue = '!=';
     }
-    #line 2970 "smarty_internal_templateparser.php"
-    #line 1159 "smarty_internal_templateparser.y"
-    function yy_r176()
+    #line 2964 "smarty_internal_templateparser.php"
+    #line 1129 "smarty_internal_templateparser.y"
+    function yy_r170()
     {
         $this->_retvalue = '>';
     }
-    #line 2975 "smarty_internal_templateparser.php"
-    #line 1163 "smarty_internal_templateparser.y"
-    function yy_r177()
+    #line 2969 "smarty_internal_templateparser.php"
+    #line 1133 "smarty_internal_templateparser.y"
+    function yy_r171()
     {
         $this->_retvalue = '<';
     }
-    #line 2980 "smarty_internal_templateparser.php"
-    #line 1167 "smarty_internal_templateparser.y"
-    function yy_r178()
+    #line 2974 "smarty_internal_templateparser.php"
+    #line 1137 "smarty_internal_templateparser.y"
+    function yy_r172()
     {
         $this->_retvalue = '>=';
     }
-    #line 2985 "smarty_internal_templateparser.php"
-    #line 1171 "smarty_internal_templateparser.y"
-    function yy_r179()
+    #line 2979 "smarty_internal_templateparser.php"
+    #line 1141 "smarty_internal_templateparser.y"
+    function yy_r173()
     {
         $this->_retvalue = '<=';
     }
-    #line 2990 "smarty_internal_templateparser.php"
-    #line 1175 "smarty_internal_templateparser.y"
-    function yy_r180()
+    #line 2984 "smarty_internal_templateparser.php"
+    #line 1145 "smarty_internal_templateparser.y"
+    function yy_r174()
     {
         $this->_retvalue = '===';
     }
-    #line 2995 "smarty_internal_templateparser.php"
-    #line 1179 "smarty_internal_templateparser.y"
-    function yy_r181()
+    #line 2989 "smarty_internal_templateparser.php"
+    #line 1149 "smarty_internal_templateparser.y"
+    function yy_r175()
     {
         $this->_retvalue = '!==';
     }
-    #line 3000 "smarty_internal_templateparser.php"
-    #line 1183 "smarty_internal_templateparser.y"
-    function yy_r182()
+    #line 2994 "smarty_internal_templateparser.php"
+    #line 1153 "smarty_internal_templateparser.y"
+    function yy_r176()
     {
         $this->_retvalue = '%';
     }
-    #line 3005 "smarty_internal_templateparser.php"
-    #line 1187 "smarty_internal_templateparser.y"
-    function yy_r183()
+    #line 2999 "smarty_internal_templateparser.php"
+    #line 1157 "smarty_internal_templateparser.y"
+    function yy_r177()
     {
         $this->_retvalue = '&&';
     }
-    #line 3010 "smarty_internal_templateparser.php"
-    #line 1191 "smarty_internal_templateparser.y"
-    function yy_r184()
+    #line 3004 "smarty_internal_templateparser.php"
+    #line 1161 "smarty_internal_templateparser.y"
+    function yy_r178()
     {
         $this->_retvalue = '||';
     }
-    #line 3015 "smarty_internal_templateparser.php"
-    #line 1195 "smarty_internal_templateparser.y"
-    function yy_r185()
+    #line 3009 "smarty_internal_templateparser.php"
+    #line 1165 "smarty_internal_templateparser.y"
+    function yy_r179()
     {
         $this->_retvalue = ' XOR ';
     }
-    #line 3020 "smarty_internal_templateparser.php"
-    #line 1202 "smarty_internal_templateparser.y"
-    function yy_r186()
+    #line 3014 "smarty_internal_templateparser.php"
+    #line 1172 "smarty_internal_templateparser.y"
+    function yy_r180()
     {
         $this->_retvalue = 'array(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
-    #line 3025 "smarty_internal_templateparser.php"
-    #line 1210 "smarty_internal_templateparser.y"
-    function yy_r188()
+    #line 3019 "smarty_internal_templateparser.php"
+    #line 1180 "smarty_internal_templateparser.y"
+    function yy_r182()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 3030 "smarty_internal_templateparser.php"
-    #line 1218 "smarty_internal_templateparser.y"
-    function yy_r190()
+    #line 3024 "smarty_internal_templateparser.php"
+    #line 1188 "smarty_internal_templateparser.y"
+    function yy_r184()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '=>' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 3035 "smarty_internal_templateparser.php"
-    #line 1222 "smarty_internal_templateparser.y"
-    function yy_r191()
+    #line 3029 "smarty_internal_templateparser.php"
+    #line 1192 "smarty_internal_templateparser.y"
+    function yy_r185()
     {
         $this->_retvalue = '\'' . $this->yystack[$this->yyidx + - 2]->minor . '\'=>' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 3040 "smarty_internal_templateparser.php"
-    #line 1234 "smarty_internal_templateparser.y"
-    function yy_r193()
+    #line 3034 "smarty_internal_templateparser.php"
+    #line 1204 "smarty_internal_templateparser.y"
+    function yy_r187()
     {
         $this->_retvalue = "''";
     }
-    #line 3045 "smarty_internal_templateparser.php"
-    #line 1238 "smarty_internal_templateparser.y"
-    function yy_r194()
+    #line 3039 "smarty_internal_templateparser.php"
+    #line 1208 "smarty_internal_templateparser.y"
+    function yy_r188()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor->to_smarty_php();
     }
-    #line 3050 "smarty_internal_templateparser.php"
-    #line 1243 "smarty_internal_templateparser.y"
-    function yy_r195()
+    #line 3044 "smarty_internal_templateparser.php"
+    #line 1213 "smarty_internal_templateparser.y"
+    function yy_r189()
     {
         $this->yystack[$this->yyidx + - 1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor);
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
-    #line 3056 "smarty_internal_templateparser.php"
-    #line 1248 "smarty_internal_templateparser.y"
-    function yy_r196()
+    #line 3050 "smarty_internal_templateparser.php"
+    #line 1218 "smarty_internal_templateparser.y"
+    function yy_r190()
     {
         $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 3061 "smarty_internal_templateparser.php"
-    #line 1252 "smarty_internal_templateparser.y"
-    function yy_r197()
+    #line 3055 "smarty_internal_templateparser.php"
+    #line 1222 "smarty_internal_templateparser.y"
+    function yy_r191()
     {
         $this->_retvalue = new _smarty_code($this, '(string)' . $this->yystack[$this->yyidx + - 1]->minor);
     }
-    #line 3066 "smarty_internal_templateparser.php"
-    #line 1260 "smarty_internal_templateparser.y"
-    function yy_r199()
+    #line 3060 "smarty_internal_templateparser.php"
+    #line 1230 "smarty_internal_templateparser.y"
+    function yy_r193()
     {
         $this->_retvalue = new _smarty_code($this, '(string)$_smarty_tpl->tpl_vars[\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\']->value');
     }
-    #line 3071 "smarty_internal_templateparser.php"
-    #line 1268 "smarty_internal_templateparser.y"
-    function yy_r201()
+    #line 3065 "smarty_internal_templateparser.php"
+    #line 1238 "smarty_internal_templateparser.y"
+    function yy_r195()
     {
         $this->_retvalue = new _smarty_code($this, '(string)(' . $this->yystack[$this->yyidx + - 1]->minor . ')');
     }
-    #line 3076 "smarty_internal_templateparser.php"
-    #line 1272 "smarty_internal_templateparser.y"
-    function yy_r202()
+    #line 3070 "smarty_internal_templateparser.php"
+    #line 1242 "smarty_internal_templateparser.y"
+    function yy_r196()
     {
         $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + - 1]->minor);
     }
-    #line 3081 "smarty_internal_templateparser.php"
-    #line 1276 "smarty_internal_templateparser.y"
-    function yy_r203()
+    #line 3075 "smarty_internal_templateparser.php"
+    #line 1246 "smarty_internal_templateparser.y"
+    function yy_r197()
     {
         $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 3086 "smarty_internal_templateparser.php"
+    #line 3080 "smarty_internal_templateparser.php"
 
     private $_retvalue;
 
@@ -4428,12 +4449,12 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
 
     public function yy_syntax_error($yymajor, $TOKEN)
     {
-        #line 84 "smarty_internal_templateparser.y"
+        #line 75 "smarty_internal_templateparser.y"
 
         $this->internalError = true;
         $this->yymajor = $yymajor;
         $this->compiler->trigger_template_error();
-        #line 3148 "smarty_internal_templateparser.php"
+        #line 3142 "smarty_internal_templateparser.php"
     }
 
     public function yy_accept()
@@ -4444,13 +4465,14 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         while ($this->yyidx >= 0) {
             $stack = $this->yy_pop_parser_stack();
         }
-        #line 76 "smarty_internal_templateparser.y"
+        #line 66 "smarty_internal_templateparser.y"
 
         $this->successful = !$this->internalError;
         $this->internalError = false;
         $this->retvalue = $this->_retvalue;
         //echo $this->retvalue."\n\n";
-        #line 3165 "smarty_internal_templateparser.php"
+
+        #line 3160 "smarty_internal_templateparser.php"
     }
 
     public function doParse($yymajor, $yytokenvalue)
diff --git a/docs/NEWS b/docs/NEWS
index befc1c64..450120b1 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,9 +1,9 @@
 #
 
-Version 2.0-beta4 / RC? ()
+Version 2.0-beta4/5 / RC? ()
 ------------------------------------------------------------------------
 
-    * Smarty 3.1.20 upgrade (see changelog)
+    * Smarty 3.1.21 upgrade (see changelog)
 
     * Fix issue #220 with pdf directory moving rename() error