From ccdb91a35602377fe389c6c5b0945478929e0eca Mon Sep 17 00:00:00 2001 From: wei <> Date: Wed, 28 Dec 2005 22:41:20 +0000 Subject: Adding TTextHighlighter for quickstart docs. --- .../controls/Highlighter/code_highlight.css | 96 + .../protected/controls/Highlighter/geshi.php | 2648 ++++++++++++++++++++ .../protected/controls/Highlighter/geshi/css.php | 178 ++ .../protected/controls/Highlighter/geshi/html.php | 254 ++ .../controls/Highlighter/geshi/javascript.php | 146 ++ .../protected/controls/Highlighter/geshi/php.php | 348 +++ .../protected/controls/Highlighter/geshi/prado.php | 147 ++ .../protected/controls/Highlighter/geshi/xml.php | 145 ++ .../protected/controls/TTextHighlighter.php | 97 + .../protected/pages/Configurations/Templates1.page | 20 +- .../protected/pages/Configurations/Templates2.page | 28 +- .../protected/pages/Configurations/Templates3.page | 24 +- .../protected/pages/Fundamentals/Components.page | 12 +- demos/quickstart/themes/Simple/style.css | 3 +- 14 files changed, 4103 insertions(+), 43 deletions(-) create mode 100644 demos/quickstart/protected/controls/Highlighter/code_highlight.css create mode 100644 demos/quickstart/protected/controls/Highlighter/geshi.php create mode 100644 demos/quickstart/protected/controls/Highlighter/geshi/css.php create mode 100644 demos/quickstart/protected/controls/Highlighter/geshi/html.php create mode 100644 demos/quickstart/protected/controls/Highlighter/geshi/javascript.php create mode 100644 demos/quickstart/protected/controls/Highlighter/geshi/php.php create mode 100644 demos/quickstart/protected/controls/Highlighter/geshi/prado.php create mode 100644 demos/quickstart/protected/controls/Highlighter/geshi/xml.php create mode 100644 demos/quickstart/protected/controls/TTextHighlighter.php (limited to 'demos') diff --git a/demos/quickstart/protected/controls/Highlighter/code_highlight.css b/demos/quickstart/protected/controls/Highlighter/code_highlight.css new file mode 100644 index 00000000..be000a83 --- /dev/null +++ b/demos/quickstart/protected/controls/Highlighter/code_highlight.css @@ -0,0 +1,96 @@ +.php .de1, .php .de2 {font-family: 'Courier New', Courier, monospace; font-weight: normal;} +.php .imp {font-weight: bold; color: red;} +.php li {font-family: 'Courier New', Courier, monospace; color: black; font-weight: normal; font-style: normal;} +.php .kw1 {color: #b1b100;} +.php .kw2 {color: #000000; font-weight: bold;} +.php .kw3 {color: #000066;} +.php .co1 {color: #808080; font-style: italic;} +.php .co2 {color: #808080; font-style: italic;} +.php .coMULTI {color: #808080; font-style: italic;} +.php .es0 {color: #000099; font-weight: bold;} +.php .br0 {color: #66cc66;} +.php .st0 {color: #ff0000;} +.php .nu0 {color: #cc66cc;} +.php .me1 {color: #006600;} +.php .me2 {color: #006600;} +.php .re0 {color: #0000ff;} + +.xml .de1, .xml .de2 {font-family: 'Courier New', Courier, monospace; font-weight: normal;} +.xml .imp {font-weight: bold; color: red;} +.xml li {font-family: 'Courier New', Courier, monospace; color: black; font-weight: normal; font-style: normal;} +.xml .coMULTI {color: #808080; font-style: italic;} +.xml .es0 {color: #000099; font-weight: bold;} +.xml .br0 {color: #66cc66;} +.xml .st0 {color: #ff0000;} +.xml .nu0 {color: #cc66cc;} +.xml .sc0 {color: #00bbdd;} +.xml .sc1 {color: #ddbb00;} +.xml .sc2 {color: #339933;} +.xml .sc3 {color: #009900;} +.xml .re0 {color: #000066;} +.xml .re1 {font-weight: bold; color: black;} +.xml .re2 {font-weight: bold; color: black;} + + +.prado .de1, .prado .de2 {font-family: 'Courier New', Courier, monospace; font-weight: normal;} +.prado .imp {font-weight: bold; color: red;} +.prado li {font-family: 'Courier New', Courier, monospace; color: black; font-weight: normal; font-style: normal;} +.prado .coMULTI {color: #808080; font-style: italic;} +.prado .es0 {color: #000099; font-weight: bold;} +.prado .br0 {color: #66cc66;} +.prado .st0 {color: #ff0000;} +.prado .nu0 {color: #cc66cc;} +.prado .sc0 {color: #00bbdd;} +.prado .sc1 {color: #ddbb00;} +.prado .sc2 {color: #339933;} +.prado .sc3 {color: #009900;} +.prado .re0 {color: #006; font-weight: bold; } /* prado com:ComponentName tags */ +.prado .re0 a.api { color: #006; text-decoration: none; border-bottom: 1px dotted #33f; } +.prado .re1 {color: #006; font-weight: bold; } /* prado tags */ +.prado .re2 {color: #c66; font-weight: bold; } /* prado tags */ + + +.html .de1, .html .de2 {font-family: 'Courier New', Courier, monospace; font-weight: normal;} +.html .imp {font-weight: bold; color: red;} +.html li {font-family: 'Courier New', Courier, monospace; color: black; font-weight: normal; font-style: normal;} +.html .kw1 {color: #b1b100;} +.html .kw2 {color: #000000; font-weight: bold;} +.html .kw3 {color: #000066;} +.html .coMULTI {color: #808080; font-style: italic;} +.html .es0 {color: #000099; font-weight: bold;} +.html .br0 {color: #66cc66;} +.html .st0 {color: #ff0000;} +.html .nu0 {color: #cc66cc;} +.html .sc0 {color: #00bbdd;} +.html .sc1 {color: #ddbb00;} +.html .sc2 {color: #009900;} + +.css .de1, .css .de2 {font-family: 'Courier New', Courier, monospace; font-weight: normal;} +.css .imp {font-weight: bold; color: red;} +.css li {font-family: 'Courier New', Courier, monospace; color: black; font-weight: normal; font-style: normal;} +.css .kw1 {color: #000000; font-weight: bold;} +.css .kw2 {color: #993333;} +.css .co1 {color: #a1a100;} +.css .coMULTI {color: #808080; font-style: italic;} +.css .es0 {color: #000099; font-weight: bold;} +.css .br0 {color: #66cc66;} +.css .st0 {color: #ff0000;} +.css .nu0 {color: #cc66cc;} +.css .re0 {color: #cc00cc;} +.css .re1 {color: #6666ff;} +.css .re2 {color: #3333ff;} + +.javascript .de1, .javascript .de2 {font-family: 'Courier New', Courier, monospace; font-weight: normal;} +.javascript .imp {font-weight: bold; color: red;} +.javascript li {font-family: 'Courier New', Courier, monospace; color: black; font-weight: normal; font-style: normal;} +.javascript .kw1 {color: #000066; font-weight: bold;} +.javascript .kw2 {color: #003366; font-weight: bold;} +.javascript .kw3 {color: #000066;} +.javascript .co1 {color: #009900; font-style: italic;} +.javascript .coMULTI {color: #009900; font-style: italic;} +.javascript .es0 {color: #000099; font-weight: bold;} +.javascript .br0 {color: #66cc66;} +.javascript .st0 {color: #3366CC;} +.javascript .nu0 {color: #CC0000;} +.javascript .me1 {color: #006600;} +.javascript .re0 {color: #0066FF;} \ No newline at end of file diff --git a/demos/quickstart/protected/controls/Highlighter/geshi.php b/demos/quickstart/protected/controls/Highlighter/geshi.php new file mode 100644 index 00000000..b124c936 --- /dev/null +++ b/demos/quickstart/protected/controls/Highlighter/geshi.php @@ -0,0 +1,2648 @@ + + * @copyright Copyright © 2004, 2005, Nigel McNie + * @license http://gnu.org/copyleft/gpl.html GNU GPL + * @version $Id: geshi.php,v 1.23 2005/11/19 02:23:37 oracleshinoda Exp $ + * + */ + +// +// GeSHi Constants +// You should use these constant names in your programs instead of +// their values - you never know when a value may change in a future +// version +// + +/** The version of this GeSHi file */ +define('GESHI_VERSION', '1.0.7.5'); + +/** For the future (though this may never be realised) */ +define('GESHI_OUTPUT_HTML', 0); + +/** Set the correct directory separator */ +define('GESHI_DIR_SEPARATOR', ('WIN' != substr(PHP_OS, 0, 3)) ? '/' : '\\'); + +// Define the root directory for the GeSHi code tree +if (!defined('GESHI_ROOT')) { + /** The root directory for GeSHi */ + define('GESHI_ROOT', dirname(__FILE__) . GESHI_DIR_SEPARATOR); +} +/** The language file directory for GeSHi + @access private */ +define('GESHI_LANG_ROOT', GESHI_ROOT . 'geshi' . GESHI_DIR_SEPARATOR); + + +// Line numbers - use with enable_line_numbers() +/** Use no line numbers when building the result */ +define('GESHI_NO_LINE_NUMBERS', 0); +/** Use normal line numbers when building the result */ +define('GESHI_NORMAL_LINE_NUMBERS', 1); +/** Use fancy line numbers when building the result */ +define('GESHI_FANCY_LINE_NUMBERS', 2); + +// Container HTML type +/** Use nothing to surround the source */ +define('GESHI_HEADER_NONE', 0); +/** Use a "div" to surround the source */ +define('GESHI_HEADER_DIV', 1); +/** Use a "pre" to surround the source */ +define('GESHI_HEADER_PRE', 2); + +// Capatalisation constants +/** Lowercase keywords found */ +define('GESHI_CAPS_NO_CHANGE', 0); +/** Uppercase keywords found */ +define('GESHI_CAPS_UPPER', 1); +/** Leave keywords found as the case that they are */ +define('GESHI_CAPS_LOWER', 2); + +// Link style constants +/** Links in the source in the :link state */ +define('GESHI_LINK', 0); +/** Links in the source in the :hover state */ +define('GESHI_HOVER', 1); +/** Links in the source in the :active state */ +define('GESHI_ACTIVE', 2); +/** Links in the source in the :visited state */ +define('GESHI_VISITED', 3); + +// Important string starter/finisher +// Note that if you change these, they should be as-is: i.e., don't +// write them as if they had been run through htmlentities() +/** The starter for important parts of the source */ +define('GESHI_START_IMPORTANT', ''); +/** The ender for important parts of the source */ +define('GESHI_END_IMPORTANT', ''); + +/**#@+ + * @access private + */ +// When strict mode applies for a language +/** Strict mode never applies (this is the most common) */ +define('GESHI_NEVER', 0); +/** Strict mode *might* apply, and can be enabled or + disabled by {@link GeSHi::enable_strict_mode()} */ +define('GESHI_MAYBE', 1); +/** Strict mode always applies */ +define('GESHI_ALWAYS', 2); + +// Advanced regexp handling constants, used in language files +/** The key of the regex array defining what to search for */ +define('GESHI_SEARCH', 0); +/** The key of the regex array defining what bracket group in a + matched search to use as a replacement */ +define('GESHI_REPLACE', 1); +/** The key of the regex array defining any modifiers to the regular expression */ +define('GESHI_MODIFIERS', 2); +/** The key of the regex array defining what bracket group in a + matched search to put before the replacement */ +define('GESHI_BEFORE', 3); +/** The key of the regex array defining what bracket group in a + matched search to put after the replacement */ +define('GESHI_AFTER', 4); + +/** Used in language files to mark comments */ +define('GESHI_COMMENTS', 0); + +// Error detection - use these to analyse faults +/** No sourcecode to highlight was specified */ +define('GESHI_ERROR_NO_INPUT', 1); +/** The language specified does not exist */ +define('GESHI_ERROR_NO_SUCH_LANG', 2); +/** GeSHi could not open a file for reading (generally a language file) */ +define('GESHI_ERROR_FILE_NOT_READABLE', 3); +/** The header type passed to {@link GeSHi::set_header_type()} was invalid */ +define('GESHI_ERROR_INVALID_HEADER_TYPE', 4); +/** The line number type passed to {@link GeSHi::enable_line_numbers()} was invalid */ +define('GESHI_ERROR_INVALID_LINE_NUMBER_TYPE', 5); +/**#@-*/ + + +/** + * The GeSHi Class. + * + * Please refer to the documentation for GeSHi 1.0.X that is available + * at http://qbnz.com/highlighter/documentation.php for more information + * about how to use this class. + * + * @package core + * @author Nigel McNie + * @copyright Copyright © 2004, 2005 Nigel McNie + */ +class GeSHi +{ + /**#@+ + * @access private + */ + /** + * The source code to highlight + * @var string + */ + protected $source = ''; + + /** + * The language to use when highlighting + * @var string + */ + protected $language = ''; + + /** + * The data for the language used + * @var array + */ + protected $language_data = array(); + + /** + * The path to the language files + * @var string + */ + protected $language_path = GESHI_LANG_ROOT; + + /** + * The error message associated with an error + * @var string + * @todo check err reporting works + */ + protected $error = false; + + /** + * Possible error messages + * @var array + */ + protected $error_messages = array( + GESHI_ERROR_NO_INPUT => 'No source code inputted', + GESHI_ERROR_NO_SUCH_LANG => 'GeSHi could not find the language {LANGUAGE} (using path {PATH})', + GESHI_ERROR_FILE_NOT_READABLE => 'The file specified for load_from_file was not readable', + GESHI_ERROR_INVALID_HEADER_TYPE => 'The header type specified is invalid', + GESHI_ERROR_INVALID_LINE_NUMBER_TYPE => 'The line number type specified is invalid' + ); + + /** + * Whether highlighting is strict or not + * @var boolean + */ + protected $strict_mode = false; + + /** + * Whether to use CSS classes in output + * @var boolean + */ + protected $use_classes = false; + + /** + * The type of header to use. Can be one of the following + * values: + * + *
    + *
  • GESHI_HEADER_PRE: Source is outputted in + * a <pre> HTML element.
    • + *
  • GESHI_HEADER_DIV: Source is outputted in + * a <div> HTML element.
    • + *
+ * + * @var int + */ + protected $header_type = GESHI_HEADER_PRE; + + /** + * Array of permissions for which lexics should be highlighted + * @var array + */ + protected $lexic_permissions = array( + 'KEYWORDS' => array(), + 'COMMENTS' => array('MULTI' => true), + 'REGEXPS' => array(), + 'ESCAPE_CHAR' => true, + 'BRACKETS' => true, + 'SYMBOLS' => true, + 'STRINGS' => true, + 'NUMBERS' => true, + 'METHODS' => true, + 'SCRIPT' => true + ); + + /** + * The time it took to parse the code + * @var double + */ + protected $time = 0; + + /** + * The content of the header block + * @var string + */ + protected $header_content = ''; + + /** + * The content of the footer block + * @var string + */ + protected $footer_content = ''; + + /** + * The style of the header block + * @var string + */ + protected $header_content_style = ''; + + /** + * The style of the footer block + * @var string + */ + protected $footer_content_style = ''; + + /** + * The styles for hyperlinks in the code + * @var array + */ + protected $link_styles = array(); + + /** + * Whether important blocks should be recognised or not + * @var boolean + * @deprecated + * @todo REMOVE THIS FUNCTIONALITY! + */ + protected $enable_important_blocks = false; + + /** + * Styles for important parts of the code + * @var string + * @deprecated + * @todo As above - rethink the whole idea of important blocks as it is buggy and + * will be hard to implement in 1.2 + */ + protected $important_styles = 'font-weight: bold; color: red;'; // Styles for important parts of the code + + /** + * Whether CSS IDs should be added to the code + * @var boolean + */ + protected $add_ids = false; + + /** + * Lines that should be highlighted extra + * @var array + */ + protected $highlight_extra_lines = array(); + + /** + * Styles of extra-highlighted lines + * @var string + */ + protected $highlight_extra_lines_style = 'color: #cc0; background-color: #ffc;'; + + /** + * Number at which line numbers should start at + * @var int + * @todo Warning documentation about XHTML compliance + */ + protected $line_numbers_start = 1; + + /** + * The overall style for this code block + * @var string + */ + protected $overall_style = ''; + + /** + * The style for the actual code + * @var string + */ + protected $code_style = 'font-family: \'Courier New\', Courier, monospace; font-weight: normal;'; + + /** + * The overall class for this code block + * @var string + */ + protected $overall_class = ''; + + /** + * The overall ID for this code block + * @var string + */ + protected $overall_id = ''; + + /** + * Line number styles + * @var string + */ + protected $line_style1 = 'font-family: \'Courier New\', Courier, monospace; color: black; font-weight: normal; font-style: normal;'; + + /** + * Line number styles for fancy lines + * @var string + */ + protected $line_style2 = 'font-weight: bold;'; + + /** + * Flag for how line nubmers are displayed + * @var boolean + */ + protected $line_numbers = GESHI_NO_LINE_NUMBERS; + + /** + * The "nth" value for fancy line highlighting + * @var int + */ + protected $line_nth_row = 0; + + /** + * The size of tab stops + * @var int + */ + protected $tab_width = 8; + + /** + * Default target for keyword links + * @var string + */ + protected $link_target = ''; + + /** + * The encoding to use for entity encoding + * @var string + */ + protected $encoding = 'ISO-8859-1'; + + /** + * Unused (planned for future) + * @var int + */ + protected $output_format = GESHI_OUTPUT_HTML; + + /**#@-*/ + + /** + * Creates a new GeSHi object, with source and language + * + * @param string The source code to highlight + * @param string The language to highlight the source with + * @param string The path to the language file directory. This + * is deprecated! I've backported the auto path + * detection from the 1.1.X dev branch, so now it + * should be automatically set correctly. If you have + * renamed the language directory however, you will + * still need to set the path using this parameter or + * {@link GeSHi::set_language_path()} + * @since 1.0.0 + */ + function __construct ($source, $language, $path = '') + { + $this->set_source($source); + $this->set_language_path($path); + $this->set_language($language); + } + + /** + * Returns an error message associated with the last GeSHi operation, + * or false if no error has occured + * + * @return string|false An error message if there has been an error, else false + * @since 1.0.0 + */ + function error () + { + if ($this->error) { + $msg = $this->error_messages[$this->error]; + $debug_tpl_vars = array( + '{LANGUAGE}' => $this->language, + '{PATH}' => $this->language_path + ); + foreach ($debug_tpl_vars as $tpl => $var) { + $msg = str_replace($tpl, $var, $msg); + } + return "
GeSHi Error: $msg (code $this->error)
"; + } + return false; + } + + /** + * Gets a human-readable language name (thanks to Simon Patterson + * for the idea :)) + * + * @return string The name for the current language + * @since 1.0.2 + */ + function get_language_name () + { + if (GESHI_ERROR_NO_SUCH_LANG == $this->_error) { + return $this->language_data['LANG_NAME'] . ' (Unknown Language)'; + } + return $this->language_data['LANG_NAME']; + } + + /** + * Sets the source code for this object + * + * @param string The source code to highlight + * @since 1.0.0 + */ + function set_source ($source) + { + if ('' == trim($source)) { + $this->error = GESHI_ERROR_NO_INPUT; + } + $this->source = $source; + } + + /** + * Sets the language for this object + * + * @param string The name of the language to use + * @since 1.0.0 + */ + function set_language ($language) + { + $this->error = false; + $this->strict_mode = GESHI_NEVER; + + $language = preg_replace('#[^a-zA-Z0-9\-_]#', '', $language); + $this->language = strtolower($language); + + $file_name = $this->language_path . $this->language . '.php'; + if (!is_readable($file_name)) { + $this->error = GESHI_ERROR_NO_SUCH_LANG; + return; + } + // Load the language for parsing + $this->load_language($file_name); + } + + /** + * Sets the path to the directory containing the language files. Note + * that this path is relative to the directory of the script that included + * geshi.php, NOT geshi.php itself. + * + * @param string The path to the language directory + * @since 1.0.0 + * @deprecated The path to the language files should now be automatically + * detected, so this method should no longer be needed. The + * 1.1.X branch handles manual setting of the path differently + * so this method will disappear in 1.2.0. + */ + function set_language_path ($path) + { + if ($path) { + $this->language_path = ('/' == substr($path, strlen($path) - 1, 1)) ? $path : $path . '/'; + } + } + + /** + * Sets the type of header to be used. + * + * If GESHI_HEADER_DIV is used, the code is surrounded in a "div".This + * means more source code but more control over tab width and line-wrapping. + * GESHI_HEADER_PRE means that a "pre" is used - less source, but less + * control. Default is GESHI_HEADER_PRE. + * + * From 1.0.7.2, you can use GESHI_HEADER_NONE to specify that no header code + * should be outputted. + * + * @param int The type of header to be used + * @since 1.0.0 + */ + function set_header_type ($type) + { + if (GESHI_HEADER_DIV != $type && GESHI_HEADER_PRE != $type && GESHI_HEADER_NONE != $type) { + $this->error = GESHI_ERROR_INVALID_HEADER_TYPE; + return; + } + $this->header_type = $type; + } + + /** + * Sets the styles for the code that will be outputted + * when this object is parsed. The style should be a + * string of valid stylesheet declarations + * + * @param string The overall style for the outputted code block + * @param boolean Whether to merge the styles with the current styles or not + * @since 1.0.0 + */ + function set_overall_style ($style, $preserve_defaults = false) + { + if (!$preserve_defaults) { + $this->overall_style = $style; + } else { + $this->overall_style .= $style; + } + } + + /** + * Sets the overall classname for this block of code. This + * class can then be used in a stylesheet to style this object's + * output + * + * @param string The class name to use for this block of code + * @since 1.0.0 + */ + function set_overall_class ($class) + { + $this->overall_class = $class; + } + + /** + * Sets the overall id for this block of code. This id can then + * be used in a stylesheet to style this object's output + * + * @param string The ID to use for this block of code + * @since 1.0.0 + */ + function set_overall_id ($id) + { + $this->overall_id = $id; + } + + /** + * Sets whether CSS classes should be used to highlight the source. Default + * is off, calling this method with no arguments will turn it on + * + * @param boolean Whether to turn classes on or not + * @since 1.0.0 + */ + function enable_classes ($flag = true) + { + $this->use_classes = ($flag) ? true : false; + } + + /** + * Sets the style for the actual code. This should be a string + * containing valid stylesheet declarations. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * Note: Use this method to override any style changes you made to + * the line numbers if you are using line numbers, else the line of + * code will have the same style as the line number! Consult the + * GeSHi documentation for more information about this. + * + * @param string The style to use for actual code + * @param boolean Whether to merge the current styles with the new styles + */ + function set_code_style ($style, $preserve_defaults = false) + { + if (!$preserve_defaults) { + $this->code_style = $style; + } else { + $this->code_style .= $style; + } + } + + /** + * Sets the styles for the line numbers. + * + * @param string The style for the line numbers that are "normal" + * @param string|boolean If a string, this is the style of the line + * numbers that are "fancy", otherwise if boolean then this + * defines whether the normal styles should be merged with the + * new normal styles or not + * @param boolean If set, is the flag for whether to merge the "fancy" + * styles with the current styles or not + * @since 1.0.2 + */ + function set_line_style ($style1, $style2 = '', $preserve_defaults = false) + { + if (is_bool($style2)) { + $preserve_defaults = $style2; + $style2 = ''; + } + if (!$preserve_defaults) { + $this->line_style1 = $style1; + $this->line_style2 = $style2; + } else { + $this->line_style1 .= $style1; + $this->line_style2 .= $style2; + } + } + + /** + * Sets whether line numbers should be displayed. + * + * Valid values for the first parameter are: + * + *
    + *
  • GESHI_NO_LINE_NUMBERS: Line numbers will not be displayed
    • + *
  • GESHI_NORMAL_LINE_NUMBERS: Line numbers will be displayed
    • + *
  • GESHI_FANCY_LINE_NUMBERS: Fancy line numbers will be displayed
    • + *
+ * + * For fancy line numbers, the second parameter is used to signal which lines + * are to be fancy. For example, if the value of this parameter is 5 then every + * 5th line will be fancy. + * + * @param int How line numbers should be displayed + * @param int Defines which lines are fancy + * @since 1.0.0 + */ + function enable_line_numbers ($flag, $nth_row = 5) + { + if (GESHI_NO_LINE_NUMBERS != $flag && GESHI_NORMAL_LINE_NUMBERS != $flag + && GESHI_FANCY_LINE_NUMBERS != $flag) { + $this->error = GESHI_ERROR_INVALID_LINE_NUMBER_TYPE; + } + $this->line_numbers = $flag; + $this->line_nth_row = $nth_row; + } + + /** + * Sets the style for a keyword group. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * @param int The key of the keyword group to change the styles of + * @param string The style to make the keywords + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_keyword_group_style ($key, $style, $preserve_defaults = false) + { + if (!$preserve_defaults) { + $this->language_data['STYLES']['KEYWORDS'][$key] = $style; + } else { + $this->language_data['STYLES']['KEYWORDS'][$key] .= $style; + } + } + + /** + * Turns highlighting on/off for a keyword group + * + * @param int The key of the keyword group to turn on or off + * @param boolean Whether to turn highlighting for that group on or off + * @since 1.0.0 + */ + function set_keyword_group_highlighting ( $key, $flag = true ) + { + $this->lexic_permissions['KEYWORDS'][$key] = ($flag) ? true : false; + } + + /** + * Sets the styles for comment groups. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * @param int The key of the comment group to change the styles of + * @param string The style to make the comments + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_comments_style ($key, $style, $preserve_defaults = false) + { + if (!$preserve_defaults) { + $this->language_data['STYLES']['COMMENTS'][$key] = $style; + } else { + $this->language_data['STYLES']['COMMENTS'][$key] .= $style; + } + } + + /** + * Turns highlighting on/off for comment groups + * + * @param int The key of the comment group to turn on or off + * @param boolean Whether to turn highlighting for that group on or off + * @since 1.0.0 + */ + function set_comments_highlighting ($key, $flag = true) + { + $this->lexic_permissions['COMMENTS'][$key] = ($flag) ? true : false; + } + + /** + * Sets the styles for escaped characters. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * @param string The style to make the escape characters + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_escape_characters_style ($style, $preserve_defaults = false) + { + if (!$preserve_defaults) { + $this->language_data['STYLES']['ESCAPE_CHAR'][0] = $style; + } else { + $this->language_data['STYLES']['ESCAPE_CHAR'][0] .= $style; + } + } + + /** + * Turns highlighting on/off for escaped characters + * + * @param boolean Whether to turn highlighting for escape characters on or off + * @since 1.0.0 + */ + function set_escape_characters_highlighting ($flag = true) + { + $this->lexic_permissions['ESCAPE_CHAR'] = ($flag) ? true : false; + } + + /** + * Sets the styles for brackets. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * This method is DEPRECATED: use set_symbols_style instead. + * This method will be removed in 1.2.X + * + * @param string The style to make the brackets + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + * @deprecated In favour of set_symbols_style + */ + function set_brackets_style ($style, $preserve_defaults = false) + { + if (!$preserve_defaults) { + $this->language_data['STYLES']['BRACKETS'][0] = $style; + } else { + $this->language_data['STYLES']['BRACKETS'][0] .= $style; + } + } + + /** + * Turns highlighting on/off for brackets + * + * This method is DEPRECATED: use set_symbols_highlighting instead. + * This method will be remove in 1.2.X + * + * @param boolean Whether to turn highlighting for brackets on or off + * @since 1.0.0 + * @deprecated In favour of set_symbols_highlighting + */ + function set_brackets_highlighting ($flag) + { + $this->lexic_permissions['BRACKETS'] = ($flag) ? true : false; + } + + /** + * Sets the styles for symbols. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * @param string The style to make the symbols + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.1 + */ + function set_symbols_style ($style, $preserve_defaults = false) + { + if (!$preserve_defaults) { + $this->language_data['STYLES']['SYMBOLS'][0] = $style; + } else { + $this->language_data['STYLES']['SYMBOLS'][0] .= $style; + } + // For backward compatibility + $this->set_brackets_style ($style, $preserve_defaults); + } + + /** + * Turns highlighting on/off for symbols + * + * @param boolean Whether to turn highlighting for symbols on or off + * @since 1.0.0 + */ + function set_symbols_highlighting ($flag) + { + $this->lexic_permissions['SYMBOLS'] = ($flag) ? true : false; + // For backward compatibility + $this->set_brackets_highlighting ($flag); + } + + /** + * Sets the styles for strings. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * @param string The style to make the escape characters + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_strings_style ($style, $preserve_defaults = false) + { + if (!$preserve_defaults) { + $this->language_data['STYLES']['STRINGS'][0] = $style; + } else { + $this->language_data['STYLES']['STRINGS'][0] .= $style; + } + } + + /** + * Turns highlighting on/off for strings + * + * @param boolean Whether to turn highlighting for strings on or off + * @since 1.0.0 + */ + function set_strings_highlighting ($flag) + { + $this->lexic_permissions['STRINGS'] = ($flag) ? true : false; + } + + /** + * Sets the styles for numbers. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * @param string The style to make the numbers + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_numbers_style ($style, $preserve_defaults = false) + { + if (!$preserve_defaults) { + $this->language_data['STYLES']['NUMBERS'][0] = $style; + } else { + $this->language_data['STYLES']['NUMBERS'][0] .= $style; + } + } + + /** + * Turns highlighting on/off for numbers + * + * @param boolean Whether to turn highlighting for numbers on or off + * @since 1.0.0 + */ + function set_numbers_highlighting ($flag) + { + $this->lexic_permissions['NUMBERS'] = ($flag) ? true : false; + } + + /** + * Sets the styles for methods. $key is a number that references the + * appropriate "object splitter" - see the language file for the language + * you are highlighting to get this number. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * @param int The key of the object splitter to change the styles of + * @param string The style to make the methods + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_methods_style ($key, $style, $preserve_defaults = false) + { + if (!$preserve_defaults) { + $this->language_data['STYLES']['METHODS'][$key] = $style; + } else { + $this->language_data['STYLES']['METHODS'][$key] .= $style; + } + } + + /** + * Turns highlighting on/off for methods + * + * @param boolean Whether to turn highlighting for methods on or off + * @since 1.0.0 + */ + function set_methods_highlighting ($flag) + { + $this->lexic_permissions['METHODS'] = ($flag) ? true : false; + } + + /** + * Sets the styles for regexps. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * @param string The style to make the regular expression matches + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_regexps_style ($key, $style, $preserve_defaults = false) + { + if (!$preserve_defaults) { + $this->language_data['STYLES']['REGEXPS'][$key] = $style; + } else { + $this->language_data['STYLES']['REGEXPS'][$key] .= $style; + } + } + + /** + * Turns highlighting on/off for regexps + * + * @param int The key of the regular expression group to turn on or off + * @param boolean Whether to turn highlighting for the regular expression group on or off + * @since 1.0.0 + */ + function set_regexps_highlighting ($key, $flag) + { + $this->lexic_permissions['REGEXPS'][$key] = ($flag) ? true : false; + } + + /** + * Sets whether a set of keywords are checked for in a case sensitive manner + * + * @param int The key of the keyword group to change the case sensitivity of + * @param boolean Whether to check in a case sensitive manner or not + * @since 1.0.0 + */ + function set_case_sensitivity ($key, $case) + { + $this->language_data['CASE_SENSITIVE'][$key] = ($case) ? true : false; + } + + /** + * Sets the case that keywords should use when found. Use the constants: + * + *
    + *
  • GESHI_CAPS_NO_CHANGE: leave keywords as-is
    • + *
  • GESHI_CAPS_UPPER: convert all keywords to uppercase where found
    • + *
  • GESHI_CAPS_LOWER: convert all keywords to lowercase where found
    • + *
+ * + * @param int A constant specifying what to do with matched keywords + * @since 1.0.1 + * @todo Error check the passed value + */ + function set_case_keywords ($case) + { + $this->language_data['CASE_KEYWORDS'] = $case; + } + + /** + * Sets how many spaces a tab is substituted for + * + * Widths below zero are ignored + * + * @param int The tab width + * @since 1.0.0 + */ + function set_tab_width ($width) + { + $this->tab_width = intval($width); + } + + /** + * Enables/disables strict highlighting. Default is off, calling this + * method without parameters will turn it on. See documentation + * for more details on strict mode and where to use it. + * + * @param boolean Whether to enable strict mode or not + * @since 1.0.0 + */ + function enable_strict_mode ($mode = true) + { + if (GESHI_MAYBE == $this->language_data['STRICT_MODE_APPLIES']) { + $this->strict_mode = ($mode) ? true : false; + } + } + + /** + * Disables all highlighting + * + * @since 1.0.0 + * @todo Rewrite with an array traversal + */ + function disable_highlighting () + { + foreach ($this->lexic_permissions as $key => $value) { + if (is_array($value)) { + foreach ($value as $k => $v) { + $this->lexic_permissions[$key][$k] = false; + } + } else { + $this->lexic_permissions[$key] = false; + } + } + // Context blocks + $this->enable_important_blocks = false; + } + + /** + * Enables all highlighting + * + * @since 1.0.0 + * @todo Rewrite with array traversal + */ + function enable_highlighting () + { + foreach ($this->lexic_permissions as $key => $value) { + if (is_array($value)) { + foreach ($value as $k => $v) { + $this->lexic_permissions[$key][$k] = true; + } + } else { + $this->lexic_permissions[$key] = true; + } + } + // Context blocks + $this->enable_important_blocks = true; + } + + /** + * Given a file extension, this method returns either a valid geshi language + * name, or the empty string if it couldn't be found + * + * @param string The extension to get a language name for + * @param array A lookup array to use instead of the default + * @since 1.0.5 + * @todo Re-think about how this method works (maybe make it private and/or make it + * a extension->lang lookup?) + * @todo static? + */ + function get_language_name_from_extension ( $extension, $lookup = array() ) + { + if ( !$lookup ) + { + $lookup = array( + 'actionscript' => array('as'), + 'ada' => array('a', 'ada', 'adb', 'ads'), + 'apache' => array('conf'), + 'asm' => array('ash', 'asm'), + 'asp' => array('asp'), + 'bash' => array('sh'), + 'c' => array('c'), + 'c_mac' => array('c'), + 'caddcl' => array(), + 'cadlisp' => array(), + 'cpp' => array('cpp'), + 'csharp' => array(), + 'css' => array('css'), + 'delphi' => array('dpk', 'dpr'), + 'html4strict' => array('html', 'htm'), + 'java' => array('java'), + 'javascript' => array('js'), + 'lisp' => array('lisp'), + 'lua' => array('lua'), + 'mpasm' => array(), + 'nsis' => array(), + 'objc' => array(), + 'oobas' => array(), + 'oracle8' => array(), + 'pascal' => array('pas'), + 'perl' => array('pl', 'pm'), + 'php' => array('php', 'php5', 'phtml', 'phps'), + 'python' => array('py'), + 'qbasic' => array('bi'), + 'smarty' => array(), + 'vb' => array('bas'), + 'vbnet' => array(), + 'visualfoxpro' => array(), + 'xml' => array('xml') + ); + } + + foreach ($lookup as $lang => $extensions) { + foreach ($extensions as $ext) { + if ($ext == $extension) { + return $lang; + } + } + } + return ''; + } + + /** + * Given a file name, this method loads its contents in, and attempts + * to set the language automatically. An optional lookup table can be + * passed for looking up the language name. If not specified a default + * table is used + * + * The language table is in the form + * 
array(
+	 *   'lang_name' => array('extension', 'extension', ...),
+	 *   'lang_name' ...
+	 * );
+ * + * @todo Complete rethink of this and above method + * @since 1.0.5 + */ + function load_from_file ($file_name, $lookup = array()) + { + if (is_readable($file_name)) { + $this->set_source(implode('', file($file_name))); + $this->set_language($this->get_language_name_from_extension(substr(strrchr($file_name, '.'), 1), $lookup)); + } else { + $this->error = GESHI_ERROR_FILE_NOT_READABLE; + } + } + + /** + * Adds a keyword to a keyword group for highlighting + * + * @param int The key of the keyword group to add the keyword to + * @param string The word to add to the keyword group + * @since 1.0.0 + */ + function add_keyword ($key, $word) + { + $this->language_data['KEYWORDS'][$key][] = $word; + } + + /** + * Removes a keyword from a keyword group + * + * @param int The key of the keyword group to remove the keyword from + * @param string The word to remove from the keyword group + * @since 1.0.0 + */ + function remove_keyword ($key, $word) + { + $this->language_data['KEYWORDS'][$key] = + array_diff($this->language_data['KEYWORDS'][$key], array($word)); + } + + /** + * Creates a new keyword group + * + * @param int The key of the keyword group to create + * @param string The styles for the keyword group + * @param boolean Whether the keyword group is case sensitive ornot + * @param array The words to use for the keyword group + * @since 1.0.0 + */ + function add_keyword_group ( $key, $styles, $case_sensitive = true, $words = array() ) + { + $words = (array) $words; + $this->language_data['KEYWORDS'][$key] = $words; + $this->lexic_permissions['KEYWORDS'][$key] = true; + $this->language_data['CASE_SENSITIVE'][$key] = $case_sensitive; + $this->language_data['STYLES']['KEYWORDS'][$key] = $styles; + } + + /** + * Removes a keyword group + * + * @param int The key of the keyword group to remove + * @since 1.0.0 + */ + function remove_keyword_group ($key) + { + unset($this->language_data['KEYWORDS'][$key]); + unset($this->lexic_permissions['KEYWORDS'][$key]); + unset($this->language_data['CASE_SENSITIVE'][$key]); + unset($this->language_data['STYLES']['KEYWORDS'][$key]); + } + + /** + * Sets the content of the header block + * + * @param string The content of the header block + * @since 1.0.2 + */ + function set_header_content ($content) + { + $this->header_content = $content; + } + + /** + * Sets the content of the footer block + * + * @param string The content of the footer block + * @since 1.0.2 + */ + function set_footer_content ($content) + { + $this->footer_content = $content; + } + + /** + * Sets the style for the header content + * + * @param string The style for the header content + * @since 1.0.2 + */ + function set_header_content_style ($style) + { + $this->header_content_style = $style; + } + + /** + * Sets the style for the footer content + * + * @param string The style for the footer content + * @since 1.0.2 + */ + function set_footer_content_style ($style) + { + $this->footer_content_style = $style; + } + + /** + * Sets the base URL to be used for keywords + * + * @param int The key of the keyword group to set the URL for + * @param string The URL to set for the group. If {FNAME} is in + * the url somewhere, it is replaced by the keyword + * that the URL is being made for + * @since 1.0.2 + */ + function set_url_for_keyword_group ($group, $url) + { + $this->language_data['URLS'][$group] = $url; + } + + /** + * Sets styles for links in code + * + * @param int A constant that specifies what state the style is being + * set for - e.g. :hover or :visited + * @param string The styles to use for that state + * @since 1.0.2 + */ + function set_link_styles ($type, $styles) + { + $this->link_styles[$type] = $styles; + } + + /** + * Sets the target for links in code + * + * @param string The target for links in the code, e.g. _blank + * @since 1.0.3 + */ + function set_link_target ( $target ) + { + if (!$target) { + $this->link_target = ''; + } else { + $this->link_target = ' target="' . $target . '" '; + } + } + + /** + * Sets styles for important parts of the code + * + * @param string The styles to use on important parts of the code + * @since 1.0.2 + */ + function set_important_styles ($styles) + { + $this->important_styles = $styles; + } + + /** + * Sets whether context-important blocks are highlighted + * + * @todo REMOVE THIS SHIZ FROM GESHI! + * @deprecated + */ + function enable_important_blocks ( $flag ) + { + $this->enable_important_blocks = ( $flag ) ? true : false; + } + + /** + * Whether CSS IDs should be added to each line + * + * @param boolean If true, IDs will be added to each line. + * @since 1.0.2 + */ + function enable_ids ($flag = true) + { + $this->add_ids = ($flag) ? true : false; + } + + /** + * Specifies which lines to highlight extra + * + * @param mixed An array of line numbers to highlight, or just a line + * number on its own. + * @since 1.0.2 + * @todo Some data replication here that could be cut down on + */ + function highlight_lines_extra ($lines) + { + if (is_array($lines)) { + foreach ($lines as $line) { + $this->highlight_extra_lines[intval($line)] = intval($line); + } + } else { + $this->highlight_extra_lines[intval($lines)] = intval($lines); + } + } + + /** + * Sets the style for extra-highlighted lines + * + * @param string The style for extra-highlighted lines + * @since 1.0.2 + */ + function set_highlight_lines_extra_style ($styles) + { + $this->highlight_extra_lines_style = $styles; + } + + /** + * Sets what number line numbers should start at. Should + * be a positive integer, and will be converted to one. + * + * Warning: Using this method will add the "start" + * attribute to the <ol> that is used for line numbering. + * This is not valid XHTML strict, so if that's what you + * care about then don't use this method. Firefox is getting + * support for the CSS method of doing this in 1.1 and Opera + * has support for the CSS method, but (of course) IE doesn't + * so it's not worth doing it the CSS way yet. + * + * @param int The number to start line numbers at + * @since 1.0.2 + */ + function start_line_numbers_at ($number) + { + $this->line_numbers_start = abs(intval($number)); + } + + /** + * Sets the encoding used for htmlspecialchars(), for international + * support. + * + * @param string The encoding to use for the source + * @since 1.0.3 + */ + function set_encoding ($encoding) + { + if ($encoding) { + $this->encoding = $encoding; + } + } + + /** + * Returns the code in $this->source, highlighted and surrounded by the + * nessecary HTML. + * + * This should only be called ONCE, cos it's SLOW! If you want to highlight + * the same source multiple times, you're better off doing a whole lot of + * str_replaces to replace the <span>s + * + * @since 1.0.0 + */ + function parse_code () + { + // Start the timer + $start_time = microtime(); + + // Firstly, if there is an error, we won't highlight + if ($this->error) { + $result = $this->header(); + if ($this->header_type != GESHI_HEADER_PRE) { + $result .= $this->indent(@htmlspecialchars($this->source, ENT_COMPAT, $this->encoding)); + } else { + $result .= @htmlspecialchars($this->source, ENT_COMPAT, $this->encoding); + } + // Stop Timing + $this->set_time($start_time, microtime()); + return $result . $this->footer(); + } + + // Add spaces for regular expression matching and line numbers + $code = ' ' . $this->source . ' '; + // Replace all newlines to a common form. + $code = str_replace("\r\n", "\n", $code); + $code = str_replace("\r", "\n", $code); + + // Initialise various stuff + $length = strlen($code); + $STRING_OPEN = ''; + $CLOSE_STRING = false; + $ESCAPE_CHAR_OPEN = false; + $COMMENT_MATCHED = false; + // Turn highlighting on if strict mode doesn't apply to this language + $HIGHLIGHTING_ON = ( !$this->strict_mode ) ? true : ''; + // Whether to highlight inside a block of code + $HIGHLIGHT_INSIDE_STRICT = false; + $stuff_to_parse = ''; + $result = ''; + + // "Important" selections are handled like multiline comments + // @todo GET RID OF THIS SHIZ + if ($this->enable_important_blocks) { + $this->language_data['COMMENT_MULTI'][GESHI_START_IMPORTANT] = GESHI_END_IMPORTANT; + } + + if ($this->strict_mode) { + // Break the source into bits. Each bit will be a portion of the code + // within script delimiters - for example, HTML between < and > + $parts = array(0 => array(0 => '')); + $k = 0; + for ($i = 0; $i < $length; $i++) { + $char = substr($code, $i, 1); + if (!$HIGHLIGHTING_ON) { + foreach ($this->language_data['SCRIPT_DELIMITERS'] as $key => $delimiters) { + foreach ($delimiters as $open => $close) { + // Get the next little bit for this opening string + $check = substr($code, $i, strlen($open)); + // If it matches... + if ($check == $open) { + // We start a new block with the highlightable + // code in it + $HIGHLIGHTING_ON = $open; + $i += strlen($open) - 1; + $char = $open; + $parts[++$k][0] = $char; + + // No point going around again... + break(2); + } + } + } + } else { + foreach ($this->language_data['SCRIPT_DELIMITERS'] as $key => $delimiters) { + foreach ($delimiters as $open => $close) { + if ($open == $HIGHLIGHTING_ON) { + // Found the closing tag + break(2); + } + } + } + // We check code from our current position BACKWARDS. This is so + // the ending string for highlighting can be included in the block + $check = substr($code, $i - strlen($close) + 1, strlen($close)); + if ($check == $close) { + $HIGHLIGHTING_ON = ''; + // Add the string to the rest of the string for this part + $parts[$k][1] = ( isset($parts[$k][1]) ) ? $parts[$k][1] . $char : $char; + $parts[++$k][0] = ''; + $char = ''; + } + } + $parts[$k][1] = ( isset($parts[$k][1]) ) ? $parts[$k][1] . $char : $char; + } + $HIGHLIGHTING_ON = ''; + } else { + // Not strict mode - simply dump the source into + // the array at index 1 (the first highlightable block) + $parts = array( + 1 => array( + 0 => '', + 1 => $code + ) + ); + } + + // Now we go through each part. We know that even-indexed parts are + // code that shouldn't be highlighted, and odd-indexed parts should + // be highlighted + foreach ($parts as $key => $data) { + $part = $data[1]; + // If this block should be highlighted... + if ($key % 2) { + if ($this->strict_mode) { + // Find the class key for this block of code + foreach ($this->language_data['SCRIPT_DELIMITERS'] as $script_key => $script_data) { + foreach ($script_data as $open => $close) { + if ($data[0] == $open) { + break(2); + } + } + } + + if ($this->language_data['STYLES']['SCRIPT'][$script_key] != '' && + $this->lexic_permissions['SCRIPT']) { + // Add a span element around the source to + // highlight the overall source block + if (!$this->use_classes && + $this->language_data['STYLES']['SCRIPT'][$script_key] != '') { + $attributes = ' style="' . $this->language_data['STYLES']['SCRIPT'][$script_key] . '"'; + } else { + $attributes = ' class="sc' . $script_key . '"'; + } + $result .= ""; + } + } + + if (!$this->strict_mode || $this->language_data['HIGHLIGHT_STRICT_BLOCK'][$script_key]) { + // Now, highlight the code in this block. This code + // is really the engine of GeSHi (along with the method + // parse_non_string_part). + $length = strlen($part); + for ($i = 0; $i < $length; $i++) { + // Get the next char + $char = substr($part, $i, 1); + // Is this char the newline and line numbers being used? + if (($this->line_numbers != GESHI_NO_LINE_NUMBERS + || count($this->highlight_extra_lines) > 0) + && $char == "\n") { + // If so, is there a string open? If there is, we should end it before + // the newline and begin it again (so when
  • s are put in the source + // remains XHTML compliant) + // note to self: This opens up possibility of config files specifying + // that languages can/cannot have multiline strings??? + if ($STRING_OPEN) { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['STRINGS'][0] . '"'; + } else { + $attributes = ' class="st0"'; + } + $char = '' . $char . ""; + } + } elseif ($char == $STRING_OPEN) { + // A match of a string delimiter + if (($this->lexic_permissions['ESCAPE_CHAR'] && $ESCAPE_CHAR_OPEN) || + ($this->lexic_permissions['STRINGS'] && !$ESCAPE_CHAR_OPEN)) { + $char .= ''; + } + if (!$ESCAPE_CHAR_OPEN) { + $STRING_OPEN = ''; + $CLOSE_STRING = true; + } + $ESCAPE_CHAR_OPEN = false; + } elseif (in_array($char, $this->language_data['QUOTEMARKS']) && + ($STRING_OPEN == '') && $this->lexic_permissions['STRINGS']) { + // The start of a new string + $STRING_OPEN = $char; + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['STRINGS'][0] . '"'; + } else { + $attributes = ' class="st0"'; + } + $char = "" . $char; + + $result .= $this->parse_non_string_part( $stuff_to_parse ); + $stuff_to_parse = ''; + } elseif (($char == $this->language_data['ESCAPE_CHAR']) && ($STRING_OPEN != '')) { + // An escape character + if (!$ESCAPE_CHAR_OPEN) { + $ESCAPE_CHAR_OPEN = true; + if ($this->lexic_permissions['ESCAPE_CHAR']) { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR'][0] . '"'; + } else { + $attributes = ' class="es0"'; + } + $char = "" . $char; + if (substr($code, $i + 1, 1) == "\n") { + // escaping a newline, what's the point in putting the span around + // the newline? It only causes hassles when inserting line numbers + $char .= ''; + $ESCAPE_CHAR_OPEN = false; + } + } + } else { + $ESCAPE_CHAR_OPEN = false; + if ($this->lexic_permissions['ESCAPE_CHAR']) { + $char .= ''; + } + } + } elseif ($ESCAPE_CHAR_OPEN) { + if ($this->lexic_permissions['ESCAPE_CHAR']) { + $char .= ''; + } + $ESCAPE_CHAR_OPEN = false; + $test_str = $char; + } elseif ($STRING_OPEN == '') { + // Is this a multiline comment? + foreach ($this->language_data['COMMENT_MULTI'] as $open => $close) { + $com_len = strlen($open); + $test_str = substr( $part, $i, $com_len ); + $test_str_match = $test_str; + if ($open == $test_str) { + $COMMENT_MATCHED = true; + //@todo If remove important do remove here + if ($this->lexic_permissions['COMMENTS']['MULTI'] || + $test_str == GESHI_START_IMPORTANT) { + if ($test_str != GESHI_START_IMPORTANT) { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS']['MULTI'] . '"'; + } else { + $attributes = ' class="coMULTI"'; + } + $test_str = "" . @htmlspecialchars($test_str, ENT_COMPAT, $this->encoding); + } else { + if (!$this->use_classes) { + $attributes = ' style="' . $this->important_styles . '"'; + } else { + $attributes = ' class="imp"'; + } + // We don't include the start of the comment if it's an + // "important" part + $test_str = ""; + } + } else { + $test_str = @htmlspecialchars($test_str, ENT_COMPAT, $this->encoding); + } + + $close_pos = strpos( $part, $close, $i + strlen($close) ); + + if ($close_pos === false) { + $close_pos = strlen($part); + } + + // Short-cut through all the multiline code + $rest_of_comment = @htmlspecialchars(substr($part, $i + $com_len, $close_pos - $i), ENT_COMPAT, $this->encoding); + if (($this->lexic_permissions['COMMENTS']['MULTI'] || + $test_str_match == GESHI_START_IMPORTANT) && + ($this->line_numbers != GESHI_NO_LINE_NUMBERS || + count($this->highlight_extra_lines) > 0)) { + // strreplace to put close span and open span around multiline newlines + $test_str .= str_replace("\n", "\n", $rest_of_comment); + } else { + $test_str .= $rest_of_comment; + } + + if ($this->lexic_permissions['COMMENTS']['MULTI'] || + $test_str_match == GESHI_START_IMPORTANT) { + $test_str .= ''; + } + $i = $close_pos + $com_len - 1; + // parse the rest + $result .= $this->parse_non_string_part($stuff_to_parse); + $stuff_to_parse = ''; + break; + } + } + // If we haven't matched a multiline comment, try single-line comments + if (!$COMMENT_MATCHED) { + foreach ($this->language_data['COMMENT_SINGLE'] as $comment_key => $comment_mark) { + $com_len = strlen($comment_mark); + $test_str = substr($part, $i, $com_len); + if ($this->language_data['CASE_SENSITIVE'][GESHI_COMMENTS]) { + $match = ($comment_mark == $test_str); + } else { + $match = (strtolower($comment_mark) == strtolower($test_str)); + } + if ($match) { + $COMMENT_MATCHED = true; + if ($this->lexic_permissions['COMMENTS'][$comment_key]) { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS'][$comment_key] . '"'; + } else { + $attributes = ' class="co' . $comment_key . '"'; + } + $test_str = "" . @htmlspecialchars($this->change_case($test_str), ENT_COMPAT, $this->encoding); + } else { + $test_str = @htmlspecialchars($test_str, ENT_COMPAT, $this->encoding); + } + $close_pos = strpos($part, "\n", $i); + $oops = false; + if ($close_pos === false) { + $close_pos = strlen($part); + $oops = true; + } + $test_str .= @htmlspecialchars(substr($part, $i + $com_len, $close_pos - $i - $com_len), ENT_COMPAT, $this->encoding); + if ($this->lexic_permissions['COMMENTS'][$comment_key]) { + $test_str .= ""; + } + // Take into account that the comment might be the last in the source + if (!$oops) { + $test_str .= "\n"; + } + $i = $close_pos; + // parse the rest + $result .= $this->parse_non_string_part($stuff_to_parse); + $stuff_to_parse = ''; + break; + } + } + } + } elseif ($STRING_OPEN != '') { + // Otherwise, convert it to HTML form + if (strtolower($this->encoding) == 'utf-8') { + //only escape <128 (we don't want to break multibyte chars) + if (ord($char) < 128) { + $char = @htmlspecialchars($char, ENT_COMPAT, $this->encoding); + } + } else { + //encode everthing + $char = @htmlspecialchars($char, ENT_COMPAT, $this->encoding); + } + } + // Where are we adding this char? + if (!$COMMENT_MATCHED) { + if (($STRING_OPEN == '') && !$CLOSE_STRING) { + $stuff_to_parse .= $char; + } else { + $result .= $char; + $CLOSE_STRING = false; + } + } else { + $result .= $test_str; + $COMMENT_MATCHED = false; + } + } + // Parse the last bit + $result .= $this->parse_non_string_part($stuff_to_parse); + $stuff_to_parse = ''; + } else { + $result .= @htmlspecialchars($part, ENT_COMPAT, $this->encoding); + } + // Close the that surrounds the block + if ($this->strict_mode && $this->language_data['STYLES']['SCRIPT'][$script_key] != '' && + $this->lexic_permissions['SCRIPT']) { + $result .= ''; + } + } else { + // Else not a block to highlight + $result .= @htmlspecialchars($part, ENT_COMPAT, $this->encoding); + } + } + + // Parse the last stuff (redundant?) + $result .= $this->parse_non_string_part($stuff_to_parse); + + // Lop off the very first and last spaces + $result = substr($result, 1, strlen($result) - 1); + + // Are we still in a string? + if ($STRING_OPEN) { + $result .= ''; + } + + // We're finished: stop timing + $this->set_time($start_time, microtime()); + + return $this->finalise($result); + } + + /** + * Swaps out spaces and tabs for HTML indentation. Not needed if + * the code is in a pre block... + * + * @param string The source to indent + * @return string The source with HTML indenting applied + * @since 1.0.0 + * @access private + */ + function indent ($result) + { + /// Replace tabs with the correct number of spaces + if (false !== strpos($result, "\t")) { + $lines = explode("\n", $result); + foreach ($lines as $key => $line) { + if (false === strpos($line, "\t")) { + $lines[$key] = $line; + continue; + }//echo 'checking line ' . $key . '
    '; + + $pos = 0; + $tab_width = $this->tab_width; + $length = strlen($line); + $result_line = ''; + + //echo '
    line: ' . htmlspecialchars($line) . '
    '; + $IN_TAG = false; + for ($i = 0; $i < $length; $i++) { + $char = substr($line, $i, 1); + // Simple engine to work out whether we're in a tag. + // If we are we modify $pos. This is so we ignore HTML + // in the line and only workout the tab replacement + // via the actual content of the string + // This test could be improved to include strings in the + // html so that < or > would be allowed in user's styles + // (e.g. quotes: '<' '>'; or similar) + if ($IN_TAG && '>' == $char) { + $IN_TAG = false; + $result_line .= '>'; + ++$pos; + } elseif (!$IN_TAG && '<' == $char) { + $IN_TAG = true; + $result_line .= '<'; + ++$pos; + } elseif (!$IN_TAG && '&' == $char) { + //echo "matched & in line... "; + $substr = substr($line, $i + 3, 4); + //$substr_5 = substr($line, 5, 1); + $posi = strpos($substr, ';'); + if (false !== $posi) { + //echo "found entity at $posi\n"; + $pos += $posi + 3; + } + $result_line .= '&'; + } elseif (!$IN_TAG && "\t" == $char) { + $str = ''; + // OPTIMISE - move $strs out. Make an array: + // $tabs = array( + // 1 => ' ', + // 2 => '  ', + // 3 => '   ' etc etc + // to use instead of building a string every time + $strs = array(0 => ' ', 1 => ' '); + //echo "building (pos=$pos i=$i) (" . ($i - $pos) . ") " . ($tab_width - (($i - $pos) % $tab_width)) . " spaces\n"; + for ($k = 0; $k < ($tab_width - (($i - $pos) % $tab_width)); $k++) $str .= $strs[$k % 2]; + $result_line .= $str; + //$pos--; + $pos++; + //$pos -= $tab_width-1; + + if (false === strpos($line, "\t", $i + 1)) { + //$lines[$key] = $result_line; + //echo 'got here'; + $result_line .= substr($line, $i + 1); + break; + } + } elseif ( $IN_TAG ) { + ++$pos; + $result_line .= $char; + } else { + $result_line .= $char; + //++$pos; + } + } + $lines[$key] = $result_line; + } + $result = implode("\n", $lines); + } + // Other whitespace + $result = str_replace(' ', '  ', $result); + $result = str_replace(' ', '  ', $result); + $result = str_replace("\n ", "\n ", $result); + + if ($this->line_numbers == GESHI_NO_LINE_NUMBERS) { + $result = nl2br($result); + } + return $result; + } + + /** + * Changes the case of a keyword for those languages where a change is asked for + * + * @param string The keyword to change the case of + * @return string The keyword with its case changed + * @since 1.0.0 + * @access private + */ + function change_case ($instr) + { + if ($this->language_data['CASE_KEYWORDS'] == GESHI_CAPS_UPPER) { + return strtoupper($instr); + } elseif ($this->language_data['CASE_KEYWORDS'] == GESHI_CAPS_LOWER) { + return strtolower($instr); + } + return $instr; + } + + /** + * Adds a url to a keyword where needed. + * + * @param string The keyword to add the URL HTML to + * @param int What group the keyword is from + * @param boolean Whether to get the HTML for the start or end + * @return The HTML for either the start or end of the HTML <a> tag + * @since 1.0.2 + * @access private + * @todo Get rid of ender + */ + function add_url_to_keyword ($keyword, $group, $start_or_end) + { + if (isset($this->language_data['URLS'][$group]) && + $this->language_data['URLS'][$group] != '' && + substr($keyword, 0, 5) != '</') { + // There is a base group for this keyword + if ($start_or_end == 'BEGIN') { + // HTML workaround... not good form (tm) but should work for 1.0.X + $keyword = ( substr($keyword, 0, 4) == '<' ) ? substr($keyword, 4) : $keyword; + $keyword = ( substr($keyword, -4) == '>' ) ? substr($keyword, 0, strlen($keyword) - 4) : $keyword; + if ($keyword != '') { + $keyword = ( $this->language_data['CASE_SENSITIVE'][$group] ) ? $keyword : strtolower($keyword); + return '<|UR1|"' . + str_replace( + array('{FNAME}', '.'), + array(@htmlspecialchars($keyword, ENT_COMPAT, $this->encoding), ''), + $this->language_data['URLS'][$group] + ) . '">'; + } + return ''; + // HTML fix. Again, dirty hackage... + } elseif (!($this->language == 'html4strict' && '>' == $keyword)) { + return ''; + } + } + } + + /** + * Takes a string that has no strings or comments in it, and highlights + * stuff like keywords, numbers and methods. + * + * @param string The string to parse for keyword, numbers etc. + * @since 1.0.0 + * @access private + * @todo BUGGY! Why? Why not build string and return? + */ + function parse_non_string_part (&$stuff_to_parse) + { + $stuff_to_parse = ' ' . quotemeta(@htmlspecialchars($stuff_to_parse, ENT_COMPAT, $this->encoding)); + // These vars will disappear in the future + $func = '$this->change_case'; + $func2 = '$this->add_url_to_keyword'; + + // + // Regular expressions + // + foreach ($this->language_data['REGEXPS'] as $key => $regexp) { + if ($this->lexic_permissions['REGEXPS'][$key]) { + if (is_array($regexp)) { + $stuff_to_parse = preg_replace( + "#" . + $regexp[GESHI_SEARCH] . + "#{$regexp[GESHI_MODIFIERS]}", + "{$regexp[GESHI_BEFORE]}<|!REG3XP$key!>{$regexp[GESHI_REPLACE]}|>{$regexp[GESHI_AFTER]}", + $stuff_to_parse + ); + } else { + $stuff_to_parse = preg_replace( "#(" . $regexp . ")#", "<|!REG3XP$key!>\\1|>", $stuff_to_parse); + } + } + } + + // + // Highlight numbers. This regexp sucks... anyone with a regexp that WORKS + // here wins a cookie if they send it to me. At the moment there's two doing + // almost exactly the same thing, except the second one prevents a number + // being highlighted twice (eg 5) + // Put /NUM!/ in for the styles, which gets replaced at the end. + // + if ($this->lexic_permissions['NUMBERS'] && preg_match('#[0-9]#', $stuff_to_parse )) { + $stuff_to_parse = preg_replace('#([^a-zA-Z0-9\#])([0-9]+)([^a-zA-Z0-9])#', "\\1<|/NUM!/>\\2|>\\3", $stuff_to_parse); + $stuff_to_parse = preg_replace('#([^a-zA-Z0-9\#>])([0-9]+)([^a-zA-Z0-9])#', "\\1<|/NUM!/>\\2|>\\3", $stuff_to_parse); + } + + // Highlight keywords + // if there is a couple of alpha symbols there *might* be a keyword + if (preg_match('#[a-zA-Z]{2,}#', $stuff_to_parse)) { + foreach ($this->language_data['KEYWORDS'] as $k => $keywordset) { + if ($this->lexic_permissions['KEYWORDS'][$k]) { + foreach ($keywordset as $keyword) { + $keyword = quotemeta($keyword); + // + // This replacement checks the word is on it's own (except if brackets etc + // are next to it), then highlights it. We don't put the color=" for the span + // in just yet - otherwise languages with the keywords "color" or "or" have + // a fit. + // + if (false !== stristr($stuff_to_parse, $keyword )) { + $stuff_to_parse .= ' '; + // Might make a more unique string for putting the number in soon + // Basically, we don't put the styles in yet because then the styles themselves will + // get highlighted if the language has a CSS keyword in it (like CSS, for example ;)) + $styles = "/$k/"; + $keyword = quotemeta($keyword); + if ($this->language_data['CASE_SENSITIVE'][$k]) { + $stuff_to_parse = preg_replace( + "#([^a-zA-Z0-9\$_\|\#;>])($keyword)([^a-zA-Z0-9_<\|%\-&])#e", + "'\\1' . $func2('\\2', '$k', 'BEGIN') . '<|$styles>' . $func('\\2') . '|>' . $func2('\\2', '$k', 'END') . '\\3'", + $stuff_to_parse + ); + } else { + // Change the case of the word. + $stuff_to_parse = preg_replace( + "#([^a-zA-Z0-9\$_\|\#;>])($keyword)([^a-zA-Z0-9_<\|%\-&])#ie", + "'\\1' . $func2('\\2', '$k', 'BEGIN') . '<|$styles>' . $func('\\2') . '|>' . $func2('\\2', '$k', 'END') . '\\3'", + $stuff_to_parse + ); + } + $stuff_to_parse = substr($stuff_to_parse, 0, strlen($stuff_to_parse) - 1); + } + } + } + } + } + + // + // Now that's all done, replace /[number]/ with the correct styles + // + foreach ($this->language_data['KEYWORDS'] as $k => $kws) { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['KEYWORDS'][$k] . '"'; + } else { + $attributes = ' class="kw' . $k . '"'; + } + $stuff_to_parse = str_replace("/$k/", $attributes, $stuff_to_parse); + } + + // Put number styles in + if (!$this->use_classes && $this->lexic_permissions['NUMBERS']) { + $attributes = ' style="' . $this->language_data['STYLES']['NUMBERS'][0] . '"'; + } else { + $attributes = ' class="nu0"'; + } + $stuff_to_parse = str_replace('/NUM!/', $attributes, $stuff_to_parse); + + // + // Highlight methods and fields in objects + // + if ($this->lexic_permissions['METHODS'] && $this->language_data['OOLANG']) { + foreach ($this->language_data['OBJECT_SPLITTERS'] as $key => $splitter) { + if (false !== stristr($stuff_to_parse, $splitter)) { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['METHODS'][$key] . '"'; + } else { + $attributes = ' class="me' . $key . '"'; + } + $stuff_to_parse = preg_replace("#(" . quotemeta($this->language_data['OBJECT_SPLITTERS'][$key]) . "[\s]*)([a-zA-Z\*\(][a-zA-Z0-9_\*]*)#", "\\1<|$attributes>\\2|>", $stuff_to_parse); + } + } + } + + // + // Highlight brackets. Yes, I've tried adding a semi-colon to this list. + // You try it, and see what happens ;) + // TODO: Fix lexic permissions not converting entities if shouldn't + // be highlighting regardless + // + if ($this->lexic_permissions['BRACKETS']) { + $code_entities_match = array('[', ']', '(', ')', '{', '}'); + if (!$this->use_classes) { + $code_entities_replace = array( + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">[|>', + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">]|>', + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">(|>', + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">)|>', + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">{|>', + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">}|>', + ); + } else { + $code_entities_replace = array( + '<| class="br0">[|>', + '<| class="br0">]|>', + '<| class="br0">(|>', + '<| class="br0">)|>', + '<| class="br0">{|>', + '<| class="br0">}|>', + ); + } + $stuff_to_parse = str_replace( $code_entities_match, $code_entities_replace, $stuff_to_parse ); + } + + // + // Add class/style for regexps + // + foreach ($this->language_data['REGEXPS'] as $key => $regexp) { + if ($this->lexic_permissions['REGEXPS'][$key]) { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['REGEXPS'][$key] . '"'; + } else { + $attributes = ' class="re' . $key . '"'; + } + $stuff_to_parse = str_replace("!REG3XP$key!", "$attributes", $stuff_to_parse); + } + } + + // Replace with . for urls + $stuff_to_parse = str_replace('', '.', $stuff_to_parse); + // Replace <|UR1| with link_styles[GESHI_LINK])) { + if ($this->use_classes) { + $stuff_to_parse = str_replace('<|UR1|', 'link_target . ' href=', $stuff_to_parse); + } else { + $stuff_to_parse = str_replace('<|UR1|', 'link_target . ' style="' . $this->link_styles[GESHI_LINK] . '" href=', $stuff_to_parse); + } + } else { + $stuff_to_parse = str_replace('<|UR1|', 'link_target . ' href=', $stuff_to_parse); + } + + // + // NOW we add the span thingy ;) + // + + $stuff_to_parse = str_replace('<|', '', '', $stuff_to_parse ); + + return substr(stripslashes($stuff_to_parse), 1); + } + + /** + * Sets the time taken to parse the code + * + * @param microtime The time when parsing started + * @param microtime The time when parsing ended + * @since 1.0.2 + * @access private + */ + function set_time ($start_time, $end_time) + { + $start = explode(' ', $start_time); + $end = explode(' ', $end_time); + $this->time = $end[0] + $end[1] - $start[0] - $start[1]; + } + + /** + * Gets the time taken to parse the code + * + * @return double The time taken to parse the code + * @since 1.0.2 + */ + function get_time () + { + return $this->time; + } + + /** + * Gets language information and stores it for later use + * + * @access private + * @todo Needs to load keys for lexic permissions for keywords, regexps etc + */ + function load_language ($file_name) + { + $language_data = array(); + require $file_name; + // Perhaps some checking might be added here later to check that + // $language data is a valid thing but maybe not + $this->language_data = $language_data; + // Set strict mode if should be set + if ($this->language_data['STRICT_MODE_APPLIES'] == GESHI_ALWAYS) { + $this->strict_mode = true; + } + // Set permissions for all lexics to true + // so they'll be highlighted by default + foreach ($this->language_data['KEYWORDS'] as $key => $words) { + $this->lexic_permissions['KEYWORDS'][$key] = true; + } + foreach ($this->language_data['COMMENT_SINGLE'] as $key => $comment) { + $this->lexic_permissions['COMMENTS'][$key] = true; + } + foreach ($this->language_data['REGEXPS'] as $key => $regexp) { + $this->lexic_permissions['REGEXPS'][$key] = true; + } + $this->enable_highlighting(); + // Set default class for CSS + $this->overall_class = $this->language; + } + + /** + * Takes the parsed code and various options, and creates the HTML + * surrounding it to make it look nice. + * + * @param string The code already parsed + * @return string The code nicely finalised + * @since 1.0.0 + * @access private + */ + function finalise ($parsed_code) + { + // Remove end parts of important declarations + // This is BUGGY!! My fault for bad code: fix coming in 1.2 + // @todo Remove this crap + if ($this->enable_important_blocks && + (strstr($parsed_code, @htmlspecialchars(GESHI_START_IMPORTANT, ENT_COMPAT, $this->encoding)) === false)) { + $parsed_code = str_replace(@htmlspecialchars(GESHI_END_IMPORTANT, ENT_COMPAT, $this->encoding), '', $parsed_code); + } + + // Add HTML whitespace stuff if we're using the
    header + if ($this->header_type != GESHI_HEADER_PRE) { + $parsed_code = $this->indent($parsed_code); + } + + // If we're using line numbers, we insert
  • s and appropriate + // markup to style them (otherwise we don't need to do anything) + if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) { + // If we're using the 
     header, we shouldn't add newlines because
+            // the 
     will line-break them (and the 
  • s already do this for us)
+            $ls = ($this->header_type != GESHI_HEADER_PRE) ? "\n" : '';
+            // Get code into lines
+            $code = explode("\n", $parsed_code);
+            // Set vars to defaults for following loop
+            $parsed_code = '';
+            $i = 0;
+            // Foreach line...
+            foreach ($code as $line) {
+                $line = ( $line ) ? $line : ' ';
+                // If this is a "special line"...
+        	    if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
+                    $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
+            		// Set the attributes to style the line
+                    if ($this->use_classes) {
+            			$attr = ' class="li2"';
+            			$def_attr = ' class="de2"';
+                    } else {
+            			$attr = ' style="' . $this->line_style2 . '"';
+            			// This style "covers up" the special styles set for special lines
+            			// so that styles applied to special lines don't apply to the actual
+            			// code on that line
+            			$def_attr = ' style="' . $this->code_style . '"';
+                    }
+            		// Span or div?
+            		$start = "";
+            		$end = '';
+            	} else {
+            		if ($this->use_classes) {
+                        $attr = ' class="li1"';
+            			$def_attr = ' class="de1"';
+            		} else {
+                        $attr = ' style="' . $this->line_style1 . '"';
+            			$def_attr = ' style="' . $this->code_style . '"';
+            		}
+            		$start = "";
+            		$end = '';
+            	}
+        
+            	++$i;
+            	// Are we supposed to use ids? If so, add them
+            	if ($this->add_ids) {
+            		$attr .= " id=\"{$this->overall_id}-{$i}\"";
+            	}
+            	if ($this->use_classes && in_array($i, $this->highlight_extra_lines)) {
+            		$attr .= " class=\"ln-xtra\"";
+            	}
+            	if (!$this->use_classes && in_array($i, $this->highlight_extra_lines)) {
+            		$attr .= " style=\"{$this->highlight_extra_lines_style}\"";
+            	}
+
+            	// Add in the line surrounded by appropriate list HTML
+            	$parsed_code .= "$start$line$end
    • $ls";
+        	}
+        } else {
+            // No line numbers, but still need to handle highlighting lines extra.
+            // Have to use divs so the full width of the code is highlighted
+            $code = explode("\n", $parsed_code);
+            $parsed_code = '';
+            $i = 0;
+            foreach ($code as $line)
+            {
+            	// Make lines have at least one space in them if they're empty
+            	$line = ($line) ? $line : ' ';
+            	if (in_array(++$i, $this->highlight_extra_lines)) {
+            		if ($this->use_classes) {
+            			$parsed_code .= '
    ';
+            		} else {
+            			$parsed_code .= "
    highlight_extra_lines_style}\">";
+            		}
+            		$parsed_code .= $line . "
    \n";
+            	} else {
+            		$parsed_code .= $line . "\n";
+            	}
+        	}
+        }
+        
+        // purge some unnecessary stuff
+        $parsed_code = preg_replace('#]+>(\s*)#', '\\1', $parsed_code);
+        $parsed_code = preg_replace('#]+>(\s*)
    #', '\\1', $parsed_code);
+        
+        if ($this->header_type == GESHI_HEADER_PRE) {
+        	// enforce line numbers when using pre
+            $parsed_code = str_replace('
  • ', '
  •  
    • ', $parsed_code);
+        }
+        
+        return $this->header() . chop($parsed_code) . $this->footer();
+    }
+
+	/**
+	 * Creates the header for the code block (with correct attributes)
+     * 
+     * @return string The header for the code block
+     * @since  1.0.0
+     * @access private
+	 */
+	function header ()
+	{
+		// Get attributes needed
+		$attributes = $this->get_attributes();
+
+		$ol_attributes = '';
+
+		if ($this->line_numbers_start != 1) {
+			$ol_attributes .= ' start="' . $this->line_numbers_start . '"';
+		}
+
+		// Get the header HTML
+		$header = $this->format_header_content();
+
+        if (GESHI_HEADER_NONE == $this->header_type) {
+            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                return "$header";
+            }
+            return $header;
+        }
+        
+		// Work out what to return and do it
+		if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+			if ($this->header_type == GESHI_HEADER_PRE) {
+				return "$header";
+			} elseif ($this->header_type == GESHI_HEADER_DIV) {
+				return "$header";
+			}
+		} else {
+			if ($this->header_type == GESHI_HEADER_PRE) {
+				return "$header";
+			} elseif ($this->header_type == GESHI_HEADER_DIV) {
+				return "$header";
+			}
+		}
+	}
+
+	/**
+	 * Returns the header content, formatted for output
+     * 
+     * @return string The header content, formatted for output
+     * @since  1.0.2
+     * @access private
+	 */
+	function format_header_content ()
+	{
+		$header = $this->header_content;
+		if ($header) {
+			if ($this->header_type == GESHI_HEADER_PRE) {
+				$header = str_replace("\n", '', $header);
+			}
+			$header = $this->replace_keywords($header);
+
+			if ($this->use_classes) {
+				$attr = ' class="head"';
+			} else {
+				$attr = " style=\"{$this->header_content_style}\"";
+			}
+			return "$header";
+		}
+	}
+
+	/**
+	 * Returns the footer for the code block.
+     * 
+     * @return string The footer for the code block
+     * @since  1.0.0
+     * @access private
+	 */
+	function footer ()
+	{
+		$footer_content = $this->format_footer_content();
+
+        if (GESHI_HEADER_NONE == $this->header_type) {
+            return ($this->line_numbers != GESHI_NO_LINE_NUMBERS) ? '' . $footer_content
+                : $footer_content;
+        }
+        
+		if ($this->header_type == GESHI_HEADER_DIV) {
+			if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+				return "$footer_content";
+			}
+			return "$footer_content";
+		} else {
+			if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+				return "$footer_content
    ";
+			}
+			return "$footer_content
    "; + } + } + + /** + * Returns the footer content, formatted for output + * + * @return string The footer content, formatted for output + * @since 1.0.2 + * @access private + */ + function format_footer_content () + { + $footer = $this->footer_content; + if ($footer) { + if ($this->header_type == GESHI_HEADER_PRE) { + $footer = str_replace("\n", '', $footer);; + } + $footer = $this->replace_keywords($footer); + + if ($this->use_classes) { + $attr = ' class="foot"'; + } else { + $attr = " style=\"{$this->footer_content_style}\""; + } + return "$footer"; + } + } + + /** + * Replaces certain keywords in the header and footer with + * certain configuration values + * + * @param string The header or footer content to do replacement on + * @return string The header or footer with replaced keywords + * @since 1.0.2 + * @access private + */ + function replace_keywords ($instr) + { + $keywords = $replacements = array(); + + $keywords[] = '
      to have no effect at all if there are line numbers + // (
        s have margins that should be destroyed so all layout is + // controlled by the set_overall_style method, which works on the + // 
         or 
         container). Additionally, set default styles for lines
+		if (!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+			//$stylesheet .= "$selector, {$selector}ol, {$selector}ol li {margin: 0;}\n";
+			$stylesheet .= "$selector.de1, $selector.de2 {{$this->code_style}}\n";
+		}
+
+		// Add overall styles
+		if (!$economy_mode || $this->overall_style != '') {
+			$stylesheet .= "$selector {{$this->overall_style}}\n";
+		}
+
+		// Add styles for links
+		foreach ($this->link_styles as $key => $style) {
+			if (!$economy_mode || $key == GESHI_LINK && $style != '') {
+				$stylesheet .= "{$selector}a:link {{$style}}\n";
+			}
+			if (!$economy_mode || $key == GESHI_HOVER && $style != '') {
+				$stylesheet .= "{$selector}a:hover {{$style}}\n";
+			}
+			if (!$economy_mode || $key == GESHI_ACTIVE && $style != '') {
+				$stylesheet .= "{$selector}a:active {{$style}}\n";
+			}
+			if (!$economy_mode || $key == GESHI_VISITED && $style != '') {
+				$stylesheet .= "{$selector}a:visited {{$style}}\n";
+			}
+		}
+
+		// Header and footer
+		if (!$economy_mode || $this->header_content_style != '') {
+			$stylesheet .= "$selector.head {{$this->header_content_style}}\n";
+		}
+		if (!$economy_mode || $this->footer_content_style != '') {
+			$stylesheet .= "$selector.foot {{$this->footer_content_style}}\n";
+		}
+
+		// Styles for important stuff
+		if (!$economy_mode || $this->important_styles != '') {
+			$stylesheet .= "$selector.imp {{$this->important_styles}}\n";
+		}
+
+		// Styles for lines being highlighted extra
+		if (!$economy_mode || count($this->highlight_extra_lines)) {
+			$stylesheet .= "$selector.ln-xtra {{$this->highlight_extra_lines_style}}\n";
+		}
+
+		// Simple line number styles
+		if (!$economy_mode || ($this->line_numbers != GESHI_NO_LINE_NUMBERS && $this->line_style1 != '')) {
+			$stylesheet .= "{$selector}li {{$this->line_style1}}\n";
+		}
+
+		// If there is a style set for fancy line numbers, echo it out
+		if (!$economy_mode || ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS && $this->line_style2 != '')) {
+			$stylesheet .= "{$selector}li.li2 {{$this->line_style2}}\n";
+		}
+
+		foreach ($this->language_data['STYLES']['KEYWORDS'] as $group => $styles) {
+			if (!$economy_mode || !($economy_mode && (!$this->lexic_permissions['KEYWORDS'][$group] || $styles == ''))) {
+				$stylesheet .= "$selector.kw$group {{$styles}}\n";
+			}
+		}
+		foreach ($this->language_data['STYLES']['COMMENTS'] as $group => $styles) {
+			if (!$economy_mode || !($economy_mode && $styles == '') &&
+                !($economy_mode && !$this->lexic_permissions['COMMENTS'][$group])) {
+				$stylesheet .= "$selector.co$group {{$styles}}\n";
+			}
+		}
+		foreach ($this->language_data['STYLES']['ESCAPE_CHAR'] as $group => $styles) {
+			if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+                !$this->lexic_permissions['ESCAPE_CHAR'])) {
+				$stylesheet .= "$selector.es$group {{$styles}}\n";
+			}
+		}
+		foreach ($this->language_data['STYLES']['SYMBOLS'] as $group => $styles) {
+			if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+                !$this->lexic_permissions['BRACKETS'])) {
+				$stylesheet .= "$selector.br$group {{$styles}}\n";
+			}
+		}
+		foreach ($this->language_data['STYLES']['STRINGS'] as $group => $styles) {
+			if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+                !$this->lexic_permissions['STRINGS'])) {
+				$stylesheet .= "$selector.st$group {{$styles}}\n";
+			}
+		}
+		foreach ($this->language_data['STYLES']['NUMBERS'] as $group => $styles) {
+			if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+                !$this->lexic_permissions['NUMBERS'])) {
+				$stylesheet .= "$selector.nu$group {{$styles}}\n";
+			}
+		}
+		foreach ($this->language_data['STYLES']['METHODS'] as $group => $styles) {
+			if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+                !$this->lexic_permissions['METHODS'])) {
+				$stylesheet .= "$selector.me$group {{$styles}}\n";
+			}
+		}
+		foreach ($this->language_data['STYLES']['SCRIPT'] as $group => $styles) {
+			if (!$economy_mode || !($economy_mode && $styles == '')) {
+				$stylesheet .= "$selector.sc$group {{$styles}}\n";
+			}
+		}
+		foreach ($this->language_data['STYLES']['REGEXPS'] as $group => $styles) {
+			if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+                !$this->lexic_permissions['REGEXPS'][$group])) {
+				$stylesheet .= "$selector.re$group {{$styles}}\n";
+			}
+		}
+
+		return $stylesheet;
+	}
+
+} // End Class GeSHi
+
+
+if (!function_exists('geshi_highlight')) {
+	/**
+     * Easy way to highlight stuff. Behaves just like highlight_string
+     * 
+     * @param string The code to highlight
+     * @param string The language to highlight the code in
+     * @param string The path to the language files. You can leave this blank if you need
+     *               as from version 1.0.7 the path should be automatically detected
+     * @param boolean Whether to return the result or to echo
+     * @return string The code highlighted (if $return is true)
+     * @since 1.0.2
+     */
+	function geshi_highlight ($string, $language, $path, $return = false)
+	{
+		$geshi = new GeSHi($string, $language, $path);
+		$geshi->set_header_type(GESHI_HEADER_NONE);
+		if ($return) {
+			return '' . $geshi->parse_code() . '';
+		}
+		echo '' . $geshi->parse_code() . '';
+		if ($geshi->error()) {
+			return false;
+		}
+		return true;
+	}
+}
+
+?>
diff --git a/demos/quickstart/protected/controls/Highlighter/geshi/css.php b/demos/quickstart/protected/controls/Highlighter/geshi/css.php
new file mode 100644
index 00000000..28e4bf18
--- /dev/null
+++ b/demos/quickstart/protected/controls/Highlighter/geshi/css.php
@@ -0,0 +1,178 @@
+ 'CSS',
+	'COMMENT_SINGLE' => array(1 => '@'),
+	'COMMENT_MULTI' => array('/*' => '*/'),
+	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+	'QUOTEMARKS' => array('"', "'"),
+	'ESCAPE_CHAR' => '\\',
+	'KEYWORDS' => array(
+		1 => array(
+			'aqua', 'azimuth', 'background-attachment', 'background-color',
+			'background-image', 'background-position', 'background-repeat',
+			'background', 'black', 'blue', 'border-bottom-color', 'border-bottom-style',
+			'border-bottom-width', 'border-left-color', 'border-left-style',
+			'border-left-width', 'border-right', 'border-right-color',
+			'border-right-style', 'border-right-width', 'border-top-color',
+			'border-top-style', 'border-top-width','border-bottom', 'border-collapse',
+			'border-left', 'border-width', 'border-color', 'border-spacing',
+			'border-style', 'border-top', 'border',  'caption-side',
+			'clear', 'clip', 'color', 'content', 'counter-increment', 'counter-reset',
+			'cue-after', 'cue-before', 'cue', 'cursor', 'direction', 'display',
+			'elevation', 'empty-cells', 'float', 'font-family', 'font-size',
+			'font-size-adjust', 'font-stretch', 'font-style', 'font-variant',
+			'font-weight', 'font', 'height', 'letter-spacing', 'line-height',
+			'list-style', 'list-style-image', 'list-style-position', 'list-style-type',
+			'margin-bottom', 'margin-left', 'margin-right', 'margin-top', 'margin',
+			'marker-offset', 'marks', 'max-height', 'max-width', 'min-height',
+			'min-width', 'orphans', 'outline', 'outline-color', 'outline-style',
+			'outline-width', 'overflow', 'padding-bottom', 'padding-left',
+			'padding-right', 'padding-top', 'padding', 'page', 'page-break-after',
+			'page-break-before', 'page-break-inside', 'pause-after', 'pause-before',
+			'pause', 'pitch', 'pitch-range',  'play-during', 'position', 'quotes',
+			'richness', 'right', 'size', 'speak-header', 'speak-numeral', 'speak-punctuation',
+			'speak', 'speech-rate', 'stress', 'table-layout', 'text-align', 'text-decoration',
+			'text-indent', 'text-shadow', 'text-transform', 'top', 'unicode-bidi',
+			'vertical-align', 'visibility', 'voice-family', 'volume', 'white-space', 'widows',
+			'width', 'word-spacing', 'z-index', 'bottom', 'left'
+			),
+		2 => array(
+			'above', 'absolute', 'always', 'armenian', 'aural', 'auto', 'avoid',
+			'baseline', 'behind', 'below', 'bidi-override', 'blink', 'block', 'bold', 'bolder', 'both',
+			'capitalize', 'center-left', 'center-right', 'center', 'circle', 'cjk-ideographic', 
+            'close-quote', 'collapse', 'condensed', 'continuous', 'crop', 'crosshair', 'cross', 'cursive',
+			'dashed', 'decimal-leading-zero', 'decimal', 'default', 'digits', 'disc', 'dotted', 'double',
+			'e-resize', 'embed', 'extra-condensed', 'extra-expanded', 'expanded',
+			'fantasy', 'far-left', 'far-right', 'faster', 'fast', 'fixed', 'fuchsia',
+			'georgian', 'gray', 'green', 'groove', 'hebrew', 'help', 'hidden', 'hide', 'higher',
+			'high', 'hiragana-iroha', 'hiragana', 'icon', 'inherit', 'inline-table', 'inline',
+			'inset', 'inside', 'invert', 'italic', 'justify', 'katakana-iroha', 'katakana',
+			'landscape', 'larger', 'large', 'left-side', 'leftwards', 'level', 'lighter', 'lime', 'line-through', 'list-item', 'loud', 'lower-alpha', 'lower-greek', 'lower-roman', 'lowercase', 'ltr', 'lower', 'low',
+			'maroon', 'medium', 'message-box', 'middle', 'mix', 'monospace',
+			'n-resize', 'narrower', 'navy', 'ne-resize', 'no-close-quote', 'no-open-quote', 'no-repeat', 'none', 'normal', 'nowrap', 'nw-resize',
+			'oblique', 'olive', 'once', 'open-quote', 'outset', 'outside', 'overline',
+			'pointer', 'portrait', 'purple', 'px',
+			'red', 'relative', 'repeat-x', 'repeat-y', 'repeat', 'rgb', 'ridge', 'right-side', 'rightwards',
+			's-resize', 'sans-serif', 'scroll', 'se-resize', 'semi-condensed', 'semi-expanded', 'separate', 'serif', 'show', 'silent', 'silver', 'slow', 'slower', 'small-caps', 'small-caption', 'smaller', 'soft', 'solid', 'spell-out', 'square',
+			'static', 'status-bar', 'super', 'sw-resize',
+			'table-caption', 'table-cell', 'table-column', 'table-column-group', 'table-footer-group', 'table-header-group', 'table-row', 'table-row-group', 'teal', 'text', 'text-bottom', 'text-top', 'thick', 'thin', 'transparent',
+			'ultra-condensed', 'ultra-expanded', 'underline', 'upper-alpha', 'upper-latin', 'upper-roman', 'uppercase', 'url',
+			'visible',
+			'w-resize', 'wait', 'white', 'wider',
+			'x-fast', 'x-high', 'x-large', 'x-loud', 'x-low', 'x-small', 'x-soft', 'xx-large', 'xx-small',
+			'yellow', 'yes'
+			)
+		),
+	'SYMBOLS' => array(
+		'(', ')', '{', '}', ':', ';'
+		),
+	'CASE_SENSITIVE' => array(
+		GESHI_COMMENTS => false,
+		1 => true,
+		2 => true
+		),
+	'STYLES' => array(
+		'KEYWORDS' => array(
+			1 => 'color: #000000; font-weight: bold;',
+			2 => 'color: #993333;'
+			),
+		'COMMENTS' => array(
+			1 => 'color: #a1a100;',
+			'MULTI' => 'color: #808080; font-style: italic;'
+			),
+		'ESCAPE_CHAR' => array(
+			0 => 'color: #000099; font-weight: bold;'
+			),
+		'BRACKETS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'STRINGS' => array(
+			0 => 'color: #ff0000;'
+			),
+		'NUMBERS' => array(
+			0 => 'color: #cc66cc;'
+			),
+		'METHODS' => array(
+			),
+		'SYMBOLS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'SCRIPT' => array(
+			),
+		'REGEXPS' => array(
+			0 => 'color: #cc00cc;',
+			1 => 'color: #6666ff;',
+			2 => 'color: #3333ff;',
+			)
+		),
+	'URLS' => array(
+		1 => '',
+		2 => ''
+		),
+	'OOLANG' => false,
+	'OBJECT_SPLITTERS' => array(
+		),
+	'REGEXPS' => array(
+		0 => '\#[a-zA-Z0-9\-]+\s+\{',
+		1 => '\.[a-zA-Z0-9\-]+\s',
+		2 => ':[a-zA-Z0-9\-]+\s'
+		),
+	'STRICT_MODE_APPLIES' => GESHI_NEVER,
+	'SCRIPT_DELIMITERS' => array(
+		),
+	'HIGHLIGHT_STRICT_BLOCK' => array(
+		)
+);
+
+?>
\ No newline at end of file
diff --git a/demos/quickstart/protected/controls/Highlighter/geshi/html.php b/demos/quickstart/protected/controls/Highlighter/geshi/html.php
new file mode 100644
index 00000000..e5683b8c
--- /dev/null
+++ b/demos/quickstart/protected/controls/Highlighter/geshi/html.php
@@ -0,0 +1,254 @@
+ 'HTML',
+	'COMMENT_SINGLE' => array(),
+	'COMMENT_MULTI' => array(''),
+	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+	'QUOTEMARKS' => array("'", '"'),
+	'ESCAPE_CHAR' => '\\',
+	'KEYWORDS' => array(
+		1 => array(
+			),
+		2 => array(
+			'<a>', '<abbr>', '<acronym>', '<address>', '<applet>',
+			'<a', '<abbr', '<acronym', '<address', '<applet',
+			'</a>', '</abbr>', '</acronym>', '</address>', '</applet>',
+			'</a', '</abbr', '</acronym', '</address', '</applet',
+
+			'<base>', '<basefont>', '<bdo>', '<big>', '<blockquote>', '<body>', '<br>', '<button>', '<b>',
+			'<base', '<basefont', '<bdo', '<big', '<blockquote', '<body', '<br', '<button', '<b',
+			'</base>', '</basefont>', '</bdo>', '</big>', '</blockquote>', '</body>', '</br>', '</button>', '</b>',
+			'</base', '</basefont', '</bdo', '</big', '</blockquote', '</body', '</br', '</button', '</b',
+
+			'<caption>', '<center>', '<cite>', '<code>', '<colgroup>', '<col>',
+			'<caption', '<center', '<cite', '<code', '<colgroup', '<col',
+			'</caption>', '</center>', '</cite>', '</code>', '</colgroup>', '</col>',
+			'</caption', '</center', '</cite', '</code', '</colgroup', '</col',
+
+			'<dd>', '<del>', '<dfn>', '<dir>', '<div>', '<dl>', '<dt>',
+			'<dd', '<del', '<dfn', '<dir', '<div', '<dl', '<dt',
+			'</dd>', '</del>', '</dfn>', '</dir>', '</div>', '</dl>', '</dt>',
+			'</dd', '</del', '</dfn', '</dir', '</div', '</dl', '</dt',
+
+			'<em>',
+			'<em',
+			'</em>',
+			'</em',
+
+			'<fieldset>', '<font>', '<form>', '<frame>', '<frameset>',
+			'<fieldset', '<font', '<form', '<frame', '<frameset',
+			'</fieldset>', '</font>', '</form>', '</frame>', '</frameset>',
+			'</fieldset', '</font', '</form', '</frame', '</frameset',
+
+			'<h1>', '<h2>', '<h3>', '<h4>', '<h5>', '<h6>', '<head>', '<hr>', '<html>',
+			'<h1', '<h2', '<h3', '<h4', '<h5', '<h6', '<head', '<hr', '<html',
+			'</h1>', '</h2>', '</h3>', '</h4>', '</h5>', '</h6>', '</head>', '</hr>', '</html>',
+			'</h1', '</h2', '</h3', '</h4', '</h5', '</h6', '</head', '</hr', '</html',
+
+			'<iframe>', '<ilayer>', '<img>', '<input>', '<ins>', '<isindex>', '<i>',
+			'<iframe', '<ilayer', '<img', '<input', '<ins', '<isindex', '<i',
+			'</iframe>', '</ilayer>', '</img>', '</input>', '</ins>', '</isindex>', '</i>',
+			'</iframe', '</ilayer', '</img', '</input', '</ins', '</isindex', '</i',
+
+			'<kbd>',
+			'<kbd',
+			'&t;/kbd>',
+			'</kbd',
+
+			'<label>', '<legend>', '<link>', '<li>',
+			'<label', '<legend', '<link', '<li',
+			'</label>', '</legend>', '</link>', '</li>',
+			'</label', '</legend', '</link', '</li',
+
+			'<map>', '<meta>',
+			'<map', '<meta',
+			'</map>', '</meta>',
+			'</map', '</meta',
+
+			'<noframes>', '<noscript>',
+			'<noframes', '<noscript',
+			'</noframes>', '</noscript>',
+			'</noframes', '</noscript',
+
+			'<object>', '<ol>', '<optgroup>', '<option>',
+			'<object', '<ol', '<optgroup', '<option',
+			'</object>', '</ol>', '</optgroup>', '</option>',
+			'</object', '</ol', '</optgroup', '</option',
+
+			'<param>', '<pre>', '<p>',
+			'<param', '<pre', '<p',
+			'</param>', '</pre>', '</p>',
+			'</param', '</pre', '</p',
+
+			'<q>',
+			'<q',
+			'</q>',
+			'</q',
+
+			'<samp>', '<script>', '<select>', '<small>', '<span>', '<strike>', '<strong>', '<style>', '<sub>', '<sup>', '<s>',
+			'<samp', '<script', '<select', '<small', '<span', '<strike', '<strong', '<style', '<sub', '<sup', '<s',
+			'</samp>', '</script>', '</select>', '</small>', '</span>', '</strike>', '</strong>', '</style>', '</sub>', '</sup>', '</s>',
+			'</samp', '</script', '</select', '</small', '</span', '</strike', '</strong', '</style', '</sub', '</sup', '</s',
+
+			'<table>', '<tbody>', '<td>', '<textarea>', '<text>', '<tfoot>', '<thead>', '<th>', '<title>', '<tr>', '<tt>',
+			'<table', '<tbody', '<td', '<textarea', '<text', '<tfoot', '<tfoot', '<thead', '<th', '<title', '<tr', '<tt',
+			'</table>', '</tbody>', '</td>', '</textarea>', '</text>', '</tfoot>', '</thead', '</tfoot', '</th>', '</title>', '</tr>', '</tt>',
+			'</table', '</tbody', '</td', '</textarea', '</text', '</tfoot', '</tfoot', '</thead', '</th', '</title', '</tr', '</tt',
+
+			'<ul>', '<u>',
+			'<ul', '<u',
+			'</ul>', '</ul>',
+			'</ul', '</u',
+
+			'<var>',
+			'<var',
+			'</var>',
+			'</var',
+
+			'>', '<'
+			),
+		3 => array(
+			'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+			'background', 'bgcolor', 'border',
+			'cellpadding', 'cellspacing', 'char', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+			'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+			'enctype',
+			'face', 'for', 'frame', 'frameborder',
+			'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+			'id', 'ismap',
+			'label', 'lang', 'language', 'link', 'longdesc',
+			'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+			'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+			'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+			'profile', 'prompt',
+			'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+			'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+			'tabindex', 'target', 'text', 'title', 'type',
+			'usemap',
+			'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+			'width'
+			)
+		),
+	'SYMBOLS' => array(
+		'/', '='
+		),
+	'CASE_SENSITIVE' => array(
+		GESHI_COMMENTS => false,
+		1 => false,
+		2 => false,
+		3 => false,
+		),
+	'STYLES' => array(
+		'KEYWORDS' => array(
+			1 => 'color: #b1b100;',
+			2 => 'color: #000000; font-weight: bold;',
+			3 => 'color: #000066;'
+			),
+		'COMMENTS' => array(
+			'MULTI' => 'color: #808080; font-style: italic;'
+			),
+		'ESCAPE_CHAR' => array(
+			0 => 'color: #000099; font-weight: bold;'
+			),
+		'BRACKETS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'STRINGS' => array(
+			0 => 'color: #ff0000;'
+			),
+		'NUMBERS' => array(
+			0 => 'color: #cc66cc;'
+			),
+		'METHODS' => array(
+			),
+		'SYMBOLS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'SCRIPT' => array(
+			0 => 'color: #00bbdd;',
+			1 => 'color: #ddbb00;',
+			2 => 'color: #009900;'
+			),
+		'REGEXPS' => array(
+			)
+		),
+	'URLS' => array(
+		1 => '',
+		2 => 'http://december.com/html/4/element/{FNAME}.html',
+		3 => ''
+		),
+	'OOLANG' => false,
+	'OBJECT_SPLITTERS' => array(
+		),
+	'REGEXPS' => array(
+		),
+	'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+	'SCRIPT_DELIMITERS' => array(
+		0 => array(
+			' '>'
+			),
+		1 => array(
+			'&' => ';'
+			),
+		2 => array(
+			'<' => '>'
+			)
+	),
+	'HIGHLIGHT_STRICT_BLOCK' => array(
+		0 => false,
+		1 => false,
+		2 => true
+		)
+);
+
+?>
\ No newline at end of file
diff --git a/demos/quickstart/protected/controls/Highlighter/geshi/javascript.php b/demos/quickstart/protected/controls/Highlighter/geshi/javascript.php
new file mode 100644
index 00000000..1a17e1e7
--- /dev/null
+++ b/demos/quickstart/protected/controls/Highlighter/geshi/javascript.php
@@ -0,0 +1,146 @@
+ 'JAVASCRIPT',
+  'COMMENT_SINGLE' => array(1 => '//'),
+  'COMMENT_MULTI' => array('/*' => '*/'),
+  'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+  'QUOTEMARKS' => array("'", '"'),
+  'ESCAPE_CHAR' => '\\',
+  'KEYWORDS' => array(
+    1 => array(
+      'as', 'break', 'case', 'catch', 'continue', 'decodeURI', 'delete', 'do',
+      'else', 'encodeURI', 'eval', 'finally', 'for', 'if', 'in', 'is', 'item',
+      'instanceof', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'void',
+      'while', 'write', 'with'
+      ),
+    2 => array(
+      'class', 'const', 'default', 'debugger', 'export', 'extends', 'false',
+      'function', 'import', 'namespace', 'new', 'null', 'package', 'private',
+      'protected', 'public', 'super', 'true', 'use', 'var'
+      ),
+    3 => array(
+
+      // common functions for Window object
+      'alert', 'back', 'blur', 'close', 'confirm', 'focus', 'forward', 'home',
+      'name', 'navigate', 'onblur', 'onerror', 'onfocus', 'onload', 'onmove',
+      'onresize', 'onunload', 'open', 'print', 'prompt', 'scroll', 'status',
+      'stop',
+      )
+    ),
+  'SYMBOLS' => array(
+    '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
+    ),
+  'CASE_SENSITIVE' => array(
+    GESHI_COMMENTS => false,
+    1 => false,
+    2 => false,
+    3 => false
+    ),
+  'STYLES' => array(
+    'KEYWORDS' => array(
+      1 => 'color: #000066; font-weight: bold;',
+      2 => 'color: #003366; font-weight: bold;',
+      3 => 'color: #000066;'
+      ),
+    'COMMENTS' => array(
+      1 => 'color: #009900; font-style: italic;',
+      'MULTI' => 'color: #009900; font-style: italic;'
+      ),
+    'ESCAPE_CHAR' => array(
+      0 => 'color: #000099; font-weight: bold;'
+      ),
+    'BRACKETS' => array(
+      0 => 'color: #66cc66;'
+      ),
+    'STRINGS' => array(
+      0 => 'color: #3366CC;'
+      ),
+    'NUMBERS' => array(
+      0 => 'color: #CC0000;'
+      ),
+    'METHODS' => array(
+      1 => 'color: #006600;'
+      ),
+    'SYMBOLS' => array(
+      0 => 'color: #66cc66;'
+      ),
+    'REGEXPS' => array(
+      0 => 'color: #0066FF;'
+      ),
+    'SCRIPT' => array(
+      0 => '',
+      1 => '',
+      2 => '',
+      3 => ''
+      )
+    ),
+  'URLS' => array(
+		1 => '',
+		2 => '',
+		3 => ''
+  	),
+  'OOLANG' => true,
+  'OBJECT_SPLITTERS' => array(
+  	1 => '.'
+	),
+  'REGEXPS' => array(
+    0 => "/.*/([igm]*)?"         // matches js reg exps
+    ),
+  'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+  'SCRIPT_DELIMITERS' => array(
+    0 => array(
+      ''
+      ),
+    1 => array(
+      ''
+      )
+    ),
+  'HIGHLIGHT_STRICT_BLOCK' => array(
+    0 => true,
+    1 => true
+  )
+);
+
+?>
\ No newline at end of file
diff --git a/demos/quickstart/protected/controls/Highlighter/geshi/php.php b/demos/quickstart/protected/controls/Highlighter/geshi/php.php
new file mode 100644
index 00000000..e78ec47c
--- /dev/null
+++ b/demos/quickstart/protected/controls/Highlighter/geshi/php.php
@@ -0,0 +1,348 @@
+ 'PHP',
+	'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+	'COMMENT_MULTI' => array('/*' => '*/'),
+	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+	'QUOTEMARKS' => array("'", '"'),
+	'ESCAPE_CHAR' => '\\',
+	'KEYWORDS' => array(
+		1 => array(
+			'include', 'require', 'include_once', 'require_once',
+			'for', 'foreach', 'as', 'if', 'elseif', 'else', 'while', 'do', 'endwhile',
+            'endif', 'switch', 'case', 'endswitch',
+			'return', 'break', 'continue'
+			),
+		2 => array(
+			'null', '__LINE__', '__FILE__',
+			'false', '<?php', '?>', '<?',
+			'<script language', '</script>',
+			'true', 'var', 'default',
+			'function', 'class', 'new', '&new',
+			'__FUNCTION__', '__CLASS__', '__METHOD__', 'PHP_VERSION',
+			'PHP_OS', 'DEFAULT_INCLUDE_PATH', 'PEAR_INSTALL_DIR', 'PEAR_EXTENSION_DIR',
+			'PHP_EXTENSION_DIR', 'PHP_BINDIR', 'PHP_LIBDIR', 'PHP_DATADIR', 'PHP_SYSCONFDIR',
+			'PHP_LOCALSTATEDIR', 'PHP_CONFIG_FILE_PATH', 'PHP_OUTPUT_HANDLER_START', 'PHP_OUTPUT_HANDLER_CONT',
+			'PHP_OUTPUT_HANDLER_END', 'E_ERROR', 'E_WARNING', 'E_PARSE', 'E_NOTICE',
+			'E_CORE_ERROR', 'E_CORE_WARNING', 'E_COMPILE_ERROR', 'E_COMPILE_WARNING', 'E_USER_ERROR',
+			'E_USER_WARNING', 'E_USER_NOTICE', 'E_ALL'
+			),
+		3 => array(
+			'zlib_get_coding_type','zend_version','zend_logo_guid','yp_order','yp_next',
+			'yp_match','yp_master','yp_get_default_domain','yp_first','yp_errno','yp_err_string',
+			'yp_cat','yp_all','xml_set_unparsed_entity_decl_handler','xml_set_start_namespace_decl_handler','xml_set_processing_instruction_handler','xml_set_object',
+			'xml_set_notation_decl_handler','xml_set_external_entity_ref_handler','xml_set_end_namespace_decl_handler','xml_set_element_handler','xml_set_default_handler','xml_set_character_data_handler',
+			'xml_parser_set_option','xml_parser_get_option','xml_parser_free','xml_parser_create_ns','xml_parser_create','xml_parse_into_struct',
+			'xml_parse','xml_get_error_code','xml_get_current_line_number','xml_get_current_column_number','xml_get_current_byte_index','xml_error_string',
+			'wordwrap','wddx_serialize_vars','wddx_serialize_value','wddx_packet_start','wddx_packet_end','wddx_deserialize',
+			'wddx_add_vars','vsprintf','vprintf','virtual','version_compare','var_export',
+			'var_dump','utf8_encode','utf8_decode','usort','usleep','user_error',
+			'urlencode','urldecode','unserialize','unregister_tick_function','unpack','unlink',
+			'unixtojd','uniqid','umask','uksort','ucwords','ucfirst',
+			'uasort','trim','trigger_error','touch','token_name','token_get_all',
+			'tmpfile','time','textdomain','tempnam','tanh','tan',
+			'system','syslog','symlink','substr_replace','substr_count','substr',
+			'strval','strtr','strtoupper','strtotime','strtolower','strtok',
+			'strstr','strspn','strrpos','strrev','strrchr','strpos',
+			'strncmp','strncasecmp','strnatcmp','strnatcasecmp','strlen','stristr',
+			'stripslashes','stripcslashes','strip_tags','strftime','stream_wrapper_register','stream_set_write_buffer',
+			'stream_set_timeout','stream_set_blocking','stream_select','stream_register_wrapper','stream_get_meta_data','stream_filter_prepend',
+			'stream_filter_append','stream_context_set_params','stream_context_set_option','stream_context_get_options','stream_context_create','strcspn',
+			'strcoll','strcmp','strchr','strcasecmp','str_word_count','str_shuffle',
+			'str_rot13','str_replace','str_repeat','str_pad','stat','sscanf',
+			'srand','sqrt','sql_regcase','sprintf','spliti','split',
+			'soundex','sort','socket_writev','socket_write','socket_strerror','socket_shutdown',
+			'socket_setopt','socket_set_timeout','socket_set_option','socket_set_nonblock','socket_set_blocking','socket_set_block',
+			'socket_sendto','socket_sendmsg','socket_send','socket_select','socket_recvmsg','socket_recvfrom',
+			'socket_recv','socket_readv','socket_read','socket_listen','socket_last_error','socket_iovec_set',
+			'socket_iovec_free','socket_iovec_fetch','socket_iovec_delete','socket_iovec_alloc','socket_iovec_add','socket_getsockname',
+			'socket_getpeername','socket_getopt','socket_get_status','socket_get_option','socket_create_pair','socket_create_listen',
+			'socket_create','socket_connect','socket_close','socket_clear_error','socket_bind','socket_accept',
+			'sleep','sizeof','sinh','sin','similar_text','shuffle',
+			'show_source','shmop_write','shmop_size','shmop_read','shmop_open','shmop_delete',
+			'shmop_close','shm_remove_var','shm_remove','shm_put_var','shm_get_var','shm_detach',
+			'shm_attach','shell_exec','sha1_file','sha1','settype','setlocale',
+			'setcookie','set_time_limit','set_socket_blocking','set_magic_quotes_runtime','set_include_path','set_file_buffer',
+			'set_error_handler','session_write_close','session_unset','session_unregister','session_start','session_set_save_handler',
+			'session_set_cookie_params','session_save_path','session_register','session_regenerate_id','session_name','session_module_name',
+			'session_is_registered','session_id','session_get_cookie_params','session_encode','session_destroy','session_decode',
+			'session_cache_limiter','session_cache_expire','serialize','sem_remove','sem_release','sem_get',
+			'sem_acquire','rtrim','rsort','round','rmdir','rewinddir',
+			'rewind','restore_include_path','restore_error_handler','reset','rename','register_tick_function',
+			'register_shutdown_function','realpath','readlink','readgzfile','readfile','readdir',
+			'read_exif_data','rawurlencode','rawurldecode','range','rand','rad2deg',
+			'quotemeta','quoted_printable_decode','putenv','proc_open','proc_close','printf',
+			'print_r','prev','preg_split','preg_replace_callback','preg_replace','preg_quote',
+			'preg_match_all','preg_match','preg_grep','pow','posix_uname','posix_ttyname',
+			'posix_times','posix_strerror','posix_setuid','posix_setsid','posix_setpgid','posix_setgid',
+			'posix_seteuid','posix_setegid','posix_mkfifo','posix_kill','posix_isatty','posix_getuid',
+			'posix_getsid','posix_getrlimit','posix_getpwuid','posix_getpwnam','posix_getppid','posix_getpid',
+			'posix_getpgrp','posix_getpgid','posix_getlogin','posix_getgroups','posix_getgrnam','posix_getgrgid',
+			'posix_getgid','posix_geteuid','posix_getegid','posix_getcwd','posix_get_last_error','posix_errno',
+			'posix_ctermid','pos','popen','pi','phpversion','phpinfo',
+			'phpcredits','php_uname','php_sapi_name','php_logo_guid','php_ini_scanned_files','pg_update',
+			'pg_untrace','pg_unescape_bytea','pg_tty','pg_trace','pg_setclientencoding','pg_set_client_encoding',
+			'pg_send_query','pg_select','pg_result_status','pg_result_seek','pg_result_error','pg_result',
+			'pg_query','pg_put_line','pg_port','pg_ping','pg_pconnect','pg_options',
+			'pg_numrows','pg_numfields','pg_num_rows','pg_num_fields','pg_meta_data','pg_lowrite',
+			'pg_lounlink','pg_loreadall','pg_loread','pg_loopen','pg_loimport','pg_loexport',
+			'pg_locreate','pg_loclose','pg_lo_write','pg_lo_unlink','pg_lo_tell','pg_lo_seek',
+			'pg_lo_read_all','pg_lo_read','pg_lo_open','pg_lo_import','pg_lo_export','pg_lo_create',
+			'pg_lo_close','pg_last_oid','pg_last_notice','pg_last_error','pg_insert','pg_host',
+			'pg_getlastoid','pg_get_result','pg_get_pid','pg_get_notify','pg_freeresult','pg_free_result',
+			'pg_fieldtype','pg_fieldsize','pg_fieldprtlen','pg_fieldnum','pg_fieldname','pg_fieldisnull',
+			'pg_field_type','pg_field_size','pg_field_prtlen','pg_field_num','pg_field_name','pg_field_is_null',
+			'pg_fetch_row','pg_fetch_result','pg_fetch_object','pg_fetch_assoc','pg_fetch_array','pg_fetch_all',
+			'pg_exec','pg_escape_string','pg_escape_bytea','pg_errormessage','pg_end_copy','pg_delete',
+			'pg_dbname','pg_copy_to','pg_copy_from','pg_convert','pg_connection_status','pg_connection_reset',
+			'pg_connection_busy','pg_connect','pg_cmdtuples','pg_close','pg_clientencoding','pg_client_encoding',
+			'pg_cancel_query','pg_affected_rows','pfsockopen','pclose','pathinfo','passthru',
+			'parse_url','parse_str','parse_ini_file','pack','overload','output_reset_rewrite_vars',
+			'output_add_rewrite_var','ord','openssl_x509_read','openssl_x509_parse','openssl_x509_free','openssl_x509_export_to_file',
+			'openssl_x509_export','openssl_x509_checkpurpose','openssl_x509_check_private_key','openssl_verify','openssl_sign','openssl_seal',
+			'openssl_public_encrypt','openssl_public_decrypt','openssl_private_encrypt','openssl_private_decrypt','openssl_pkey_new','openssl_pkey_get_public',
+			'openssl_pkey_get_private','openssl_pkey_free','openssl_pkey_export_to_file','openssl_pkey_export','openssl_pkcs7_verify','openssl_pkcs7_sign',
+			'openssl_pkcs7_encrypt','openssl_pkcs7_decrypt','openssl_open','openssl_get_publickey','openssl_get_privatekey','openssl_free_key',
+			'openssl_error_string','openssl_csr_sign','openssl_csr_new','openssl_csr_export_to_file','openssl_csr_export','openlog',
+			'opendir','octdec','ob_start','ob_list_handlers','ob_implicit_flush','ob_iconv_handler',
+			'ob_gzhandler','ob_get_status','ob_get_level','ob_get_length','ob_get_flush','ob_get_contents',
+			'ob_get_clean','ob_flush','ob_end_flush','ob_end_clean','ob_clean','number_format',
+			'nl_langinfo','nl2br','ngettext','next','natsort','natcasesort',
+			'mysql_unbuffered_query','mysql_thread_id','mysql_tablename','mysql_table_name','mysql_stat','mysql_selectdb',
+			'mysql_select_db','mysql_result','mysql_real_escape_string','mysql_query','mysql_ping','mysql_pconnect',
+			'mysql_numrows','mysql_numfields','mysql_num_rows','mysql_num_fields','mysql_listtables','mysql_listfields',
+			'mysql_listdbs','mysql_list_tables','mysql_list_processes','mysql_list_fields','mysql_list_dbs','mysql_insert_id',
+			'mysql_info','mysql_get_server_info','mysql_get_proto_info','mysql_get_host_info','mysql_get_client_info','mysql_freeresult',
+			'mysql_free_result','mysql_fieldtype','mysql_fieldtable','mysql_fieldname','mysql_fieldlen','mysql_fieldflags',
+			'mysql_field_type','mysql_field_table','mysql_field_seek','mysql_field_name','mysql_field_len','mysql_field_flags',
+			'mysql_fetch_row','mysql_fetch_object','mysql_fetch_lengths','mysql_fetch_field','mysql_fetch_assoc','mysql_fetch_array',
+			'mysql_escape_string','mysql_error','mysql_errno','mysql_dropdb','mysql_drop_db','mysql_dbname',
+			'mysql_db_query','mysql_db_name','mysql_data_seek','mysql_createdb','mysql_create_db','mysql_connect',
+			'mysql_close','mysql_client_encoding','mysql_affected_rows','mysql','mt_srand','mt_rand',
+			'mt_getrandmax','move_uploaded_file','money_format','mktime','mkdir','min',
+			'microtime','method_exists','metaphone','memory_get_usage','md5_file','md5',
+			'mbsubstr','mbstrrpos','mbstrpos','mbstrlen','mbstrcut','mbsplit',
+			'mbregex_encoding','mberegi_replace','mberegi','mbereg_search_setpos','mbereg_search_regs','mbereg_search_pos',
+			'mbereg_search_init','mbereg_search_getregs','mbereg_search_getpos','mbereg_search','mbereg_replace','mbereg_match',
+			'mbereg','mb_substr_count','mb_substr','mb_substitute_character','mb_strwidth','mb_strtoupper',
+			'mb_strtolower','mb_strrpos','mb_strpos','mb_strlen','mb_strimwidth','mb_strcut',
+			'mb_split','mb_send_mail','mb_regex_set_options','mb_regex_encoding','mb_preferred_mime_name','mb_parse_str',
+			'mb_output_handler','mb_language','mb_internal_encoding','mb_http_output','mb_http_input','mb_get_info',
+			'mb_eregi_replace','mb_eregi','mb_ereg_search_setpos','mb_ereg_search_regs','mb_ereg_search_pos','mb_ereg_search_init',
+			'mb_ereg_search_getregs','mb_ereg_search_getpos','mb_ereg_search','mb_ereg_replace','mb_ereg_match','mb_ereg',
+			'mb_encode_numericentity','mb_encode_mimeheader','mb_detect_order','mb_detect_encoding','mb_decode_numericentity','mb_decode_mimeheader',
+			'mb_convert_variables','mb_convert_kana','mb_convert_encoding','mb_convert_case','max','mail',
+			'magic_quotes_runtime','ltrim','lstat','long2ip','log1p','log10',
+			'log','localtime','localeconv','linkinfo','link','levenshtein',
+			'lcg_value','ksort','krsort','key_exists','key','juliantojd',
+			'join','jewishtojd','jdtounix','jdtojulian','jdtojewish','jdtogregorian',
+			'jdtofrench','jdmonthname','jddayofweek','is_writeable','is_writable','is_uploaded_file',
+			'is_subclass_of','is_string','is_scalar','is_resource','is_real','is_readable',
+			'is_object','is_numeric','is_null','is_nan','is_long','is_link',
+			'is_integer','is_int','is_infinite','is_float','is_finite','is_file',
+			'is_executable','is_double','is_dir','is_callable','is_bool','is_array',
+			'is_a','iptcparse','iptcembed','ip2long','intval','ini_set',
+			'ini_restore','ini_get_all','ini_get','ini_alter','in_array','import_request_variables',
+			'implode','image_type_to_mime_type','ignore_user_abort','iconv_set_encoding','iconv_get_encoding','iconv',
+			'i18n_mime_header_encode','i18n_mime_header_decode','i18n_ja_jp_hantozen','i18n_internal_encoding','i18n_http_output','i18n_http_input',
+			'i18n_discover_encoding','i18n_convert','hypot','htmlspecialchars','htmlentities','html_entity_decode',
+			'highlight_string','highlight_file','hexdec','hebrevc','hebrev','headers_sent',
+			'header','gzwrite','gzuncompress','gztell','gzseek','gzrewind',
+			'gzread','gzputs','gzpassthru','gzopen','gzinflate','gzgetss',
+			'gzgets','gzgetc','gzfile','gzeof','gzencode','gzdeflate',
+			'gzcompress','gzclose','gregoriantojd','gmstrftime','gmmktime','gmdate',
+			'glob','gettype','gettimeofday','gettext','getservbyport','getservbyname',
+			'getrusage','getrandmax','getprotobynumber','getprotobyname','getopt','getmyuid',
+			'getmypid','getmyinode','getmygid','getmxrr','getlastmod','getimagesize',
+			'gethostbynamel','gethostbyname','gethostbyaddr','getenv','getdate','getcwd',
+			'getallheaders','get_resource_type','get_required_files','get_parent_class','get_object_vars','get_meta_tags',
+			'get_magic_quotes_runtime','get_magic_quotes_gpc','get_loaded_extensions','get_included_files','get_include_path','get_html_translation_table',
+			'get_extension_funcs','get_defined_vars','get_defined_functions','get_defined_constants','get_declared_classes','get_current_user',
+			'get_class_vars','get_class_methods','get_class','get_cfg_var','get_browser','fwrite',
+			'function_exists','func_num_args','func_get_args','func_get_arg','ftruncate','ftp_systype',
+			'ftp_ssl_connect','ftp_size','ftp_site','ftp_set_option','ftp_rmdir','ftp_rename',
+			'ftp_rawlist','ftp_quit','ftp_pwd','ftp_put','ftp_pasv','ftp_nlist',
+			'ftp_nb_put','ftp_nb_get','ftp_nb_fput','ftp_nb_fget','ftp_nb_continue','ftp_mkdir',
+			'ftp_mdtm','ftp_login','ftp_get_option','ftp_get','ftp_fput','ftp_fget',
+			'ftp_exec','ftp_delete','ftp_connect','ftp_close','ftp_chdir','ftp_cdup',
+			'ftok','ftell','fstat','fsockopen','fseek','fscanf',
+			'frenchtojd','fread','fputs','fpassthru','fopen','fnmatch',
+			'fmod','flush','floor','flock','floatval','filetype',
+			'filesize','filepro_rowcount','filepro_retrieve','filepro_fieldwidth','filepro_fieldtype','filepro_fieldname',
+			'filepro_fieldcount','filepro','fileperms','fileowner','filemtime','fileinode',
+			'filegroup','filectime','fileatime','file_get_contents','file_exists','file',
+			'fgetss','fgets','fgetcsv','fgetc','fflush','feof',
+			'fclose','ezmlm_hash','extract','extension_loaded','expm1','explode',
+			'exp','exif_thumbnail','exif_tagname','exif_read_data','exif_imagetype','exec',
+			'escapeshellcmd','escapeshellarg','error_reporting','error_log','eregi_replace','eregi',
+			'ereg_replace','ereg','end','easter_days','easter_date','each',
+			'doubleval','dngettext','dl','diskfreespace','disk_total_space','disk_free_space',
+			'dirname','dir','dgettext','deg2rad','defined','define_syslog_variables',
+			'define','decoct','dechex','decbin','debug_zval_dump','debug_backtrace',
+			'deaggregate','dcngettext','dcgettext','dba_sync','dba_replace','dba_popen',
+			'dba_optimize','dba_open','dba_nextkey','dba_list','dba_insert','dba_handlers',
+			'dba_firstkey','dba_fetch','dba_exists','dba_delete','dba_close','date',
+			'current','ctype_xdigit','ctype_upper','ctype_space','ctype_punct','ctype_print',
+			'ctype_lower','ctype_graph','ctype_digit','ctype_cntrl','ctype_alpha','ctype_alnum',
+			'crypt','create_function','crc32','count_chars','count','cosh',
+			'cos','copy','convert_cyr_string','constant','connection_status','connection_aborted',
+			'compact','closelog','closedir','clearstatcache','class_exists','chunk_split',
+			'chr','chown','chop','chmod','chgrp','checkdnsrr',
+			'checkdate','chdir','ceil','call_user_method_array','call_user_method','call_user_func_array',
+			'call_user_func','cal_to_jd','cal_info','cal_from_jd','cal_days_in_month','bzwrite',
+			'bzread','bzopen','bzflush','bzerrstr','bzerror','bzerrno',
+			'bzdecompress','bzcompress','bzclose','bindtextdomain','bindec','bind_textdomain_codeset',
+			'bin2hex','bcsub','bcsqrt','bcscale','bcpow','bcmul',
+			'bcmod','bcdiv','bccomp','bcadd','basename','base_convert',
+			'base64_encode','base64_decode','atanh','atan2','atan','assert_options',
+			'assert','asort','asinh','asin','arsort','array_walk',
+			'array_values','array_unshift','array_unique','array_sum','array_splice','array_slice',
+			'array_shift','array_search','array_reverse','array_reduce','array_rand','array_push',
+			'array_pop','array_pad','array_multisort','array_merge_recursive','array_merge','array_map',
+			'array_keys','array_key_exists','array_intersect_assoc','array_intersect','array_flip','array_filter',
+			'array_fill','array_diff_assoc','array_diff','array_count_values','array_chunk','array_change_key_case',
+			'apache_setenv','apache_response_headers','apache_request_headers','apache_note','apache_lookup_uri','apache_get_version',
+			'apache_child_terminate','aggregation_info','aggregate_properties_by_regexp','aggregate_properties_by_list','aggregate_properties','aggregate_methods_by_regexp',
+			'aggregate_methods_by_list','aggregate_methods','aggregate','addslashes','addcslashes','acosh',
+			'acos','abs','_','echo', 'print', 'global', 'static', 'exit', 'array', 'empty',
+            'eval', 'isset', 'unset', 'die', 'list'
+			)
+		),
+	'SYMBOLS' => array(
+		'(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
+		),
+	'CASE_SENSITIVE' => array(
+		GESHI_COMMENTS => false,
+		1 => false,
+		2 => false,
+		3 => false,
+		),
+	'STYLES' => array(
+		'KEYWORDS' => array(
+			1 => 'color: #b1b100;',
+			2 => 'color: #000000; font-weight: bold;',
+			3 => 'color: #000066;'
+			),
+		'COMMENTS' => array(
+			1 => 'color: #808080; font-style: italic;',
+			2 => 'color: #808080; font-style: italic;',
+			'MULTI' => 'color: #808080; font-style: italic;'
+			),
+		'ESCAPE_CHAR' => array(
+			0 => 'color: #000099; font-weight: bold;'
+			),
+		'BRACKETS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'STRINGS' => array(
+			0 => 'color: #ff0000;'
+			),
+		'NUMBERS' => array(
+			0 => 'color: #cc66cc;'
+			),
+		'METHODS' => array(
+			1 => 'color: #006600;',
+			2 => 'color: #006600;'
+			),
+		'SYMBOLS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'REGEXPS' => array(
+			0 => 'color: #0000ff;'
+			),
+		'SCRIPT' => array(
+			0 => '',
+			1 => '',
+			2 => '',
+			3 => ''
+			)
+		),
+	'URLS' => array(
+		1 => '',
+		2 => '',
+		3 => 'http://www.php.net/{FNAME}',
+		4 => ''
+		),
+	'OOLANG' => true,
+	'OBJECT_SPLITTERS' => array(
+		1 => '->',
+		2 => '::'
+		),
+	'REGEXPS' => array(
+		0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*",
+		),
+	'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+	'SCRIPT_DELIMITERS' => array(
+		0 => array(
+			' '?>'
+			),
+		1 => array(
+			' '?>'
+			),
+		2 => array(
+			'<%' => '%>'
+			),
+		3 => array(
+			''
+			)
+		),
+	'HIGHLIGHT_STRICT_BLOCK' => array(
+		0 => true,
+		1 => true,
+		2 => true,
+		3 => true
+		)
+);
+
+?>
\ No newline at end of file
diff --git a/demos/quickstart/protected/controls/Highlighter/geshi/prado.php b/demos/quickstart/protected/controls/Highlighter/geshi/prado.php
new file mode 100644
index 00000000..95759a87
--- /dev/null
+++ b/demos/quickstart/protected/controls/Highlighter/geshi/prado.php
@@ -0,0 +1,147 @@
+ 'XML',
+	'COMMENT_SINGLE' => array(),
+	'COMMENT_MULTI' => array('', ' '!>'),
+	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+	'QUOTEMARKS' => array("'", '"'),
+	'ESCAPE_CHAR' => '\\',
+	'KEYWORDS' => array(
+		),
+	'SYMBOLS' => array(
+		),
+	'CASE_SENSITIVE' => array(
+		GESHI_COMMENTS => false,
+		),
+	'STYLES' => array(
+		'KEYWORDS' => array(),
+		'COMMENTS' => array(
+			'MULTI' => 'color: #808080; font-style: italic;'
+			),
+		'ESCAPE_CHAR' => array(
+			0 => 'color: #000099; font-weight: bold;'
+			),
+		'BRACKETS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'STRINGS' => array(
+			0 => 'color: #ff0000;'
+			),
+		'NUMBERS' => array(
+			0 => 'color: #cc66cc;'
+			),
+		'METHODS' => array(
+			),
+		'SYMBOLS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'SCRIPT' => array(
+			0 => 'color: #00bbdd;',
+			1 => 'color: #ddbb00;',
+			2 => 'color: #339933;',
+			3 => 'color: #009900;'
+			),
+		'REGEXPS' => array(
+			0 => 'color: #000066;',
+			1 => 'font-weight: bold; color: black;',
+			2 => 'font-weight: bold; color: black;',
+			)
+		),
+	'URLS' => array(
+		1 => '',
+		2 => 'http://december.com/html/4/element/{FNAME}.html',
+		3 => ''
+		),
+	'OOLANG' => false,
+	'OBJECT_SPLITTERS' => array(
+		),
+	'REGEXPS' => array(
+		0 => array(
+			GESHI_SEARCH => '((<)(com:)([a-z0-9\\\.]+)(\s*))',
+			GESHI_REPLACE => '\\2\\3\\4\\5',
+			GESHI_MODIFIERS => 'i',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+		1 => array(
+			GESHI_SEARCH => '(</com:[a-z0-9\-]+\s*>)',
+			GESHI_REPLACE => '\\1',
+			GESHI_MODIFIERS => 'i',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+		2 => array(
+			GESHI_SEARCH => '(</?prop:?([a-z0-9_]+)>)',
+			GESHI_REPLACE => '\\1',
+			GESHI_MODIFIERS => 'i',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+		),
+	'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+	'SCRIPT_DELIMITERS' => array(
+		0 => array(
+			' '>'
+			),
+		1 => array(
+			'&' => ';'
+			),
+		2 => array(
+			' ']]>'
+			),
+		3 => array(
+			'<' => '>'
+			)
+	),
+	'HIGHLIGHT_STRICT_BLOCK' => array(
+		0 => false,
+		1 => false,
+		2 => false,
+		3 => true
+		)
+);
+
+?>
\ No newline at end of file
diff --git a/demos/quickstart/protected/controls/Highlighter/geshi/xml.php b/demos/quickstart/protected/controls/Highlighter/geshi/xml.php
new file mode 100644
index 00000000..682ca3db
--- /dev/null
+++ b/demos/quickstart/protected/controls/Highlighter/geshi/xml.php
@@ -0,0 +1,145 @@
+ 'XML',
+	'COMMENT_SINGLE' => array(),
+	'COMMENT_MULTI' => array(''),
+	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+	'QUOTEMARKS' => array("'", '"'),
+	'ESCAPE_CHAR' => '\\',
+	'KEYWORDS' => array(
+		),
+	'SYMBOLS' => array(
+		),
+	'CASE_SENSITIVE' => array(
+		GESHI_COMMENTS => false,
+		),
+	'STYLES' => array(
+		'KEYWORDS' => array(
+			),
+		'COMMENTS' => array(
+			'MULTI' => 'color: #808080; font-style: italic;'
+			),
+		'ESCAPE_CHAR' => array(
+			0 => 'color: #000099; font-weight: bold;'
+			),
+		'BRACKETS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'STRINGS' => array(
+			0 => 'color: #ff0000;'
+			),
+		'NUMBERS' => array(
+			0 => 'color: #cc66cc;'
+			),
+		'METHODS' => array(
+			),
+		'SYMBOLS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'SCRIPT' => array(
+			0 => 'color: #00bbdd;',
+			1 => 'color: #ddbb00;',
+			2 => 'color: #339933;',
+			3 => 'color: #009900;'
+			),
+		'REGEXPS' => array(
+			0 => 'color: #000066;',
+			1 => 'font-weight: bold; color: black;',
+			2 => 'font-weight: bold; color: black;',
+			)
+		),
+	'URLS' => array(
+		),
+	'OOLANG' => false,
+	'OBJECT_SPLITTERS' => array(
+		),
+	'REGEXPS' => array(
+		0 => array(
+			GESHI_SEARCH => '(((xml:)?[a-z\-]+))(=)',
+			GESHI_REPLACE => '\\1',
+			GESHI_MODIFIERS => 'i',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => '\\4'
+			),
+		1 => array(
+			GESHI_SEARCH => '(</?[a-z0-9_]*(>)?)',
+			GESHI_REPLACE => '\\1',
+			GESHI_MODIFIERS => 'i',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+		2 => array(
+			GESHI_SEARCH => '((/)?>)',
+			GESHI_REPLACE => '\\1',
+			GESHI_MODIFIERS => 'i',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			)
+		),
+	'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+	'SCRIPT_DELIMITERS' => array(
+		0 => array(
+			' '>'
+			),
+		1 => array(
+			'&' => ';'
+			),
+		2 => array(
+			' ']]>'
+			),
+		3 => array(
+			'<' => '>'
+			)
+	),
+	'HIGHLIGHT_STRICT_BLOCK' => array(
+		0 => false,
+		1 => false,
+		2 => false,
+		3 => true
+		)
+);
+
+?>
\ No newline at end of file
diff --git a/demos/quickstart/protected/controls/TTextHighlighter.php b/demos/quickstart/protected/controls/TTextHighlighter.php
new file mode 100644
index 00000000..d8bb6bba
--- /dev/null
+++ b/demos/quickstart/protected/controls/TTextHighlighter.php
@@ -0,0 +1,97 @@
+
+ * @version $Revision: 1.66 $  $Date: ${DATE} ${TIME} $
+ * @package ${package}
+ */
+class TTextHighlighter extends TWebControl
+{
+	/**
+	 * @return string tag name of the panel
+	 */
+	protected function getTagName()
+	{
+		return 'div';
+	}
+
+	public function getLanguage()
+	{
+		return $this->getViewState('Language', '');
+	}
+
+	public function setLanguage($value)
+	{
+		$this->setViewState('Language', $value, '');
+	}
+
+	public function setEnableLineNumbers($value)
+	{
+		$this->setViewState('LineNumbers', TPropertyValue::ensureBoolean($value), false);
+	}
+
+	public function getEnableLineNumbers()
+	{
+		return $this->getViewState('LineNumbers', false);
+	}
+
+	public function getEnableEntities()
+	{
+		return $this->getViewState('Entities', false);
+	}
+
+	public function setEnableEntities($value)
+	{
+		$this->setViewState('Entities', TPropertyValue::ensureBoolean($value), false);
+	}
+
+	/**
+	 * Parse the body string using GeSHi to highlight the contents.
+	 */
+	public function addParsedObject($object)
+	{
+		if(is_string($object))
+		{
+			$this->registerTextHighlightStyleSheet();
+			$this->getControls()->add($this->getTextHighlight($object));
+		}
+		else
+			$this->getControls()->add($object);
+	}
+
+	/**
+	 * Register CSS style sheet file.
+	 */
+	protected function registerTextHighlightStyleSheet()
+	{
+		$cs = $this->getPage()->getClientScript();
+		if(!$cs->isStyleSheetFileRegistered(get_class($this)))
+		{
+			$styleSheet = $this->getAsset('Highlighter/code_highlight.css');
+			$cs->registerStyleSheetFile(get_class($this), $styleSheet);
+		}
+	}
+
+	/**
+	 * Returns the highlighted text.
+	 * @param string text to highlight.
+	 * @return string highlighted text.
+	 */
+	protected function getTextHighlight($text)
+	{
+		if(!$this->getEnableEntities())
+			$text = html_entity_decode($text);
+		$geshi = new GeSHi(trim($text), $this->getLanguage());
+		if($this->getEnableLineNumbers())
+			$geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
+		$geshi->enable_classes();
+		return $geshi->parse_code();
+	}
+}
+?>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Configurations/Templates1.page b/demos/quickstart/protected/pages/Configurations/Templates1.page
index d9b71d35..ec230599 100644
--- a/demos/quickstart/protected/pages/Configurations/Templates1.page
+++ b/demos/quickstart/protected/pages/Configurations/Templates1.page
@@ -13,35 +13,35 @@ A component tag specifies a component as part of the body content of the templat
 
        
 
        
 The format of a component tag is as follows,
-
        +
 <com:ComponentType PropertyName="PropertyValue" ... EventName="EventHandler" ...>
 body content
 </com:ComponentType>
-
        
+
 ComponentType can be either the class name or the dotted type name (e.g. System.Web.UI.TControl) of the component. PropertyName and EventName are both case-insensitive. PropertyName can be a property or subproperty name (e.g. Font.Name). Note, PropertyValue will be HTML-decoded when assigned to the corresponding property. Content enclosed between the opening and closing component tag are normally treated the body of the component.
 
        
 
        
 It is required that component tags nest properly with each other and an opening component tag be paired with a closing tag, similar to that in XML. The following shows a component tag specifying the Text property and Click event of a button control,
-
        +
 <com:TButton Text="Register" Click="registerUser" />
-
        
+
 
        
 
        
 To deal conveniently with properties taking take big trunk of initial data, the following property initialization tag is introduced,
-
        +
 <prop:PropertyName>
 PropertyValue
 </prop:PropertyName>
-
        
+
 It is equivalent to ...PropertyName="PropertyValue"... in a component tag. Property initialization tags must be directly enclosed between the corresponding opening and closing component tag.
 
        
 
 
 
        Template Control Tags
        
 A template control tag is used to configure the initial property values of the control owning the template. Its format is as follows,
-
        +
 <%@ PropertyName="PropertyValue" ... %>
-
        
+
 Like in component tags, PropertyName is case-insensitive and can be a property or subproperty name.
 
        
 
        
@@ -55,7 +55,7 @@ Template control tag is optional in a template. Each template can contain at mos
 
        Comment Tags
        
 
        
 Comment tags are used to put comments in the template or the ultimate rendering result. There are two types of comment tags. One is like that in HTML and will be displayed to the end-users. The other only appear in a template and will be stripped out when the template is instantiated and displayed to the end-users. The format of these two comment tags is as follows,
-
        +
 <!--
 Comments VISIBLE to end-users
 -->
@@ -63,7 +63,7 @@ Comments VISIBLE to end-users
 <!
 Comments INVISIBLE to end-users
 !>
-
        
+
 
        
 
 
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Configurations/Templates2.page b/demos/quickstart/protected/pages/Configurations/Templates2.page
index c4528a0b..66d9d0d1 100644
--- a/demos/quickstart/protected/pages/Configurations/Templates2.page
+++ b/demos/quickstart/protected/pages/Configurations/Templates2.page
@@ -11,51 +11,51 @@ Dynamic content tags are introduced as shortcuts to some commonly used         
+
 <%= PhpExpression %>
-
        + Inernally, an expression tag is represented by a TExpression control. Therefore, in the expression $this refers to the TExpression control. For example, the following expression tag will display the current page title at the place, -
        +
 <%= $this->Page->Title %>
-
        +

        Statement Tags

        Statement tags are similar to expression tags, except that statement tags contain PHP statements rather than expressions. The output of the PHP statements (using for example echo or print in PHP) are displayed at the place where the statement tag resides in the template. Inernally, a statement tag is represented by a TStatements control. Therefore, in the statements $this refers to the TStatements control. The format of statement tags is as follows, -

        +
 <%%
 PHP Statements
 %>
-
        +

        The following example displays the current time in Dutch at the place, -

        +
 <%%
 setlocale(LC_ALL, 'nl_NL');
 echo strftime("%A %e %B %Y",time());
 %>
-
        +

        Databind Tags

        Databind tags are similar to expression tags, except that the expressions are evaluated only when a dataBind() call is invoked on the controls representing the databind tags. Internally, a TLiteral control is used to represent a databind tag and $this in the expression would refer to the control. The format of databind tags is as follows, -

        +
 <%# PhpExpression %>
-
        +

        Parameter Tags

        Parameter tags are used to insert application parameters at the place where they appear in the template. The format of parameter tags is as follows, -

        +
 <%$ ParameterName %>
-
        + Note, application parameters are usually defined in application configurations or page directory configurations. The parameters are evaluated when the template is instantiated.

        @@ -66,9 +66,9 @@ Asset tags are used to publish private files and display the corresponding the U

        The format of asset tags is as follows, -

        +
 <%~ LocalFileName %>
-
        + where LocalFileName refers to a file path that is relative to the directory containing the current template file. The file path can be a single file or a directory. If the latter, the content in the whole directory will be made accessible by end-users.

        diff --git a/demos/quickstart/protected/pages/Configurations/Templates3.page b/demos/quickstart/protected/pages/Configurations/Templates3.page index 7ab55281..ae496553 100644 --- a/demos/quickstart/protected/pages/Configurations/Templates3.page +++ b/demos/quickstart/protected/pages/Configurations/Templates3.page @@ -5,11 +5,11 @@

        Dynamic Property Tags

        Dynamic property tags are very similar to dynamic content tags, except that they are applied to component properties. The purpose of dynamic property tags is to allow more versatile component property configuration. Note, you are not required to use dynamic property tags because what can be done using dynamic property tags can also be done in PHP code. However, using dynamic property tags bring you much more convenience at accomplishing the same tasks. The basic usage of dynamic property tags is as follows, -

        +
 <com:ComponentType PropertyName=DynamicPropertyTag ...>
 body content
 </com:ComponentType>
-
        + where you may enclose DynamicPropertyTag within single or double quotes for better readability.

        @@ -20,13 +20,13 @@ We now introduce the available types of dynamic property tags that may be used i

        Expression Tags

        An expression tag represents a PHP expression that is evaluated when the template is being instantiated. The expression evaluation result is assigned to the corresponding component property. The format of expression tags is as follows, -

        +
 <%= PhpExpression %>
-
        + In the expression, $this refers to the component specified by the component tag. The following example specifies a TLabel control whose Text property is initialized as the current page title when the TLabel control is being constructed, -
        +
 <com:TLabel Text=<%= $this->Page->Title %> />
-
        +

        Note, unlike dynamic content tags, the expressions tags for component properties are evaluated when the components are being constructed, while for the dynamic content tags, the expressions are evaluated when the controls are being rendered. @@ -39,18 +39,18 @@ Databind tags are similar to expression tags, except that the expressions are ev

        The format of databind tags is as follows, -

        +
 <%# PhpExpression %>
-
        +

        Parameter Tags

        Parameter tags are used to assign application parameter values to the corresponding component properties. The format of parameter tags is as follows, -

        +
 <%$ ParameterName %>
-
        + Note, application parameters are usually defined in application configurations or page directory configurations. The parameters are evaluated when the template is instantiated.

        @@ -61,9 +61,9 @@ Asset tags are used to publish private files and assign the corresponding the UR

        The format of asset tags is as follows, -

        +
 <%~ LocalFileName %>
-
        + where LocalFileName refers to a file path that is relative to the directory containing the current template file. The file path can be a single file or a directory. If the latter, the content in the whole directory will be made accessible by end-users.

        diff --git a/demos/quickstart/protected/pages/Fundamentals/Components.page b/demos/quickstart/protected/pages/Fundamentals/Components.page index 20888fba..be71b18b 100644 --- a/demos/quickstart/protected/pages/Fundamentals/Components.page +++ b/demos/quickstart/protected/pages/Fundamentals/Components.page @@ -7,7 +7,7 @@ A component is an instance of TComponent or its child class. The base c

        Component Properties

        A component property can be viewed as a public variable describing a specific aspect of the component, such as the background color, the font size, etc. A property is defined by the existence of a getter and/or a setter method in the component class. For example, in TControl, we define its ID property using the following getter and setter methods, -

        +
 class TControl extends TComponent {
     public function getID() {
         ...
@@ -16,7 +16,7 @@ class TControl extends TComponent {
         ...
     }
 }
-
        +

        To get or set the ID property, do as follows, just like working with a variable, @@ -58,20 +58,20 @@ Component events are special properties that take method names as their values.

        A component event is defined by the existence of an on-method. For example, in TButton, we have -

        +
 class TButton extends TWebControl {
     public function onClick($param) {
         ...
     }
 }
-
        + This defines an event named Click, and a handler can be attached to the event using one of the following ways, -
        +
 $button->Click=$callback;
 $button->Click->add($callback);
 $button->Click[]=$callback;
 $button->attachEventHandler('Click',$callback);
-
        + where $callback refers to a valid PHP callback (e.g. a function name, a class method array($object,'method'), etc.)

        diff --git a/demos/quickstart/themes/Simple/style.css b/demos/quickstart/themes/Simple/style.css index 4fc38e07..a4e15ff8 100644 --- a/demos/quickstart/themes/Simple/style.css +++ b/demos/quickstart/themes/Simple/style.css @@ -86,12 +86,13 @@ h3 { } .source { - padding:10px; + padding: 0 1em; border-style:solid; border-width:1px; border-color:#cccccc; background-color:#ffffee; font-family: "Courier New", Courier, mono; + margin-bottom: 0.5em; } .runbar a:link, .runbar a:visited { -- cgit v1.2.3