geshi updated

darcs-hash:20050416100220-9977f-bf2ecf2d68e5f90907b03d95690cb357d7d9033f.gz

38 files changed, 938 insertions, 103 deletions

diff --git a/inc/geshi.php b/inc/geshi.php
index ba080f8b1..a15d2d813 100644
--- a/inc/geshi.php
+++ b/inc/geshi.php
@@ -4,10 +4,10 @@
  * ---------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie
- * Release Version: 1.0.4
- * CVS Revision Version: $Revision: 1.6 $
+ * Release Version: 1.0.6
+ * CVS Revision Version: $Revision: 1.4 $
  * Date Started: 2004/05/20
- * Last Modified: $Date: 2004/11/27 00:57:58 $
+ * Last Modified: $Date: 2005/01/29 10:36:06 $
  *
  * The GeSHi class for Generic Syntax Highlighting. Please refer to the documentation
  * at http://qbnz.com/highlighter/documentation.php for more information about how to
@@ -52,10 +52,12 @@ define('GESHI_COMMENTS', 0);
 // Error detection - use these to analyse faults
 define('GESHI_ERROR_NO_INPUT', 1);
 define('GESHI_ERROR_NO_SUCH_LANG', 2);
+define('GESHI_ERROR_FILE_NOT_READABLE', 3);
 // Human error messages - added in 1.0.2
 $_GESHI_ERRORS = 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_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'
 );
 
 // Line numbers - use with enable_line_numbers()
@@ -85,7 +87,7 @@ define('GESHI_VISITED', 3);
 
 // Important string starter/finisher - use these (added in 1.0.2).
 // 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()
+// write them as if they had been run through @htmlentities()
 define('GESHI_START_IMPORTANT', '<BEGIN GeSHi>');
 define('GESHI_END_IMPORTANT', '<END GeSHi>');
 
@@ -144,7 +146,7 @@ class GeSHi
 	var $max_tabs = 20;                   // Maximum number of spaces per tab
 	var $min_tabs = 0;                    // Minimum  "   "    "    "    "
 	var $link_target = '';                // default target for keyword links
-	var $encoding = '';                   // The encoding to use for htmlentities() calls
+	var $encoding = 'ISO-8859-1';         // The encoding to use for @htmlentities() calls
 
 	// Deprecated/unused
 	var $output_format = GESHI_OUTPUT_HTML;
@@ -838,6 +840,93 @@ class GeSHi
 
 
 	/**
+	 * method: get_language_name_from_extension
+	 * ----------------------------------------
+	 * Given a file extension, this method returns either a valid geshi language
+	 * name, or the empty string if it couldn't be found
+	 */
+	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'),
+				'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 '';
+	}
+
+	/**
+	 * Method: load_from_file
+	 * ----------------------
+	 * 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.
+	 *
+	 * The language table is in the form
+	 * <pre>array(
+	 *   'lang_name' => array('extension', 'extension', ...),
+	 *   'lang_name' ...
+	 * );</pre>
+	 */
+	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;
+		}
+	}
+
+	/**
 	 * method: add_keyword
 	 * -------------------
 	 * Adds a keyword to a keyword group for highlighting
@@ -1055,7 +1144,7 @@ class GeSHi
 	/**
 	 * method: set_encoding
 	 * --------------------
-	 * Sets the encoding used for htmlentities(), for international
+	 * Sets the encoding used for @htmlentities(), for international
 	 * support.
 	 */
 	function set_encoding ( $encoding )
@@ -1070,7 +1159,7 @@ class GeSHi
 	 * 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
+	 * off doing a whole lot of str_replaces to replace the <<span>>s
 	 */
 	function parse_code()
 	{
@@ -1084,11 +1173,11 @@ class GeSHi
 			$result = $this->header();
 			if ( $this->header_type != GESHI_HEADER_PRE )
 			{
-				$result .= $this->indent(htmlentities($this->source, ENT_COMPAT, $this->encoding));
+				$result .= $this->indent(@htmlentities($this->source, ENT_COMPAT, $this->encoding));
 			}
 			else
 			{
-				$result .= htmlentities($this->source, ENT_COMPAT, $this->encoding);
+				$result .= @htmlentities($this->source, ENT_COMPAT, $this->encoding);
 			}
 			// Stop Timing
 			$this->set_time($start_time, microtime());
@@ -1358,7 +1447,7 @@ class GeSHi
 											{
 												$attributes = ' class="coMULTI"';
 											}
-											$test_str = "<span$attributes>" . htmlentities($test_str, ENT_COMPAT, $this->encoding);
+											$test_str = "<span$attributes>" . @htmlentities($test_str, ENT_COMPAT, $this->encoding);
 										}
 										else
 										{
@@ -1377,7 +1466,7 @@ class GeSHi
 									}
 									else
 									{
-										$test_str = htmlentities($test_str, ENT_COMPAT, $this->encoding);
+										$test_str = @htmlentities($test_str, ENT_COMPAT, $this->encoding);
 									}
 
 									$close_pos = strpos( $part, $close, $i + strlen($close) );
@@ -1388,7 +1477,7 @@ class GeSHi
 									}
 
 									// Short-cut through all the multiline code
-									$rest_of_comment = htmlentities(substr($part, $i + $com_len, $close_pos - $i), ENT_COMPAT, $this->encoding);
+									$rest_of_comment = @htmlentities(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
@@ -1438,18 +1527,18 @@ class GeSHi
 											{
 												$attributes = ' class="co' . $comment_key . '"';
 											}
-											$test_str = "<span$attributes>" . htmlentities($this->change_case($test_str), ENT_COMPAT, $this->encoding);
+											$test_str = "<span$attributes>" . @htmlentities($this->change_case($test_str), ENT_COMPAT, $this->encoding);
 										}
 										else
 										{
-											$test_str = htmlentities($test_str, ENT_COMPAT, $this->encoding);
+											$test_str = @htmlentities($test_str, ENT_COMPAT, $this->encoding);
 										}
 										$close_pos = strpos( $part, "\n", $i );
 										if ( $close_pos === false )
 										{
 											$close_pos = strlen($part);
 										}
-										$test_str .= htmlentities(substr($part, $i + $com_len, $close_pos - $i - $com_len), ENT_COMPAT, $this->encoding);
+										$test_str .= @htmlentities(substr($part, $i + $com_len, $close_pos - $i - $com_len), ENT_COMPAT, $this->encoding);
 										if ( $this->lexic_permissions['COMMENTS'][$comment_key] )
 										{
 											$test_str .= "</span>";
@@ -1467,10 +1556,16 @@ class GeSHi
 						// Otherwise, convert it to HTML form
 						elseif ( $STRING_OPEN != '' )
 						{
-							if(strtolower($this->encoding) == 'utf-8'){
+							if ( strtolower($this->encoding) == 'utf-8' )
+							{
 								//only escape <128 (we don't want to break multibyte chars)
-								if( ord($char) < 128 ) $char = htmlentities($char, ENT_COMPAT, $this->encoding);
-							}else{
+								if ( ord($char) < 128 )
+								{
+									$char = htmlentities($char, ENT_COMPAT, $this->encoding);
+								}
+							}
+							else
+							{
 								//encode everthing
 								$char = htmlentities($char, ENT_COMPAT, $this->encoding);
 							}
@@ -1500,7 +1595,7 @@ class GeSHi
 				}
 				else
 				{
-					$result .= htmlentities($part, ENT_COMPAT, $this->encoding);
+					$result .= @htmlentities($part, ENT_COMPAT, $this->encoding);
 				}
 				// Close the <span> that surrounds the block
 				if ( $this->strict_mode && $this->lexic_permissions['SCRIPT'] )
@@ -1511,7 +1606,7 @@ class GeSHi
 			// Else not a block to highlight
 			else
 			{
-				$result .= htmlentities($part, ENT_COMPAT, $this->encoding);
+				$result .= @htmlentities($part, ENT_COMPAT, $this->encoding);
 			}
 		}
 
@@ -1541,10 +1636,88 @@ class GeSHi
 	 */
 	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 . '<br />';
+
+                    $pos = 0;
+                    $tab_width = $this->tab_width;
+                    $length = strlen($line);
+                    $result_line = '';
+
+                    //echo '<pre>line: ' . htmlspecialchars($line) . '</pre>';
+                    $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 &amp; 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 => '&nbsp;',
+                            //  2 => '&nbsp; ',
+                            //  3 => '&nbsp; &nbsp;' etc etc
+                            // to use instead of building a string every time
+                            $strs = array(0 => '&nbsp;', 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('  ', '&nbsp; ', $result);
 		$result = str_replace('  ', ' &nbsp;', $result);
 		$result = str_replace("\n ", "\n&nbsp;", $result);
-		$result = str_replace("\t", $this->get_tab_replacement(), $result);
+		//$result = str_replace("\t", $this->get_tab_replacement(), $result);
 		if ( $this->line_numbers == GESHI_NO_LINE_NUMBERS )
 		{
 			$result = nl2br($result);
@@ -1591,7 +1764,7 @@ class GeSHi
 				if ( $keyword != '' )
 				{
 					$keyword = ( $this->language_data['CASE_SENSITIVE'][$group] ) ? $keyword : strtolower($keyword);
-					return '<|UR1|"' . str_replace(array('{FNAME}', '.'), array(htmlentities($keyword, ENT_COMPAT, $this->encoding), '<DOT>'), $this->language_data['URLS'][$group]) . '">';
+					return '<|UR1|"' . str_replace(array('{FNAME}', '.'), array(@htmlentities($keyword, ENT_COMPAT, $this->encoding), '<DOT>'), $this->language_data['URLS'][$group]) . '">';
 				}
 				return '';
 			}
@@ -1611,7 +1784,7 @@ class GeSHi
 	 */
 	function parse_non_string_part ( &$stuff_to_parse )
 	{
-		$stuff_to_parse = ' ' . quotemeta(htmlentities($stuff_to_parse, ENT_COMPAT, $this->encoding));
+		$stuff_to_parse = ' ' . quotemeta(@htmlentities($stuff_to_parse, ENT_COMPAT, $this->encoding));
 		// These vars will disappear in the future
 		$func = '$this->change_case';
 		$func2 = '$this->add_url_to_keyword';
@@ -1723,7 +1896,7 @@ class GeSHi
 		{
 			foreach ( $this->language_data['OBJECT_SPLITTERS'] as $key => $splitter )
 			{
-				if ( false !== stristr($stuff_to_parse, $this->language_data['OBJECT_SPLITTERS'][$key]) )
+				if ( false !== stristr($stuff_to_parse, $splitter) )
 				{
 					if ( !$this->use_classes )
 					{
@@ -1877,6 +2050,7 @@ class GeSHi
 	 * Gets the replacement string for tabs in the source code. Useful for
 	 * HTML highlighting, where tabs don't mean anything to a browser.
 	 */
+	 /*
 	function get_tab_replacement ()
 	{
 		$i = 0;
@@ -1895,6 +2069,7 @@ class GeSHi
 		}
 		return $result;
 	}
+	*/
 
 	/**
 	 * method: finalise
@@ -1906,9 +2081,9 @@ class GeSHi
 	{
 		// Remove end parts of important declarations
 		// This is BUGGY!! My fault for bad code: fix coming in 1.2
-		if ( $this->enable_important_blocks && (strstr($parsed_code, htmlentities(GESHI_START_IMPORTANT, ENT_COMPAT, $this->encoding)) === false) )
+		if ( $this->enable_important_blocks && (strstr($parsed_code, @htmlentities(GESHI_START_IMPORTANT, ENT_COMPAT, $this->encoding)) === false) )
 		{
-			$parsed_code = str_replace(htmlentities(GESHI_END_IMPORTANT, ENT_COMPAT, $this->encoding), '', $parsed_code);
+			$parsed_code = str_replace(@htmlentities(GESHI_END_IMPORTANT, ENT_COMPAT, $this->encoding), '', $parsed_code);
 		}
 
 		// Add HTML whitespace stuff if we're using the <div> header
@@ -2021,6 +2196,16 @@ class GeSHi
 			}
 		}
 
+		// purge some unnecessary stuff
+		$parsed_code = preg_replace('#<span[^>]+>(\s*)</span>#', '\\1', $parsed_code);
+		$parsed_code = preg_replace('#<div[^>]+>(\s*)</div>#', '\\1', $parsed_code);
+
+		if ( $this->header_type == GESHI_HEADER_PRE )
+		{
+			// enforce line numbers when using pre
+			$parsed_code = str_replace('<li></li>', '<li>&nbsp;</li>', $parsed_code);
+		}
+
 		return $this->header() . chop($parsed_code) . $this->footer();
 	}
 
@@ -2035,14 +2220,14 @@ class GeSHi
 		// Get attributes needed
 		$attributes = $this->get_attributes();
 
-		if ( $this->use_classes )
-		{
+		/*if ( $this->use_classes )
+		{*/
 			$ol_attributes = '';
-		}
+		/*}
 		else
 		{
-			$ol_attributes = ' style="margin: 0;"';
-		}
+			//$ol_attributes = ' style="margin: 0;"';
+		}*/
 
 		if ( $this->line_numbers_start != 1 )
 		{
@@ -2181,7 +2366,7 @@ class GeSHi
 		$replacements[] = $this->language;
 
 		$keywords[] = '<VERSION>';
-		$replacements[] = '1.0.4';
+		$replacements[] = '1.0.6';
 
 		return str_replace($keywords, $replacements, $instr);
 	}
@@ -2249,7 +2434,7 @@ class GeSHi
 		// <pre> or <div> 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, {$selector}ol, {$selector}ol li {margin: 0;}\n";
 			$stylesheet .= "$selector.de1, $selector.de2 {{$this->code_style}}\n";
 		}
 
@@ -2416,3 +2601,4 @@ if ( !function_exists('geshi_highlight') )
 	}
 }
 
+?>
diff --git a/inc/geshi/actionscript.php b/inc/geshi/actionscript.php
index 26b299f94..f04e2a1a6 100644
--- a/inc/geshi/actionscript.php
+++ b/inc/geshi/actionscript.php
@@ -4,10 +4,10 @@
  * ----------------
  * Author: Steffen Krause (Steffen.krause@muse.de)
  * Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.1
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/06/20
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * Actionscript language file for GeSHi.
  *
diff --git a/inc/geshi/ada.php b/inc/geshi/ada.php
index 23ba14704..7ce4f52ee 100644
--- a/inc/geshi/ada.php
+++ b/inc/geshi/ada.php
@@ -4,10 +4,10 @@
  * -------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.2
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/07/29
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * Ada language file for GeSHi.
  * Words are from SciTe configuration file
diff --git a/inc/geshi/apache.php b/inc/geshi/apache.php
index d7447a1ac..78e5f76ce 100644
--- a/inc/geshi/apache.php
+++ b/inc/geshi/apache.php
@@ -4,10 +4,10 @@
  * ----------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.2
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/29/07
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * Apache language file for GeSHi.
  * Words are from SciTe configuration file
diff --git a/inc/geshi/asm.php b/inc/geshi/asm.php
index ea8d2c1d2..d2836c18e 100644
--- a/inc/geshi/asm.php
+++ b/inc/geshi/asm.php
@@ -4,10 +4,10 @@
  * -------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.2
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/07/27
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * x86 Assembler language file for GeSHi.
  * Words are from SciTe configuration file (based on NASM syntax)
diff --git a/inc/geshi/asp.php b/inc/geshi/asp.php
index 5728a1bbd..e4d3884e1 100644
--- a/inc/geshi/asp.php
+++ b/inc/geshi/asp.php
@@ -4,10 +4,10 @@
  * --------

  * Author: Amit Gupta (http://blog.igeek.info/)

  * Copyright: (c) 2004 Amit Gupta (http://blog.igeek.info/), Nigel McNie (http://qbnz.com/highlighter)

- * Release Version: 1.0.2

+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $

  * Date Started: 2004/08/13

- * Last Modified: $Date: 2004/11/29 08:46:24 $

+ * Last Modified: $Date: 2005/01/29 01:48:39 $

  *

  * ASP language file for GeSHi.

  *

diff --git a/inc/geshi/bash.php b/inc/geshi/bash.php
index 976ecd676..65631998a 100644
--- a/inc/geshi/bash.php
+++ b/inc/geshi/bash.php
@@ -4,10 +4,10 @@
  * --------
  * Author: Andreas Gohr (andi@splitbrain.org)
  * Copyright: (c) 2004 Andreas Gohr, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.2
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/08/20
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * BASH language file for GeSHi.
  *
diff --git a/inc/geshi/c.php b/inc/geshi/c.php
index 79a3295e1..896a588c2 100644
--- a/inc/geshi/c.php
+++ b/inc/geshi/c.php
@@ -6,10 +6,10 @@
  * Contributors:
  *  - Jack Lloyd (lloyd@randombit.net)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.4
- * CVS Revision Version: $Revision: 1.2 $
+ * Release Version: 1.0.6
+ * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/06/04
- * Last Modified: $Date: 2004/12/01 08:44:47 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * C language file for GeSHi.
  *
diff --git a/inc/geshi/c_mac.php b/inc/geshi/c_mac.php
index 94a8fd25a..2527cbf8e 100644
--- a/inc/geshi/c_mac.php
+++ b/inc/geshi/c_mac.php
@@ -4,10 +4,10 @@
  * ---------
  * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
  * Copyright: (c) 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.0
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/06/04
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * C for Macs language file for GeSHi.
  *
diff --git a/inc/geshi/caddcl.php b/inc/geshi/caddcl.php
index 04c3c117f..84deade8b 100644
--- a/inc/geshi/caddcl.php
+++ b/inc/geshi/caddcl.php
@@ -4,10 +4,10 @@
  * ----------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.1
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * CAD DCL (Dialog Control Language) file for GeSHi.
  *
diff --git a/inc/geshi/cadlisp.php b/inc/geshi/cadlisp.php
index 23991d576..dfeb57db3 100644
--- a/inc/geshi/cadlisp.php
+++ b/inc/geshi/cadlisp.php
@@ -4,10 +4,10 @@
  * -----------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/blog)
- * Release Version: 1.0.1
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * AutoCAD/IntelliCAD Lisp language file for GeSHi.
  *
diff --git a/inc/geshi/cpp.php b/inc/geshi/cpp.php
index b7cd988c1..fd8a3d6ca 100644
--- a/inc/geshi/cpp.php
+++ b/inc/geshi/cpp.php
@@ -7,10 +7,10 @@
  *  - M. Uli Kusterer (witness.of.teachtext@gmx.net)

  *  - Jack Lloyd (lloyd@randombit.net)

  * Copyright: (c) 2004 Dennis Bayer, Nigel McNie (http://qbnz.com/highlighter)

- * Release Version: 1.0.2

- * CVS Revision Version: $Revision: 1.2 $

+ * Release Version: 1.0.6
+ * CVS Revision Version: $Revision: 1.1 $

  * Date Started: 2004/09/27

- * Last Modified: $Date: 2004/12/01 08:44:47 $

+ * Last Modified: $Date: 2005/01/29 01:48:39 $

  *

  * C++ language file for GeSHi.

  *

diff --git a/inc/geshi/csharp.php b/inc/geshi/csharp.php
index d602d53fc..efb4e6a74 100644
--- a/inc/geshi/csharp.php
+++ b/inc/geshi/csharp.php
@@ -4,10 +4,10 @@
  * ----------

  * Author: Alan Juden (alan@judenware.org)

  * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)

- * Release Version: 1.0.0

+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $

  * Date Started: 2004/06/04

- * Last Modified: $Date: 2004/11/29 08:46:24 $

+ * Last Modified: $Date: 2005/01/29 01:48:39 $

  *

  * C# language file for GeSHi.

  *

diff --git a/inc/geshi/css-gen.cfg b/inc/geshi/css-gen.cfg
deleted file mode 100644
index e69de29bb..000000000
--- a/inc/geshi/css-gen.cfg
+++ /dev/null
diff --git a/inc/geshi/css.php b/inc/geshi/css.php
index b82aa555a..cea30cdd2 100644
--- a/inc/geshi/css.php
+++ b/inc/geshi/css.php
@@ -4,10 +4,10 @@
  * -------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.3
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/06/18
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * CSS language file for GeSHi.
  *
diff --git a/inc/geshi/delphi.php b/inc/geshi/delphi.php
index b27ec698d..89a6385cf 100644
--- a/inc/geshi/delphi.php
+++ b/inc/geshi/delphi.php
@@ -4,10 +4,10 @@
  * ----------

  * Author: Járja Norbert (jnorbi@vipmail.hu)

  * Copyright: (c) 2004 Járja Norbert, Nigel McNie (http://qbnz.com/highlighter)

- * Release Version: 1.0.1

+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $

  * Date Started: 2004/07/26

- * Last Modified: $Date: 2004/11/29 08:46:24 $

+ * Last Modified: $Date: 2005/01/29 01:48:39 $

  *

  * Delphi (Object Pascal) language file for GeSHi.

  *

diff --git a/inc/geshi/html4strict.php b/inc/geshi/html4strict.php
index 22c0c33eb..7e9bf1416 100644
--- a/inc/geshi/html4strict.php
+++ b/inc/geshi/html4strict.php
@@ -4,10 +4,10 @@
  * ---------------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.3
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/07/10
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * HTML 4.01 strict language file for GeSHi.
  *
diff --git a/inc/geshi/java.php b/inc/geshi/java.php
index 3033b3738..045f14afd 100644
--- a/inc/geshi/java.php
+++ b/inc/geshi/java.php
@@ -4,10 +4,10 @@
  * --------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.3
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/07/10
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * Java language file for GeSHi.
  *
diff --git a/inc/geshi/javascript.php b/inc/geshi/javascript.php
index 95f41ee05..8744229b1 100644
--- a/inc/geshi/javascript.php
+++ b/inc/geshi/javascript.php
@@ -4,10 +4,10 @@
  * --------------

  * Author: Ben Keen (ben.keen@gmail.com)

  * Copyright: (c) 2004 Ben Keen (ben.keen@gmail.com), Nigel McNie (http://qbnz.com/highlighter)

- * Release Version: 1.0.1

+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $

  * Date Started: 2004/06/20

- * Last Modified: $Date: 2004/11/29 08:46:24 $

+ * Last Modified: $Date: 2005/01/29 01:48:39 $

  *

  * JavaScript language file for GeSHi.

  *

diff --git a/inc/geshi/lisp.php b/inc/geshi/lisp.php
index 38ce47274..66b65ae3d 100644
--- a/inc/geshi/lisp.php
+++ b/inc/geshi/lisp.php
@@ -4,10 +4,10 @@
  * --------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter
- * Release Version: 1.0.1
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * Generic Lisp language file for GeSHi.
  *
diff --git a/inc/geshi/lua.php b/inc/geshi/lua.php
index 939fa1644..57e61aba7 100644
--- a/inc/geshi/lua.php
+++ b/inc/geshi/lua.php
@@ -4,10 +4,10 @@
  * -------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/blog)
- * Release Version: 1.0.1
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/07/10
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * LUA language file for GeSHi.
  *
diff --git a/inc/geshi/mpasm.php b/inc/geshi/mpasm.php
new file mode 100644
index 000000000..26732d9ae
--- /dev/null
+++ b/inc/geshi/mpasm.php
@@ -0,0 +1,160 @@
+<?php
+/*************************************************************************************
+ * mpasm.php
+ * ---------
+ * Author: Bakalex (bakalex@gmail.com)
+ * Copyright: (c) 2004 Bakalex, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.6
+ * CVS Revision Version: $Revision: 1.1 $
+ * Date Started: 2004/12/6
+ * Last Modified: $Date: 2005/01/29 02:12:58 $
+ *
+ * Microchip Assembler language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/01/29 (1.0.0)
+ *  - First Release
+ *
+ * TODO (updated 2005/12/6)
+ * -------------------------
+ *
+ * For the moment, i've only added PIC16C6X registers. We need more (PIC16F/C7x/8x,
+ * PIC10, PIC18 and dsPIC registers).
+ * Must take a look to dsPIC instructions.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+	'LANG_NAME' => 'Microchip Assembler',
+	'COMMENT_SINGLE' => array(1 => ';'),
+	'COMMENT_MULTI' => array(),
+	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+	'QUOTEMARKS' => array("'", '"'),
+	'ESCAPE_CHAR' => '',
+	'KEYWORDS' => array(
+		/*Directive Language*/
+		4 => array(
+			'CONSTANT', '#DEFINE', 'END', 'EQU', 'ERROR', 'ERROR-LEVEL', '#INCLUDE', 'LIST',
+			'MESSG', 'NOLIST', 'ORG', 'PAGE', 'PROCESSOR', 'RADIX', 'SET', 'SPACE', 'SUBTITLE',
+			'TITLE', '#UNDEFINE', 'VARIABLE', 'ELSE', 'ENDIF', 'ENDW', 'IF', 'IFDEF', 'IFNDEF',
+			'WHILE', '__BADRAM', 'CBLOCK', '__CONFIG', 'DA', 'DATA', 'DB', 'DE', 'DT', 'DW',
+			'ENDC', 'FILL', '__IDLOCS', '__MAXRAM', 'RES', 'ENDM', 'EXITM', 'EXPAND', 'LOCAL',
+			'MACRO', 'NOEXPAND', 'BANKISEL', 'BANKSEL', 'CODE', 'EXTERN', 'GLOBAL', 'IDATA',
+			'PAGESEL', 'UDATA', 'UDATA_ACS', 'UDATA_OVR', 'UDATA_SHR'
+		  ),
+		/* 12&14-bit Specific Instruction Set*/
+		1 => array(
+			'andlw', 'call', 'clrwdt', 'goto', 'iorlw', 'movlw', 'option', 'retlw', 'sleep',
+			'tris', 'xorlw', 'addwf', 'andwf', 'clrf', 'clrw', 'comf', 'decf', 'decfsz', 'incf',
+			'incfsz', 'iorwf', 'movf', 'movwf', 'nop', 'rlf', 'rrf', 'subwf', 'swapf', 'xorwf',
+			'bcf', 'bsf', 'btfsc', 'btfss',
+			'addlw', 'iorlw', 'retfie', 'return', 'sublw', 'xorlw', 'addcf', 'adddcf', 'b', 'bc', 'bdc',
+			'bnc', 'bndc', 'bnz', 'bz', 'clrc', 'clrdc', 'clrz', 'lcall', 'lgoto', 'movfw',
+			'negf', 'setc', 'setdc', 'setz', 'skpc', 'skpdc', 'skpnc', 'skpndc', 'skpnz', 'skpz',
+			'subcf', 'subdcf', 'tstf'
+		    ),
+		/* 16-bit Specific Instructiob Set */
+		2 => array (
+			'movfp', 'movlb', 'movlp', 'movpf', 'movwf', 'tablrd', 'tablwt', 'tlrd', 'tlwt',
+			'addwfc', 'daw', 'mullw', 'negw', 'rlcf', 'rlncf', 'rrcf', 'rrncf', 'setf', 'subwfb',
+			'btg', 'cpfseq', 'cpfsgt', 'cpfslt', 'dcfsnz', 'infsnz', 'tstfsz', 'lfsr', 'bnn',
+			'bnov', 'bra', 'pop', 'push', 'rcall', 'reset'
+		    ),
+		/* Registers */
+		3 => array(
+			'INDF', 'TMR0', 'PCL', 'STATUS', 'FSR', 'PORTA', 'PORTB', 'PORTC', 'PORTD', 'PORTE',
+			'PCLATH', 'INTCON', 'PIR1', 'PIR2', 'TMR1L', 'TMR1H', 'T1CON', 'TMR2', 'T2CON', 'TMR2L',
+			'TMR2H', 'TMR0H', 'TMR0L', 'SSPBUF', 'SSPCON', 'CCPR1L', 'CCPR1H', 'CCP1CON', 'RCSTA',
+			'TXREG', 'RCREG', 'CCPR2L', 'CCPR2H', 'CCP2CON', 'OPTION', 'TRISA', 'TRISB', 'TRISC',
+			'TRISD', 'TRISE', 'PIE2', 'PIE1', 'PR2', 'SSPADD', 'SSPSTAT', 'TXSTA', 'SPBRG'
+		    ),
+		/*Operands*/
+		5 => array(
+			 'high','low'
+			)
+		),
+	'SYMBOLS' => array(
+		'[', ']', '(', ')'
+		),
+	'CASE_SENSITIVE' => array(
+		GESHI_COMMENTS => true,
+		1 => false,
+		2 => false,
+		3 => false,
+		4 => false,
+		5 => false
+		),
+	'STYLES' => array(
+		'KEYWORDS' => array(
+			1 => 'color: #00007f;',
+			2 => 'color: #0000ff;',
+			3 => 'color: #007f00;',
+			4 => 'color: #46aa03; font-weight:bold;',
+			5 => 'color: #7f0000;',
+			6 => 'color: #7f0000;'
+			),
+		'COMMENTS' => array(
+			1 => 'color: #adadad; font-style: italic;',
+			),
+		'ESCAPE_CHAR' => array(
+			0 => 'color: #000099; font-weight: bold;'
+			),
+		'BRACKETS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'STRINGS' => array(
+			0 => 'color: #7f007f;'
+			),
+		'NUMBERS' => array(
+			0 => 'color: #ff0000;'
+			),
+		'METHODS' => array(
+			),
+		'SYMBOLS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'REGEXPS' => array(
+			0 => 'color: #ff0000;',
+			1 => 'color: #ff0000;'
+			),
+		'SCRIPT' => array(
+			)
+		),
+	'URLS' => array(
+		1 => '',
+		2 => ''
+		),
+	'OOLANG' => false,
+	'OBJECT_SPLITTERS' => array(
+		),
+	'REGEXPS' => array(
+		0 => '[0-9a-fA-F][0-9a-fA-F]*[hH]',
+		1 => '[01][01]*[bB]'
+		),
+	'STRICT_MODE_APPLIES' => GESHI_NEVER,
+	'SCRIPT_DELIMITERS' => array(
+		),
+	'HIGHLIGHT_STRICT_BLOCK' => array(
+		)
+);
+
+?>
diff --git a/inc/geshi/nsis.php b/inc/geshi/nsis.php
index 1d249c524..9e35dd1d7 100644
--- a/inc/geshi/nsis.php
+++ b/inc/geshi/nsis.php
@@ -4,10 +4,10 @@
  * --------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.2
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/29/07
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * NullSoft Installer System language file for GeSHi.
  * Words are from SciTe configuration file
diff --git a/inc/geshi/objc.php b/inc/geshi/objc.php
index d9fc56adf..c39683968 100644
--- a/inc/geshi/objc.php
+++ b/inc/geshi/objc.php
@@ -4,10 +4,10 @@
  * --------
  * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
  * Copyright: (c) 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.0
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/06/04
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * Objective C language file for GeSHi.
  *
diff --git a/inc/geshi/oobas.php b/inc/geshi/oobas.php
index f771d1239..4652197ed 100644
--- a/inc/geshi/oobas.php
+++ b/inc/geshi/oobas.php
@@ -4,10 +4,10 @@
  * ---------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.1
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * OpenOffice.org Basic language file for GeSHi.
  *
diff --git a/inc/geshi/oracle8.php b/inc/geshi/oracle8.php
new file mode 100644
index 000000000..f3c8c9c8a
--- /dev/null
+++ b/inc/geshi/oracle8.php
@@ -0,0 +1,489 @@
+<?php
+/*************************************************************************************
+ * oracle8.php
+ * -----------
+ * Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.6
+ * CVS Revision Version: $Revision: 1.2 $
+ * Date Started: 2004/06/04
+ * Last Modified: $Date: 2005/01/29 02:06:01 $
+ *
+ * Oracle 8 language file for GeSHi
+ *
+ * CHANGES
+ * -------
+ * 2005/01/29 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+	'LANG_NAME' => 'Oracle 8',
+	'COMMENT_SINGLE' => array(1 => '--'),
+	'COMMENT_MULTI' => array('/*' => '*/'),
+	'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+	'QUOTEMARKS' => array("'", '"', '`'),
+	'ESCAPE_CHAR' => '\\',
+	'KEYWORDS' => array(
+//Put your package names here - e.g. select distinct ''''|| lower(name) || ''',' from user_source;
+		6 => array(
+			),
+
+//Put your table names here - e.g. select distinct ''''|| lower(table_name) || ''',' from user_tables;
+		5 => array(
+			),
+
+//Put your view names here - e.g. select distinct ''''|| lower(view_name) || ''',' from user_views;
+		4 => array(
+			),
+
+//Put your table field names here - e.g. select distinct ''''|| lower(column_name) || ''',' from user_tab_columns;
+		3 => array(
+			),
+//Put ORACLE reserved keywords here (8.1.7).  I like mine uppercase.
+		1 => array(
+			'ABS',
+			'ACCESS',
+			'ACOS',
+			'ADD',
+			'ADD_MONTHS',
+			'ALL',
+			'ALTER',
+			'ANALYZE',
+			'AND',
+			'ANY',
+			'ARRAY',
+			'AS',
+			'ASC',
+			'ASCII',
+			'ASIN',
+			'ASSOCIATE',
+			'AT',
+			'ATAN',
+			'ATAN2',
+			'AUDIT',
+			'AUTHID',
+			'AVG',
+			'BEGIN',
+			'BETWEEN',
+			'BFILENAME',
+			'BINARY_INTEGER',
+			'BITAND',
+			'BODY',
+			'BOOLEAN',
+			'BULK',
+			'BY',
+			'CALL',
+			'CASCADE',
+			'CASE',
+			'CEIL',
+			'CHAR',
+			'CHAR_BASE',
+			'CHARTOROWID',
+			'CHECK',
+			'CHR',
+			'CLOSE',
+			'CLUSTER',
+			'COALESCE',
+			'COLLECT',
+			'COLUMN',
+			'COMMENT',
+			'COMMIT',
+			'COMPRESS',
+			'CONCAT',
+			'CONNECT',
+			'CONSTANT',
+			'CONSTRAINT',
+			'CONSTRAINTS',
+			'CONTEXT',
+			'CONTROLFILE',
+			'CONVERT',
+			'CORR',
+			'COS',
+			'COSH',
+			'COST',
+			'COUNT',
+			'COVAR_POP',
+			'COVAR_SAMP',
+			'CREATE',
+			'CUME_DIST',
+			'CURRENT',
+			'CURRVAL',
+			'CURSOR',
+			'DATABASE',
+			'DATE',
+			'DAY',
+			'DECIMAL',
+			'DECLARE',
+			'DECODE',
+			'DEFAULT',
+			'DELETE',
+			'DENSE_RANK',
+			'DEREF',
+			'DESC',
+			'DIMENSION',
+			'DIRECTORY',
+			'DISASSOCIATE',
+			'DISTINCT',
+			'DO',
+			'DROP',
+			'DUMP',
+			'ELSE',
+			'ELSIF',
+			'EMPTY_BLOB',
+			'EMPTY_CLOB',
+			'END',
+			'EXCEPTION',
+			'EXCLUSIVE',
+			'EXEC',
+			'EXECUTE',
+			'EXISTS',
+			'EXIT',
+			'EXP',
+			'EXPLAIN',
+			'EXTENDS',
+			'EXTRACT',
+			'FALSE',
+			'FETCH',
+			'FILE',
+			'FIRST_VALUE',
+			'FLOAT',
+			'FLOOR',
+			'FOR',
+			'FORALL',
+			'FROM',
+			'FUNCTION',
+			'GOTO',
+			'GRANT',
+			'GREATEST',
+			'GROUP',
+			'GROUPING',
+			'HAVING',
+			'HEAP',
+			'HEXTORAW',
+			'HOUR',
+			'IDENTIFIED',
+			'IF',
+			'IMMEDIATE',
+			'IN',
+			'INCREMENT',
+			'INDEX',
+			'INDEXTYPE',
+			'INDICATOR',
+			'INITCAP',
+			'INITIAL',
+			'INSERT',
+			'INSTR',
+			'INSTRB',
+			'INTEGER',
+			'INTERFACE',
+			'INTERSECT',
+			'INTERVAL',
+			'INTO',
+			'IS',
+			'ISOLATION',
+			'JAVA',
+			'KEY',
+			'LAG',
+			'LAST_DAY',
+			'LAST_VALUE',
+			'LEAD',
+			'LEAST',
+			'LENGTH',
+			'LENGTHB',
+			'LEVEL',
+			'LIBRARY',
+			'LIKE',
+			'LIMITED',
+			'LINK',
+			'LN',
+			'LOCK',
+			'LOG',
+			'LONG',
+			'LOOP',
+			'LOWER',
+			'LPAD',
+			'LTRIM',
+			'MAKE_REF',
+			'MATERIALIZED',
+			'MAX',
+			'MAXEXTENTS',
+			'MIN',
+			'MINUS',
+			'MINUTE',
+			'MLSLABEL',
+			'MOD',
+			'MODE',
+			'MODIFY',
+			'MONTH',
+			'MONTHS_BETWEEN',
+			'NATURAL',
+			'NATURALN',
+			'NEW',
+			'NEW_TIME',
+			'NEXT_DAY',
+			'NEXTVAL',
+			'NLS_CHARSET_DECL_LEN',
+			'NLS_CHARSET_ID',
+			'NLS_CHARSET_NAME',
+			'NLS_INITCAP',
+			'NLS_LOWER',
+			'NLS_UPPER',
+			'NLSSORT',
+			'NOAUDIT',
+			'NOCOMPRESS',
+			'NOCOPY',
+			'NOT',
+			'NOWAIT',
+			'NTILE',
+			'NULL',
+			'NULLIF',
+			'NUMBER',
+			'NUMBER_BASE',
+			'NUMTODSINTERVAL',
+			'NUMTOYMINTERVAL',
+			'NVL',
+			'NVL2',
+			'OCIROWID',
+			'OF',
+			'OFFLINE',
+			'ON',
+			'ONLINE',
+			'OPAQUE',
+			'OPEN',
+			'OPERATOR',
+			'OPTION',
+			'OR',
+			'ORDER',
+			'ORGANIZATION',
+			'OTHERS',
+			'OUT',
+			'OUTLINE',
+			'PACKAGE',
+			'PARTITION',
+			'PCTFREE',
+			'PERCENT_RANK',
+			'PLAN',
+			'PLS_INTEGER',
+			'POSITIVE',
+			'POSITIVEN',
+			'POWER',
+			'PRAGMA',
+			'PRIMARY',
+			'PRIOR',
+			'PRIVATE',
+			'PRIVILEGES',
+			'PROCEDURE',
+			'PROFILE',
+			'PUBLIC',
+			'RAISE',
+			'RANGE',
+			'RANK',
+			'RATIO_TO_REPORT',
+			'RAW',
+			'RAWTOHEX',
+			'REAL',
+			'RECORD',
+			'REF',
+			'REFTOHEX',
+			'REGR_AVGX',
+			'REGR_AVGY',
+			'REGR_COUNT',
+			'REGR_INTERCEPT',
+			'REGR_R2',
+			'REGR_SLOPE',
+			'REGR_SXX',
+			'REGR_SXY',
+			'REGR_SYY',
+			'RELEASE',
+			'RENAME',
+			'REPLACE',
+			'RESOURCE',
+			'RETURN',
+			'RETURNING',
+			'REVERSE',
+			'REVOKE',
+			'ROLE',
+			'ROLLBACK',
+			'ROUND',
+			'ROW',
+			'ROW_NUMBER',
+			'ROWID',
+			'ROWIDTOCHAR',
+			'ROWNUM',
+			'ROWS',
+			'ROWTYPE',
+			'RPAD',
+			'RTRIM',
+			'SAVEPOINT',
+			'SCHEMA',
+			'SECOND',
+			'SEGMENT',
+			'SELECT',
+			'SEPERATE',
+			'SEQUENCE',
+			'SESSION',
+			'SET',
+			'SHARE',
+			'SIGN',
+			'SIN',
+			'SINH',
+			'SIZE',
+			'SMALLINT',
+			'SOUNDEX',
+			'SPACE',
+			'SQL',
+			'SQLCODE',
+			'SQLERRM',
+			'SQRT',
+			'START',
+			'STATISTICS',
+			'STDDEV',
+			'STDDEV_POP',
+			'STDDEV_SAMP',
+			'STOP',
+			'SUBSTR',
+			'SUBSTRB',
+			'SUBTYPE',
+			'SUCCESSFUL',
+			'SUM',
+			'SYNONYM',
+			'SYS_CONTEXT',
+			'SYS_GUID',
+			'SYSDATE',
+			'SYSTEM',
+			'TABLE',
+			'TABLESPACE',
+			'TAN',
+			'TANH',
+			'TEMPORARY',
+			'THEN',
+			'TIME',
+			'TIMESTAMP',
+			'TIMEZONE_ABBR',
+			'TIMEZONE_HOUR',
+			'TIMEZONE_MINUTE',
+			'TIMEZONE_REGION',
+			'TIMING',
+			'TO',
+			'TO_CHAR',
+			'TO_DATE',
+			'TO_LOB',
+			'TO_MULTI_BYTE',
+			'TO_NUMBER',
+			'TO_SINGLE_BYTE',
+			'TRANSACTION',
+			'TRANSLATE',
+			'TRIGGER',
+			'TRIM',
+			'TRUE',
+			'TRUNC',
+			'TRUNCATE',
+			'TYPE',
+			'UI',
+			'UID',
+			'UNION',
+			'UNIQUE',
+			'UPDATE',
+			'UPPER',
+			'USE',
+			'USER',
+			'USERENV',
+			'USING',
+			'VALIDATE',
+			'VALUE',
+			'VALUES',
+			'VAR_POP',
+			'VAR_SAMP',
+			'VARCHAR',
+			'VARCHAR2',
+			'VARIANCE',
+			'VIEW',
+			'VSIZE',
+			'WHEN',
+			'WHENEVER',
+			'WHERE',
+			'WHILE',
+			'WITH',
+			'WORK',
+			'WRITE',
+			'YEAR',
+			'ZONE'
+			)
+		),
+	'SYMBOLS' => array(
+		'(', ')', '=', '<', '>', '|'
+		),
+	'CASE_SENSITIVE' => array(
+		GESHI_COMMENTS => false,
+		1 => false
+		),
+	'STYLES' => array(
+		'KEYWORDS' => array(
+			1 => 'color: #993333; font-weight: bold; text-transform: uppercase;'
+			),
+		'COMMENTS' => array(
+			1 => 'color: #808080; font-style: italic;',
+			2 => '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: #ff0000;'
+			),
+		'SYMBOLS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'SCRIPT' => array(
+			),
+		'REGEXPS' => array(
+			)
+		),
+	'URLS' => array(
+		),
+
+	'OOLANG' => false,
+	'OBJECT_SPLITTERS' => array(
+		),
+	'REGEXPS' => array(
+		),
+	'STRICT_MODE_APPLIES' => GESHI_NEVER,
+	'SCRIPT_DELIMITERS' => array(
+		),
+	'HIGHLIGHT_STRICT_BLOCK' => array(
+		)
+);
+
+?>
diff --git a/inc/geshi/pascal.php b/inc/geshi/pascal.php
index ac44eebd5..b36cad7f1 100644
--- a/inc/geshi/pascal.php
+++ b/inc/geshi/pascal.php
@@ -4,10 +4,10 @@
  * ----------
  * Author: Tux (tux@inamil.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.2
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/07/26
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * Pascal language file for GeSHi.
  *
diff --git a/inc/geshi/perl.php b/inc/geshi/perl.php
index 196dd8689..cfc0fee53 100644
--- a/inc/geshi/perl.php
+++ b/inc/geshi/perl.php
@@ -4,10 +4,10 @@
  * --------
  * Author: Andreas Gohr (andi@splitbrain.org), Ben Keen (ben.keen@gmail.com)
  * Copyright: (c) 2004 Andreas Gohr, Ben Keen (http://www.benjaminkeen.org/), Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.1
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/08/20
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * Perl language file for GeSHi.
  *
diff --git a/inc/geshi/php-brief.php b/inc/geshi/php-brief.php
index 54729318e..f1d6bddfb 100644
--- a/inc/geshi/php-brief.php
+++ b/inc/geshi/php-brief.php
@@ -4,10 +4,10 @@
  * -------------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.3
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/06/02
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * PHP language file for GeSHi (brief version).
  *
diff --git a/inc/geshi/php.php b/inc/geshi/php.php
index 447e85fb2..734e770a7 100644
--- a/inc/geshi/php.php
+++ b/inc/geshi/php.php
@@ -4,10 +4,10 @@
  * --------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.3
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/06/20
- * Last Modified: $Date: 2004/11/29 08:46:24 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * PHP language file for GeSHi.
  *
diff --git a/inc/geshi/python.php b/inc/geshi/python.php
index 86a8f22f1..ca1b231eb 100644
--- a/inc/geshi/python.php
+++ b/inc/geshi/python.php
@@ -4,10 +4,10 @@
  * ----------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.1
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2004/11/29 08:46:25 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * Python language file for GeSHi.
  *
diff --git a/inc/geshi/qbasic.php b/inc/geshi/qbasic.php
index c1aa44abd..3eafea681 100644
--- a/inc/geshi/qbasic.php
+++ b/inc/geshi/qbasic.php
@@ -4,10 +4,10 @@
  * ----------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.3
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/06/20
- * Last Modified: $Date: 2004/11/29 08:46:25 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * QBasic/QuickBASIC language file for GeSHi.
  *
diff --git a/inc/geshi/smarty.php b/inc/geshi/smarty.php
index 7a6b4e5f5..6dae5f4d9 100644
--- a/inc/geshi/smarty.php
+++ b/inc/geshi/smarty.php
@@ -4,10 +4,10 @@
  * ----------

  * Author: Alan Juden (alan@judenware.org)

  * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)

- * Release Version: 1.0.0

+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $

  * Date Started: 2004/07/10

- * Last Modified: $Date: 2004/11/29 08:46:25 $

+ * Last Modified: $Date: 2005/01/29 01:48:39 $

  *

  * Smarty template language file for GeSHi.

  *

diff --git a/inc/geshi/sql.php b/inc/geshi/sql.php
index e0bac2671..9537df2c1 100644
--- a/inc/geshi/sql.php
+++ b/inc/geshi/sql.php
@@ -4,10 +4,10 @@
  * -------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.3
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/06/04
- * Last Modified: $Date: 2004/11/29 08:46:25 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * SQL language file for GeSHi.
  *
diff --git a/inc/geshi/vb.php b/inc/geshi/vb.php
index c46883bdf..da2a90eb0 100644
--- a/inc/geshi/vb.php
+++ b/inc/geshi/vb.php
@@ -4,10 +4,10 @@
  * ------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.1
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2004/11/29 08:46:25 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * Visual Basic language file for GeSHi.
  *
diff --git a/inc/geshi/vbnet.php b/inc/geshi/vbnet.php
index 37f11133e..bc9a9f8bc 100644
--- a/inc/geshi/vbnet.php
+++ b/inc/geshi/vbnet.php
@@ -4,10 +4,10 @@
  * ---------

  * Author: Alan Juden (alan@judenware.org)

  * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter)

- * Release Version: 1.0.0

+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $

  * Date Started: 2004/06/04

- * Last Modified: $Date: 2004/11/29 08:46:25 $

+ * Last Modified: $Date: 2005/01/29 01:48:39 $

  *

  * VB.NET language file for GeSHi.

  *

diff --git a/inc/geshi/visualfoxpro.php b/inc/geshi/visualfoxpro.php
index 0203d116e..f3cb29059 100644
--- a/inc/geshi/visualfoxpro.php
+++ b/inc/geshi/visualfoxpro.php
@@ -4,7 +4,7 @@
  * ----------------

  * Author: Roberto Armellin (r.armellin@tin.it)

  * Copyright: (c) 2004 Roberto Armellin, Nigel McNie (http://qbnz.com/highlighter/)

- * Release Version: 1.0.1

+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $

  * Date Started: 2004/09/17

  * Last Modified: 2004/09/18

diff --git a/inc/geshi/xml.php b/inc/geshi/xml.php
index b6c116c76..9eb775b7e 100644
--- a/inc/geshi/xml.php
+++ b/inc/geshi/xml.php
@@ -4,10 +4,10 @@
  * -------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.1
+ * Release Version: 1.0.6
  * CVS Revision Version: $Revision: 1.1 $
  * Date Started: 2004/09/01
- * Last Modified: $Date: 2004/11/29 08:46:25 $
+ * Last Modified: $Date: 2005/01/29 01:48:39 $
  *
  * XML language file for GeSHi. Based on the idea/file by Christian Weiske
  *