From 903ae8a581fac1e6917fc3e31d2ad8fb91df80c3 Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Thu, 12 Jul 2012 11:21:01 +0000
Subject: standardize the use of unix eol; use svn properties to enforce native
 eol

---
 .../TextHighlighter/Text/Highlighter/ABAP.php      |   98 +-
 .../TextHighlighter/Text/Highlighter/CPP.php       |   90 +-
 .../TextHighlighter/Text/Highlighter/CSS.php       |   90 +-
 .../TextHighlighter/Text/Highlighter/DIFF.php      |   90 +-
 .../TextHighlighter/Text/Highlighter/DTD.php       |   90 +-
 .../TextHighlighter/Text/Highlighter/Generator.php | 2508 ++++++++++----------
 .../TextHighlighter/Text/Highlighter/HTML.php      |   98 +-
 .../TextHighlighter/Text/Highlighter/JAVA.php      |   90 +-
 .../Text/Highlighter/JAVASCRIPT.php                |   90 +-
 .../TextHighlighter/Text/Highlighter/MYSQL.php     |   90 +-
 .../TextHighlighter/Text/Highlighter/PERL.php      |   90 +-
 .../TextHighlighter/Text/Highlighter/PHP.php       | 2176 ++++++++---------
 .../TextHighlighter/Text/Highlighter/PRADO.php     |  506 ++--
 .../TextHighlighter/Text/Highlighter/PYTHON.php    |   90 +-
 .../TextHighlighter/Text/Highlighter/RUBY.php      |   90 +-
 .../TextHighlighter/Text/Highlighter/Renderer.php  |  302 +--
 .../Text/Highlighter/Renderer/Array.php            |  396 ++--
 .../Text/Highlighter/Renderer/BB.php               |  474 ++--
 .../Text/Highlighter/Renderer/Console.php          |  414 ++--
 .../Text/Highlighter/Renderer/Html.php             |  890 +++----
 .../Text/Highlighter/Renderer/HtmlTags.php         |  372 +--
 .../Text/Highlighter/Renderer/JSON.php             |  170 +-
 .../Text/Highlighter/Renderer/XML.php              |  204 +-
 .../TextHighlighter/Text/Highlighter/SQL.php       |   90 +-
 .../TextHighlighter/Text/Highlighter/XML.php       |   90 +-
 25 files changed, 4844 insertions(+), 4844 deletions(-)

(limited to 'framework/3rdParty/TextHighlighter/Text/Highlighter')

diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/ABAP.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/ABAP.php
index adeaabf9..153ce9fe 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/ABAP.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/ABAP.php
@@ -1,53 +1,53 @@
-<?php
-/**
- * Auto-generated class. ABAP syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+<?php
+/**
+ * Auto-generated class. ABAP syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : abap.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Stoyan Stefanov <ssttoo@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-/**
- * Auto-generated class. ABAP syntax highlighting
- *
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+/**
+ * Auto-generated class. ABAP syntax highlighting
+ *
  * @author Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_ABAP extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_ABAP extends Text_Highlighter
+{
     var $_language = 'abap';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)^\\*|")|((?i)\')|((?i)[a-z_\\-]\\w*)/',
@@ -498,8 +498,8 @@ class  Text_Highlighter_ABAP extends Text_Highlighter
             'reserved' => 'reserved',
             'constants' => 'reserved',
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/CPP.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/CPP.php
index 7be6add9..761297ac 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/CPP.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/CPP.php
@@ -1,56 +1,56 @@
-<?php
-/**
+<?php
+/**
  * Auto-generated class. CPP syntax highlighting
  *
  *
  * Thanks to Aaron Kalin for initial
  * implementation of this highlighter
- *
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+ *
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : cpp.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Aaron Kalin
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. CPP syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. CPP syntax highlighting
+ *
  * @author Aaron Kalin
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_CPP extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_CPP extends Text_Highlighter
+{
     var $_language = 'cpp';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
@@ -833,8 +833,8 @@ class  Text_Highlighter_CPP extends Text_Highlighter
             'types' => 'types',
             'Common Macros' => 'prepro',
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/CSS.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/CSS.php
index 04705ff6..28f92f34 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/CSS.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/CSS.php
@@ -1,49 +1,49 @@
-<?php
-/**
- * Auto-generated class. CSS syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+<?php
+/**
+ * Auto-generated class. CSS syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : css.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. CSS syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. CSS syntax highlighting
+ *
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_CSS extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_CSS extends Text_Highlighter
+{
     var $_language = 'css';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?i)(@[a-z\\d]+))|((?i)(((\\.|#)?[a-z]+[a-z\\d\\-]*(?![a-z\\d\\-]))|(\\*))(?!\\s*:\\s*[\\s\\{]))|((?i):[a-z][a-z\\d\\-]*)|((?i)\\[)|((?i)\\{)/',
@@ -376,8 +376,8 @@ class  Text_Highlighter_CSS extends Text_Highlighter
             'propertyValue' => 'string',
             'namedcolor' => 'var',
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/DIFF.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/DIFF.php
index c27301f5..21e97087 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/DIFF.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/DIFF.php
@@ -1,49 +1,49 @@
-<?php
-/**
- * Auto-generated class. DIFF syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+<?php
+/**
+ * Auto-generated class. DIFF syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : diff.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. DIFF syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. DIFF syntax highlighting
+ *
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_DIFF extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_DIFF extends Text_Highlighter
+{
     var $_language = 'diff';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?m)^\\\\\\sNo\\snewline.+$)|((?m)^\\-\\-\\-$)|((?m)^(diff\\s+\\-|Only\\s+|Index).*$)|((?m)^(\\-\\-\\-|\\+\\+\\+)\\s.+$)|((?m)^\\*.*$)|((?m)^\\+.*$)|((?m)^!.*$)|((?m)^\\<\\s.*$)|((?m)^\\>\\s.*$)|((?m)^\\d+(\\,\\d+)?[acd]\\d+(,\\d+)?$)|((?m)^\\-.*$)|((?m)^\\+.*$)|((?m)^@@.+@@$)|((?m)^d\\d+\\s\\d+$)|((?m)^a\\d+\\s\\d+$)|((?m)^(\\d+)(,\\d+)?(a)$)|((?m)^(\\d+)(,\\d+)?(c)$)|((?m)^(\\d+)(,\\d+)?(d)$)|((?m)^a(\\d+)(\\s\\d+)?$)|((?m)^c(\\d+)(\\s\\d+)?$)|((?m)^d(\\d+)(\\s\\d+)?$)/',
@@ -359,8 +359,8 @@ class  Text_Highlighter_DIFF extends Text_Highlighter
         );
         $this->_kwmap = array (
         );
-        $this->_defClass = 'default';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'default';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/DTD.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/DTD.php
index ad33e528..1d4a403e 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/DTD.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/DTD.php
@@ -1,49 +1,49 @@
-<?php
-/**
- * Auto-generated class. DTD syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+<?php
+/**
+ * Auto-generated class. DTD syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : dtd.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. DTD syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. DTD syntax highlighting
+ *
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_DTD extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_DTD extends Text_Highlighter
+{
     var $_language = 'dtd';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/(\\<!--)|(\\<\\!\\[)|((\\&|\\%)[\\w\\-\\.]+;)/',
@@ -401,8 +401,8 @@ class  Text_Highlighter_DTD extends Text_Highlighter
         );
         $this->_kwmap = array (
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Generator.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/Generator.php
index 896af078..c9bca6aa 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Generator.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/Generator.php
@@ -1,1254 +1,1254 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
-* Syntax highlighter class generator
-*
-* To simplify the process of creating new syntax highlighters
-* for different languages, {@link Text_Highlighter_Generator} class is
-* provided. It takes highlighting rules from XML file and generates
-* a code of a class inherited from {@link Text_Highlighter}.
-*
-* PHP versions 4 and 5
-*
-* LICENSE: This source file is subject to version 3.0 of the PHP license
-* that is available through the world-wide-web at the following URI:
-* http://www.php.net/license/3_0.txt.  If you did not receive a copy of
-* the PHP License and are unable to obtain it through the web, please
-* send a note to license@php.net so we can mail you a copy immediately.
-*
-* @category   Text
-* @package    Text_Highlighter
-* @author     Andrey Demenev <demenev@gmail.com>
-* @copyright  2004-2006 Andrey Demenev
-* @license    http://www.php.net/license/3_0.txt  PHP License
-* @version    CVS: $Id: Generator.php,v 1.1 2007/06/03 02:36:35 ssttoo Exp $
-* @link       http://pear.php.net/package/Text_Highlighter
-*/
-
-// {{{ error codes
-
-define ('TEXT_HIGHLIGHTER_EMPTY_RE',          1);
-define ('TEXT_HIGHLIGHTER_INVALID_RE',        2);
-define ('TEXT_HIGHLIGHTER_EMPTY_OR_MISSING',  3);
-define ('TEXT_HIGHLIGHTER_EMPTY',             4);
-define ('TEXT_HIGHLIGHTER_REGION_REGION',     5);
-define ('TEXT_HIGHLIGHTER_REGION_BLOCK',      6);
-define ('TEXT_HIGHLIGHTER_BLOCK_REGION',      7);
-define ('TEXT_HIGHLIGHTER_KEYWORD_BLOCK',     8);
-define ('TEXT_HIGHLIGHTER_KEYWORD_INHERITS',  9);
-define ('TEXT_HIGHLIGHTER_PARSE',            10);
-define ('TEXT_HIGHLIGHTER_FILE_WRITE',       11);
-define ('TEXT_HIGHLIGHTER_FILE_READ',        12);
-// }}}
-
-/**
-* Syntax highliter class generator class
-*
-* This class is used to generate PHP classes
-* from XML files with highlighting rules
-*
-* Usage example
-* <code>
-*require_once 'Text/Highlighter/Generator.php';
-*$generator =& new Text_Highlighter_Generator('php.xml');
-*$generator->generate();
-*$generator->saveCode('PHP.php');
-* </code>
-*
-* A command line script <b>generate</b> is provided for
-* class generation (installs in scripts/Text/Highlighter).
-*
-* @author     Andrey Demenev <demenev@gmail.com>
-* @copyright  2004-2006 Andrey Demenev
-* @license    http://www.php.net/license/3_0.txt  PHP License
-* @version    Release: 0.7.0
-* @link       http://pear.php.net/package/Text_Highlighter
-*/
-
-class Text_Highlighter_Generator extends  XML_Parser
-{
-    // {{{ properties
-    /**
-    * Whether to do case folding.
-    * We have to declare it here, because XML_Parser
-    * sets case folding in constructor
-    *
-    * @var  boolean
-    */
-    var $folding = false;
-
-    /**
-    * Holds name of file with highlighting rules
-    *
-    * @var string
-    * @access private
-    */
-    var $_syntaxFile;
-
-    /**
-    * Current element being processed
-    *
-    * @var array
-    * @access private
-    */
-    var $_element;
-
-    /**
-    * List of regions
-    *
-    * @var array
-    * @access private
-    */
-    var $_regions = array();
-
-    /**
-    * List of blocks
-    *
-    * @var array
-    * @access private
-    */
-    var $_blocks = array();
-
-    /**
-    * List of keyword groups
-    *
-    * @var array
-    * @access private
-    */
-    var $_keywords = array();
-
-    /**
-    * List of authors
-    *
-    * @var array
-    * @access private
-    */
-    var $_authors = array();
-
-    /**
-    * Name of language
-    *
-    * @var string
-    * @access public
-    */
-    var $language = '';
-
-    /**
-    * Generated code
-    *
-    * @var string
-    * @access private
-    */
-    var $_code = '';
-
-    /**
-    * Default class
-    *
-    * @var string
-    * @access private
-    */
-    var $_defClass = 'default';
-
-    /**
-    * Comment
-    *
-    * @var string
-    * @access private
-    */
-    var $_comment = '';
-
-    /**
-    * Flag for comment processing
-    *
-    * @var boolean
-    * @access private
-    */
-    var $_inComment = false;
-
-    /**
-    * Sorting order of current block/region
-    *
-    * @var integer
-    * @access private
-    */
-    var $_blockOrder = 0;
-
-    /**
-    * Generation errors
-    *
-    * @var array
-    * @access private
-    */
-    var $_errors;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-    * Constructor
-    *
-    * @param string $syntaxFile Name of XML file
-    * with syntax highlighting rules
-    *
-    * @access public
-    */
-
-    function __construct($syntaxFile = '')
-    {
-        XML_Parser::XML_Parser(null, 'func');
-        $this->_errors = array();
-        $this->_declareErrorMessages();
-        if ($syntaxFile) {
-            $this->setInputFile($syntaxFile);
-        }
-    }
-
-    // }}}
-    // {{{ _formatError
-
-    /**
-    * Format error message
-    *
-    * @param int $code error code
-    * @param string $params parameters
-    * @param string $fileName file name
-    * @param int $lineNo line number
-    * @return  array
-    * @access  public
-    */
-    function _formatError($code, $params, $fileName, $lineNo)
-    {
-        $template = $this->_templates[$code];
-        $ret = call_user_func_array('sprintf', array_merge(array($template), $params));
-        if ($fileName) {
-            $ret = '[' . $fileName . '] ' . $ret;
-        }
-        if ($lineNo) {
-            $ret .= ' (line ' . $lineNo . ')';
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ declareErrorMessages
-
-    /**
-    * Set up error message templates
-    *
-    * @access  private
-    */
-    function _declareErrorMessages()
-    {
-        $this->_templates = array (
-        TEXT_HIGHLIGHTER_EMPTY_RE => 'Empty regular expression',
-        TEXT_HIGHLIGHTER_INVALID_RE => 'Invalid regular expression : %s',
-        TEXT_HIGHLIGHTER_EMPTY_OR_MISSING => 'Empty or missing %s',
-        TEXT_HIGHLIGHTER_EMPTY  => 'Empty %s',
-        TEXT_HIGHLIGHTER_REGION_REGION => 'Region %s refers undefined region %s',
-        TEXT_HIGHLIGHTER_REGION_BLOCK => 'Region %s refers undefined block %s',
-        TEXT_HIGHLIGHTER_BLOCK_REGION => 'Block %s refers undefined region %s',
-        TEXT_HIGHLIGHTER_KEYWORD_BLOCK => 'Keyword group %s refers undefined block %s',
-        TEXT_HIGHLIGHTER_KEYWORD_INHERITS => 'Keyword group %s inherits undefined block %s',
-        TEXT_HIGHLIGHTER_PARSE => '%s',
-        TEXT_HIGHLIGHTER_FILE_WRITE => 'Error writing file %s',
-        TEXT_HIGHLIGHTER_FILE_READ => '%s'
-        );
-    }
-
-    // }}}
-    // {{{ setInputFile
-
-    /**
-    * Sets the input xml file to be parsed
-    *
-    * @param    string      Filename (full path)
-    * @return   boolean
-    * @access   public
-    */
-    function setInputFile($file)
-    {
-        $this->_syntaxFile = $file;
-        $ret = parent::setInputFile($file);
-        if (PEAR::isError($ret)) {
-            $this->_error(TEXT_HIGHLIGHTER_FILE_READ, $ret->message);
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ generate
-
-    /**
-    * Generates class code
-    *
-    * @access public
-    */
-
-    function generate()
-    {
-        $this->_regions    = array();
-        $this->_blocks     = array();
-        $this->_keywords   = array();
-        $this->language    = '';
-        $this->_code       = '';
-        $this->_defClass   = 'default';
-        $this->_comment    = '';
-        $this->_inComment  = false;
-        $this->_authors    = array();
-        $this->_blockOrder = 0;
-        $this->_errors   = array();
-
-        $ret = $this->parse();
-        if (PEAR::isError($ret)) {
-            $this->_error(TEXT_HIGHLIGHTER_PARSE, $ret->message);
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ getCode
-
-    /**
-    * Returns generated code as a string.
-    *
-    * @return string Generated code
-    * @access public
-    */
-
-    function getCode()
-    {
-        return $this->_code;
-    }
-
-    // }}}
-    // {{{ saveCode
-
-    /**
-    * Saves generated class to file. Note that {@link Text_Highlighter::factory()}
-    * assumes that filename is uppercase (SQL.php, DTD.php, etc), and file
-    * is located in Text/Highlighter
-    *
-    * @param string $filename Name of file to write the code to
-    * @return boolean true on success, false on failure
-    * @access public
-    */
-
-    function saveCode($filename)
-    {
-        $f = @fopen($filename, 'wb');
-        if (!$f) {
-            $this->_error(TEXT_HIGHLIGHTER_FILE_WRITE, array('outfile'=>$filename));
-            return false;
-        }
-        fwrite ($f, $this->_code);
-        fclose($f);
-        return true;
-    }
-
-    // }}}
-    // {{{ hasErrors
-
-    /**
-    * Reports if there were errors
-    *
-    * @return boolean
-    * @access public
-    */
-
-    function hasErrors()
-    {
-        return count($this->_errors) > 0;
-    }
-
-    // }}}
-    // {{{ getErrors
-
-    /**
-    * Returns errors
-    *
-    * @return array
-    * @access public
-    */
-
-    function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    // }}}
-    // {{{ _sortBlocks
-
-    /**
-    * Sorts blocks
-    *
-    * @access private
-    */
-
-    function _sortBlocks($b1, $b2) {
-        return $b1['order'] - $b2['order'];
-    }
-
-    // }}}
-    // {{{ _sortLookFor
-    /**
-    * Sort 'look for' list
-    * @return int
-    * @param string $b1
-    * @param string $b2
-    */
-    function _sortLookFor($b1, $b2) {
-        $o1 = isset($this->_blocks[$b1]) ? $this->_blocks[$b1]['order'] : $this->_regions[$b1]['order'];
-        $o2 = isset($this->_blocks[$b2]) ? $this->_blocks[$b2]['order'] : $this->_regions[$b2]['order'];
-        return $o1 - $o2;
-    }
-
-    // }}}
-    // {{{ _makeRE
-
-    /**
-    * Adds delimiters and modifiers to regular expression if necessary
-    *
-    * @param string $text Original RE
-    * @return string Final RE
-    * @access private
-    */
-    function _makeRE($text, $case = false)
-    {
-        if (!strlen($text)) {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_RE);
-        }
-        if (!strlen($text) || $text{0} != '/') {
-            $text = '/' . $text . '/';
-        }
-        if (!$case) {
-            $text .= 'i';
-        }
-        $php_errormsg = '';
-        @preg_match($text, '');
-        if ($php_errormsg) {
-            $this->_error(TEXT_HIGHLIGHTER_INVALID_RE, $php_errormsg);
-        }
-        preg_match ('#^/(.+)/(.*)$#', $text, $m);
-        if (@$m[2]) {
-            $text = '(?' . $m[2] . ')' . $m[1];
-        } else {
-            $text = $m[1];
-        }
-        return $text;
-    }
-
-    // }}}
-    // {{{ _exportArray
-
-    /**
-    * Exports array as PHP code
-    *
-    * @param array $array
-    * @return string Code
-    * @access private
-    */
-    function _exportArray($array)
-    {
-        $array = var_export($array, true);
-        return trim(preg_replace('~^(\s*)~m','        \1\1',$array));
-    }
-
-    // }}}
-    // {{{ _countSubpatterns
-    /**
-    * Find number of capturing suppaterns in regular expression
-    * @return int
-    * @param string $re Regular expression (without delimiters)
-    */
-    function _countSubpatterns($re)
-    {
-        preg_match_all('/' . $re . '/', '', $m);
-        return count($m)-1;
-    }
-
-    // }}}
-
-    /**#@+
-    * @access private
-    * @param resource $xp      XML parser resource
-    * @param string   $elem    XML element name
-    * @param array    $attribs XML element attributes
-    */
-
-    // {{{ xmltag_Default
-
-    /**
-    * start handler for <default> element
-    */
-    function xmltag_Default($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_defClass = @$attribs['innerGroup'];
-    }
-
-    // }}}
-    // {{{ xmltag_Region
-
-    /**
-    * start handler for <region> element
-    */
-    function xmltag_Region($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region name');
-        }
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_element = array('name' => $attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        $this->_element['innerGroup'] = $attribs['innerGroup'];
-        $this->_element['delimGroup'] = isset($attribs['delimGroup']) ?
-        $attribs['delimGroup'] :
-        $attribs['innerGroup'];
-        $this->_element['start'] = $this->_makeRE(@$attribs['start'], $this->_element['case']);
-        $this->_element['end'] = $this->_makeRE(@$attribs['end'], $this->_element['case']);
-        $this->_element['contained'] = @$attribs['contained'] == 'yes';
-        $this->_element['never-contained'] = @$attribs['never-contained'] == 'yes';
-        $this->_element['remember'] = @$attribs['remember'] == 'yes';
-        if (isset($attribs['startBOL']) && $attribs['startBOL'] == 'yes') {
-            $this->_element['startBOL'] = true;
-        }
-        if (isset($attribs['endBOL']) && $attribs['endBOL'] == 'yes') {
-            $this->_element['endBOL'] = true;
-        }
-        if (isset($attribs['neverAfter'])) {
-            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Block
-
-    /**
-    * start handler for <block> element
-    */
-    function xmltag_Block($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'block name');
-        }
-        if (isset($attribs['innerGroup']) && $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY, 'innerGroup');
-        }
-        $this->_element = array('name' => $attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        if (isset($attribs['innerGroup'])) {
-            $this->_element['innerGroup'] = @$attribs['innerGroup'];
-        }
-        $this->_element['match'] = $this->_makeRE($attribs['match'], $this->_element['case']);
-        $this->_element['contained'] = @$attribs['contained'] == 'yes';
-        $this->_element['multiline'] = @$attribs['multiline'] == 'yes';
-        if (isset($attribs['BOL']) && $attribs['BOL'] == 'yes') {
-            $this->_element['BOL'] = true;
-        }
-        if (isset($attribs['neverAfter'])) {
-            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
-        }
-    }
-
-    // }}}
-    // {{{ cdataHandler
-
-    /**
-    * Character data handler. Used for comment
-    */
-    function cdataHandler($xp, $cdata)
-    {
-        if ($this->_inComment) {
-            $this->_comment .= $cdata;
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Comment
-
-    /**
-    * start handler for <comment> element
-    */
-    function xmltag_Comment($xp, $elem, $attribs)
-    {
-        $this->_comment = '';
-        $this->_inComment = true;
-    }
-
-    // }}}
-    // {{{ xmltag_PartGroup
-
-    /**
-    * start handler for <partgroup> element
-    */
-    function xmltag_PartGroup($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_element['partClass'][$attribs['index']] = @$attribs['innerGroup'];
-    }
-
-    // }}}
-    // {{{ xmltag_PartClass
-
-    /**
-    * start handler for <partclass> element
-    */
-    function xmltag_PartClass($xp, $elem, $attribs)
-    {
-        $this->xmltag_PartGroup($xp, $elem, $attribs);
-    }
-
-    // }}}
-    // {{{ xmltag_Keywords
-
-    /**
-    * start handler for <keywords> element
-    */
-    function xmltag_Keywords($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'keyword group name');
-        }
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        if (!isset($attribs['inherits']) || $attribs['inherits'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'inherits');
-        }
-        $this->_element = array('name'=>@$attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        $this->_element['innerGroup'] = @$attribs['innerGroup'];
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        $this->_element['inherits'] = @$attribs['inherits'];
-        if (isset($attribs['otherwise'])) {
-            $this->_element['otherwise'] = $attribs['otherwise'];
-        }
-        if (isset($attribs['ifdef'])) {
-            $this->_element['ifdef'] = $attribs['ifdef'];
-        }
-        if (isset($attribs['ifndef'])) {
-            $this->_element['ifndef'] = $attribs['ifndef'];
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Keyword
-
-    /**
-    * start handler for <keyword> element
-    */
-    function xmltag_Keyword($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['match']) || $attribs['match'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'match');
-        }
-        $keyword = @$attribs['match'];
-        if (!$this->_element['case']) {
-            $keyword = strtolower($keyword);
-        }
-        $this->_element['match'][$keyword] = true;
-    }
-
-    // }}}
-    // {{{ xmltag_Contains
-
-    /**
-    * start handler for <contains> element
-    */
-    function xmltag_Contains($xp, $elem, $attribs)
-    {
-        $this->_element['contains-all'] = @$attribs['all'] == 'yes';
-        if (isset($attribs['region'])) {
-            $this->_element['contains']['region'][$attribs['region']] =
-            xml_get_current_line_number($this->parser);
-        }
-        if (isset($attribs['block'])) {
-            $this->_element['contains']['block'][$attribs['block']] =
-            xml_get_current_line_number($this->parser);
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_But
-
-    /**
-    * start handler for <but> element
-    */
-    function xmltag_But($xp, $elem, $attribs)
-    {
-        if (isset($attribs['region'])) {
-            $this->_element['not-contains']['region'][$attribs['region']] = true;
-        }
-        if (isset($attribs['block'])) {
-            $this->_element['not-contains']['block'][$attribs['block']] = true;
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Onlyin
-
-    /**
-    * start handler for <onlyin> element
-    */
-    function xmltag_Onlyin($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['region']) || $attribs['region'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region');
-        }
-        $this->_element['onlyin'][$attribs['region']] = xml_get_current_line_number($this->parser);
-    }
-
-    // }}}
-    // {{{ xmltag_Author
-
-    /**
-    * start handler for <author> element
-    */
-    function xmltag_Author($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'author name');
-        }
-        $this->_authors[] = array(
-        'name'  => @$attribs['name'],
-        'email' => (string)@$attribs['email']
-        );
-    }
-
-    // }}}
-    // {{{ xmltag_Highlight
-
-    /**
-    * start handler for <highlight> element
-    */
-    function xmltag_Highlight($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['lang']) || $attribs['lang'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'language name');
-        }
-        $this->_code = '';
-        $this->language = strtoupper(@$attribs['lang']);
-        $this->_case = @$attribs['case'] == 'yes';
-    }
-
-    // }}}
-
-    /**#@-*/
-
-    // {{{ _error
-
-    /**
-    * Add an error message
-    *
-    * @param integer $code Error code
-    * @param mixed   $message Error message or array with error message parameters
-    * @param integer $lineNo Source code line number
-    * @access private
-    */
-    function _error($code, $params = array(), $lineNo = 0)
-    {
-        if (!$lineNo && !empty($this->parser)) {
-            $lineNo = xml_get_current_line_number($this->parser);
-        }
-        $this->_errors[] = $this->_formatError($code, $params, $this->_syntaxFile, $lineNo);
-    }
-
-    // }}}
-    // {{{ _aliasAttributes
-
-    /**
-    * BC trick
-    *
-    * @param array $attrs attributes
-    */
-    function _aliasAttributes(&$attrs)
-    {
-        if (isset($attrs['innerClass']) && !isset($attrs['innerGroup'])) {
-            $attrs['innerGroup'] = $attrs['innerClass'];
-        }
-        if (isset($attrs['delimClass']) && !isset($attrs['delimGroup'])) {
-            $attrs['delimGroup'] = $attrs['delimClass'];
-        }
-        if (isset($attrs['partClass']) && !isset($attrs['partGroup'])) {
-            $attrs['partGroup'] = $attrs['partClass'];
-        }
-    }
-
-    // }}}
-
-    /**#@+
-    * @access private
-    * @param resource $xp      XML parser resource
-    * @param string   $elem    XML element name
-    */
-
-    // {{{ xmltag_Comment_
-
-    /**
-    * end handler for <comment> element
-    */
-    function xmltag_Comment_($xp, $elem)
-    {
-        $this->_inComment = false;
-    }
-
-    // }}}
-    // {{{ xmltag_Region_
-
-    /**
-    * end handler for <region> element
-    */
-    function xmltag_Region_($xp, $elem)
-    {
-        $this->_element['type'] = 'region';
-        $this->_element['order'] = $this->_blockOrder ++;
-        $this->_regions[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Keywords_
-
-    /**
-    * end handler for <keywords> element
-    */
-    function xmltag_Keywords_($xp, $elem)
-    {
-        $this->_keywords[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Block_
-
-    /**
-    * end handler for <block> element
-    */
-    function xmltag_Block_($xp, $elem)
-    {
-        $this->_element['type'] = 'block';
-        $this->_element['order'] = $this->_blockOrder ++;
-        $this->_blocks[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Highlight_
-
-    /**
-    * end handler for <highlight> element
-    */
-    function xmltag_Highlight_($xp, $elem)
-    {
-        $conditions = array();
-        $toplevel = array();
-        foreach ($this->_blocks as $i => $current) {
-            if (!$current['contained'] && !isset($current['onlyin'])) {
-                $toplevel[] = $i;
-            }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_BLOCK_REGION,
-                    array(
-                    'block' => $current['name'],
-                    'region' => $region
-                    ));
-                }
-            }
-        }
-        foreach ($this->_regions as $i=>$current) {
-            if (!$current['contained'] && !isset($current['onlyin'])) {
-                $toplevel[] = $i;
-            }
-            foreach ((array)@$current['contains']['region'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
-                    array(
-                    'region1' => $current['name'],
-                    'region2' => $region
-                    ));
-                }
-            }
-            foreach ((array)@$current['contains']['block'] as $region => $lineNo) {
-                if (!isset($this->_blocks[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_BLOCK,
-                    array(
-                    'block' => $current['name'],
-                    'region' => $region
-                    ));
-                }
-            }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
-                    array(
-                    'region1' => $current['name'],
-                    'region2' => $region
-                    ));
-                }
-            }
-            foreach ($this->_regions as $j => $region) {
-                if (isset($region['onlyin'])) {
-                    $suits = isset($region['onlyin'][$current['name']]);
-                } elseif (isset($current['not-contains']['region'][$region['name']])) {
-                    $suits = false;
-                } elseif (isset($current['contains']['region'][$region['name']])) {
-                    $suits = true;
-                } else {
-                    $suits = @$current['contains-all'] && @!$region['never-contained'];
-                }
-                if ($suits) {
-                    $this->_regions[$i]['lookfor'][] = $j;
-                }
-            }
-            foreach ($this->_blocks as $j=>$region) {
-                if (isset($region['onlyin'])) {
-                    $suits = isset($region['onlyin'][$current['name']]);
-                } elseif (isset($current['not-contains']['block'][$region['name']])) {
-                    $suits = false;
-                } elseif (isset($current['contains']['block'][$region['name']])) {
-                    $suits = true;
-                } else {
-                    $suits = @$current['contains-all'] && @!$region['never-contained'];
-                }
-                if ($suits) {
-                    $this->_regions[$i]['lookfor'][] = $j;
-                }
-            }
-        }
-        foreach ($this->_blocks as $i=>$current) {
-            unset ($this->_blocks[$i]['never-contained']);
-            unset ($this->_blocks[$i]['contained']);
-            unset ($this->_blocks[$i]['contains-all']);
-            unset ($this->_blocks[$i]['contains']);
-            unset ($this->_blocks[$i]['onlyin']);
-            unset ($this->_blocks[$i]['line']);
-        }
-
-        foreach ($this->_regions as $i=>$current) {
-            unset ($this->_regions[$i]['never-contained']);
-            unset ($this->_regions[$i]['contained']);
-            unset ($this->_regions[$i]['contains-all']);
-            unset ($this->_regions[$i]['contains']);
-            unset ($this->_regions[$i]['onlyin']);
-            unset ($this->_regions[$i]['line']);
-        }
-
-        foreach ($this->_keywords as $name => $keyword) {
-            if (isset($keyword['ifdef'])) {
-                $conditions[$keyword['ifdef']][] = array($name, true);
-            }
-            if (isset($keyword['ifndef'])) {
-                $conditions[$keyword['ifndef']][] = array($name, false);
-            }
-            unset($this->_keywords[$name]['line']);
-            if (!isset($this->_blocks[$keyword['inherits']])) {
-                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_INHERITS,
-                array(
-                'keyword' => $keyword['name'],
-                'block' => $keyword['inherits']
-                ));
-            }
-            if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']]) ) {
-                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_BLOCK,
-                array(
-                'keyword' => $keyword['name'],
-                'block' => $keyword['inherits']
-                ));
-            }
-        }
-
-        $syntax=array(
-        'keywords'   => $this->_keywords,
-        'blocks'     => array_merge($this->_blocks, $this->_regions),
-        'toplevel'   => $toplevel,
-        );
-        uasort($syntax['blocks'], array(&$this, '_sortBlocks'));
-        foreach ($syntax['blocks'] as $name => $block) {
-            if ($block['type'] == 'block') {
-                continue;
-            }
-            if (is_array(@$syntax['blocks'][$name]['lookfor'])) {
-                usort($syntax['blocks'][$name]['lookfor'], array(&$this, '_sortLookFor'));
-            }
-        }
-        usort($syntax['toplevel'], array(&$this, '_sortLookFor'));
-        $syntax['case'] = $this->_case;
-        $this->_code = <<<CODE
-<?php
-/**
- * Auto-generated class. {$this->language} syntax highlighting
-CODE;
-
-        if ($this->_comment) {
-            $comment = preg_replace('~^~m',' * ',$this->_comment);
-            $this->_code .= "\n * \n" . $comment;
-        }
-
-        $this->_code .= <<<CODE
-
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: $this->_syntaxFile
-
-CODE;
-
-        foreach ($this->_authors as $author) {
-            $this->_code .= ' * @author ' . $author['name'];
-            if ($author['email']) {
-                $this->_code .= ' <' . $author['email'] . '>';
-            }
-            $this->_code .= "\n";
-        }
-
-        $this->_code .= <<<CODE
- *
- */
-
-/**
- * Auto-generated class. {$this->language} syntax highlighting
- *
-
-CODE;
-        foreach ($this->_authors as $author) {
-            $this->_code .= ' * @author ' . $author['name'];
-            if ($author['email']) {
-                $this->_code .= ' <' . $author['email']. '>';
-            }
-            $this->_code .= "\n";
-        }
-
-
-        $this->_code .= <<<CODE
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_{$this->language} extends Text_Highlighter
-{
-
-CODE;
-        $this->_code .= 'var $_language = \'' . strtolower($this->language) . "';\n\n";
-        $array = var_export($syntax, true);
-        $array = trim(preg_replace('~^(\s*)~m','        \1\1',$array));
-        //        \$this->_syntax = $array;
-        $this->_code .= <<<CODE
-
-    /**
-     *  Constructor
-     *
-     * @param array  \$options
-     * @access public
-     */
-    function __construct(\$options=array())
-    {
-
-CODE;
-        $this->_code .= <<<CODE
-
-        \$this->_options = \$options;
-CODE;
-        $states = array();
-        $i = 0;
-        foreach ($syntax['blocks'] as $name => $block) {
-            if ($block['type'] == 'region') {
-                $states[$name] = $i++;
-            }
-        }
-        $regs = array();
-        $counts = array();
-        $delim = array();
-        $inner = array();
-        $end = array();
-        $stat = array();
-        $keywords = array();
-        $parts = array();
-        $kwmap = array();
-        $subst = array();
-        $re = array();
-        $ce = array();
-        $rd = array();
-        $in = array();
-        $st = array();
-        $kw = array();
-        $sb = array();
-        foreach ($syntax['toplevel'] as $name) {
-            $block = $syntax['blocks'][$name];
-            if ($block['type'] == 'block') {
-                $kwm = array();
-                $re[] = '(' . $block['match'] . ')';
-                $ce[] = $this->_countSubpatterns($block['match']);
-                $rd[] = '';
-                $sb[] = false;;
-                $st[] = -1;
-                foreach ($syntax['keywords'] as $kwname => $kwgroup) {
-                    if ($kwgroup['inherits'] != $name) {
-                        continue;
-                    }
-                    $gre = implode('|', array_keys($kwgroup['match']));
-                    if (!$kwgroup['case']) {
-                        $gre = '(?i)' . $gre;
-                    }
-                    $kwm[$kwname][] =  $gre;
-                    $kwmap[$kwname] = $kwgroup['innerGroup'];
-                }
-                foreach ($kwm as $g => $ma) {
-                    $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
-                }
-                $kw[] = $kwm;
-            } else {
-                $kw[] = -1;
-                $re[] = '(' . $block['start'] . ')';
-                $ce[] = $this->_countSubpatterns($block['start']);
-                $rd[] = $block['delimGroup'];
-                $st[] = $states[$name];
-                $sb[] = $block['remember'];
-            }
-            $in[] = $block['innerGroup'];
-        }
-        $re = implode('|', $re);
-        $regs[-1] = '/' . $re . '/';
-        $counts[-1] = $ce;
-        $delim[-1] = $rd;
-        $inner[-1] = $in;
-        $stat[-1] = $st;
-        $keywords[-1] = $kw;
-        $subst[-1] = $sb;
-
-        foreach ($syntax['blocks'] as $ablock) {
-            if ($ablock['type'] != 'region') {
-                continue;
-            }
-            $end[] = '/' . $ablock['end'] . '/';
-            $re = array();
-            $ce = array();
-            $rd = array();
-            $in = array();
-            $st = array();
-            $kw = array();
-            $pc = array();
-            $sb = array();
-            foreach ((array)@$ablock['lookfor'] as $name) {
-                $block = $syntax['blocks'][$name];
-                if (isset($block['partClass'])) {
-                    $pc[] = $block['partClass'];
-                } else {
-                    $pc[] = null;
-                }
-                if ($block['type'] == 'block') {
-                    $kwm = array();;
-                    $re[] = '(' . $block['match'] . ')';
-                    $ce[] = $this->_countSubpatterns($block['match']);
-                    $rd[] = '';
-                    $sb[] = false;
-                    $st[] = -1;
-                    foreach ($syntax['keywords'] as $kwname => $kwgroup) {
-                        if ($kwgroup['inherits'] != $name) {
-                            continue;
-                        }
-                        $gre = implode('|', array_keys($kwgroup['match']));
-                        if (!$kwgroup['case']) {
-                            $gre = '(?i)' . $gre;
-                        }
-                        $kwm[$kwname][] =  $gre;
-                        $kwmap[$kwname] = $kwgroup['innerGroup'];
-                    }
-                    foreach ($kwm as $g => $ma) {
-                        $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
-                    }
-                    $kw[] = $kwm;
-                } else {
-                    $sb[] = $block['remember'];
-                    $kw[] = -1;
-                    $re[] = '(' . $block['start'] . ')';
-                    $ce[] = $this->_countSubpatterns($block['start']);
-                    $rd[] = $block['delimGroup'];
-                    $st[] = $states[$name];
-                }
-                $in[] = $block['innerGroup'];
-            }
-            $re = implode('|', $re);
-            $regs[] = '/' . $re . '/';
-            $counts[] = $ce;
-            $delim[] = $rd;
-            $inner[] = $in;
-            $stat[] = $st;
-            $keywords[] = $kw;
-            $parts[] = $pc;
-            $subst[] = $sb;
-        }
-
-
-        $this->_code .= "\n        \$this->_regs = " . $this->_exportArray($regs);
-        $this->_code .= ";\n        \$this->_counts = " .$this->_exportArray($counts);
-        $this->_code .= ";\n        \$this->_delim = " .$this->_exportArray($delim);
-        $this->_code .= ";\n        \$this->_inner = " .$this->_exportArray($inner);
-        $this->_code .= ";\n        \$this->_end = " .$this->_exportArray($end);
-        $this->_code .= ";\n        \$this->_states = " .$this->_exportArray($stat);
-        $this->_code .= ";\n        \$this->_keywords = " .$this->_exportArray($keywords);
-        $this->_code .= ";\n        \$this->_parts = " .$this->_exportArray($parts);
-        $this->_code .= ";\n        \$this->_subst = " .$this->_exportArray($subst);
-        $this->_code .= ";\n        \$this->_conditions = " .$this->_exportArray($conditions);
-        $this->_code .= ";\n        \$this->_kwmap = " .$this->_exportArray($kwmap);
-        $this->_code .= ";\n        \$this->_defClass = '" .$this->_defClass . '\'';
-        $this->_code .= <<<CODE
-;
-        \$this->_checkDefines();
-    }
-
-}
-CODE;
-}
-
-// }}}
-}
-
-
-/*
-* Local variables:
-* tab-width: 4
-* c-basic-offset: 4
-* c-hanging-comment-ender-p: nil
-* End:
-*/
-
-?>
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+* Syntax highlighter class generator
+*
+* To simplify the process of creating new syntax highlighters
+* for different languages, {@link Text_Highlighter_Generator} class is
+* provided. It takes highlighting rules from XML file and generates
+* a code of a class inherited from {@link Text_Highlighter}.
+*
+* PHP versions 4 and 5
+*
+* LICENSE: This source file is subject to version 3.0 of the PHP license
+* that is available through the world-wide-web at the following URI:
+* http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+* the PHP License and are unable to obtain it through the web, please
+* send a note to license@php.net so we can mail you a copy immediately.
+*
+* @category   Text
+* @package    Text_Highlighter
+* @author     Andrey Demenev <demenev@gmail.com>
+* @copyright  2004-2006 Andrey Demenev
+* @license    http://www.php.net/license/3_0.txt  PHP License
+* @version    CVS: $Id: Generator.php,v 1.1 2007/06/03 02:36:35 ssttoo Exp $
+* @link       http://pear.php.net/package/Text_Highlighter
+*/
+
+// {{{ error codes
+
+define ('TEXT_HIGHLIGHTER_EMPTY_RE',          1);
+define ('TEXT_HIGHLIGHTER_INVALID_RE',        2);
+define ('TEXT_HIGHLIGHTER_EMPTY_OR_MISSING',  3);
+define ('TEXT_HIGHLIGHTER_EMPTY',             4);
+define ('TEXT_HIGHLIGHTER_REGION_REGION',     5);
+define ('TEXT_HIGHLIGHTER_REGION_BLOCK',      6);
+define ('TEXT_HIGHLIGHTER_BLOCK_REGION',      7);
+define ('TEXT_HIGHLIGHTER_KEYWORD_BLOCK',     8);
+define ('TEXT_HIGHLIGHTER_KEYWORD_INHERITS',  9);
+define ('TEXT_HIGHLIGHTER_PARSE',            10);
+define ('TEXT_HIGHLIGHTER_FILE_WRITE',       11);
+define ('TEXT_HIGHLIGHTER_FILE_READ',        12);
+// }}}
+
+/**
+* Syntax highliter class generator class
+*
+* This class is used to generate PHP classes
+* from XML files with highlighting rules
+*
+* Usage example
+* <code>
+*require_once 'Text/Highlighter/Generator.php';
+*$generator =& new Text_Highlighter_Generator('php.xml');
+*$generator->generate();
+*$generator->saveCode('PHP.php');
+* </code>
+*
+* A command line script <b>generate</b> is provided for
+* class generation (installs in scripts/Text/Highlighter).
+*
+* @author     Andrey Demenev <demenev@gmail.com>
+* @copyright  2004-2006 Andrey Demenev
+* @license    http://www.php.net/license/3_0.txt  PHP License
+* @version    Release: 0.7.0
+* @link       http://pear.php.net/package/Text_Highlighter
+*/
+
+class Text_Highlighter_Generator extends  XML_Parser
+{
+    // {{{ properties
+    /**
+    * Whether to do case folding.
+    * We have to declare it here, because XML_Parser
+    * sets case folding in constructor
+    *
+    * @var  boolean
+    */
+    var $folding = false;
+
+    /**
+    * Holds name of file with highlighting rules
+    *
+    * @var string
+    * @access private
+    */
+    var $_syntaxFile;
+
+    /**
+    * Current element being processed
+    *
+    * @var array
+    * @access private
+    */
+    var $_element;
+
+    /**
+    * List of regions
+    *
+    * @var array
+    * @access private
+    */
+    var $_regions = array();
+
+    /**
+    * List of blocks
+    *
+    * @var array
+    * @access private
+    */
+    var $_blocks = array();
+
+    /**
+    * List of keyword groups
+    *
+    * @var array
+    * @access private
+    */
+    var $_keywords = array();
+
+    /**
+    * List of authors
+    *
+    * @var array
+    * @access private
+    */
+    var $_authors = array();
+
+    /**
+    * Name of language
+    *
+    * @var string
+    * @access public
+    */
+    var $language = '';
+
+    /**
+    * Generated code
+    *
+    * @var string
+    * @access private
+    */
+    var $_code = '';
+
+    /**
+    * Default class
+    *
+    * @var string
+    * @access private
+    */
+    var $_defClass = 'default';
+
+    /**
+    * Comment
+    *
+    * @var string
+    * @access private
+    */
+    var $_comment = '';
+
+    /**
+    * Flag for comment processing
+    *
+    * @var boolean
+    * @access private
+    */
+    var $_inComment = false;
+
+    /**
+    * Sorting order of current block/region
+    *
+    * @var integer
+    * @access private
+    */
+    var $_blockOrder = 0;
+
+    /**
+    * Generation errors
+    *
+    * @var array
+    * @access private
+    */
+    var $_errors;
+
+    // }}}
+    // {{{ constructor
+
+    /**
+    * Constructor
+    *
+    * @param string $syntaxFile Name of XML file
+    * with syntax highlighting rules
+    *
+    * @access public
+    */
+
+    function __construct($syntaxFile = '')
+    {
+        XML_Parser::XML_Parser(null, 'func');
+        $this->_errors = array();
+        $this->_declareErrorMessages();
+        if ($syntaxFile) {
+            $this->setInputFile($syntaxFile);
+        }
+    }
+
+    // }}}
+    // {{{ _formatError
+
+    /**
+    * Format error message
+    *
+    * @param int $code error code
+    * @param string $params parameters
+    * @param string $fileName file name
+    * @param int $lineNo line number
+    * @return  array
+    * @access  public
+    */
+    function _formatError($code, $params, $fileName, $lineNo)
+    {
+        $template = $this->_templates[$code];
+        $ret = call_user_func_array('sprintf', array_merge(array($template), $params));
+        if ($fileName) {
+            $ret = '[' . $fileName . '] ' . $ret;
+        }
+        if ($lineNo) {
+            $ret .= ' (line ' . $lineNo . ')';
+        }
+        return $ret;
+    }
+
+    // }}}
+    // {{{ declareErrorMessages
+
+    /**
+    * Set up error message templates
+    *
+    * @access  private
+    */
+    function _declareErrorMessages()
+    {
+        $this->_templates = array (
+        TEXT_HIGHLIGHTER_EMPTY_RE => 'Empty regular expression',
+        TEXT_HIGHLIGHTER_INVALID_RE => 'Invalid regular expression : %s',
+        TEXT_HIGHLIGHTER_EMPTY_OR_MISSING => 'Empty or missing %s',
+        TEXT_HIGHLIGHTER_EMPTY  => 'Empty %s',
+        TEXT_HIGHLIGHTER_REGION_REGION => 'Region %s refers undefined region %s',
+        TEXT_HIGHLIGHTER_REGION_BLOCK => 'Region %s refers undefined block %s',
+        TEXT_HIGHLIGHTER_BLOCK_REGION => 'Block %s refers undefined region %s',
+        TEXT_HIGHLIGHTER_KEYWORD_BLOCK => 'Keyword group %s refers undefined block %s',
+        TEXT_HIGHLIGHTER_KEYWORD_INHERITS => 'Keyword group %s inherits undefined block %s',
+        TEXT_HIGHLIGHTER_PARSE => '%s',
+        TEXT_HIGHLIGHTER_FILE_WRITE => 'Error writing file %s',
+        TEXT_HIGHLIGHTER_FILE_READ => '%s'
+        );
+    }
+
+    // }}}
+    // {{{ setInputFile
+
+    /**
+    * Sets the input xml file to be parsed
+    *
+    * @param    string      Filename (full path)
+    * @return   boolean
+    * @access   public
+    */
+    function setInputFile($file)
+    {
+        $this->_syntaxFile = $file;
+        $ret = parent::setInputFile($file);
+        if (PEAR::isError($ret)) {
+            $this->_error(TEXT_HIGHLIGHTER_FILE_READ, $ret->message);
+            return false;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ generate
+
+    /**
+    * Generates class code
+    *
+    * @access public
+    */
+
+    function generate()
+    {
+        $this->_regions    = array();
+        $this->_blocks     = array();
+        $this->_keywords   = array();
+        $this->language    = '';
+        $this->_code       = '';
+        $this->_defClass   = 'default';
+        $this->_comment    = '';
+        $this->_inComment  = false;
+        $this->_authors    = array();
+        $this->_blockOrder = 0;
+        $this->_errors   = array();
+
+        $ret = $this->parse();
+        if (PEAR::isError($ret)) {
+            $this->_error(TEXT_HIGHLIGHTER_PARSE, $ret->message);
+            return false;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ getCode
+
+    /**
+    * Returns generated code as a string.
+    *
+    * @return string Generated code
+    * @access public
+    */
+
+    function getCode()
+    {
+        return $this->_code;
+    }
+
+    // }}}
+    // {{{ saveCode
+
+    /**
+    * Saves generated class to file. Note that {@link Text_Highlighter::factory()}
+    * assumes that filename is uppercase (SQL.php, DTD.php, etc), and file
+    * is located in Text/Highlighter
+    *
+    * @param string $filename Name of file to write the code to
+    * @return boolean true on success, false on failure
+    * @access public
+    */
+
+    function saveCode($filename)
+    {
+        $f = @fopen($filename, 'wb');
+        if (!$f) {
+            $this->_error(TEXT_HIGHLIGHTER_FILE_WRITE, array('outfile'=>$filename));
+            return false;
+        }
+        fwrite ($f, $this->_code);
+        fclose($f);
+        return true;
+    }
+
+    // }}}
+    // {{{ hasErrors
+
+    /**
+    * Reports if there were errors
+    *
+    * @return boolean
+    * @access public
+    */
+
+    function hasErrors()
+    {
+        return count($this->_errors) > 0;
+    }
+
+    // }}}
+    // {{{ getErrors
+
+    /**
+    * Returns errors
+    *
+    * @return array
+    * @access public
+    */
+
+    function getErrors()
+    {
+        return $this->_errors;
+    }
+
+    // }}}
+    // {{{ _sortBlocks
+
+    /**
+    * Sorts blocks
+    *
+    * @access private
+    */
+
+    function _sortBlocks($b1, $b2) {
+        return $b1['order'] - $b2['order'];
+    }
+
+    // }}}
+    // {{{ _sortLookFor
+    /**
+    * Sort 'look for' list
+    * @return int
+    * @param string $b1
+    * @param string $b2
+    */
+    function _sortLookFor($b1, $b2) {
+        $o1 = isset($this->_blocks[$b1]) ? $this->_blocks[$b1]['order'] : $this->_regions[$b1]['order'];
+        $o2 = isset($this->_blocks[$b2]) ? $this->_blocks[$b2]['order'] : $this->_regions[$b2]['order'];
+        return $o1 - $o2;
+    }
+
+    // }}}
+    // {{{ _makeRE
+
+    /**
+    * Adds delimiters and modifiers to regular expression if necessary
+    *
+    * @param string $text Original RE
+    * @return string Final RE
+    * @access private
+    */
+    function _makeRE($text, $case = false)
+    {
+        if (!strlen($text)) {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_RE);
+        }
+        if (!strlen($text) || $text{0} != '/') {
+            $text = '/' . $text . '/';
+        }
+        if (!$case) {
+            $text .= 'i';
+        }
+        $php_errormsg = '';
+        @preg_match($text, '');
+        if ($php_errormsg) {
+            $this->_error(TEXT_HIGHLIGHTER_INVALID_RE, $php_errormsg);
+        }
+        preg_match ('#^/(.+)/(.*)$#', $text, $m);
+        if (@$m[2]) {
+            $text = '(?' . $m[2] . ')' . $m[1];
+        } else {
+            $text = $m[1];
+        }
+        return $text;
+    }
+
+    // }}}
+    // {{{ _exportArray
+
+    /**
+    * Exports array as PHP code
+    *
+    * @param array $array
+    * @return string Code
+    * @access private
+    */
+    function _exportArray($array)
+    {
+        $array = var_export($array, true);
+        return trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+    }
+
+    // }}}
+    // {{{ _countSubpatterns
+    /**
+    * Find number of capturing suppaterns in regular expression
+    * @return int
+    * @param string $re Regular expression (without delimiters)
+    */
+    function _countSubpatterns($re)
+    {
+        preg_match_all('/' . $re . '/', '', $m);
+        return count($m)-1;
+    }
+
+    // }}}
+
+    /**#@+
+    * @access private
+    * @param resource $xp      XML parser resource
+    * @param string   $elem    XML element name
+    * @param array    $attribs XML element attributes
+    */
+
+    // {{{ xmltag_Default
+
+    /**
+    * start handler for <default> element
+    */
+    function xmltag_Default($xp, $elem, $attribs)
+    {
+        $this->_aliasAttributes($attribs);
+        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+        }
+        $this->_defClass = @$attribs['innerGroup'];
+    }
+
+    // }}}
+    // {{{ xmltag_Region
+
+    /**
+    * start handler for <region> element
+    */
+    function xmltag_Region($xp, $elem, $attribs)
+    {
+        $this->_aliasAttributes($attribs);
+        if (!isset($attribs['name']) || $attribs['name'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region name');
+        }
+        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+        }
+        $this->_element = array('name' => $attribs['name']);
+        $this->_element['line'] = xml_get_current_line_number($this->parser);
+        if (isset($attribs['case'])) {
+            $this->_element['case'] = $attribs['case'] == 'yes';
+        } else {
+            $this->_element['case'] = $this->_case;
+        }
+        $this->_element['innerGroup'] = $attribs['innerGroup'];
+        $this->_element['delimGroup'] = isset($attribs['delimGroup']) ?
+        $attribs['delimGroup'] :
+        $attribs['innerGroup'];
+        $this->_element['start'] = $this->_makeRE(@$attribs['start'], $this->_element['case']);
+        $this->_element['end'] = $this->_makeRE(@$attribs['end'], $this->_element['case']);
+        $this->_element['contained'] = @$attribs['contained'] == 'yes';
+        $this->_element['never-contained'] = @$attribs['never-contained'] == 'yes';
+        $this->_element['remember'] = @$attribs['remember'] == 'yes';
+        if (isset($attribs['startBOL']) && $attribs['startBOL'] == 'yes') {
+            $this->_element['startBOL'] = true;
+        }
+        if (isset($attribs['endBOL']) && $attribs['endBOL'] == 'yes') {
+            $this->_element['endBOL'] = true;
+        }
+        if (isset($attribs['neverAfter'])) {
+            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
+        }
+    }
+
+    // }}}
+    // {{{ xmltag_Block
+
+    /**
+    * start handler for <block> element
+    */
+    function xmltag_Block($xp, $elem, $attribs)
+    {
+        $this->_aliasAttributes($attribs);
+        if (!isset($attribs['name']) || $attribs['name'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'block name');
+        }
+        if (isset($attribs['innerGroup']) && $attribs['innerGroup'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY, 'innerGroup');
+        }
+        $this->_element = array('name' => $attribs['name']);
+        $this->_element['line'] = xml_get_current_line_number($this->parser);
+        if (isset($attribs['case'])) {
+            $this->_element['case'] = $attribs['case'] == 'yes';
+        } else {
+            $this->_element['case'] = $this->_case;
+        }
+        if (isset($attribs['innerGroup'])) {
+            $this->_element['innerGroup'] = @$attribs['innerGroup'];
+        }
+        $this->_element['match'] = $this->_makeRE($attribs['match'], $this->_element['case']);
+        $this->_element['contained'] = @$attribs['contained'] == 'yes';
+        $this->_element['multiline'] = @$attribs['multiline'] == 'yes';
+        if (isset($attribs['BOL']) && $attribs['BOL'] == 'yes') {
+            $this->_element['BOL'] = true;
+        }
+        if (isset($attribs['neverAfter'])) {
+            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
+        }
+    }
+
+    // }}}
+    // {{{ cdataHandler
+
+    /**
+    * Character data handler. Used for comment
+    */
+    function cdataHandler($xp, $cdata)
+    {
+        if ($this->_inComment) {
+            $this->_comment .= $cdata;
+        }
+    }
+
+    // }}}
+    // {{{ xmltag_Comment
+
+    /**
+    * start handler for <comment> element
+    */
+    function xmltag_Comment($xp, $elem, $attribs)
+    {
+        $this->_comment = '';
+        $this->_inComment = true;
+    }
+
+    // }}}
+    // {{{ xmltag_PartGroup
+
+    /**
+    * start handler for <partgroup> element
+    */
+    function xmltag_PartGroup($xp, $elem, $attribs)
+    {
+        $this->_aliasAttributes($attribs);
+        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+        }
+        $this->_element['partClass'][$attribs['index']] = @$attribs['innerGroup'];
+    }
+
+    // }}}
+    // {{{ xmltag_PartClass
+
+    /**
+    * start handler for <partclass> element
+    */
+    function xmltag_PartClass($xp, $elem, $attribs)
+    {
+        $this->xmltag_PartGroup($xp, $elem, $attribs);
+    }
+
+    // }}}
+    // {{{ xmltag_Keywords
+
+    /**
+    * start handler for <keywords> element
+    */
+    function xmltag_Keywords($xp, $elem, $attribs)
+    {
+        $this->_aliasAttributes($attribs);
+        if (!isset($attribs['name']) || $attribs['name'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'keyword group name');
+        }
+        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+        }
+        if (!isset($attribs['inherits']) || $attribs['inherits'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'inherits');
+        }
+        $this->_element = array('name'=>@$attribs['name']);
+        $this->_element['line'] = xml_get_current_line_number($this->parser);
+        $this->_element['innerGroup'] = @$attribs['innerGroup'];
+        if (isset($attribs['case'])) {
+            $this->_element['case'] = $attribs['case'] == 'yes';
+        } else {
+            $this->_element['case'] = $this->_case;
+        }
+        $this->_element['inherits'] = @$attribs['inherits'];
+        if (isset($attribs['otherwise'])) {
+            $this->_element['otherwise'] = $attribs['otherwise'];
+        }
+        if (isset($attribs['ifdef'])) {
+            $this->_element['ifdef'] = $attribs['ifdef'];
+        }
+        if (isset($attribs['ifndef'])) {
+            $this->_element['ifndef'] = $attribs['ifndef'];
+        }
+    }
+
+    // }}}
+    // {{{ xmltag_Keyword
+
+    /**
+    * start handler for <keyword> element
+    */
+    function xmltag_Keyword($xp, $elem, $attribs)
+    {
+        if (!isset($attribs['match']) || $attribs['match'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'match');
+        }
+        $keyword = @$attribs['match'];
+        if (!$this->_element['case']) {
+            $keyword = strtolower($keyword);
+        }
+        $this->_element['match'][$keyword] = true;
+    }
+
+    // }}}
+    // {{{ xmltag_Contains
+
+    /**
+    * start handler for <contains> element
+    */
+    function xmltag_Contains($xp, $elem, $attribs)
+    {
+        $this->_element['contains-all'] = @$attribs['all'] == 'yes';
+        if (isset($attribs['region'])) {
+            $this->_element['contains']['region'][$attribs['region']] =
+            xml_get_current_line_number($this->parser);
+        }
+        if (isset($attribs['block'])) {
+            $this->_element['contains']['block'][$attribs['block']] =
+            xml_get_current_line_number($this->parser);
+        }
+    }
+
+    // }}}
+    // {{{ xmltag_But
+
+    /**
+    * start handler for <but> element
+    */
+    function xmltag_But($xp, $elem, $attribs)
+    {
+        if (isset($attribs['region'])) {
+            $this->_element['not-contains']['region'][$attribs['region']] = true;
+        }
+        if (isset($attribs['block'])) {
+            $this->_element['not-contains']['block'][$attribs['block']] = true;
+        }
+    }
+
+    // }}}
+    // {{{ xmltag_Onlyin
+
+    /**
+    * start handler for <onlyin> element
+    */
+    function xmltag_Onlyin($xp, $elem, $attribs)
+    {
+        if (!isset($attribs['region']) || $attribs['region'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region');
+        }
+        $this->_element['onlyin'][$attribs['region']] = xml_get_current_line_number($this->parser);
+    }
+
+    // }}}
+    // {{{ xmltag_Author
+
+    /**
+    * start handler for <author> element
+    */
+    function xmltag_Author($xp, $elem, $attribs)
+    {
+        if (!isset($attribs['name']) || $attribs['name'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'author name');
+        }
+        $this->_authors[] = array(
+        'name'  => @$attribs['name'],
+        'email' => (string)@$attribs['email']
+        );
+    }
+
+    // }}}
+    // {{{ xmltag_Highlight
+
+    /**
+    * start handler for <highlight> element
+    */
+    function xmltag_Highlight($xp, $elem, $attribs)
+    {
+        if (!isset($attribs['lang']) || $attribs['lang'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'language name');
+        }
+        $this->_code = '';
+        $this->language = strtoupper(@$attribs['lang']);
+        $this->_case = @$attribs['case'] == 'yes';
+    }
+
+    // }}}
+
+    /**#@-*/
+
+    // {{{ _error
+
+    /**
+    * Add an error message
+    *
+    * @param integer $code Error code
+    * @param mixed   $message Error message or array with error message parameters
+    * @param integer $lineNo Source code line number
+    * @access private
+    */
+    function _error($code, $params = array(), $lineNo = 0)
+    {
+        if (!$lineNo && !empty($this->parser)) {
+            $lineNo = xml_get_current_line_number($this->parser);
+        }
+        $this->_errors[] = $this->_formatError($code, $params, $this->_syntaxFile, $lineNo);
+    }
+
+    // }}}
+    // {{{ _aliasAttributes
+
+    /**
+    * BC trick
+    *
+    * @param array $attrs attributes
+    */
+    function _aliasAttributes(&$attrs)
+    {
+        if (isset($attrs['innerClass']) && !isset($attrs['innerGroup'])) {
+            $attrs['innerGroup'] = $attrs['innerClass'];
+        }
+        if (isset($attrs['delimClass']) && !isset($attrs['delimGroup'])) {
+            $attrs['delimGroup'] = $attrs['delimClass'];
+        }
+        if (isset($attrs['partClass']) && !isset($attrs['partGroup'])) {
+            $attrs['partGroup'] = $attrs['partClass'];
+        }
+    }
+
+    // }}}
+
+    /**#@+
+    * @access private
+    * @param resource $xp      XML parser resource
+    * @param string   $elem    XML element name
+    */
+
+    // {{{ xmltag_Comment_
+
+    /**
+    * end handler for <comment> element
+    */
+    function xmltag_Comment_($xp, $elem)
+    {
+        $this->_inComment = false;
+    }
+
+    // }}}
+    // {{{ xmltag_Region_
+
+    /**
+    * end handler for <region> element
+    */
+    function xmltag_Region_($xp, $elem)
+    {
+        $this->_element['type'] = 'region';
+        $this->_element['order'] = $this->_blockOrder ++;
+        $this->_regions[$this->_element['name']] = $this->_element;
+    }
+
+    // }}}
+    // {{{ xmltag_Keywords_
+
+    /**
+    * end handler for <keywords> element
+    */
+    function xmltag_Keywords_($xp, $elem)
+    {
+        $this->_keywords[$this->_element['name']] = $this->_element;
+    }
+
+    // }}}
+    // {{{ xmltag_Block_
+
+    /**
+    * end handler for <block> element
+    */
+    function xmltag_Block_($xp, $elem)
+    {
+        $this->_element['type'] = 'block';
+        $this->_element['order'] = $this->_blockOrder ++;
+        $this->_blocks[$this->_element['name']] = $this->_element;
+    }
+
+    // }}}
+    // {{{ xmltag_Highlight_
+
+    /**
+    * end handler for <highlight> element
+    */
+    function xmltag_Highlight_($xp, $elem)
+    {
+        $conditions = array();
+        $toplevel = array();
+        foreach ($this->_blocks as $i => $current) {
+            if (!$current['contained'] && !isset($current['onlyin'])) {
+                $toplevel[] = $i;
+            }
+            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+                if (!isset($this->_regions[$region])) {
+                    $this->_error(TEXT_HIGHLIGHTER_BLOCK_REGION,
+                    array(
+                    'block' => $current['name'],
+                    'region' => $region
+                    ));
+                }
+            }
+        }
+        foreach ($this->_regions as $i=>$current) {
+            if (!$current['contained'] && !isset($current['onlyin'])) {
+                $toplevel[] = $i;
+            }
+            foreach ((array)@$current['contains']['region'] as $region => $lineNo) {
+                if (!isset($this->_regions[$region])) {
+                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
+                    array(
+                    'region1' => $current['name'],
+                    'region2' => $region
+                    ));
+                }
+            }
+            foreach ((array)@$current['contains']['block'] as $region => $lineNo) {
+                if (!isset($this->_blocks[$region])) {
+                    $this->_error(TEXT_HIGHLIGHTER_REGION_BLOCK,
+                    array(
+                    'block' => $current['name'],
+                    'region' => $region
+                    ));
+                }
+            }
+            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+                if (!isset($this->_regions[$region])) {
+                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
+                    array(
+                    'region1' => $current['name'],
+                    'region2' => $region
+                    ));
+                }
+            }
+            foreach ($this->_regions as $j => $region) {
+                if (isset($region['onlyin'])) {
+                    $suits = isset($region['onlyin'][$current['name']]);
+                } elseif (isset($current['not-contains']['region'][$region['name']])) {
+                    $suits = false;
+                } elseif (isset($current['contains']['region'][$region['name']])) {
+                    $suits = true;
+                } else {
+                    $suits = @$current['contains-all'] && @!$region['never-contained'];
+                }
+                if ($suits) {
+                    $this->_regions[$i]['lookfor'][] = $j;
+                }
+            }
+            foreach ($this->_blocks as $j=>$region) {
+                if (isset($region['onlyin'])) {
+                    $suits = isset($region['onlyin'][$current['name']]);
+                } elseif (isset($current['not-contains']['block'][$region['name']])) {
+                    $suits = false;
+                } elseif (isset($current['contains']['block'][$region['name']])) {
+                    $suits = true;
+                } else {
+                    $suits = @$current['contains-all'] && @!$region['never-contained'];
+                }
+                if ($suits) {
+                    $this->_regions[$i]['lookfor'][] = $j;
+                }
+            }
+        }
+        foreach ($this->_blocks as $i=>$current) {
+            unset ($this->_blocks[$i]['never-contained']);
+            unset ($this->_blocks[$i]['contained']);
+            unset ($this->_blocks[$i]['contains-all']);
+            unset ($this->_blocks[$i]['contains']);
+            unset ($this->_blocks[$i]['onlyin']);
+            unset ($this->_blocks[$i]['line']);
+        }
+
+        foreach ($this->_regions as $i=>$current) {
+            unset ($this->_regions[$i]['never-contained']);
+            unset ($this->_regions[$i]['contained']);
+            unset ($this->_regions[$i]['contains-all']);
+            unset ($this->_regions[$i]['contains']);
+            unset ($this->_regions[$i]['onlyin']);
+            unset ($this->_regions[$i]['line']);
+        }
+
+        foreach ($this->_keywords as $name => $keyword) {
+            if (isset($keyword['ifdef'])) {
+                $conditions[$keyword['ifdef']][] = array($name, true);
+            }
+            if (isset($keyword['ifndef'])) {
+                $conditions[$keyword['ifndef']][] = array($name, false);
+            }
+            unset($this->_keywords[$name]['line']);
+            if (!isset($this->_blocks[$keyword['inherits']])) {
+                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_INHERITS,
+                array(
+                'keyword' => $keyword['name'],
+                'block' => $keyword['inherits']
+                ));
+            }
+            if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']]) ) {
+                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_BLOCK,
+                array(
+                'keyword' => $keyword['name'],
+                'block' => $keyword['inherits']
+                ));
+            }
+        }
+
+        $syntax=array(
+        'keywords'   => $this->_keywords,
+        'blocks'     => array_merge($this->_blocks, $this->_regions),
+        'toplevel'   => $toplevel,
+        );
+        uasort($syntax['blocks'], array(&$this, '_sortBlocks'));
+        foreach ($syntax['blocks'] as $name => $block) {
+            if ($block['type'] == 'block') {
+                continue;
+            }
+            if (is_array(@$syntax['blocks'][$name]['lookfor'])) {
+                usort($syntax['blocks'][$name]['lookfor'], array(&$this, '_sortLookFor'));
+            }
+        }
+        usort($syntax['toplevel'], array(&$this, '_sortLookFor'));
+        $syntax['case'] = $this->_case;
+        $this->_code = <<<CODE
+<?php
+/**
+ * Auto-generated class. {$this->language} syntax highlighting
+CODE;
+
+        if ($this->_comment) {
+            $comment = preg_replace('~^~m',' * ',$this->_comment);
+            $this->_code .= "\n * \n" . $comment;
+        }
+
+        $this->_code .= <<<CODE
+
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: $this->_syntaxFile
+
+CODE;
+
+        foreach ($this->_authors as $author) {
+            $this->_code .= ' * @author ' . $author['name'];
+            if ($author['email']) {
+                $this->_code .= ' <' . $author['email'] . '>';
+            }
+            $this->_code .= "\n";
+        }
+
+        $this->_code .= <<<CODE
+ *
+ */
+
+/**
+ * Auto-generated class. {$this->language} syntax highlighting
+ *
+
+CODE;
+        foreach ($this->_authors as $author) {
+            $this->_code .= ' * @author ' . $author['name'];
+            if ($author['email']) {
+                $this->_code .= ' <' . $author['email']. '>';
+            }
+            $this->_code .= "\n";
+        }
+
+
+        $this->_code .= <<<CODE
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_{$this->language} extends Text_Highlighter
+{
+
+CODE;
+        $this->_code .= 'var $_language = \'' . strtolower($this->language) . "';\n\n";
+        $array = var_export($syntax, true);
+        $array = trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+        //        \$this->_syntax = $array;
+        $this->_code .= <<<CODE
+
+    /**
+     *  Constructor
+     *
+     * @param array  \$options
+     * @access public
+     */
+    function __construct(\$options=array())
+    {
+
+CODE;
+        $this->_code .= <<<CODE
+
+        \$this->_options = \$options;
+CODE;
+        $states = array();
+        $i = 0;
+        foreach ($syntax['blocks'] as $name => $block) {
+            if ($block['type'] == 'region') {
+                $states[$name] = $i++;
+            }
+        }
+        $regs = array();
+        $counts = array();
+        $delim = array();
+        $inner = array();
+        $end = array();
+        $stat = array();
+        $keywords = array();
+        $parts = array();
+        $kwmap = array();
+        $subst = array();
+        $re = array();
+        $ce = array();
+        $rd = array();
+        $in = array();
+        $st = array();
+        $kw = array();
+        $sb = array();
+        foreach ($syntax['toplevel'] as $name) {
+            $block = $syntax['blocks'][$name];
+            if ($block['type'] == 'block') {
+                $kwm = array();
+                $re[] = '(' . $block['match'] . ')';
+                $ce[] = $this->_countSubpatterns($block['match']);
+                $rd[] = '';
+                $sb[] = false;;
+                $st[] = -1;
+                foreach ($syntax['keywords'] as $kwname => $kwgroup) {
+                    if ($kwgroup['inherits'] != $name) {
+                        continue;
+                    }
+                    $gre = implode('|', array_keys($kwgroup['match']));
+                    if (!$kwgroup['case']) {
+                        $gre = '(?i)' . $gre;
+                    }
+                    $kwm[$kwname][] =  $gre;
+                    $kwmap[$kwname] = $kwgroup['innerGroup'];
+                }
+                foreach ($kwm as $g => $ma) {
+                    $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
+                }
+                $kw[] = $kwm;
+            } else {
+                $kw[] = -1;
+                $re[] = '(' . $block['start'] . ')';
+                $ce[] = $this->_countSubpatterns($block['start']);
+                $rd[] = $block['delimGroup'];
+                $st[] = $states[$name];
+                $sb[] = $block['remember'];
+            }
+            $in[] = $block['innerGroup'];
+        }
+        $re = implode('|', $re);
+        $regs[-1] = '/' . $re . '/';
+        $counts[-1] = $ce;
+        $delim[-1] = $rd;
+        $inner[-1] = $in;
+        $stat[-1] = $st;
+        $keywords[-1] = $kw;
+        $subst[-1] = $sb;
+
+        foreach ($syntax['blocks'] as $ablock) {
+            if ($ablock['type'] != 'region') {
+                continue;
+            }
+            $end[] = '/' . $ablock['end'] . '/';
+            $re = array();
+            $ce = array();
+            $rd = array();
+            $in = array();
+            $st = array();
+            $kw = array();
+            $pc = array();
+            $sb = array();
+            foreach ((array)@$ablock['lookfor'] as $name) {
+                $block = $syntax['blocks'][$name];
+                if (isset($block['partClass'])) {
+                    $pc[] = $block['partClass'];
+                } else {
+                    $pc[] = null;
+                }
+                if ($block['type'] == 'block') {
+                    $kwm = array();;
+                    $re[] = '(' . $block['match'] . ')';
+                    $ce[] = $this->_countSubpatterns($block['match']);
+                    $rd[] = '';
+                    $sb[] = false;
+                    $st[] = -1;
+                    foreach ($syntax['keywords'] as $kwname => $kwgroup) {
+                        if ($kwgroup['inherits'] != $name) {
+                            continue;
+                        }
+                        $gre = implode('|', array_keys($kwgroup['match']));
+                        if (!$kwgroup['case']) {
+                            $gre = '(?i)' . $gre;
+                        }
+                        $kwm[$kwname][] =  $gre;
+                        $kwmap[$kwname] = $kwgroup['innerGroup'];
+                    }
+                    foreach ($kwm as $g => $ma) {
+                        $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
+                    }
+                    $kw[] = $kwm;
+                } else {
+                    $sb[] = $block['remember'];
+                    $kw[] = -1;
+                    $re[] = '(' . $block['start'] . ')';
+                    $ce[] = $this->_countSubpatterns($block['start']);
+                    $rd[] = $block['delimGroup'];
+                    $st[] = $states[$name];
+                }
+                $in[] = $block['innerGroup'];
+            }
+            $re = implode('|', $re);
+            $regs[] = '/' . $re . '/';
+            $counts[] = $ce;
+            $delim[] = $rd;
+            $inner[] = $in;
+            $stat[] = $st;
+            $keywords[] = $kw;
+            $parts[] = $pc;
+            $subst[] = $sb;
+        }
+
+
+        $this->_code .= "\n        \$this->_regs = " . $this->_exportArray($regs);
+        $this->_code .= ";\n        \$this->_counts = " .$this->_exportArray($counts);
+        $this->_code .= ";\n        \$this->_delim = " .$this->_exportArray($delim);
+        $this->_code .= ";\n        \$this->_inner = " .$this->_exportArray($inner);
+        $this->_code .= ";\n        \$this->_end = " .$this->_exportArray($end);
+        $this->_code .= ";\n        \$this->_states = " .$this->_exportArray($stat);
+        $this->_code .= ";\n        \$this->_keywords = " .$this->_exportArray($keywords);
+        $this->_code .= ";\n        \$this->_parts = " .$this->_exportArray($parts);
+        $this->_code .= ";\n        \$this->_subst = " .$this->_exportArray($subst);
+        $this->_code .= ";\n        \$this->_conditions = " .$this->_exportArray($conditions);
+        $this->_code .= ";\n        \$this->_kwmap = " .$this->_exportArray($kwmap);
+        $this->_code .= ";\n        \$this->_defClass = '" .$this->_defClass . '\'';
+        $this->_code .= <<<CODE
+;
+        \$this->_checkDefines();
+    }
+
+}
+CODE;
+}
+
+// }}}
+}
+
+
+/*
+* Local variables:
+* tab-width: 4
+* c-basic-offset: 4
+* c-hanging-comment-ender-p: nil
+* End:
+*/
+
+?>
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/HTML.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/HTML.php
index 163288a7..eaf001e2 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/HTML.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/HTML.php
@@ -1,53 +1,53 @@
-<?php
-/**
- * Auto-generated class. HTML syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+<?php
+/**
+ * Auto-generated class. HTML syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : html.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-/**
- * Auto-generated class. HTML syntax highlighting
- *
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+/**
+ * Auto-generated class. HTML syntax highlighting
+ *
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_HTML extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_HTML extends Text_Highlighter
+{
     var $_language = 'html';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?i)\\<!--)|((?i)\\<[\\?\\/]?)|((?i)(&)[\\w\\-\\.]+;)/',
@@ -213,8 +213,8 @@ class  Text_Highlighter_HTML extends Text_Highlighter
         );
         $this->_kwmap = array (
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVA.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVA.php
index ef1e8e29..53c02680 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVA.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVA.php
@@ -1,49 +1,49 @@
-<?php
-/**
- * Auto-generated class. JAVA syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+<?php
+/**
+ * Auto-generated class. JAVA syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : java.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. JAVA syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. JAVA syntax highlighting
+ *
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_JAVA extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_JAVA extends Text_Highlighter
+{
     var $_language = 'java';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
@@ -777,8 +777,8 @@ class  Text_Highlighter_JAVA extends Text_Highlighter
             'reserved' => 'reserved',
             'builtin' => 'builtin',
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVASCRIPT.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVASCRIPT.php
index d29a4f64..2055c94e 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVASCRIPT.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVASCRIPT.php
@@ -1,49 +1,49 @@
-<?php
-/**
- * Auto-generated class. JAVASCRIPT syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+<?php
+/**
+ * Auto-generated class. JAVASCRIPT syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : javascript.xml,v 1.2 2007/06/05 21:57:21 ssttoo Exp
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. JAVASCRIPT syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. JAVASCRIPT syntax highlighting
+ *
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_JAVASCRIPT extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_JAVASCRIPT extends Text_Highlighter
+{
     var $_language = 'javascript';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)\\d*\\.?\\d+)/',
@@ -606,8 +606,8 @@ class  Text_Highlighter_JAVASCRIPT extends Text_Highlighter
             'builtin' => 'builtin',
             'reserved' => 'reserved',
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/MYSQL.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/MYSQL.php
index 0fc75eb2..ba240512 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/MYSQL.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/MYSQL.php
@@ -1,49 +1,49 @@
-<?php
-/**
- * Auto-generated class. MYSQL syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+<?php
+/**
+ * Auto-generated class. MYSQL syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : mysql.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. MYSQL syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. MYSQL syntax highlighting
+ *
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_MYSQL extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_MYSQL extends Text_Highlighter
+{
     var $_language = 'mysql';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?i)`)|((?i)\\/\\*)|((?i)(#|--\\s).*)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)")|((?i)\\()|((?i)\')|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)/',
@@ -409,8 +409,8 @@ class  Text_Highlighter_MYSQL extends Text_Highlighter
             'function' => 'reserved',
             'reserved' => 'reserved',
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/PERL.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/PERL.php
index ace0d37c..9e8bd752 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/PERL.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/PERL.php
@@ -1,56 +1,56 @@
-<?php
-/**
+<?php
+/**
  * Auto-generated class. PERL syntax highlighting
  *
  * This highlighter is EXPERIMENTAL, so that it may work incorrectly.
  * Most rules were created by Mariusz Jakubowski, and extended by me.
  * My  knowledge  of  Perl  is  poor,  and  Perl  syntax  seems  too
- * complicated to me.
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+ * complicated to me.
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : perl.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Mariusz 'kg' Jakubowski <kg@alternatywa.info>
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. PERL syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. PERL syntax highlighting
+ *
  * @author Mariusz 'kg' Jakubowski <kg@alternatywa.info>
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_PERL extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_PERL extends Text_Highlighter
+{
     var $_language = 'perl';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?m)^(#!)(.*))|((?m)^=\\w+)|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|([& ](\\w{2,}::)+\\w{2,})|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(&|\\w+)\'[\\w_\']+\\b)|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
@@ -1327,8 +1327,8 @@ class  Text_Highlighter_PERL extends Text_Highlighter
             'missingreserved' => 'reserved',
             'flowcontrol' => 'reserved',
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/PHP.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/PHP.php
index ee49951e..be504b65 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/PHP.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/PHP.php
@@ -1,1089 +1,1089 @@
-<?php
-/**
- * Auto-generated class. PHP syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: Text/php.xml
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. PHP syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_PHP extends Text_Highlighter
-{
-    var $_language = 'php';
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)(\\<\\?(php|=)?)?)/',
-            0 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)\\?\\>)|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            2 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            3 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            4 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
-            5 => '/((?i)\\\\[\\\\"\'`tnr\\$\\{])|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
-            6 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
-            7 => '/((?i)\\\\[\\\\"\'`tnr\\$\\{])|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
-            8 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
-            9 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
-            10 => '//',
-        );
-        $this->_counts = array (
-            -1 =>
-            array (
-                0 => 2,
-            ),
-            0 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 1,
-                7 => 0,
-                8 => 1,
-                9 => 0,
-                10 => 1,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 2,
-                16 => 5,
-            ),
-            1 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 1,
-                7 => 0,
-                8 => 1,
-                9 => 0,
-                10 => 1,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 0,
-                16 => 2,
-                17 => 5,
-            ),
-            2 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 1,
-                7 => 0,
-                8 => 1,
-                9 => 0,
-                10 => 1,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 2,
-                16 => 5,
-            ),
-            3 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 1,
-                7 => 0,
-                8 => 1,
-                9 => 0,
-                10 => 1,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 2,
-                16 => 5,
-            ),
-            4 =>
-            array (
-                0 => 0,
-                1 => 3,
-                2 => 1,
-                3 => 0,
-                4 => 0,
-            ),
-            5 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-            ),
-            6 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-            ),
-            7 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-            ),
-            8 =>
-            array (
-                0 => 0,
-            ),
-            9 =>
-            array (
-                0 => 0,
-                1 => 3,
-                2 => 1,
-                3 => 0,
-                4 => 0,
-            ),
-            10 =>
-            array (
-            ),
-        );
-        $this->_delim = array (
-            -1 =>
-            array (
-                0 => 'inlinetags',
-            ),
-            0 =>
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => 'quotes',
-                8 => 'comment',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-            ),
-            1 =>
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => 'quotes',
-                8 => 'comment',
-                9 => '',
-                10 => '',
-                11 => 'inlinetags',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-                17 => '',
-            ),
-            2 =>
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => 'quotes',
-                8 => 'comment',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-            ),
-            3 =>
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => 'quotes',
-                8 => 'comment',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-            ),
-            4 =>
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => '',
-            ),
-            5 =>
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-            ),
-            6 =>
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-            ),
-            7 =>
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-            ),
-            8 =>
-            array (
-                0 => '',
-            ),
-            9 =>
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => '',
-            ),
-            10 =>
-            array (
-            ),
-        );
-        $this->_inner = array (
-            -1 =>
-            array (
-                0 => 'code',
-            ),
-            0 =>
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'string',
-                7 => 'string',
-                8 => 'comment',
-                9 => 'identifier',
-                10 => 'reserved',
-                11 => 'number',
-                12 => 'var',
-                13 => 'number',
-                14 => 'number',
-                15 => 'number',
-                16 => 'number',
-            ),
-            1 =>
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'string',
-                7 => 'string',
-                8 => 'comment',
-                9 => 'identifier',
-                10 => 'reserved',
-                11 => 'default',
-                12 => 'number',
-                13 => 'var',
-                14 => 'number',
-                15 => 'number',
-                16 => 'number',
-                17 => 'number',
-            ),
-            2 =>
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'string',
-                7 => 'string',
-                8 => 'comment',
-                9 => 'identifier',
-                10 => 'reserved',
-                11 => 'number',
-                12 => 'var',
-                13 => 'number',
-                14 => 'number',
-                15 => 'number',
-                16 => 'number',
-            ),
-            3 =>
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'string',
-                7 => 'string',
-                8 => 'comment',
-                9 => 'identifier',
-                10 => 'reserved',
-                11 => 'number',
-                12 => 'var',
-                13 => 'number',
-                14 => 'number',
-                15 => 'number',
-                16 => 'number',
-            ),
-            4 =>
-            array (
-                0 => 'inlinedoc',
-                1 => 'url',
-                2 => 'url',
-                3 => 'inlinedoc',
-                4 => 'inlinedoc',
-            ),
-            5 =>
-            array (
-                0 => 'special',
-                1 => 'var',
-                2 => 'var',
-            ),
-            6 =>
-            array (
-                0 => 'special',
-                1 => 'var',
-                2 => 'var',
-            ),
-            7 =>
-            array (
-                0 => 'special',
-                1 => 'var',
-                2 => 'var',
-            ),
-            8 =>
-            array (
-                0 => 'special',
-            ),
-            9 =>
-            array (
-                0 => 'inlinedoc',
-                1 => 'url',
-                2 => 'url',
-                3 => 'inlinedoc',
-                4 => 'inlinedoc',
-            ),
-            10 =>
-            array (
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)\\?\\>/',
-            1 => '/(?i)\\}/',
-            2 => '/(?i)\\)/',
-            3 => '/(?i)\\]/',
-            4 => '/(?i)\\*\\//',
-            5 => '/(?i)"/',
-            6 => '/(?i)`/',
-            7 => '/(?mi)^%1%;?$/',
-            8 => '/(?i)\'/',
-            9 => '/(?mi)$|(?=\\?\\>)/',
-            10 => '/(?i)\\<\\?(php|=)?/',
-        );
-        $this->_states = array (
-            -1 =>
-            array (
-                0 => 0,
-            ),
-            0 =>
-            array (
-                0 => 1,
-                1 => 2,
-                2 => 3,
-                3 => 4,
-                4 => 5,
-                5 => 6,
-                6 => 7,
-                7 => 8,
-                8 => 9,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-            ),
-            1 =>
-            array (
-                0 => 1,
-                1 => 2,
-                2 => 3,
-                3 => 4,
-                4 => 5,
-                5 => 6,
-                6 => 7,
-                7 => 8,
-                8 => 9,
-                9 => -1,
-                10 => -1,
-                11 => 10,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-                17 => -1,
-            ),
-            2 =>
-            array (
-                0 => 1,
-                1 => 2,
-                2 => 3,
-                3 => 4,
-                4 => 5,
-                5 => 6,
-                6 => 7,
-                7 => 8,
-                8 => 9,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-            ),
-            3 =>
-            array (
-                0 => 1,
-                1 => 2,
-                2 => 3,
-                3 => 4,
-                4 => 5,
-                5 => 6,
-                6 => 7,
-                7 => 8,
-                8 => 9,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-            ),
-            4 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-            ),
-            5 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-            ),
-            6 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-            ),
-            7 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-            ),
-            8 =>
-            array (
-                0 => -1,
-            ),
-            9 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-            ),
-            10 =>
-            array (
-            ),
-        );
-        $this->_keywords = array (
-            -1 =>
-            array (
-                0 => -1,
-            ),
-            0 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 =>
-                array (
-                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
-                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
-                ),
-                10 =>
-                array (
-                ),
-                11 =>
-                array (
-                ),
-                12 =>
-                array (
-                ),
-                13 =>
-                array (
-                ),
-                14 =>
-                array (
-                ),
-                15 =>
-                array (
-                ),
-                16 =>
-                array (
-                ),
-            ),
-            1 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 =>
-                array (
-                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
-                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
-                ),
-                10 =>
-                array (
-                ),
-                11 => -1,
-                12 =>
-                array (
-                ),
-                13 =>
-                array (
-                ),
-                14 =>
-                array (
-                ),
-                15 =>
-                array (
-                ),
-                16 =>
-                array (
-                ),
-                17 =>
-                array (
-                ),
-            ),
-            2 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 =>
-                array (
-                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
-                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
-                ),
-                10 =>
-                array (
-                ),
-                11 =>
-                array (
-                ),
-                12 =>
-                array (
-                ),
-                13 =>
-                array (
-                ),
-                14 =>
-                array (
-                ),
-                15 =>
-                array (
-                ),
-                16 =>
-                array (
-                ),
-            ),
-            3 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 =>
-                array (
-                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
-                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
-                ),
-                10 =>
-                array (
-                ),
-                11 =>
-                array (
-                ),
-                12 =>
-                array (
-                ),
-                13 =>
-                array (
-                ),
-                14 =>
-                array (
-                ),
-                15 =>
-                array (
-                ),
-                16 =>
-                array (
-                ),
-            ),
-            4 =>
-            array (
-                0 =>
-                array (
-                ),
-                1 =>
-                array (
-                ),
-                2 =>
-                array (
-                ),
-                3 =>
-                array (
-                ),
-                4 =>
-                array (
-                ),
-            ),
-            5 =>
-            array (
-                0 =>
-                array (
-                ),
-                1 =>
-                array (
-                ),
-                2 =>
-                array (
-                ),
-            ),
-            6 =>
-            array (
-                0 =>
-                array (
-                ),
-                1 =>
-                array (
-                ),
-                2 =>
-                array (
-                ),
-            ),
-            7 =>
-            array (
-                0 =>
-                array (
-                ),
-                1 =>
-                array (
-                ),
-                2 =>
-                array (
-                ),
-            ),
-            8 =>
-            array (
-                0 =>
-                array (
-                ),
-            ),
-            9 =>
-            array (
-                0 =>
-                array (
-                ),
-                1 =>
-                array (
-                ),
-                2 =>
-                array (
-                ),
-                3 =>
-                array (
-                ),
-                4 =>
-                array (
-                ),
-            ),
-            10 =>
-            array (
-            ),
-        );
-        $this->_parts = array (
-            0 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-            ),
-            1 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-                17 => NULL,
-            ),
-            2 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-            ),
-            3 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-            ),
-            4 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-            ),
-            5 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-            ),
-            6 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-            ),
-            7 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-            ),
-            8 =>
-            array (
-                0 => NULL,
-            ),
-            9 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-            ),
-            10 =>
-            array (
-            ),
-        );
-        $this->_subst = array (
-            -1 =>
-            array (
-                0 => false,
-            ),
-            0 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-            ),
-            1 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-            ),
-            2 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-            ),
-            3 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-            ),
-            4 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-            ),
-            5 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            6 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            7 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            8 =>
-            array (
-                0 => false,
-            ),
-            9 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-            ),
-            10 =>
-            array (
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'constants' => 'reserved',
-            'reserved' => 'reserved',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+<?php
+/**
+ * Auto-generated class. PHP syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: Text/php.xml
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * Auto-generated class. PHP syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_PHP extends Text_Highlighter
+{
+    var $_language = 'php';
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)(\\<\\?(php|=)?)?)/',
+            0 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)\\?\\>)|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            2 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            3 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            4 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
+            5 => '/((?i)\\\\[\\\\"\'`tnr\\$\\{])|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
+            6 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
+            7 => '/((?i)\\\\[\\\\"\'`tnr\\$\\{])|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
+            8 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
+            9 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
+            10 => '//',
+        );
+        $this->_counts = array (
+            -1 =>
+            array (
+                0 => 2,
+            ),
+            0 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 1,
+                7 => 0,
+                8 => 1,
+                9 => 0,
+                10 => 1,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 2,
+                16 => 5,
+            ),
+            1 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 1,
+                7 => 0,
+                8 => 1,
+                9 => 0,
+                10 => 1,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 0,
+                16 => 2,
+                17 => 5,
+            ),
+            2 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 1,
+                7 => 0,
+                8 => 1,
+                9 => 0,
+                10 => 1,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 2,
+                16 => 5,
+            ),
+            3 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 1,
+                7 => 0,
+                8 => 1,
+                9 => 0,
+                10 => 1,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 2,
+                16 => 5,
+            ),
+            4 =>
+            array (
+                0 => 0,
+                1 => 3,
+                2 => 1,
+                3 => 0,
+                4 => 0,
+            ),
+            5 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+            ),
+            6 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+            ),
+            7 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+            ),
+            8 =>
+            array (
+                0 => 0,
+            ),
+            9 =>
+            array (
+                0 => 0,
+                1 => 3,
+                2 => 1,
+                3 => 0,
+                4 => 0,
+            ),
+            10 =>
+            array (
+            ),
+        );
+        $this->_delim = array (
+            -1 =>
+            array (
+                0 => 'inlinetags',
+            ),
+            0 =>
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => 'quotes',
+                8 => 'comment',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+            ),
+            1 =>
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => 'quotes',
+                8 => 'comment',
+                9 => '',
+                10 => '',
+                11 => 'inlinetags',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+                17 => '',
+            ),
+            2 =>
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => 'quotes',
+                8 => 'comment',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+            ),
+            3 =>
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => 'quotes',
+                8 => 'comment',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+            ),
+            4 =>
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+                4 => '',
+            ),
+            5 =>
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+            ),
+            6 =>
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+            ),
+            7 =>
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+            ),
+            8 =>
+            array (
+                0 => '',
+            ),
+            9 =>
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+                4 => '',
+            ),
+            10 =>
+            array (
+            ),
+        );
+        $this->_inner = array (
+            -1 =>
+            array (
+                0 => 'code',
+            ),
+            0 =>
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'string',
+                7 => 'string',
+                8 => 'comment',
+                9 => 'identifier',
+                10 => 'reserved',
+                11 => 'number',
+                12 => 'var',
+                13 => 'number',
+                14 => 'number',
+                15 => 'number',
+                16 => 'number',
+            ),
+            1 =>
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'string',
+                7 => 'string',
+                8 => 'comment',
+                9 => 'identifier',
+                10 => 'reserved',
+                11 => 'default',
+                12 => 'number',
+                13 => 'var',
+                14 => 'number',
+                15 => 'number',
+                16 => 'number',
+                17 => 'number',
+            ),
+            2 =>
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'string',
+                7 => 'string',
+                8 => 'comment',
+                9 => 'identifier',
+                10 => 'reserved',
+                11 => 'number',
+                12 => 'var',
+                13 => 'number',
+                14 => 'number',
+                15 => 'number',
+                16 => 'number',
+            ),
+            3 =>
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'string',
+                7 => 'string',
+                8 => 'comment',
+                9 => 'identifier',
+                10 => 'reserved',
+                11 => 'number',
+                12 => 'var',
+                13 => 'number',
+                14 => 'number',
+                15 => 'number',
+                16 => 'number',
+            ),
+            4 =>
+            array (
+                0 => 'inlinedoc',
+                1 => 'url',
+                2 => 'url',
+                3 => 'inlinedoc',
+                4 => 'inlinedoc',
+            ),
+            5 =>
+            array (
+                0 => 'special',
+                1 => 'var',
+                2 => 'var',
+            ),
+            6 =>
+            array (
+                0 => 'special',
+                1 => 'var',
+                2 => 'var',
+            ),
+            7 =>
+            array (
+                0 => 'special',
+                1 => 'var',
+                2 => 'var',
+            ),
+            8 =>
+            array (
+                0 => 'special',
+            ),
+            9 =>
+            array (
+                0 => 'inlinedoc',
+                1 => 'url',
+                2 => 'url',
+                3 => 'inlinedoc',
+                4 => 'inlinedoc',
+            ),
+            10 =>
+            array (
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)\\?\\>/',
+            1 => '/(?i)\\}/',
+            2 => '/(?i)\\)/',
+            3 => '/(?i)\\]/',
+            4 => '/(?i)\\*\\//',
+            5 => '/(?i)"/',
+            6 => '/(?i)`/',
+            7 => '/(?mi)^%1%;?$/',
+            8 => '/(?i)\'/',
+            9 => '/(?mi)$|(?=\\?\\>)/',
+            10 => '/(?i)\\<\\?(php|=)?/',
+        );
+        $this->_states = array (
+            -1 =>
+            array (
+                0 => 0,
+            ),
+            0 =>
+            array (
+                0 => 1,
+                1 => 2,
+                2 => 3,
+                3 => 4,
+                4 => 5,
+                5 => 6,
+                6 => 7,
+                7 => 8,
+                8 => 9,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+            ),
+            1 =>
+            array (
+                0 => 1,
+                1 => 2,
+                2 => 3,
+                3 => 4,
+                4 => 5,
+                5 => 6,
+                6 => 7,
+                7 => 8,
+                8 => 9,
+                9 => -1,
+                10 => -1,
+                11 => 10,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+                17 => -1,
+            ),
+            2 =>
+            array (
+                0 => 1,
+                1 => 2,
+                2 => 3,
+                3 => 4,
+                4 => 5,
+                5 => 6,
+                6 => 7,
+                7 => 8,
+                8 => 9,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+            ),
+            3 =>
+            array (
+                0 => 1,
+                1 => 2,
+                2 => 3,
+                3 => 4,
+                4 => 5,
+                5 => 6,
+                6 => 7,
+                7 => 8,
+                8 => 9,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+            ),
+            4 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+            ),
+            5 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+            ),
+            6 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+            ),
+            7 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+            ),
+            8 =>
+            array (
+                0 => -1,
+            ),
+            9 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+            ),
+            10 =>
+            array (
+            ),
+        );
+        $this->_keywords = array (
+            -1 =>
+            array (
+                0 => -1,
+            ),
+            0 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 =>
+                array (
+                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
+                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
+                ),
+                10 =>
+                array (
+                ),
+                11 =>
+                array (
+                ),
+                12 =>
+                array (
+                ),
+                13 =>
+                array (
+                ),
+                14 =>
+                array (
+                ),
+                15 =>
+                array (
+                ),
+                16 =>
+                array (
+                ),
+            ),
+            1 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 =>
+                array (
+                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
+                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
+                ),
+                10 =>
+                array (
+                ),
+                11 => -1,
+                12 =>
+                array (
+                ),
+                13 =>
+                array (
+                ),
+                14 =>
+                array (
+                ),
+                15 =>
+                array (
+                ),
+                16 =>
+                array (
+                ),
+                17 =>
+                array (
+                ),
+            ),
+            2 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 =>
+                array (
+                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
+                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
+                ),
+                10 =>
+                array (
+                ),
+                11 =>
+                array (
+                ),
+                12 =>
+                array (
+                ),
+                13 =>
+                array (
+                ),
+                14 =>
+                array (
+                ),
+                15 =>
+                array (
+                ),
+                16 =>
+                array (
+                ),
+            ),
+            3 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 =>
+                array (
+                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
+                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
+                ),
+                10 =>
+                array (
+                ),
+                11 =>
+                array (
+                ),
+                12 =>
+                array (
+                ),
+                13 =>
+                array (
+                ),
+                14 =>
+                array (
+                ),
+                15 =>
+                array (
+                ),
+                16 =>
+                array (
+                ),
+            ),
+            4 =>
+            array (
+                0 =>
+                array (
+                ),
+                1 =>
+                array (
+                ),
+                2 =>
+                array (
+                ),
+                3 =>
+                array (
+                ),
+                4 =>
+                array (
+                ),
+            ),
+            5 =>
+            array (
+                0 =>
+                array (
+                ),
+                1 =>
+                array (
+                ),
+                2 =>
+                array (
+                ),
+            ),
+            6 =>
+            array (
+                0 =>
+                array (
+                ),
+                1 =>
+                array (
+                ),
+                2 =>
+                array (
+                ),
+            ),
+            7 =>
+            array (
+                0 =>
+                array (
+                ),
+                1 =>
+                array (
+                ),
+                2 =>
+                array (
+                ),
+            ),
+            8 =>
+            array (
+                0 =>
+                array (
+                ),
+            ),
+            9 =>
+            array (
+                0 =>
+                array (
+                ),
+                1 =>
+                array (
+                ),
+                2 =>
+                array (
+                ),
+                3 =>
+                array (
+                ),
+                4 =>
+                array (
+                ),
+            ),
+            10 =>
+            array (
+            ),
+        );
+        $this->_parts = array (
+            0 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+            ),
+            1 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+                17 => NULL,
+            ),
+            2 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+            ),
+            3 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+            ),
+            4 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+            ),
+            5 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+            ),
+            6 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+            ),
+            7 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+            ),
+            8 =>
+            array (
+                0 => NULL,
+            ),
+            9 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+            ),
+            10 =>
+            array (
+            ),
+        );
+        $this->_subst = array (
+            -1 =>
+            array (
+                0 => false,
+            ),
+            0 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+            ),
+            1 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+            ),
+            2 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+            ),
+            3 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+            ),
+            4 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+            ),
+            5 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            6 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            7 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            8 =>
+            array (
+                0 => false,
+            ),
+            9 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+            ),
+            10 =>
+            array (
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'constants' => 'reserved',
+            'reserved' => 'reserved',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/PRADO.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/PRADO.php
index 2bd402c2..dab4a4bc 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/PRADO.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/PRADO.php
@@ -1,254 +1,254 @@
-<?php
-/**
- * Auto-generated class. PRADO syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: Text/prado.xml
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. PRADO syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_PRADO extends Text_Highlighter
-{
-    var $_language = 'prado';
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)\\<\\!\\[CDATA\\[)|((?i)\\<!--)|((?i)\\<[\\?\\/]?)|((?i)(&|%)[\\w\\-\\.]+;)/',
-            0 => '//',
-            1 => '//',
-            2 => '/((?i)(?<=[\\<\\/?])com:\\w+)|((?i)(?<=[\\<\\/?])[\\w\\-\\:]+)|((?i)[\\w\\-\\:]+)|((?i)")/',
-            3 => '/((?i)(&|%)[\\w\\-\\.]+;)/',
-        );
-        $this->_counts = array (
-            -1 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 1,
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-            ),
-            2 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-            ),
-            3 =>
-            array (
-                0 => 1,
-            ),
-        );
-        $this->_delim = array (
-            -1 =>
-            array (
-                0 => 'comment',
-                1 => 'comment',
-                2 => 'brackets',
-                3 => '',
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-            ),
-            2 =>
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => 'quotes',
-            ),
-            3 =>
-            array (
-                0 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 =>
-            array (
-                0 => 'comment',
-                1 => 'comment',
-                2 => 'code',
-                3 => 'special',
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-            ),
-            2 =>
-            array (
-                0 => 'special',
-                1 => 'reserved',
-                2 => 'var',
-                3 => 'string',
-            ),
-            3 =>
-            array (
-                0 => 'special',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)\\]\\]\\>/',
-            1 => '/(?i)--\\>/',
-            2 => '/(?i)[\\/\\?]?\\>/',
-            3 => '/(?i)"/',
-        );
-        $this->_states = array (
-            -1 =>
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => -1,
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-            ),
-            2 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => 3,
-            ),
-            3 =>
-            array (
-                0 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 =>
-                array (
-                ),
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-            ),
-            2 =>
-            array (
-                0 =>
-                array (
-                ),
-                1 =>
-                array (
-                ),
-                2 =>
-                array (
-                ),
-                3 => -1,
-            ),
-            3 =>
-            array (
-                0 =>
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-            ),
-            2 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-            3 =>
-            array (
-                0 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-            ),
-            2 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-            3 =>
-            array (
-                0 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+<?php
+/**
+ * Auto-generated class. PRADO syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: Text/prado.xml
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * Auto-generated class. PRADO syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_PRADO extends Text_Highlighter
+{
+    var $_language = 'prado';
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)\\<\\!\\[CDATA\\[)|((?i)\\<!--)|((?i)\\<[\\?\\/]?)|((?i)(&|%)[\\w\\-\\.]+;)/',
+            0 => '//',
+            1 => '//',
+            2 => '/((?i)(?<=[\\<\\/?])com:\\w+)|((?i)(?<=[\\<\\/?])[\\w\\-\\:]+)|((?i)[\\w\\-\\:]+)|((?i)")/',
+            3 => '/((?i)(&|%)[\\w\\-\\.]+;)/',
+        );
+        $this->_counts = array (
+            -1 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 1,
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+            ),
+            2 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+            ),
+            3 =>
+            array (
+                0 => 1,
+            ),
+        );
+        $this->_delim = array (
+            -1 =>
+            array (
+                0 => 'comment',
+                1 => 'comment',
+                2 => 'brackets',
+                3 => '',
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+            ),
+            2 =>
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => 'quotes',
+            ),
+            3 =>
+            array (
+                0 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 =>
+            array (
+                0 => 'comment',
+                1 => 'comment',
+                2 => 'code',
+                3 => 'special',
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+            ),
+            2 =>
+            array (
+                0 => 'special',
+                1 => 'reserved',
+                2 => 'var',
+                3 => 'string',
+            ),
+            3 =>
+            array (
+                0 => 'special',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)\\]\\]\\>/',
+            1 => '/(?i)--\\>/',
+            2 => '/(?i)[\\/\\?]?\\>/',
+            3 => '/(?i)"/',
+        );
+        $this->_states = array (
+            -1 =>
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => -1,
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+            ),
+            2 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => 3,
+            ),
+            3 =>
+            array (
+                0 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 =>
+                array (
+                ),
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+            ),
+            2 =>
+            array (
+                0 =>
+                array (
+                ),
+                1 =>
+                array (
+                ),
+                2 =>
+                array (
+                ),
+                3 => -1,
+            ),
+            3 =>
+            array (
+                0 =>
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+            ),
+            2 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+            3 =>
+            array (
+                0 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+            ),
+            2 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+            3 =>
+            array (
+                0 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/PYTHON.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/PYTHON.php
index 8625ee8b..a1f381cb 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/PYTHON.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/PYTHON.php
@@ -1,49 +1,49 @@
-<?php
-/**
- * Auto-generated class. PYTHON syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+<?php
+/**
+ * Auto-generated class. PYTHON syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : python.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. PYTHON syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. PYTHON syntax highlighting
+ *
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_PYTHON extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_PYTHON extends Text_Highlighter
+{
     var $_language = 'python';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?i)\'\'\')|((?i)""")|((?i)")|((?i)\')|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)((\\d*\\.\\d+)|(\\d+\\.\\d*)|(\\d+))j)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)|((?i)0[0-7]+l?)|((?i)#.+)/',
@@ -622,8 +622,8 @@ class  Text_Highlighter_PYTHON extends Text_Highlighter
             'builtin' => 'builtin',
             'reserved' => 'reserved',
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/RUBY.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/RUBY.php
index 80f21d03..3deaa376 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/RUBY.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/RUBY.php
@@ -1,5 +1,5 @@
-<?php
-/**
+<?php
+/**
  * Auto-generated class. RUBY syntax highlighting
  *
  *
@@ -9,50 +9,50 @@
  * start of RE), making highlighting improper
  *
  * %q(a (nested) string) does not get highlighted correctly
- *
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+ *
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : ruby.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. RUBY syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. RUBY syntax highlighting
+ *
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_RUBY extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_RUBY extends Text_Highlighter
+{
     var $_language = 'ruby';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?mi)^__END__$)|((?i)")|((?i)%[Qx]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\')|((?i)%[wq]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\\$(\\W|\\w+))|((?ii)@@?[_a-z][\\d_a-z]*)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)0[xX][\\da-f]+l?)|((?i)\\d+l?|\\b0l?\\b)|((?i)0[0-7]+l?)|((?mi)^=begin$)|((?i)#)|((?i)\\s*\\/)/',
@@ -800,8 +800,8 @@ class  Text_Highlighter_RUBY extends Text_Highlighter
         $this->_kwmap = array (
             'reserved' => 'reserved',
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer.php
index 87b89156..9fcafe2e 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer.php
@@ -1,152 +1,152 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * Abstract base class for Highlighter renderers
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Andrey Demenev <demenev@gmail.com>
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id: Renderer.php,v 1.1 2007/06/03 02:36:35 ssttoo Exp $
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * Abstract base class for Highlighter renderers
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- * @abstract
- */
-
-class Text_Highlighter_Renderer
-{
-    /**
-     * Renderer options
-     *
-     * @var array
-     * @access protected
-     */
-    public $_options = array();
-
-    /**
-     * Current language
-     *
-     * @var string
-     * @access protected
-     */
-    public $_language = '';
-
-    /**
-     * Constructor
-     *
-     * @access public
-     *
-     * @param  array $options  Rendering options. Renderer-specific.
-     */
-    function __construct($options = array())
-    {
-        $this->_options = $options;
-    }
-
-    /**
-     * Resets renderer state
-     *
-     * @access public
-     *
-     * @param  array $options  Rendering options. Renderer-specific.
-     */
-    function reset()
-    {
-        return;
-    }
-
-    /**
-     * Preprocesses code
-     *
-     * @access public
-     *
-     * @param  string $str Code to preprocess
-     * @return string Preprocessed code
-     */
-    function preprocess($str)
-    {
-        return $str;
-    }
-
-    /**
-     * Accepts next token
-     *
-     * @abstract
-     * @access public
-     *
-     * @param  string $class   Token class
-     * @param  string $content Token content
-     */
-    function acceptToken($class, $content)
-    {
-        return;
-    }
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @access public
-     *
-     */
-    function finalize()
-    {
-        return;
-    }
-
-    /**
-     * Get generated output
-     *
-     * @abstract
-     * @return mixed Renderer-specific
-     * @access public
-     *
-     */
-    function getOutput()
-    {
-        return;
-    }
-
-    /**
-     * Set current language
-     *
-     * @abstract
-     * @return void
-     * @access public
-     *
-     */
-    function setCurrentLanguage($lang)
-    {
-        $this->_language = $lang;
-    }
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * Abstract base class for Highlighter renderers
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Andrey Demenev <demenev@gmail.com>
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id: Renderer.php,v 1.1 2007/06/03 02:36:35 ssttoo Exp $
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * Abstract base class for Highlighter renderers
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @abstract
+ */
+
+class Text_Highlighter_Renderer
+{
+    /**
+     * Renderer options
+     *
+     * @var array
+     * @access protected
+     */
+    public $_options = array();
+
+    /**
+     * Current language
+     *
+     * @var string
+     * @access protected
+     */
+    public $_language = '';
+
+    /**
+     * Constructor
+     *
+     * @access public
+     *
+     * @param  array $options  Rendering options. Renderer-specific.
+     */
+    function __construct($options = array())
+    {
+        $this->_options = $options;
+    }
+
+    /**
+     * Resets renderer state
+     *
+     * @access public
+     *
+     * @param  array $options  Rendering options. Renderer-specific.
+     */
+    function reset()
+    {
+        return;
+    }
+
+    /**
+     * Preprocesses code
+     *
+     * @access public
+     *
+     * @param  string $str Code to preprocess
+     * @return string Preprocessed code
+     */
+    function preprocess($str)
+    {
+        return $str;
+    }
+
+    /**
+     * Accepts next token
+     *
+     * @abstract
+     * @access public
+     *
+     * @param  string $class   Token class
+     * @param  string $content Token content
+     */
+    function acceptToken($class, $content)
+    {
+        return;
+    }
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @access public
+     *
+     */
+    function finalize()
+    {
+        return;
+    }
+
+    /**
+     * Get generated output
+     *
+     * @abstract
+     * @return mixed Renderer-specific
+     * @access public
+     *
+     */
+    function getOutput()
+    {
+        return;
+    }
+
+    /**
+     * Set current language
+     *
+     * @abstract
+     * @return void
+     * @access public
+     *
+     */
+    function setCurrentLanguage($lang)
+    {
+        $this->_language = $lang;
+    }
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
 ?>
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Array.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Array.php
index 5a0c9c09..ef3ffec1 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Array.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Array.php
@@ -1,199 +1,199 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * Array renderer.
- *
- * Produces an array that contains class names and content pairs.
- * The array can be enumerated or associative. Associative means
- * <code>class =&gt; content</code> pairs.
- * Based on the HTML renderer by Andrey Demenev.
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id: Array.php,v 1.1 2007/06/03 02:37:08 ssttoo Exp $
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once dirname(__FILE__).'/../Renderer.php';
-
-/**
- * Array renderer, based on Andrey Demenev's HTML renderer.
- *
- * In addition to the options supported by the HTML renderer,
- * the following options were also introduced:
- * <ul><li>htmlspecialchars - whether or not htmlspecialchars() will
- *                            be called on the content, default TRUE</li>
- *     <li>enumerated - type of array produced, default FALSE,
- *                            meaning associative array</li>
- * </ul>
- *
- *
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.5.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_Array extends Text_Highlighter_Renderer
-{
-
-    /**#@+
-     * @access private
-     */
-
-    /**
-     * Tab size
-     *
-     * @var integer
-     */
-    var $_tabsize = 4;
-
-    /**
-     * Should htmlentities() will be called
-     *
-     * @var boolean
-     */
-    var $_htmlspecialchars = true;
-
-    /**
-     * Enumerated or associative array
-     *
-     * @var integer
-     */
-    var $_enumerated = false;
-
-    /**
-     * Array containing highlighting rules
-     *
-     * @var array
-     */
-    var $_output = array();
-
-    /**#@-*/
-
-    /**
-     * Preprocesses code
-     *
-     * @access public
-     *
-     * @param  string $str Code to preprocess
-     * @return string Preprocessed code
-     */
-    function preprocess($str)
-    {
-        // normalize whitespace and tabs
-        $str = str_replace("\r\n","\n", $str);
-        // some browsers refuse to display empty lines
-        $str = preg_replace('~^$~m'," ", $str);
-        $str = str_replace("\t",str_repeat(' ', $this->_tabsize), $str);
-        return rtrim($str);
-    }
-
-
-    /**
-     * Resets renderer state
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     *
-     * @access protected
-     */
-    function reset()
-    {
-        $this->_output = array();
-        $this->_lastClass = 'default';
-        if (isset($this->_options['tabsize'])) {
-            $this->_tabsize = $this->_options['tabsize'];
-        }
-        if (isset($this->_options['htmlspecialchars'])) {
-            $this->_htmlspecialchars = $this->_options['htmlspecialchars'];
-        }
-        if (isset($this->_options['enumerated'])) {
-            $this->_enumerated = $this->_options['enumerated'];
-        }
-    }
-
-
-
-    /**
-     * Accepts next token
-     *
-     * @abstract
-     * @access public
-     * @param  string $class   Token class
-     * @param  string $content Token content
-     */
-    function acceptToken($class, $content)
-    {
-
-
-        $theClass = $this->_getFullClassName($class);
-        if ($this->_htmlspecialchars) {
-            $content = htmlspecialchars($content);
-        }
-        if ($this->_enumerated) {
-            $this->_output[] = array($class, $content);
-        } else {
-            $this->_output[][$class] = $content;
-        }
-        $this->_lastClass = $class;
-
-    }
-
-
-    /**
-     * Given a CSS class name, returns the class name
-     * with language name prepended, if necessary
-     *
-     * @access private
-     *
-     * @param  string $class   Token class
-     */
-    function _getFullClassName($class)
-    {
-        if (!empty($this->_options['use_language'])) {
-            $theClass = $this->_language . '-' . $class;
-        } else {
-            $theClass = $class;
-        }
-        return $theClass;
-    }
-
-    /**
-     * Get generated output
-     *
-     * @abstract
-     * @return array Highlighted code as an array
-     * @access public
-     */
-    function getOutput()
-    {
-        return $this->_output;
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * Array renderer.
+ *
+ * Produces an array that contains class names and content pairs.
+ * The array can be enumerated or associative. Associative means
+ * <code>class =&gt; content</code> pairs.
+ * Based on the HTML renderer by Andrey Demenev.
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id: Array.php,v 1.1 2007/06/03 02:37:08 ssttoo Exp $
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once dirname(__FILE__).'/../Renderer.php';
+
+/**
+ * Array renderer, based on Andrey Demenev's HTML renderer.
+ *
+ * In addition to the options supported by the HTML renderer,
+ * the following options were also introduced:
+ * <ul><li>htmlspecialchars - whether or not htmlspecialchars() will
+ *                            be called on the content, default TRUE</li>
+ *     <li>enumerated - type of array produced, default FALSE,
+ *                            meaning associative array</li>
+ * </ul>
+ *
+ *
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.5.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_Array extends Text_Highlighter_Renderer
+{
+
+    /**#@+
+     * @access private
+     */
+
+    /**
+     * Tab size
+     *
+     * @var integer
+     */
+    var $_tabsize = 4;
+
+    /**
+     * Should htmlentities() will be called
+     *
+     * @var boolean
+     */
+    var $_htmlspecialchars = true;
+
+    /**
+     * Enumerated or associative array
+     *
+     * @var integer
+     */
+    var $_enumerated = false;
+
+    /**
+     * Array containing highlighting rules
+     *
+     * @var array
+     */
+    var $_output = array();
+
+    /**#@-*/
+
+    /**
+     * Preprocesses code
+     *
+     * @access public
+     *
+     * @param  string $str Code to preprocess
+     * @return string Preprocessed code
+     */
+    function preprocess($str)
+    {
+        // normalize whitespace and tabs
+        $str = str_replace("\r\n","\n", $str);
+        // some browsers refuse to display empty lines
+        $str = preg_replace('~^$~m'," ", $str);
+        $str = str_replace("\t",str_repeat(' ', $this->_tabsize), $str);
+        return rtrim($str);
+    }
+
+
+    /**
+     * Resets renderer state
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     *
+     * @access protected
+     */
+    function reset()
+    {
+        $this->_output = array();
+        $this->_lastClass = 'default';
+        if (isset($this->_options['tabsize'])) {
+            $this->_tabsize = $this->_options['tabsize'];
+        }
+        if (isset($this->_options['htmlspecialchars'])) {
+            $this->_htmlspecialchars = $this->_options['htmlspecialchars'];
+        }
+        if (isset($this->_options['enumerated'])) {
+            $this->_enumerated = $this->_options['enumerated'];
+        }
+    }
+
+
+
+    /**
+     * Accepts next token
+     *
+     * @abstract
+     * @access public
+     * @param  string $class   Token class
+     * @param  string $content Token content
+     */
+    function acceptToken($class, $content)
+    {
+
+
+        $theClass = $this->_getFullClassName($class);
+        if ($this->_htmlspecialchars) {
+            $content = htmlspecialchars($content);
+        }
+        if ($this->_enumerated) {
+            $this->_output[] = array($class, $content);
+        } else {
+            $this->_output[][$class] = $content;
+        }
+        $this->_lastClass = $class;
+
+    }
+
+
+    /**
+     * Given a CSS class name, returns the class name
+     * with language name prepended, if necessary
+     *
+     * @access private
+     *
+     * @param  string $class   Token class
+     */
+    function _getFullClassName($class)
+    {
+        if (!empty($this->_options['use_language'])) {
+            $theClass = $this->_language . '-' . $class;
+        } else {
+            $theClass = $class;
+        }
+        return $theClass;
+    }
+
+    /**
+     * Get generated output
+     *
+     * @abstract
+     * @return array Highlighted code as an array
+     * @access public
+     */
+    function getOutput()
+    {
+        return $this->_output;
+    }
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
 ?>
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/BB.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/BB.php
index 84bc67c0..3536260b 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/BB.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/BB.php
@@ -1,238 +1,238 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * BB code renderer.
- *
- * This BB renderer produces BB code, ready to be pasted in bulletin boards and
- * other applications that accept BB code. Based on the HTML renderer by Andrey Demenev.
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @copyright  2005 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id: BB.php,v 1.1 2007/06/03 02:37:08 ssttoo Exp $
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once dirname(__FILE__).'/../Renderer.php';
-
-/**
- * BB code renderer, based on Andrey Demenev's HTML renderer.
- *
- * Elements of $options argument of constructor (each being optional):
- *
- * - 'numbers' - Line numbering TRUE or FALSE
- * - 'tabsize' - Tab size, default is 4
- * - 'bb_tags' - An array containing three BB tags, see below
- * - 'tag_brackets' - An array that conains opening and closing tags, [ and ]
- * - 'colors' - An array with all the colors to be used for highlighting
- *
- * The default BB tags are:
- * - 'color' => 'color'
- * - 'list'  => 'list'
- * - 'list_item' => '*'
- *
- * The default colors for the highlighter are:
- * - 'default'    => 'Black',
- * - 'code'       => 'Gray',
- * - 'brackets'   => 'Olive',
- * - 'comment'    => 'Orange',
- * - 'mlcomment'  => 'Orange',
- * - 'quotes'     => 'Darkred',
- * - 'string'     => 'Red',
- * - 'identifier' => 'Blue',
- * - 'builtin'    => 'Teal',
- * - 'reserved'   => 'Green',
- * - 'inlinedoc'  => 'Blue',
- * - 'var'        => 'Darkblue',
- * - 'url'        => 'Blue',
- * - 'special'    => 'Navy',
- * - 'number'     => 'Maroon',
- * - 'inlinetags' => 'Blue',
- *
- *
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  20045 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.5.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_BB extends Text_Highlighter_Renderer_Array
-{
-
-    /**#@+
-     * @access private
-     */
-
-    /**
-     * Line numbering - will use the specified BB tag for listings
-     *
-     * @var boolean
-     */
-    var $_numbers = false;
-
-    /**
-     * BB tags to be used
-     *
-     * @var array
-     */
-    var $_bb_tags = array (
-        'color'     => 'color',
-        'list'      => 'list',
-        'list_item' => '*',
-        'code'      => 'code',
-    );
-
-    /**
-     * BB brackets - [ and ]
-     *
-     * @var array
-     */
-    var $_tag_brackets = array ('start' => '[', 'end' => ']');
-
-    /**
-     * Colors map
-     *
-     * @var boolean
-     */
-    var $_colors = array(
-        'default'    => 'Black',
-        'code'       => 'Gray',
-        'brackets'   => 'Olive',
-        'comment'    => 'Orange',
-        'mlcomment'  => 'Orange',
-        'quotes'     => 'Darkred',
-        'string'     => 'Red',
-        'identifier' => 'Blue',
-        'builtin'    => 'Teal',
-        'reserved'   => 'Green',
-        'inlinedoc'  => 'Blue',
-        'var'        => 'Darkblue',
-        'url'        => 'Blue',
-        'special'    => 'Navy',
-        'number'     => 'Maroon',
-        'inlinetags' => 'Blue',
-    );
-
-    /**#@-*/
-
-    /**
-     * Resets renderer state
-     *
-     * @access protected
-     *
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     */
-    function reset()
-    {
-        parent::reset();
-        if (isset($this->_options['numbers'])) {
-            $this->_numbers = $this->_options['numbers'];
-        }
-        if (isset($this->_options['bb_tags'])) {
-            $this->_bb_tags = array_merge($this->_bb_tags, $this->_options['bb_tags']);
-        }
-        if (isset($this->_options['tag_brackets'])) {
-            $this->_tag_brackets = array_merge($this->_tag_brackets, $this->_options['tag_brackets']);
-        }
-        if (isset($this->_options['colors'])) {
-            $this->_colors = array_merge($this->_colors, $this->_options['colors']);
-        }
-    }
-
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @abstract
-     * @access public
-     *
-     */
-    function finalize()
-    {
-
-        // get parent's output
-        parent::finalize();
-        $output = parent::getOutput();
-
-        $bb_output = '';
-
-        $color_start = $this->_tag_brackets['start'] . $this->_bb_tags['color'] . '=%s'  . $this->_tag_brackets['end'];
-        $color_end   = $this->_tag_brackets['start'] . '/' . $this->_bb_tags['color'] . $this->_tag_brackets['end'];
-
-        // loop through each class=>content pair
-        foreach ($output AS $token) {
-
-            if ($this->_enumerated) {
-                $class = $token[0];
-                $content = $token[1];
-            } else {
-                $key = key($token);
-                $class = $key;
-                $content = $token[$key];
-            }
-
-            $iswhitespace = ctype_space($content);
-            if (!$iswhitespace && !empty($this->_colors[$class])) {
-                $bb_output .= sprintf($color_start, $this->_colors[$class]);
-                $bb_output .= $content;
-                $bb_output .= $color_end;
-            } else {
-                $bb_output .= $content;
-            }
-        }
-
-        if ($this->_numbers) {
-
-            $item_tag = $this->_tag_brackets['start'] .
-                        $this->_bb_tags['list_item'] .
-                        $this->_tag_brackets['end'];
-            $this->_output = $item_tag . str_replace("\n", "\n". $item_tag .' ', $bb_output);
-            $this->_output = $this->_tag_brackets['start'] .
-                             $this->_bb_tags['list'] .
-                             $this->_tag_brackets['end'] .
-                             $this->_output .
-                             $this->_tag_brackets['start'] .
-                             '/'.
-                             $this->_bb_tags['list'] .
-                             $this->_tag_brackets['end']
-                             ;
-        } else {
-            $this->_output = $this->_tag_brackets['start'] .
-                             $this->_bb_tags['code'] .
-                             $this->_tag_brackets['end'] .
-                             $bb_output .
-                             $this->_tag_brackets['start'] .
-                             '/' .
-                             $this->_bb_tags['code'] .
-                             $this->_tag_brackets['end'];
-        }
-    }
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * BB code renderer.
+ *
+ * This BB renderer produces BB code, ready to be pasted in bulletin boards and
+ * other applications that accept BB code. Based on the HTML renderer by Andrey Demenev.
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @copyright  2005 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id: BB.php,v 1.1 2007/06/03 02:37:08 ssttoo Exp $
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once dirname(__FILE__).'/../Renderer.php';
+
+/**
+ * BB code renderer, based on Andrey Demenev's HTML renderer.
+ *
+ * Elements of $options argument of constructor (each being optional):
+ *
+ * - 'numbers' - Line numbering TRUE or FALSE
+ * - 'tabsize' - Tab size, default is 4
+ * - 'bb_tags' - An array containing three BB tags, see below
+ * - 'tag_brackets' - An array that conains opening and closing tags, [ and ]
+ * - 'colors' - An array with all the colors to be used for highlighting
+ *
+ * The default BB tags are:
+ * - 'color' => 'color'
+ * - 'list'  => 'list'
+ * - 'list_item' => '*'
+ *
+ * The default colors for the highlighter are:
+ * - 'default'    => 'Black',
+ * - 'code'       => 'Gray',
+ * - 'brackets'   => 'Olive',
+ * - 'comment'    => 'Orange',
+ * - 'mlcomment'  => 'Orange',
+ * - 'quotes'     => 'Darkred',
+ * - 'string'     => 'Red',
+ * - 'identifier' => 'Blue',
+ * - 'builtin'    => 'Teal',
+ * - 'reserved'   => 'Green',
+ * - 'inlinedoc'  => 'Blue',
+ * - 'var'        => 'Darkblue',
+ * - 'url'        => 'Blue',
+ * - 'special'    => 'Navy',
+ * - 'number'     => 'Maroon',
+ * - 'inlinetags' => 'Blue',
+ *
+ *
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  20045 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.5.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_BB extends Text_Highlighter_Renderer_Array
+{
+
+    /**#@+
+     * @access private
+     */
+
+    /**
+     * Line numbering - will use the specified BB tag for listings
+     *
+     * @var boolean
+     */
+    var $_numbers = false;
+
+    /**
+     * BB tags to be used
+     *
+     * @var array
+     */
+    var $_bb_tags = array (
+        'color'     => 'color',
+        'list'      => 'list',
+        'list_item' => '*',
+        'code'      => 'code',
+    );
+
+    /**
+     * BB brackets - [ and ]
+     *
+     * @var array
+     */
+    var $_tag_brackets = array ('start' => '[', 'end' => ']');
+
+    /**
+     * Colors map
+     *
+     * @var boolean
+     */
+    var $_colors = array(
+        'default'    => 'Black',
+        'code'       => 'Gray',
+        'brackets'   => 'Olive',
+        'comment'    => 'Orange',
+        'mlcomment'  => 'Orange',
+        'quotes'     => 'Darkred',
+        'string'     => 'Red',
+        'identifier' => 'Blue',
+        'builtin'    => 'Teal',
+        'reserved'   => 'Green',
+        'inlinedoc'  => 'Blue',
+        'var'        => 'Darkblue',
+        'url'        => 'Blue',
+        'special'    => 'Navy',
+        'number'     => 'Maroon',
+        'inlinetags' => 'Blue',
+    );
+
+    /**#@-*/
+
+    /**
+     * Resets renderer state
+     *
+     * @access protected
+     *
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     */
+    function reset()
+    {
+        parent::reset();
+        if (isset($this->_options['numbers'])) {
+            $this->_numbers = $this->_options['numbers'];
+        }
+        if (isset($this->_options['bb_tags'])) {
+            $this->_bb_tags = array_merge($this->_bb_tags, $this->_options['bb_tags']);
+        }
+        if (isset($this->_options['tag_brackets'])) {
+            $this->_tag_brackets = array_merge($this->_tag_brackets, $this->_options['tag_brackets']);
+        }
+        if (isset($this->_options['colors'])) {
+            $this->_colors = array_merge($this->_colors, $this->_options['colors']);
+        }
+    }
+
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @abstract
+     * @access public
+     *
+     */
+    function finalize()
+    {
+
+        // get parent's output
+        parent::finalize();
+        $output = parent::getOutput();
+
+        $bb_output = '';
+
+        $color_start = $this->_tag_brackets['start'] . $this->_bb_tags['color'] . '=%s'  . $this->_tag_brackets['end'];
+        $color_end   = $this->_tag_brackets['start'] . '/' . $this->_bb_tags['color'] . $this->_tag_brackets['end'];
+
+        // loop through each class=>content pair
+        foreach ($output AS $token) {
+
+            if ($this->_enumerated) {
+                $class = $token[0];
+                $content = $token[1];
+            } else {
+                $key = key($token);
+                $class = $key;
+                $content = $token[$key];
+            }
+
+            $iswhitespace = ctype_space($content);
+            if (!$iswhitespace && !empty($this->_colors[$class])) {
+                $bb_output .= sprintf($color_start, $this->_colors[$class]);
+                $bb_output .= $content;
+                $bb_output .= $color_end;
+            } else {
+                $bb_output .= $content;
+            }
+        }
+
+        if ($this->_numbers) {
+
+            $item_tag = $this->_tag_brackets['start'] .
+                        $this->_bb_tags['list_item'] .
+                        $this->_tag_brackets['end'];
+            $this->_output = $item_tag . str_replace("\n", "\n". $item_tag .' ', $bb_output);
+            $this->_output = $this->_tag_brackets['start'] .
+                             $this->_bb_tags['list'] .
+                             $this->_tag_brackets['end'] .
+                             $this->_output .
+                             $this->_tag_brackets['start'] .
+                             '/'.
+                             $this->_bb_tags['list'] .
+                             $this->_tag_brackets['end']
+                             ;
+        } else {
+            $this->_output = $this->_tag_brackets['start'] .
+                             $this->_bb_tags['code'] .
+                             $this->_tag_brackets['end'] .
+                             $bb_output .
+                             $this->_tag_brackets['start'] .
+                             '/' .
+                             $this->_bb_tags['code'] .
+                             $this->_tag_brackets['end'];
+        }
+    }
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
 ?>
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Console.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Console.php
index 30e4ed69..224cf71d 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Console.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Console.php
@@ -1,208 +1,208 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * Console renderer
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Andrey Demenev <demenev@gmail.com>
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id: Console.php,v 1.1 2007/06/03 02:37:08 ssttoo Exp $
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once dirname(__FILE__).'/../Renderer.php';
-
-define ('HL_CONSOLE_DEFCOLOR', "\033[0m");
-
-/**
- * Console renderer
- *
- * Suitable for displaying text on color-capable terminals, directly
- * or trough less -r
- *
- * Elements of $options argument of constructor (each being optional):
- *
- * - 'numbers' - whether to add line numbers
- * - 'tabsize' - Tab size
- * - 'colors'  - additional colors
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_Console extends Text_Highlighter_Renderer
-{
-
-    /**#@+
-     * @access private
-     */
-
-    /**
-     * class of last outputted text chunk
-     *
-     * @var string
-     */
-    var $_lastClass;
-
-    /**
-     * Line numbering
-     *
-     * @var boolean
-     */
-    var $_numbers = false;
-
-    /**
-     * Tab size
-     *
-     * @var integer
-     */
-    var $_tabsize = 4;
-
-    /**
-     * Highlighted code
-     *
-     * @var string
-     */
-    var $_output = '';
-
-    /**#@-*/
-
-    var $_colors = array();
-
-    var $_defColors = array(
-        'default' => "\033[0m",
-        'inlinetags' => "\033[31m",
-        'brackets' => "\033[36m",
-        'quotes' => "\033[34m",
-        'inlinedoc' => "\033[34m",
-        'var' => "\033[1m",
-        'types' => "\033[32m",
-        'number' => "\033[32m",
-        'string' => "\033[31m",
-        'reserved' => "\033[35m",
-        'comment' => "\033[33m",
-        'mlcomment' => "\033[33m",
-    );
-
-    function preprocess($str)
-    {
-        // normalize whitespace and tabs
-        $str = str_replace("\r\n","\n", $str);
-        $str = str_replace("\t",str_repeat(' ', $this->_tabsize), $str);
-        return rtrim($str);
-    }
-
-
-    /**
-     * Resets renderer state
-     *
-     * @access protected
-     *
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     */
-    function reset()
-    {
-        $this->_lastClass = '';
-        if (isset($this->_options['numbers'])) {
-            $this->_numbers = (bool)$this->_options['numbers'];
-        } else {
-            $this->_numbers = false;
-        }
-        if (isset($this->_options['tabsize'])) {
-            $this->_tabsize = $this->_options['tabsize'];
-        } else {
-            $this->_tabsize = 4;
-        }
-        if (isset($this->_options['colors'])) {
-            $this->_colors = array_merge($this->_defColors, $this->_options['colors']);
-        } else {
-            $this->_colors = $this->_defColors;
-        }
-        $this->_output = '';
-    }
-
-
-
-    /**
-     * Accepts next token
-     *
-     * @access public
-     *
-     * @param  string $class   Token class
-     * @param  string $content Token content
-     */
-    function acceptToken($class, $content)
-    {
-        if (isset($this->_colors[$class])) {
-            $color = $this->_colors[$class];
-        } else {
-            $color = $this->_colors['default'];
-        }
-        if ($this->_lastClass != $class) {
-            $this->_output .= $color;
-        }
-        $content = str_replace("\n", $this->_colors['default'] . "\n" . $color, $content);
-        $content .= $this->_colors['default'];
-        $this->_output .= $content;
-    }
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @access public
-     *
-     */
-    function finalize()
-    {
-        if ($this->_numbers) {
-            $nlines = substr_count($this->_output, "\n") + 1;
-            $len = strlen($nlines);
-            $i = 1;
-            $this->_output = preg_replace('~^~em', '" " . str_pad($i++, $len, " ", STR_PAD_LEFT) . ": "', $this->_output);
-        }
-        $this->_output .= HL_CONSOLE_DEFCOLOR . "\n";
-    }
-
-    /**
-     * Get generated output
-     *
-     * @return string Highlighted code
-     * @access public
-     *
-     */
-    function getOutput()
-    {
-        return $this->_output;
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * Console renderer
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Andrey Demenev <demenev@gmail.com>
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id: Console.php,v 1.1 2007/06/03 02:37:08 ssttoo Exp $
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once dirname(__FILE__).'/../Renderer.php';
+
+define ('HL_CONSOLE_DEFCOLOR', "\033[0m");
+
+/**
+ * Console renderer
+ *
+ * Suitable for displaying text on color-capable terminals, directly
+ * or trough less -r
+ *
+ * Elements of $options argument of constructor (each being optional):
+ *
+ * - 'numbers' - whether to add line numbers
+ * - 'tabsize' - Tab size
+ * - 'colors'  - additional colors
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_Console extends Text_Highlighter_Renderer
+{
+
+    /**#@+
+     * @access private
+     */
+
+    /**
+     * class of last outputted text chunk
+     *
+     * @var string
+     */
+    var $_lastClass;
+
+    /**
+     * Line numbering
+     *
+     * @var boolean
+     */
+    var $_numbers = false;
+
+    /**
+     * Tab size
+     *
+     * @var integer
+     */
+    var $_tabsize = 4;
+
+    /**
+     * Highlighted code
+     *
+     * @var string
+     */
+    var $_output = '';
+
+    /**#@-*/
+
+    var $_colors = array();
+
+    var $_defColors = array(
+        'default' => "\033[0m",
+        'inlinetags' => "\033[31m",
+        'brackets' => "\033[36m",
+        'quotes' => "\033[34m",
+        'inlinedoc' => "\033[34m",
+        'var' => "\033[1m",
+        'types' => "\033[32m",
+        'number' => "\033[32m",
+        'string' => "\033[31m",
+        'reserved' => "\033[35m",
+        'comment' => "\033[33m",
+        'mlcomment' => "\033[33m",
+    );
+
+    function preprocess($str)
+    {
+        // normalize whitespace and tabs
+        $str = str_replace("\r\n","\n", $str);
+        $str = str_replace("\t",str_repeat(' ', $this->_tabsize), $str);
+        return rtrim($str);
+    }
+
+
+    /**
+     * Resets renderer state
+     *
+     * @access protected
+     *
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     */
+    function reset()
+    {
+        $this->_lastClass = '';
+        if (isset($this->_options['numbers'])) {
+            $this->_numbers = (bool)$this->_options['numbers'];
+        } else {
+            $this->_numbers = false;
+        }
+        if (isset($this->_options['tabsize'])) {
+            $this->_tabsize = $this->_options['tabsize'];
+        } else {
+            $this->_tabsize = 4;
+        }
+        if (isset($this->_options['colors'])) {
+            $this->_colors = array_merge($this->_defColors, $this->_options['colors']);
+        } else {
+            $this->_colors = $this->_defColors;
+        }
+        $this->_output = '';
+    }
+
+
+
+    /**
+     * Accepts next token
+     *
+     * @access public
+     *
+     * @param  string $class   Token class
+     * @param  string $content Token content
+     */
+    function acceptToken($class, $content)
+    {
+        if (isset($this->_colors[$class])) {
+            $color = $this->_colors[$class];
+        } else {
+            $color = $this->_colors['default'];
+        }
+        if ($this->_lastClass != $class) {
+            $this->_output .= $color;
+        }
+        $content = str_replace("\n", $this->_colors['default'] . "\n" . $color, $content);
+        $content .= $this->_colors['default'];
+        $this->_output .= $content;
+    }
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @access public
+     *
+     */
+    function finalize()
+    {
+        if ($this->_numbers) {
+            $nlines = substr_count($this->_output, "\n") + 1;
+            $len = strlen($nlines);
+            $i = 1;
+            $this->_output = preg_replace('~^~em', '" " . str_pad($i++, $len, " ", STR_PAD_LEFT) . ": "', $this->_output);
+        }
+        $this->_output .= HL_CONSOLE_DEFCOLOR . "\n";
+    }
+
+    /**
+     * Get generated output
+     *
+     * @return string Highlighted code
+     * @access public
+     *
+     */
+    function getOutput()
+    {
+        return $this->_output;
+    }
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
 ?>
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Html.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Html.php
index 40cb3f59..a0bcfec2 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Html.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Html.php
@@ -1,446 +1,446 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * HTML renderer
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Andrey Demenev <demenev@gmail.com>
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id: Html.php,v 1.1 2007/06/03 02:37:09 ssttoo Exp $
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once dirname(__FILE__).'/../Renderer.php';
-require_once dirname(__FILE__).'/../Renderer/Array.php';
-
-// BC trick : only define constants if Text/Highlighter.php
-// is not yet included
-if (!defined('HL_NUMBERS_LI')) {
-    /**#@+
-     * Constant for use with $options['numbers']
-     */
-    /**
-     * use numbered list, deprecated, use HL_NUMBERS_OL instaed
-     * @deprecated
-     */
-    define ('HL_NUMBERS_LI'    ,    1);
-    /**
-     * Use 2-column table with line numbers in left column and code in  right column.
-     */
-    define ('HL_NUMBERS_TABLE'    , 2);
-    /**#@-*/
-}
-
-
-/**#@+
- * Constant for use with $options['numbers']
- */
-/**
- * Use numbered list
- */
-define ('HL_NUMBERS_OL',    1);
-/**
- * Use non-numbered list
- */
-define ('HL_NUMBERS_UL',    3);
-/**#@-*/
-
-
-/**
- * HTML renderer
- *
- * Elements of $options argument of constructor (each being optional):
- *
- * - 'numbers' - Line numbering style 0 or {@link HL_NUMBERS_TABLE}
- *               or {@link HL_NUMBERS_UL} or {@link HL_NUMBERS_OL}
- * - 'numbers_start' - starting number for numbered lines
- * - 'tabsize' - Tab size
- * - 'style_map' - Mapping of keywords to formatting rules using inline styles
- * - 'class_map' - Mapping of keywords to formatting rules using class names
- * - 'doclinks' - array that has keys "url", "target" and "elements", used for
- *                generating links to online documentation
- * - 'use_language' - class names will be prefixed with language, like "php-reserved" or "css-code"
- *
- * Example of setting documentation links:
- * $options['doclinks'] = array(
- *   'url' => 'http://php.net/%s',
- *   'target' => '_blank',
- *   'elements' => array('reserved', 'identifier')
- * );
- *
- * Example of setting class names map:
- * $options['class_map'] = array(
- *       'main'       => 'my-main',
- *       'table'      => 'my-table',
- *       'gutter'     => 'my-gutter',
- *       'brackets'   => 'my-brackets',
- *       'builtin'    => 'my-builtin',
- *       'code'       => 'my-code',
- *       'comment'    => 'my-comment',
- *       'default'    => 'my-default',
- *       'identifier' => 'my-identifier',
- *       'inlinedoc'  => 'my-inlinedoc',
- *       'inlinetags' => 'my-inlinetags',
- *       'mlcomment'  => 'my-mlcomment',
- *       'number'     => 'my-number',
- *       'quotes'     => 'my-quotes',
- *       'reserved'   => 'my-reserved',
- *       'special'    => 'my-special',
- *       'string'     => 'my-string',
- *       'url'        => 'my-url',
- *       'var'        => 'my-var',
- * );
- *
- * Example of setting styles mapping:
- * $options['style_map'] = array(
- *       'main'       => 'color: black',
- *       'table'      => 'border: 1px solid black',
- *       'gutter'     => 'background-color: yellow',
- *       'brackets'   => 'color: blue',
- *       'builtin'    => 'color: red',
- *       'code'       => 'color: green',
- *       'comment'    => 'color: orange',
- *       // ....
- * );
- *
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_Html extends Text_Highlighter_Renderer_Array
-{
-
-    /**#@+
-     * @access private
-     */
-
-    /**
-     * Line numbering style
-     *
-     * @var integer
-     */
-    var $_numbers = 0;
-
-    /**
-     * For numberered lines - where to start
-     *
-     * @var integer
-     */
-    var $_numbers_start = 0;
-
-    /**
-     * Tab size
-     *
-     * @var integer
-     */
-    var $_tabsize = 4;
-
-    /**
-     * Highlighted code
-     *
-     * @var string
-     */
-    var $_output = '';
-
-    /**
-     * Mapping of keywords to formatting rules using inline styles
-     *
-     * @var array
-     */
-    var $_style_map = array();
-
-    /**
-     * Mapping of keywords to formatting rules using class names
-     *
-     * @var array
-     */
-    var $_class_map = array(
-        'main'       => 'hl-main',
-        'table'      => 'hl-table',
-        'gutter'     => 'hl-gutter',
-        'brackets'   => 'hl-brackets',
-        'builtin'    => 'hl-builtin',
-        'code'       => 'hl-code',
-        'comment'    => 'hl-comment',
-        'default'    => 'hl-default',
-        'identifier' => 'hl-identifier',
-        'inlinedoc'  => 'hl-inlinedoc',
-        'inlinetags' => 'hl-inlinetags',
-        'mlcomment'  => 'hl-mlcomment',
-        'number'     => 'hl-number',
-        'quotes'     => 'hl-quotes',
-        'reserved'   => 'hl-reserved',
-        'special'    => 'hl-special',
-        'string'     => 'hl-string',
-        'url'        => 'hl-url',
-        'var'        => 'hl-var',
-    );
-
-    /**
-     * Setup for links to online documentation
-     *
-     * This is an array with keys:
-     * - url, ex. http://php.net/%s
-     * - target, ex. _blank, default - no target
-     * - elements, default is <code>array('reserved', 'identifier')</code>
-     *
-     * @var array
-     */
-    var $_doclinks = array();
-
-    /**#@-*/
-
-    /**
-     * Resets renderer state
-     *
-     * @access protected
-     *
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     */
-    function reset()
-    {
-        $this->_output = '';
-        if (isset($this->_options['numbers'])) {
-            $this->_numbers = (int)$this->_options['numbers'];
-            if ($this->_numbers != HL_NUMBERS_LI
-             && $this->_numbers != HL_NUMBERS_UL
-             && $this->_numbers != HL_NUMBERS_OL
-             && $this->_numbers != HL_NUMBERS_TABLE
-             ) {
-                $this->_numbers = 0;
-            }
-        }
-        if (isset($this->_options['tabsize'])) {
-            $this->_tabsize = $this->_options['tabsize'];
-        }
-        if (isset($this->_options['numbers_start'])) {
-            $this->_numbers_start = intval($this->_options['numbers_start']);
-        }
-        if (isset($this->_options['doclinks']) &&
-            is_array($this->_options['doclinks']) &&
-            !empty($this->_options['doclinks']['url'])
-        ) {
-
-            $this->_doclinks = $this->_options['doclinks']; // keys: url, target, elements array
-
-            if (empty($this->_options['doclinks']['elements'])) {
-                $this->_doclinks['elements'] = array('reserved', 'identifier');
-            }
-        }
-        if (isset($this->_options['style_map'])) {
-            $this->_style_map = $this->_options['style_map'];
-        }
-        if (isset($this->_options['class_map'])) {
-            $this->_class_map = array_merge($this->_class_map, $this->_options['class_map']);
-        }
-        $this->_htmlspecialchars = true;
-
-    }
-
-
-    /**
-     * Given a CSS class name, returns the class name
-     * with language name prepended, if necessary
-     *
-     * @access private
-     *
-     * @param  string $class   Token class
-     */
-    function _getFullClassName($class)
-    {
-        if (!empty($this->_options['use_language'])) {
-            $the_class = $this->_language . '-' . $class;
-        } else {
-            $the_class = $class;
-        }
-        return $the_class;
-    }
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @access public
-     */
-    function finalize()
-    {
-
-        // get parent's output
-        parent::finalize();
-        $output = parent::getOutput();
-        if(empty($output))
-        	return;
-
-		$html_output = '';
-        // loop through each class=>content pair
-        foreach ($output AS $token) {
-
-            if ($this->_enumerated) {
-                $the_class = $token[0];
-                $content = $token[1];
-            } else {
-                $key = key($token);
-                $the_class = $key;
-                $content = $token[$key];
-            }
-
-            $span = $this->_getStyling($the_class);
-            $decorated_output = $this->_decorate($content, $key);
-			//print "<pre> token = ".var_export($token, true)." -- span = " . htmlentities($span). "-- deco = ".$decorated_output."</pre>\n";
-            $html_output .= sprintf($span, $decorated_output);
-        }
-
-        // format lists
-        if (!empty($this->_numbers) &&
-            (
-            $this->_numbers == HL_NUMBERS_LI ||
-            $this->_numbers == HL_NUMBERS_UL ||
-            $this->_numbers == HL_NUMBERS_OL
-            )
-        ) {
-			//$html_output = "<pre>".$html_output."</pre>";
-            // additional whitespace for browsers that do not display
-            // empty list items correctly
-            $this->_output = '<li><pre>&nbsp;' . str_replace("\n", "</pre></li>\n<li><pre>&nbsp;", $html_output) . '</pre></li>';
-
-
-            $start = '';
-            if ($this->_numbers == HL_NUMBERS_OL && intval($this->_numbers_start) > 0)  {
-                $start = ' start="' . $this->_numbers_start . '"';
-            }
-
-            $list_tag = 'ol';
-            if ($this->_numbers == HL_NUMBERS_UL)  {
-                $list_tag = 'ul';
-            }
-
-
-            $this->_output = '<' . $list_tag . $start
-                             . ' ' . $this->_getStyling('main', false) . '>'
-                             . $this->_output . '</'. $list_tag .'>';
-
-        // render a table
-        } else if ($this->_numbers == HL_NUMBERS_TABLE) {
-
-
-            $start_number = 0;
-            if (intval($this->_numbers_start)) {
-                $start_number = $this->_numbers_start - 1;
-            }
-
-            $numbers = '';
-
-            $nlines = substr_count($html_output,"\n")+1;
-            for ($i=1; $i <= $nlines; $i++) {
-                $numbers .= ($start_number + $i) . "\n";
-            }
-            $this->_output = '<table ' . $this->_getStyling('table', false) . ' width="100%"><tr>' .
-                             '<td '. $this->_getStyling('gutter', false) .' align="right" valign="top">' .
-                             '<pre>' . $numbers . '</pre></td><td '. $this->_getStyling('main', false) .
-                             ' valign="top"><pre>' .
-                             $html_output . '</pre></td></tr></table>';
-        }
-        if (!$this->_numbers) {
-            $this->_output = '<pre>' . $html_output . '</pre>';
-        }
-        $this->_output = '<div ' . $this->_getStyling('main', false) . '>' . $this->_output . '</div>';
-    }
-
-
-    /**
-     * Provides additional formatting to a keyword
-     *
-     * @param string $content Keyword
-     * @return string Keyword with additional formatting
-     * @access public
-     *
-     */
-    function _decorate($content, $key)
-    {
-        // links to online documentation
-        if (!empty($this->_doclinks) &&
-            !empty($this->_doclinks['url']) &&
-            in_array($key, $this->_doclinks['elements'])
-        ) {
-
-            $link = '<a href="'. sprintf($this->_doclinks['url'], $content) . '"';
-            if (!empty($this->_doclinks['target'])) {
-                $link.= ' target="' . $this->_doclinks['target'] . '"';
-            }
-            $link .= '>';
-            $link.= $content;
-            $link.= '</a>';
-
-            $content = $link;
-
-        }
-
-        return $content;
-    }
-
-    /**
-     * Returns <code>class</code> and/or <code>style</code> attribute,
-     * optionally enclosed in a <code>span</code> tag
-     *
-     * @param string $class Class name
-     * @paran boolean $span_tag Whether or not to return styling attributes in a <code>&gt;span&lt;</code> tag
-     * @return string <code>span</code> tag or just a <code>class</code> and/or <code>style</code> attributes
-     * @access private
-     */
-    function _getStyling($class, $span_tag = true)
-    {
-        $attrib = '';
-        if (!empty($this->_style_map) &&
-            !empty($this->_style_map[$class])
-        ) {
-            $attrib = 'style="'. $this->_style_map[$class] .'"';
-        }
-        if (!empty($this->_class_map) &&
-            !empty($this->_class_map[$class])
-        ) {
-            if ($attrib) {
-                $attrib .= ' ';
-            }
-            $attrib .= 'class="'. $this->_getFullClassName($this->_class_map[$class]) .'"';
-        }
-
-        if ($span_tag) {
-            $span = '<span ' . $attrib . '>%s</span>';
-            return $span;
-        } else {
-            return $attrib;
-        }
-
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * HTML renderer
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Andrey Demenev <demenev@gmail.com>
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id: Html.php,v 1.1 2007/06/03 02:37:09 ssttoo Exp $
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once dirname(__FILE__).'/../Renderer.php';
+require_once dirname(__FILE__).'/../Renderer/Array.php';
+
+// BC trick : only define constants if Text/Highlighter.php
+// is not yet included
+if (!defined('HL_NUMBERS_LI')) {
+    /**#@+
+     * Constant for use with $options['numbers']
+     */
+    /**
+     * use numbered list, deprecated, use HL_NUMBERS_OL instaed
+     * @deprecated
+     */
+    define ('HL_NUMBERS_LI'    ,    1);
+    /**
+     * Use 2-column table with line numbers in left column and code in  right column.
+     */
+    define ('HL_NUMBERS_TABLE'    , 2);
+    /**#@-*/
+}
+
+
+/**#@+
+ * Constant for use with $options['numbers']
+ */
+/**
+ * Use numbered list
+ */
+define ('HL_NUMBERS_OL',    1);
+/**
+ * Use non-numbered list
+ */
+define ('HL_NUMBERS_UL',    3);
+/**#@-*/
+
+
+/**
+ * HTML renderer
+ *
+ * Elements of $options argument of constructor (each being optional):
+ *
+ * - 'numbers' - Line numbering style 0 or {@link HL_NUMBERS_TABLE}
+ *               or {@link HL_NUMBERS_UL} or {@link HL_NUMBERS_OL}
+ * - 'numbers_start' - starting number for numbered lines
+ * - 'tabsize' - Tab size
+ * - 'style_map' - Mapping of keywords to formatting rules using inline styles
+ * - 'class_map' - Mapping of keywords to formatting rules using class names
+ * - 'doclinks' - array that has keys "url", "target" and "elements", used for
+ *                generating links to online documentation
+ * - 'use_language' - class names will be prefixed with language, like "php-reserved" or "css-code"
+ *
+ * Example of setting documentation links:
+ * $options['doclinks'] = array(
+ *   'url' => 'http://php.net/%s',
+ *   'target' => '_blank',
+ *   'elements' => array('reserved', 'identifier')
+ * );
+ *
+ * Example of setting class names map:
+ * $options['class_map'] = array(
+ *       'main'       => 'my-main',
+ *       'table'      => 'my-table',
+ *       'gutter'     => 'my-gutter',
+ *       'brackets'   => 'my-brackets',
+ *       'builtin'    => 'my-builtin',
+ *       'code'       => 'my-code',
+ *       'comment'    => 'my-comment',
+ *       'default'    => 'my-default',
+ *       'identifier' => 'my-identifier',
+ *       'inlinedoc'  => 'my-inlinedoc',
+ *       'inlinetags' => 'my-inlinetags',
+ *       'mlcomment'  => 'my-mlcomment',
+ *       'number'     => 'my-number',
+ *       'quotes'     => 'my-quotes',
+ *       'reserved'   => 'my-reserved',
+ *       'special'    => 'my-special',
+ *       'string'     => 'my-string',
+ *       'url'        => 'my-url',
+ *       'var'        => 'my-var',
+ * );
+ *
+ * Example of setting styles mapping:
+ * $options['style_map'] = array(
+ *       'main'       => 'color: black',
+ *       'table'      => 'border: 1px solid black',
+ *       'gutter'     => 'background-color: yellow',
+ *       'brackets'   => 'color: blue',
+ *       'builtin'    => 'color: red',
+ *       'code'       => 'color: green',
+ *       'comment'    => 'color: orange',
+ *       // ....
+ * );
+ *
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_Html extends Text_Highlighter_Renderer_Array
+{
+
+    /**#@+
+     * @access private
+     */
+
+    /**
+     * Line numbering style
+     *
+     * @var integer
+     */
+    var $_numbers = 0;
+
+    /**
+     * For numberered lines - where to start
+     *
+     * @var integer
+     */
+    var $_numbers_start = 0;
+
+    /**
+     * Tab size
+     *
+     * @var integer
+     */
+    var $_tabsize = 4;
+
+    /**
+     * Highlighted code
+     *
+     * @var string
+     */
+    var $_output = '';
+
+    /**
+     * Mapping of keywords to formatting rules using inline styles
+     *
+     * @var array
+     */
+    var $_style_map = array();
+
+    /**
+     * Mapping of keywords to formatting rules using class names
+     *
+     * @var array
+     */
+    var $_class_map = array(
+        'main'       => 'hl-main',
+        'table'      => 'hl-table',
+        'gutter'     => 'hl-gutter',
+        'brackets'   => 'hl-brackets',
+        'builtin'    => 'hl-builtin',
+        'code'       => 'hl-code',
+        'comment'    => 'hl-comment',
+        'default'    => 'hl-default',
+        'identifier' => 'hl-identifier',
+        'inlinedoc'  => 'hl-inlinedoc',
+        'inlinetags' => 'hl-inlinetags',
+        'mlcomment'  => 'hl-mlcomment',
+        'number'     => 'hl-number',
+        'quotes'     => 'hl-quotes',
+        'reserved'   => 'hl-reserved',
+        'special'    => 'hl-special',
+        'string'     => 'hl-string',
+        'url'        => 'hl-url',
+        'var'        => 'hl-var',
+    );
+
+    /**
+     * Setup for links to online documentation
+     *
+     * This is an array with keys:
+     * - url, ex. http://php.net/%s
+     * - target, ex. _blank, default - no target
+     * - elements, default is <code>array('reserved', 'identifier')</code>
+     *
+     * @var array
+     */
+    var $_doclinks = array();
+
+    /**#@-*/
+
+    /**
+     * Resets renderer state
+     *
+     * @access protected
+     *
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     */
+    function reset()
+    {
+        $this->_output = '';
+        if (isset($this->_options['numbers'])) {
+            $this->_numbers = (int)$this->_options['numbers'];
+            if ($this->_numbers != HL_NUMBERS_LI
+             && $this->_numbers != HL_NUMBERS_UL
+             && $this->_numbers != HL_NUMBERS_OL
+             && $this->_numbers != HL_NUMBERS_TABLE
+             ) {
+                $this->_numbers = 0;
+            }
+        }
+        if (isset($this->_options['tabsize'])) {
+            $this->_tabsize = $this->_options['tabsize'];
+        }
+        if (isset($this->_options['numbers_start'])) {
+            $this->_numbers_start = intval($this->_options['numbers_start']);
+        }
+        if (isset($this->_options['doclinks']) &&
+            is_array($this->_options['doclinks']) &&
+            !empty($this->_options['doclinks']['url'])
+        ) {
+
+            $this->_doclinks = $this->_options['doclinks']; // keys: url, target, elements array
+
+            if (empty($this->_options['doclinks']['elements'])) {
+                $this->_doclinks['elements'] = array('reserved', 'identifier');
+            }
+        }
+        if (isset($this->_options['style_map'])) {
+            $this->_style_map = $this->_options['style_map'];
+        }
+        if (isset($this->_options['class_map'])) {
+            $this->_class_map = array_merge($this->_class_map, $this->_options['class_map']);
+        }
+        $this->_htmlspecialchars = true;
+
+    }
+
+
+    /**
+     * Given a CSS class name, returns the class name
+     * with language name prepended, if necessary
+     *
+     * @access private
+     *
+     * @param  string $class   Token class
+     */
+    function _getFullClassName($class)
+    {
+        if (!empty($this->_options['use_language'])) {
+            $the_class = $this->_language . '-' . $class;
+        } else {
+            $the_class = $class;
+        }
+        return $the_class;
+    }
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @access public
+     */
+    function finalize()
+    {
+
+        // get parent's output
+        parent::finalize();
+        $output = parent::getOutput();
+        if(empty($output))
+        	return;
+
+		$html_output = '';
+        // loop through each class=>content pair
+        foreach ($output AS $token) {
+
+            if ($this->_enumerated) {
+                $the_class = $token[0];
+                $content = $token[1];
+            } else {
+                $key = key($token);
+                $the_class = $key;
+                $content = $token[$key];
+            }
+
+            $span = $this->_getStyling($the_class);
+            $decorated_output = $this->_decorate($content, $key);
+			//print "<pre> token = ".var_export($token, true)." -- span = " . htmlentities($span). "-- deco = ".$decorated_output."</pre>\n";
+            $html_output .= sprintf($span, $decorated_output);
+        }
+
+        // format lists
+        if (!empty($this->_numbers) &&
+            (
+            $this->_numbers == HL_NUMBERS_LI ||
+            $this->_numbers == HL_NUMBERS_UL ||
+            $this->_numbers == HL_NUMBERS_OL
+            )
+        ) {
+			//$html_output = "<pre>".$html_output."</pre>";
+            // additional whitespace for browsers that do not display
+            // empty list items correctly
+            $this->_output = '<li><pre>&nbsp;' . str_replace("\n", "</pre></li>\n<li><pre>&nbsp;", $html_output) . '</pre></li>';
+
+
+            $start = '';
+            if ($this->_numbers == HL_NUMBERS_OL && intval($this->_numbers_start) > 0)  {
+                $start = ' start="' . $this->_numbers_start . '"';
+            }
+
+            $list_tag = 'ol';
+            if ($this->_numbers == HL_NUMBERS_UL)  {
+                $list_tag = 'ul';
+            }
+
+
+            $this->_output = '<' . $list_tag . $start
+                             . ' ' . $this->_getStyling('main', false) . '>'
+                             . $this->_output . '</'. $list_tag .'>';
+
+        // render a table
+        } else if ($this->_numbers == HL_NUMBERS_TABLE) {
+
+
+            $start_number = 0;
+            if (intval($this->_numbers_start)) {
+                $start_number = $this->_numbers_start - 1;
+            }
+
+            $numbers = '';
+
+            $nlines = substr_count($html_output,"\n")+1;
+            for ($i=1; $i <= $nlines; $i++) {
+                $numbers .= ($start_number + $i) . "\n";
+            }
+            $this->_output = '<table ' . $this->_getStyling('table', false) . ' width="100%"><tr>' .
+                             '<td '. $this->_getStyling('gutter', false) .' align="right" valign="top">' .
+                             '<pre>' . $numbers . '</pre></td><td '. $this->_getStyling('main', false) .
+                             ' valign="top"><pre>' .
+                             $html_output . '</pre></td></tr></table>';
+        }
+        if (!$this->_numbers) {
+            $this->_output = '<pre>' . $html_output . '</pre>';
+        }
+        $this->_output = '<div ' . $this->_getStyling('main', false) . '>' . $this->_output . '</div>';
+    }
+
+
+    /**
+     * Provides additional formatting to a keyword
+     *
+     * @param string $content Keyword
+     * @return string Keyword with additional formatting
+     * @access public
+     *
+     */
+    function _decorate($content, $key)
+    {
+        // links to online documentation
+        if (!empty($this->_doclinks) &&
+            !empty($this->_doclinks['url']) &&
+            in_array($key, $this->_doclinks['elements'])
+        ) {
+
+            $link = '<a href="'. sprintf($this->_doclinks['url'], $content) . '"';
+            if (!empty($this->_doclinks['target'])) {
+                $link.= ' target="' . $this->_doclinks['target'] . '"';
+            }
+            $link .= '>';
+            $link.= $content;
+            $link.= '</a>';
+
+            $content = $link;
+
+        }
+
+        return $content;
+    }
+
+    /**
+     * Returns <code>class</code> and/or <code>style</code> attribute,
+     * optionally enclosed in a <code>span</code> tag
+     *
+     * @param string $class Class name
+     * @paran boolean $span_tag Whether or not to return styling attributes in a <code>&gt;span&lt;</code> tag
+     * @return string <code>span</code> tag or just a <code>class</code> and/or <code>style</code> attributes
+     * @access private
+     */
+    function _getStyling($class, $span_tag = true)
+    {
+        $attrib = '';
+        if (!empty($this->_style_map) &&
+            !empty($this->_style_map[$class])
+        ) {
+            $attrib = 'style="'. $this->_style_map[$class] .'"';
+        }
+        if (!empty($this->_class_map) &&
+            !empty($this->_class_map[$class])
+        ) {
+            if ($attrib) {
+                $attrib .= ' ';
+            }
+            $attrib .= 'class="'. $this->_getFullClassName($this->_class_map[$class]) .'"';
+        }
+
+        if ($span_tag) {
+            $span = '<span ' . $attrib . '>%s</span>';
+            return $span;
+        } else {
+            return $attrib;
+        }
+
+    }
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
 ?>
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/HtmlTags.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/HtmlTags.php
index a75e659e..b085d535 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/HtmlTags.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/HtmlTags.php
@@ -1,187 +1,187 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * HTML renderer that uses only basic html tags
- *
- * PHP versions 4 and 5. Based on the "normal" HTML renderer by Andrey Demenev.
- * It's designed to work with user agents that support only a limited number of
- * HTML tags. Like the iPod which supports only b, i, u and a.
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @copyright  2005 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id: HtmlTags.php,v 1.1 2007/06/03 02:37:09 ssttoo Exp $
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once dirname(__FILE__).'/../Renderer.php';
-require_once dirname(__FILE__).'/../Renderer/Array.php';
-
-/**
- * HTML basic tags renderer, based on Andrey Demenev's HTML renderer.
- *
- * Elements of $options argument of constructor (each being optional):
- *
- * - 'numbers' - Line numbering TRUE or FALSE. Default is FALSE.
- * - 'tabsize' - Tab size, default is 4.
- * - 'tags'    - Array, containing the tags to be used for highlighting
- *
- * Here's the listing of the default tags:
- * - 'default'    => '',
- * - 'code'       => '',
- * - 'brackets'   => 'b',
- * - 'comment'    => 'i',
- * - 'mlcomment'  => 'i',
- * - 'quotes'     => '',
- * - 'string'     => 'i',
- * - 'identifier' => 'b',
- * - 'builtin'    => 'b',
- * - 'reserved'   => 'u',
- * - 'inlinedoc'  => 'i',
- * - 'var'        => 'b',
- * - 'url'        => 'i',
- * - 'special'    => '',
- * - 'number'     => '',
- * - 'inlinetags' => ''
- *
- * @author Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2005 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.5.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_HtmlTags extends Text_Highlighter_Renderer_Array
-{
-
-    /**#@+
-     * @access private
-     */
-
-    /**
-     * Line numbering - will use 'ol' tag
-     *
-     * @var boolean
-     */
-    var $_numbers = false;
-
-    /**
-     * HTML tags map
-     *
-     * @var array
-     */
-    var $_hilite_tags = array(
-        'default'    => '',
-        'code'       => '',
-        'brackets'   => 'b',
-        'comment'    => 'i',
-        'mlcomment'  => 'i',
-        'quotes'     => '',
-        'string'     => 'i',
-        'identifier' => 'b',
-        'builtin'    => 'b',
-        'reserved'   => 'u',
-        'inlinedoc'  => 'i',
-        'var'        => 'b',
-        'url'        => 'i',
-        'special'    => '',
-        'number'     => '',
-        'inlinetags' => '',
-    );
-
-    /**#@-*/
-
-    /**
-     * Resets renderer state
-     *
-     * @access protected
-     *
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     */
-    function reset()
-    {
-        parent::reset();
-        if (isset($this->_options['numbers'])) {
-            $this->_numbers = $this->_options['numbers'];
-        }
-        if (isset($this->_options['tags'])) {
-            $this->_hilite_tags = array_merge($this->_tags, $this->_options['tags']);
-        }
-    }
-
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @abstract
-     * @access public
-     *
-     */
-    function finalize()
-    {
-
-        // get parent's output
-        parent::finalize();
-        $output = parent::getOutput();
-
-        $html_output = '';
-
-        // loop through each class=>content pair
-        foreach ($output AS $token) {
-
-            if ($this->_enumerated) {
-                $class = $token[0];
-                $content = $token[1];
-            } else {
-                $key = key($token);
-                $class = $key;
-                $content = $token[$key];
-            }
-
-            $iswhitespace = ctype_space($content);
-            if (!$iswhitespace && !empty($this->_hilite_tags[$class])) {
-                $html_output .= '<'. $this->_hilite_tags[$class] . '>' . $content . '</'. $this->_hilite_tags[$class] . '>';
-            } else {
-                $html_output .= $content;
-            }
-        }
-
-
-        if ($this->_numbers) {
-            /* additional whitespace for browsers that do not display
-            empty list items correctly */
-            $html_output = '<li>&nbsp;' . str_replace("\n", "</li>\n<li>&nbsp;", $html_output) . '</li>';
-            $this->_output = '<ol>' . str_replace(' ', '&nbsp;', $html_output) . '</ol>';
-        } else {
-            $this->_output = '<pre>' . $html_output . '</pre>';
-        }
-    }
-
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * HTML renderer that uses only basic html tags
+ *
+ * PHP versions 4 and 5. Based on the "normal" HTML renderer by Andrey Demenev.
+ * It's designed to work with user agents that support only a limited number of
+ * HTML tags. Like the iPod which supports only b, i, u and a.
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @copyright  2005 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id: HtmlTags.php,v 1.1 2007/06/03 02:37:09 ssttoo Exp $
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once dirname(__FILE__).'/../Renderer.php';
+require_once dirname(__FILE__).'/../Renderer/Array.php';
+
+/**
+ * HTML basic tags renderer, based on Andrey Demenev's HTML renderer.
+ *
+ * Elements of $options argument of constructor (each being optional):
+ *
+ * - 'numbers' - Line numbering TRUE or FALSE. Default is FALSE.
+ * - 'tabsize' - Tab size, default is 4.
+ * - 'tags'    - Array, containing the tags to be used for highlighting
+ *
+ * Here's the listing of the default tags:
+ * - 'default'    => '',
+ * - 'code'       => '',
+ * - 'brackets'   => 'b',
+ * - 'comment'    => 'i',
+ * - 'mlcomment'  => 'i',
+ * - 'quotes'     => '',
+ * - 'string'     => 'i',
+ * - 'identifier' => 'b',
+ * - 'builtin'    => 'b',
+ * - 'reserved'   => 'u',
+ * - 'inlinedoc'  => 'i',
+ * - 'var'        => 'b',
+ * - 'url'        => 'i',
+ * - 'special'    => '',
+ * - 'number'     => '',
+ * - 'inlinetags' => ''
+ *
+ * @author Stoyan Stefanov <ssttoo@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2005 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.5.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_HtmlTags extends Text_Highlighter_Renderer_Array
+{
+
+    /**#@+
+     * @access private
+     */
+
+    /**
+     * Line numbering - will use 'ol' tag
+     *
+     * @var boolean
+     */
+    var $_numbers = false;
+
+    /**
+     * HTML tags map
+     *
+     * @var array
+     */
+    var $_hilite_tags = array(
+        'default'    => '',
+        'code'       => '',
+        'brackets'   => 'b',
+        'comment'    => 'i',
+        'mlcomment'  => 'i',
+        'quotes'     => '',
+        'string'     => 'i',
+        'identifier' => 'b',
+        'builtin'    => 'b',
+        'reserved'   => 'u',
+        'inlinedoc'  => 'i',
+        'var'        => 'b',
+        'url'        => 'i',
+        'special'    => '',
+        'number'     => '',
+        'inlinetags' => '',
+    );
+
+    /**#@-*/
+
+    /**
+     * Resets renderer state
+     *
+     * @access protected
+     *
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     */
+    function reset()
+    {
+        parent::reset();
+        if (isset($this->_options['numbers'])) {
+            $this->_numbers = $this->_options['numbers'];
+        }
+        if (isset($this->_options['tags'])) {
+            $this->_hilite_tags = array_merge($this->_tags, $this->_options['tags']);
+        }
+    }
+
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @abstract
+     * @access public
+     *
+     */
+    function finalize()
+    {
+
+        // get parent's output
+        parent::finalize();
+        $output = parent::getOutput();
+
+        $html_output = '';
+
+        // loop through each class=>content pair
+        foreach ($output AS $token) {
+
+            if ($this->_enumerated) {
+                $class = $token[0];
+                $content = $token[1];
+            } else {
+                $key = key($token);
+                $class = $key;
+                $content = $token[$key];
+            }
+
+            $iswhitespace = ctype_space($content);
+            if (!$iswhitespace && !empty($this->_hilite_tags[$class])) {
+                $html_output .= '<'. $this->_hilite_tags[$class] . '>' . $content . '</'. $this->_hilite_tags[$class] . '>';
+            } else {
+                $html_output .= $content;
+            }
+        }
+
+
+        if ($this->_numbers) {
+            /* additional whitespace for browsers that do not display
+            empty list items correctly */
+            $html_output = '<li>&nbsp;' . str_replace("\n", "</li>\n<li>&nbsp;", $html_output) . '</li>';
+            $this->_output = '<ol>' . str_replace(' ', '&nbsp;', $html_output) . '</ol>';
+        } else {
+            $this->_output = '<pre>' . $html_output . '</pre>';
+        }
+    }
+
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
 ?>
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/JSON.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/JSON.php
index 7f1158fb..6a6ff71e 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/JSON.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/JSON.php
@@ -1,86 +1,86 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * JSON renderer.
- *
- * Based on the HTML renderer by Andrey Demenev.
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id: JSON.php,v 1.1 2007/06/03 02:37:09 ssttoo Exp $
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once dirname(__FILE__).'/../Renderer.php';
-require_once dirname(__FILE__).'/../Renderer/Array.php';
-
-/**
- * JSON renderer, based on Andrey Demenev's HTML renderer.
- *
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.5.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_JSON extends Text_Highlighter_Renderer_Array
-{
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @abstract
-     * @access public
-     */
-    function finalize()
-    {
-
-        parent::finalize();
-        $output = parent::getOutput();
-
-        $json_array = array();
-
-        foreach ($output AS $token) {
-
-            if ($this->_enumerated) {
-                $json_array[] = '["' . $token[0] . '","' . $token[1] . '"]';
-            } else {
-                $key = key($token);
-                $json_array[] = '{"class": "' . $key . '","content":"' . $token[$key] . '"}';
-            }
-
-        }
-
-        $this->_output  = '['. implode(',', $json_array) .']';
-        $this->_output = str_replace("\n", '\n', $this->_output);
-
-    }
-
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * JSON renderer.
+ *
+ * Based on the HTML renderer by Andrey Demenev.
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id: JSON.php,v 1.1 2007/06/03 02:37:09 ssttoo Exp $
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once dirname(__FILE__).'/../Renderer.php';
+require_once dirname(__FILE__).'/../Renderer/Array.php';
+
+/**
+ * JSON renderer, based on Andrey Demenev's HTML renderer.
+ *
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.5.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_JSON extends Text_Highlighter_Renderer_Array
+{
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @abstract
+     * @access public
+     */
+    function finalize()
+    {
+
+        parent::finalize();
+        $output = parent::getOutput();
+
+        $json_array = array();
+
+        foreach ($output AS $token) {
+
+            if ($this->_enumerated) {
+                $json_array[] = '["' . $token[0] . '","' . $token[1] . '"]';
+            } else {
+                $key = key($token);
+                $json_array[] = '{"class": "' . $key . '","content":"' . $token[$key] . '"}';
+            }
+
+        }
+
+        $this->_output  = '['. implode(',', $json_array) .']';
+        $this->_output = str_replace("\n", '\n', $this->_output);
+
+    }
+
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
 ?>
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/XML.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/XML.php
index e86f620a..ab8a4e3e 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/XML.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/XML.php
@@ -1,103 +1,103 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * XML renderer.
- *
- * Based on the HTML renderer by Andrey Demenev.
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id: XML.php,v 1.1 2007/06/03 02:37:09 ssttoo Exp $
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once dirname(__FILE__).'/../Renderer.php';
-require_once dirname(__FILE__).'/../Renderer/Array.php';
-
-/**
- * XML renderer, based on Andrey Demenev's HTML renderer.
- *
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.5.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_XML extends Text_Highlighter_Renderer_Array
-{
-
-
-    /**
-     * Options for XML_Serializer
-     *
-     * @access private
-     * @var array
-     */
-    var $_serializer_options = array();
-
-
-    /**
-     * Resets renderer state
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     *
-     * @access protected
-     */
-    function reset()
-    {
-        parent::reset();
-        if (isset($this->_options['xml_serializer'])) {
-            $this->_serializer_options = $this->_options['xml_serializer'];
-        }
-    }
-
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @abstract
-     * @access public
-     */
-    function finalize()
-    {
-
-        // call parent's finalize(), then serialize array into XML
-        parent::finalize();
-        $output = parent::getOutput();
-
-        $serializer = new XML_Serializer($this->_serializer_options);
-        $result = $serializer->serialize($output);
-        if ($result === true) {
-            $this->_output = $serializer->getSerializedData();
-        }
-    }
-
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * XML renderer.
+ *
+ * Based on the HTML renderer by Andrey Demenev.
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id: XML.php,v 1.1 2007/06/03 02:37:09 ssttoo Exp $
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once dirname(__FILE__).'/../Renderer.php';
+require_once dirname(__FILE__).'/../Renderer/Array.php';
+
+/**
+ * XML renderer, based on Andrey Demenev's HTML renderer.
+ *
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.5.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_XML extends Text_Highlighter_Renderer_Array
+{
+
+
+    /**
+     * Options for XML_Serializer
+     *
+     * @access private
+     * @var array
+     */
+    var $_serializer_options = array();
+
+
+    /**
+     * Resets renderer state
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     *
+     * @access protected
+     */
+    function reset()
+    {
+        parent::reset();
+        if (isset($this->_options['xml_serializer'])) {
+            $this->_serializer_options = $this->_options['xml_serializer'];
+        }
+    }
+
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @abstract
+     * @access public
+     */
+    function finalize()
+    {
+
+        // call parent's finalize(), then serialize array into XML
+        parent::finalize();
+        $output = parent::getOutput();
+
+        $serializer = new XML_Serializer($this->_serializer_options);
+        $result = $serializer->serialize($output);
+        if ($result === true) {
+            $this->_output = $serializer->getSerializedData();
+        }
+    }
+
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
 ?>
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/SQL.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/SQL.php
index 9679b230..6b0b4b7c 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/SQL.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/SQL.php
@@ -1,51 +1,51 @@
-<?php
-/**
+<?php
+/**
  * Auto-generated class. SQL syntax highlighting
  *
- * Based on SQL-99
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+ * Based on SQL-99
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : sql.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. SQL syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. SQL syntax highlighting
+ *
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_SQL extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_SQL extends Text_Highlighter
+{
     var $_language = 'sql';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?i)`)|((?i)\\/\\*)|((?i)(#|--\\s).*)|((?i)[a-z_]\\w*)|((?i)")|((?i)\\()|((?i)\')|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)/',
@@ -394,8 +394,8 @@ class  Text_Highlighter_SQL extends Text_Highlighter
             'reserved' => 'reserved',
             'keyword' => 'var',
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/XML.php b/framework/3rdParty/TextHighlighter/Text/Highlighter/XML.php
index 8dc3b881..3c454c77 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/XML.php
+++ b/framework/3rdParty/TextHighlighter/Text/Highlighter/XML.php
@@ -1,49 +1,49 @@
-<?php
-/**
- * Auto-generated class. XML syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
+<?php
+/**
+ * Auto-generated class. XML syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
  * @version    generated from: : xml.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp
  * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * Auto-generated class. XML syntax highlighting
- *
+ *
+ */
+
+/**
+ * Auto-generated class. XML syntax highlighting
+ *
  * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_XML extends Text_Highlighter
-{
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_XML extends Text_Highlighter
+{
     var $_language = 'xml';
 
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
         $this->_options = $options;
         $this->_regs = array (
             -1 => '/((?i)\\<\\!\\[CDATA\\[)|((?i)\\<!--)|((?i)\\<[\\?\\/]?)|((?i)(&|%)[\\w\\-\\.]+;)/',
@@ -238,8 +238,8 @@ class  Text_Highlighter_XML extends Text_Highlighter
         );
         $this->_kwmap = array (
         );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
 }
\ No newline at end of file
-- 
cgit v1.2.3