GeShi update to 1.0.7.8

darcs-hash:20060327133738-7ad00-d9b2615cc73c0924c25ef6039449ff66ef88aae1.gz

62 files changed, 188 insertions, 137 deletions

diff --git a/inc/geshi.php b/inc/geshi.php
index ef12b10c6..11e347105 100644
--- a/inc/geshi.php
+++ b/inc/geshi.php
@@ -28,7 +28,7 @@
  * @author    Nigel McNie <nigel@geshi.org>
  * @copyright Copyright &copy; 2004, 2005, Nigel McNie
  * @license   http://gnu.org/copyleft/gpl.html GNU GPL
- * @version   $Id: geshi.php,v 1.30 2006/02/25 00:46:33 oracleshinoda Exp $
+ * @version   $Id: geshi.php,v 1.32 2006/03/23 07:24:17 oracleshinoda Exp $
  *
  */
 
@@ -40,7 +40,7 @@
 //
 
 /** The version of this GeSHi file */
-define('GESHI_VERSION', '1.0.7.7');
+define('GESHI_VERSION', '1.0.7.8');
 
 /** Set the correct directory separator */
 define('GESHI_DIR_SEPARATOR', ('WIN' != substr(PHP_OS, 0, 3)) ? '/' : '\\');
@@ -1985,7 +1985,8 @@ class GeSHi
 	 */
 	function parse_non_string_part (&$stuff_to_parse)
 	{
-		$stuff_to_parse = ' ' . quotemeta(@htmlspecialchars($stuff_to_parse, ENT_COMPAT, $this->encoding));
+		$stuff_to_parse = ' ' . @htmlspecialchars($stuff_to_parse, ENT_COMPAT, $this->encoding);
+        $stuff_to_parse_pregquote = preg_quote($stuff_to_parse, '/');
 		// These vars will disappear in the future
 		$func = '$this->change_case';
 		$func2 = '$this->add_url_to_keyword';
@@ -1997,14 +1998,14 @@ class GeSHi
 			if ($this->lexic_permissions['REGEXPS'][$key]) {
 				if (is_array($regexp)) {
 					$stuff_to_parse = preg_replace(
-                        "#" .
-                        $regexp[GESHI_SEARCH] .
-                        "#{$regexp[GESHI_MODIFIERS]}",
+                        "/" .
+                        str_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);
+					$stuff_to_parse = preg_replace( "/(" . str_replace('/', '\/', $regexp) . ")/", "<|!REG3XP$key!>\\1|>", $stuff_to_parse);
 				}
 			}
 		}
@@ -2032,30 +2033,31 @@ class GeSHi
 			foreach ($this->language_data['KEYWORDS'] as $k => $keywordset) {
 				if ($this->lexic_permissions['KEYWORDS'][$k]) {
 					foreach ($keywordset as $keyword) {
-						$keyword = quotemeta($keyword);
+						$keyword = preg_quote($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 )) {
+						if (false !== stristr($stuff_to_parse_pregquote, $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",
+                                    "/([^a-zA-Z0-9\$_\|\#;>|^])($keyword)(?=[^a-zA-Z0-9_<\|%\-&])/e",
                                     "'\\1' . $func2('\\2', '$k', 'BEGIN') . '<|$styles>' . $func('\\2') . '|>' . $func2('\\2', '$k', 'END')",
                                     $stuff_to_parse
                                 );
 							} else {
 								// Change the case of the word.
+                                // hackage again... must... release... 1.2...
+                                if ('smarty' == $this->language) { $hackage = '\/'; } else { $hackage = ''; }
 								$stuff_to_parse = preg_replace(
-                                    "#([^a-zA-Z0-9\$_\|\#;>])($keyword)(?=[^a-zA-Z0-9_<\|%\-&])#ie",
+                                    "/([^a-zA-Z0-9\$_\|\#;>$hackage|^])($keyword)(?=[^a-zA-Z0-9_<\|%\-&])/ie",
                                     "'\\1' . $func2('\\2', '$k', 'BEGIN') . '<|$styles>' . $func('\\2') . '|>' . $func2('\\2', '$k', 'END')",
                                     $stuff_to_parse
                                 );
@@ -2098,7 +2100,7 @@ class GeSHi
 					} 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);
+					$stuff_to_parse = preg_replace("/(" . preg_quote($this->language_data['OBJECT_SPLITTERS'][$key], 1) . "[\s]*)([a-zA-Z\*\(][a-zA-Z0-9_\*]*)/", "\\1<|$attributes>\\2|>", $stuff_to_parse);
 				}
 			}
 		}
diff --git a/inc/geshi/actionscript-french.php b/inc/geshi/actionscript-french.php
index 23de81f64..4bbc7a38e 100644
--- a/inc/geshi/actionscript-french.php
+++ b/inc/geshi/actionscript-french.php
@@ -4,7 +4,7 @@
  * ----------------
  * Author: Steffen Krause (Steffen.krause@muse.de)
  * Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.7 $
  * Date Started: 2004/06/20
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/actionscript.php b/inc/geshi/actionscript.php
index 7eb235cd2..876edc1c3 100644
--- a/inc/geshi/actionscript.php
+++ b/inc/geshi/actionscript.php
@@ -4,7 +4,7 @@
  * ----------------
  * Author: Steffen Krause (Steffen.krause@muse.de)
  * Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/06/20
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/ada.php b/inc/geshi/ada.php
index 7665d2b5e..d01e01d87 100644
--- a/inc/geshi/ada.php
+++ b/inc/geshi/ada.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2004/07/29
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/apache.php b/inc/geshi/apache.php
index 88c76f47d..07d01f9b5 100644
--- a/inc/geshi/apache.php
+++ b/inc/geshi/apache.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2004/29/07
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/applescript.php b/inc/geshi/applescript.php
index eb1e55f67..2e53893d6 100644
--- a/inc/geshi/applescript.php
+++ b/inc/geshi/applescript.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Stephan Klimek (http://www.initware.org)
  * Copyright: Stephan Klimek (http://www.initware.org)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.7 $
  * Date Started: 2005/07/20
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/asm.php b/inc/geshi/asm.php
index fb7abe694..6868749fa 100644
--- a/inc/geshi/asm.php
+++ b/inc/geshi/asm.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/07/27
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/asp.php b/inc/geshi/asp.php
index 77fdcf505..6adab9259 100644
--- a/inc/geshi/asp.php
+++ b/inc/geshi/asp.php
@@ -4,7 +4,7 @@
  * --------

  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.9 $

  * Date Started: 2004/08/13

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/autoit.php b/inc/geshi/autoit.php
index b811b7251..521f7fd48 100644
--- a/inc/geshi/autoit.php
+++ b/inc/geshi/autoit.php
@@ -4,7 +4,7 @@
  * --------
  * Author: mastrboy
  * Copyright: (c) 2006 and to GESHi ;)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * Date Started: 26.01.2006
  *
  * Current bugs & todo:
diff --git a/inc/geshi/bash.php b/inc/geshi/bash.php
index 489bd4273..01069b0b8 100644
--- a/inc/geshi/bash.php
+++ b/inc/geshi/bash.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Andreas Gohr (andi@splitbrain.org)
  * Copyright: (c) 2004 Andreas Gohr, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/08/20
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/blitzbasic.php b/inc/geshi/blitzbasic.php
index 5acdae74a..1fafc75aa 100644
--- a/inc/geshi/blitzbasic.php
+++ b/inc/geshi/blitzbasic.php
@@ -4,7 +4,7 @@
  * --------------

  * Author: Pàdraig O`Connel (info@moonsword.info)

  * Copyright: (c) 2005 Pàdraig O`Connel (http://moonsword.info)

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.6 $

  * Date Started: 16.10.2005

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/c.php b/inc/geshi/c.php
index b8fd2287f..42dd01a7b 100644
--- a/inc/geshi/c.php
+++ b/inc/geshi/c.php
@@ -6,7 +6,7 @@
  * Contributors:
  *  - Jack Lloyd (lloyd@randombit.net)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/06/04
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/c_mac.php b/inc/geshi/c_mac.php
index d05ce0b37..6d1fdd84f 100644
--- a/inc/geshi/c_mac.php
+++ b/inc/geshi/c_mac.php
@@ -4,7 +4,7 @@
  * ---------
  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/06/04
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/caddcl.php b/inc/geshi/caddcl.php
index ad084803f..ac358c4d6 100644
--- a/inc/geshi/caddcl.php
+++ b/inc/geshi/caddcl.php
@@ -4,7 +4,7 @@
  * ----------
  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/08/30
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/cadlisp.php b/inc/geshi/cadlisp.php
index 340dc8e5e..6c4e35277 100644
--- a/inc/geshi/cadlisp.php
+++ b/inc/geshi/cadlisp.php
@@ -4,7 +4,7 @@
  * -----------
  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/08/30
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/cfm.php b/inc/geshi/cfm.php
index 4858c31ea..2f2ba259a 100644
--- a/inc/geshi/cfm.php
+++ b/inc/geshi/cfm.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Diego ()
  * Copyright: (c) 2006 Diego
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.2 $
  * Date Started: 2006/02/25
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/cpp.php b/inc/geshi/cpp.php
index b4c939a2b..357eb41fa 100644
--- a/inc/geshi/cpp.php
+++ b/inc/geshi/cpp.php
@@ -7,7 +7,7 @@
  *  - 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.10 $

  * Date Started: 2004/09/27

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/csharp.php b/inc/geshi/csharp.php
index 077c540e7..3d1a7ed39 100644
--- a/inc/geshi/csharp.php
+++ b/inc/geshi/csharp.php
@@ -4,7 +4,7 @@
  * ----------

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

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

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.9 $

  * Date Started: 2004/06/04

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/css.php b/inc/geshi/css.php
index 3abfeb953..73e7281ae 100644
--- a/inc/geshi/css.php
+++ b/inc/geshi/css.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/06/18
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/d.php b/inc/geshi/d.php
index 6da17a5b5..e23cb6467 100644
--- a/inc/geshi/d.php
+++ b/inc/geshi/d.php
@@ -4,7 +4,7 @@
  * -----
  * Author: Thomas Kuehne (thomas@kuehne.cn)
  * Copyright: (c) 2005 Thomas Kuehne (http://thomas.kuehne.cn/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2005/04/22
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/delphi.php b/inc/geshi/delphi.php
index 2ecb21d93..5fedb7d0b 100644
--- a/inc/geshi/delphi.php
+++ b/inc/geshi/delphi.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Járja Norbert (jnorbi@vipmail.hu)
  * Copyright: (c) 2004 Járja Norbert, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.12 $
  * Date Started: 2004/07/26
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/diff.php b/inc/geshi/diff.php
index 732411b30..926aeff89 100644
--- a/inc/geshi/diff.php
+++ b/inc/geshi/diff.php
@@ -2,25 +2,26 @@
 /*************************************************************************************
  * diff.php
  * --------
- * Author: Conny Brunnkvist (conny@fuchsia.se)
+ * Author: Conny Brunnkvist (conny@fuchsia.se), W. Tasin (tasin@fhm.edu)
  * Copyright: (c) 2004 Fuchsia Open Source Solutions (http://www.fuchsia.se/)
- * Release Version: 1.0.7.7
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2004/12/29
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/03/23 07:28:46 $
  *
  * Diff-output language file for GeSHi.
  *
  * CHANGES
  * -------
+ * 2006/02/27
+ *  -  changing language file to use matching of start (^) and end ($) (wt)
+ * 
  * 2004/12/29 (1.0.0)
  *  -  First Release
  *
- * TODO (updated 2004/12/29)
+ * TODO (updated 2006/02/27)
  * -------------------------
- * * Find out why GeSHi doesn't seem to allow matching of start (^) and end ($) 
- * * So that we can stop pretending that we are dealing with single-line comments
- * * Should be able to cover all sorts of diff-output
+ *    
  *
  *************************************************************************************
  *
@@ -45,72 +46,64 @@
 
 $language_data = array (
 	'LANG_NAME' => 'Diff',
-	'COMMENT_SINGLE' => array(
-				0 => '--- ',
-				1 => '+++ ',
-				2 => '<',
-				3 => '>',
-				4 => '-',
-				5 => '+',
-				6 => '!',
-				7 => '@@',
-				8 => '*** ',
-				/*9 => '***************',*/
-				/*10 => ' ', // All other rows starts with a space (bug?) */
-			),
+	'COMMENT_SINGLE' => array(),
 	'COMMENT_MULTI' => array(),
 	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
 	'QUOTEMARKS' => array(),
 	'ESCAPE_CHAR' => ' ',
 	'KEYWORDS' => array(
-			0 => array(
-				'\ No newline at end of file',
-			),
 			1 => array(
+				'\ No newline at end of file'
+			),
+			2 => array(
 				'***************' /* This only seems to works in some cases? */
 			),
 		),
 	'SYMBOLS' => array(
 		),
 	'CASE_SENSITIVE' => array(
-		GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
 		),
 	'STYLES' => array(
 		'KEYWORDS' => array(
-			0 => 'color: #aaaaaa; font-style: italic;',
-			1 => 'color: #dd6611;',
+			1 => 'color: #aaaaaa; font-style: italic;',
+			2 => 'color: #dd6611;',
 			),
 		'COMMENTS' => array(
-			0 => 'color: #228822;',
-			1 => 'color: #228822;',
-                        2 => 'color: #991111;', 
-                        3 => 'color: #00aaee;', 
-                        4 => 'color: #991111;', 
-                        5 => 'color: #00b000;', 
-                        /*6 => 'color: #dd6611;', */
-                        6 => 'color: #0011dd;', 
-			7 => 'color: #aaaa88;',
-			8 => 'color: #228822;',
-			/*9 => 'color: #aaaa88;',*/
-			/*10 => 'color: #000000;',*/
-			),
+            ),
 		'ESCAPE_CHAR' => array(
+            0 => ''
 			),
 		'BRACKETS' => array(
+            0 => ''
 			),
 		'STRINGS' => array(
+            0 => ''
 			),
 		'NUMBERS' => array(
+            0 => ''
 			),
 		'METHODS' => array(
+            0 => ''
 			),
 		'SYMBOLS' => array(
+            0 => ''
 			),
 		'SCRIPT' => array(
+            0 => ''
 			),
-                'REGEXPS' => array(
-			0 => 'color: #aaaaaa;',
-			/*1 => 'color: #000000;',*/
+        'REGEXPS' => array(
+			0 => 'color: #440088;',
+			1 => 'color: #991111;',
+			2 => 'color: #00b000;',
+            3 => 'color: #888822;', 
+            4 => 'color: #888822;', 
+            5 => 'color: #0011dd;', 
+            6 => 'color: #440088;', 
+			7 => 'color: #991111;',
+            8 => 'color: #00b000;', 
+			9 => 'color: #888822;',
                         ),
 		),
 	'URLS' => array(
@@ -119,14 +112,70 @@ $language_data = array (
 	'OBJECT_SPLITTER' => '',
 	'REGEXPS' => array(
 			0 => "[0-9,]+[acd][0-9,]+",
-			/*1 => array( // Match all other lines - again this also doesn't work.
-				GESHI_SEARCH => '(\ )(.+)',
-				GESHI_REPLACE => '\\2\\3',
-				GESHI_MODIFIERS => '',
-				GESHI_BEFORE => '\\1',
-				GESHI_AFTER => ''
-			),*/
-		),
+			1 => array(
+			GESHI_SEARCH => '^\\&lt;.*$',
+			GESHI_REPLACE => '\\0',
+			GESHI_MODIFIERS => 'm',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+			2 => array(
+			GESHI_SEARCH => '^\\&gt;.*$',
+			GESHI_REPLACE => '\\0',
+			GESHI_MODIFIERS => 'm',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+			3 => array(
+			GESHI_SEARCH => '^[\\-]{3}\\s.*$',
+			GESHI_REPLACE => '\\0',
+			GESHI_MODIFIERS => 'm',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+			4 => array(
+			GESHI_SEARCH => '^(\\+){3}\\s.*$',
+			GESHI_REPLACE => '\\0',
+			GESHI_MODIFIERS => 'm',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+			5 => array(
+			GESHI_SEARCH => '^\\!.*$',
+			GESHI_REPLACE => '\\0',
+			GESHI_MODIFIERS => 'm',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+			6 => array(
+			GESHI_SEARCH => '^[\\@]{2}.*$',
+			GESHI_REPLACE => '\\0',
+			GESHI_MODIFIERS => 'm',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+			7 => array(
+			GESHI_SEARCH => '^\\-.*$',
+			GESHI_REPLACE => '\\0',
+			GESHI_MODIFIERS => 'm',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+			8 => array(
+			GESHI_SEARCH => '^\\+.*$',
+			GESHI_REPLACE => '\\0',
+			GESHI_MODIFIERS => 'm',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+			9 => array(
+			GESHI_SEARCH => '^(\\*){3}\\s.*$',
+			GESHI_REPLACE => '\\0',
+			GESHI_MODIFIERS => 'm',
+			GESHI_BEFORE => '',
+			GESHI_AFTER => ''
+			),
+	),
 	'STRICT_MODE_APPLIES' => GESHI_NEVER,
 	'SCRIPT_DELIMITERS' => array(
 		),
diff --git a/inc/geshi/div.php b/inc/geshi/div.php
index 5252feb90..b4bc08576 100644
--- a/inc/geshi/div.php
+++ b/inc/geshi/div.php
@@ -4,7 +4,7 @@
  * ---------------------------------

  * Author: Gabriel Lorenzo (ermakina@gmail.com)

  * Copyright: (c) 2005 Gabriel Lorenzo (http://ermakina.gazpachito.net)

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $

  * Date Started: 2005/06/19

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/dos.php b/inc/geshi/dos.php
index ee31c3f7f..28189f246 100644
--- a/inc/geshi/dos.php
+++ b/inc/geshi/dos.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Alessandro Staltari (staltari@geocities.com)
  * Copyright: (c) 2005 Alessandro Staltari (http://www.geocities.com/SiliconValley/Vista/8155/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2005/07/05
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/eiffel.php b/inc/geshi/eiffel.php
index d9b190985..c93677034 100644
--- a/inc/geshi/eiffel.php
+++ b/inc/geshi/eiffel.php
@@ -4,7 +4,7 @@
  * ----------

  * Author: Zoran Simic (zsimic@axarosenberg.com)

  * Copyright: (c) 2005 Zoran Simic

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $

  * Date Started: 2005/06/30

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/freebasic.php b/inc/geshi/freebasic.php
index f0f6069f6..2d671c925 100644
--- a/inc/geshi/freebasic.php
+++ b/inc/geshi/freebasic.php
@@ -4,7 +4,7 @@
  * -------------
  * Author: Roberto Rossi 
  * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * Date Started: 2005/08/19
  *
  * FreeBasic (http://www.freebasic.net/) language file for GeSHi.
diff --git a/inc/geshi/gml.php b/inc/geshi/gml.php
index 3ffd229d1..2e149f836 100644
--- a/inc/geshi/gml.php
+++ b/inc/geshi/gml.php
@@ -4,10 +4,10 @@
  * --------

  * Author: José Jorge Enríquez (jenriquez@users.sourceforge.net)

  * Copyright: (c) 2005 José Jorge Enríquez Rodríguez (http://www.zonamakers.com)

- * Release Version: 1.0.7.7
- * CVS Revision Version: $Revision: 1.9 $

+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 1.10 $

  * Date Started: 2005/06/21

- * Last Modified: $Date: 2006/02/25 00:46:33 $

+ * Last Modified: $Date: 2006/03/23 07:30:24 $

  *

  * GML language file for GeSHi.

  *

@@ -471,8 +471,7 @@ $language_data = array (
 			0 => 'color: #cc66cc;'

 			),

 		'METHODS' => array(

-			1 => 'color: #202020;',

-			2 => 'color: #202020;'

+			1 => 'color: #202020;'

 			),

 		'SYMBOLS' => array(

 			0 => 'color: #66cc66; font-weight: bold;'

diff --git a/inc/geshi/html4strict.php b/inc/geshi/html4strict.php
index dd27f25e0..f3e886a09 100644
--- a/inc/geshi/html4strict.php
+++ b/inc/geshi/html4strict.php
@@ -4,7 +4,7 @@
  * ---------------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/07/10
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/ini.php b/inc/geshi/ini.php
index 8a647329e..9130aaf62 100644
--- a/inc/geshi/ini.php
+++ b/inc/geshi/ini.php
@@ -4,7 +4,7 @@
  * --------

  * Author: deguix (cevo_deguix@yahoo.com.br)

  * Copyright: (c) 2005 deguix

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.9 $

  * Date Started: 2005/03/27

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/inno.php b/inc/geshi/inno.php
index bad7f0fa6..297f7d228 100644
--- a/inc/geshi/inno.php
+++ b/inc/geshi/inno.php
@@ -4,7 +4,7 @@
  * ----------

  * Author: Thomas Klingler (hotline@theratech.de) based on delphi.php from Járja Norbert (jnorbi@vipmail.hu)

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

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.7 $

  * Date Started: 2005/07/29

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/java.php b/inc/geshi/java.php
index b0d133b3b..91aa1add5 100644
--- a/inc/geshi/java.php
+++ b/inc/geshi/java.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.14 $
  * Date Started: 2004/07/10
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/java5.php b/inc/geshi/java5.php
index 2b541f6ee..f99b6e729 100644
--- a/inc/geshi/java5.php
+++ b/inc/geshi/java5.php
@@ -4,7 +4,7 @@
  * --------

  * Author: Nigel McNie (oracle.shinoda@gmail.com)

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

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.2 $

  * Date Started: 2004/07/10

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/javascript.php b/inc/geshi/javascript.php
index 419e3ee40..81b7e7640 100644
--- a/inc/geshi/javascript.php
+++ b/inc/geshi/javascript.php
@@ -4,7 +4,7 @@
  * --------------

  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $

  * Date Started: 2004/06/20

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/lisp.php b/inc/geshi/lisp.php
index 63fd85e4b..a20ce0627 100644
--- a/inc/geshi/lisp.php
+++ b/inc/geshi/lisp.php
@@ -4,7 +4,7 @@
  * --------
  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2004/08/30
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/lua.php b/inc/geshi/lua.php
index 09a61495b..e4585a530 100644
--- a/inc/geshi/lua.php
+++ b/inc/geshi/lua.php
@@ -4,7 +4,7 @@
  * -------

  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.10 $

  * Date Started: 2004/07/10

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/matlab.php b/inc/geshi/matlab.php
index fef97f4b5..48d7866ea 100644
--- a/inc/geshi/matlab.php
+++ b/inc/geshi/matlab.php
@@ -4,7 +4,7 @@
  * -----------

  * Author: Florian Knorn (floz@gmx.de)

  * Copyright: (c) 2004 Florian Knorn (http://www.florian-knorn.com)

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $

  * Date Started: 2005/02/09

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/mpasm.php b/inc/geshi/mpasm.php
index 59a470a4c..bfde9214c 100644
--- a/inc/geshi/mpasm.php
+++ b/inc/geshi/mpasm.php
@@ -4,7 +4,7 @@
  * ---------
  * Author: Bakalex (bakalex@gmail.com)
  * Copyright: (c) 2004 Bakalex, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/12/6
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/mysql.php b/inc/geshi/mysql.php
index 63094a158..d1584c86f 100644
--- a/inc/geshi/mysql.php
+++ b/inc/geshi/mysql.php
@@ -1,13 +1,13 @@
- <?php 
+<?php 
  /************************************************************************************* 
  * mysql.php 
  * --------- 
  * Author: Carl Fürstenberg (azatoth@gmail.com) 
  * Copyright: (c) 2005 Carl Fürstenberg, Nigel McNie (http://qbnz.com/highlighter) 
- * Release Version: 1.0.7.7
- * CVS Revision Version: $Revision: 1.5 $ 
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 1.6 $ 
  * Date Started: 2004/06/04 
- * Last Modified: $Date: 2006/02/25 00:46:33 $ 
+ * Last Modified: $Date: 2006/03/11 21:44:08 $ 
  * 
  * MySQL language file for GeSHi. 
  * 
diff --git a/inc/geshi/nsis.php b/inc/geshi/nsis.php
index 0d15683c7..d414d5707 100644
--- a/inc/geshi/nsis.php
+++ b/inc/geshi/nsis.php
@@ -4,7 +4,7 @@
  * --------

  * Author: deguix (cevo_deguix@yahoo.com.br), Tux (http://tux.a4.cz/)

  * Copyright: (c) 2005 deguix, 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.10 $

  * Date Started: 2005/12/03

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/objc.php b/inc/geshi/objc.php
index f5ff1c2c9..c508575bd 100644
--- a/inc/geshi/objc.php
+++ b/inc/geshi/objc.php
@@ -4,7 +4,7 @@
  * --------
  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/06/04
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/ocaml-brief.php b/inc/geshi/ocaml-brief.php
index 5c8feb77d..fdf1255cc 100644
--- a/inc/geshi/ocaml-brief.php
+++ b/inc/geshi/ocaml-brief.php
@@ -4,7 +4,7 @@
  * ----------

  * Author: Flaie (fireflaie@gmail.com)

  * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.6 $

  * Date Started: 2005/08/27

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/ocaml.php b/inc/geshi/ocaml.php
index 9d28624c1..5d5664927 100644
--- a/inc/geshi/ocaml.php
+++ b/inc/geshi/ocaml.php
@@ -4,7 +4,7 @@
  * ----------

  * Author: Flaie (fireflaie@gmail.com)

  * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.6 $

  * Date Started: 2005/08/27

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/oobas.php b/inc/geshi/oobas.php
index 425d8c748..bcd942661 100644
--- a/inc/geshi/oobas.php
+++ b/inc/geshi/oobas.php
@@ -4,7 +4,7 @@
  * ---------
  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/08/30
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/oracle8.php b/inc/geshi/oracle8.php
index bb88f222c..57b0c0b6d 100644
--- a/inc/geshi/oracle8.php
+++ b/inc/geshi/oracle8.php
@@ -4,7 +4,7 @@
  * -----------
  * Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/06/04
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/pascal.php b/inc/geshi/pascal.php
index 69feccf6a..2250dd92a 100644
--- a/inc/geshi/pascal.php
+++ b/inc/geshi/pascal.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Tux (tux@inamil.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/07/26
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/perl.php b/inc/geshi/perl.php
index 489b010fb..2d48e8aa4 100644
--- a/inc/geshi/perl.php
+++ b/inc/geshi/perl.php
@@ -4,7 +4,7 @@
  * --------
  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2004/08/20
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/php-brief.php b/inc/geshi/php-brief.php
index 8ae5c0bc1..6fb380d0d 100644
--- a/inc/geshi/php-brief.php
+++ b/inc/geshi/php-brief.php
@@ -4,7 +4,7 @@
  * -------------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/06/02
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/php.php b/inc/geshi/php.php
index f6a11eedd..046a4f462 100644
--- a/inc/geshi/php.php
+++ b/inc/geshi/php.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2004/06/20
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/python.php b/inc/geshi/python.php
index ecd4faa56..578042c81 100644
--- a/inc/geshi/python.php
+++ b/inc/geshi/python.php
@@ -4,7 +4,7 @@
  * ----------
  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2004/08/30
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/qbasic.php b/inc/geshi/qbasic.php
index bfcfb1aec..e5f6c874a 100644
--- a/inc/geshi/qbasic.php
+++ b/inc/geshi/qbasic.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2004/06/20
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/robots.php b/inc/geshi/robots.php
index bdcbfd6f4..84c5b8768 100644
--- a/inc/geshi/robots.php
+++ b/inc/geshi/robots.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Christian Lescuyer (cl@goelette.net)
  * Copyright: (c) 2006 Christian Lescuyer http://xtian.goelette.info
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.2 $
  * Date Started: 2006/02/17
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/ruby.php b/inc/geshi/ruby.php
index e535348ee..29b428e48 100644
--- a/inc/geshi/ruby.php
+++ b/inc/geshi/ruby.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Amit Gupta (http://blog.igeek.info/)
  * Copyright: (c) 2005 Amit Gupta (http://blog.igeek.info/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2005/09/05
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/scheme.php b/inc/geshi/scheme.php
index c02b6c44a..f0c86533d 100644
--- a/inc/geshi/scheme.php
+++ b/inc/geshi/scheme.php
@@ -4,7 +4,7 @@
  * ----------

  * Author: Jon Raphaelson (jonraphaelson@gmail.com)

  * Copyright: (c) 2005 Jon Raphaelson, Nigel McNie (http://qbnz.com/highlighter)

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.6 $

  * Date Started: 2004/08/30

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/sdlbasic.php b/inc/geshi/sdlbasic.php
index 6e8c832e0..de408a12a 100644
--- a/inc/geshi/sdlbasic.php
+++ b/inc/geshi/sdlbasic.php
@@ -4,7 +4,7 @@
  * ------------
  * Author: Roberto Rossi 
  * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.7 $
  * Date Started: 2005/08/19
  * Date Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/smarty.php b/inc/geshi/smarty.php
index db27c993a..c877a9998 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.7.7
- * CVS Revision Version: $Revision: 1.9 $

+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 1.10 $

  * Date Started: 2004/07/10

- * Last Modified: $Date: 2006/02/25 00:46:33 $

+ * Last Modified: $Date: 2006/03/11 21:44:08 $

  *

  * Smarty template language file for GeSHi.

  *

@@ -134,6 +134,7 @@ $language_data = array (
 			0 => 'color: #D36900;'

 			),

 		'SCRIPT' => array(

+            0 => ''

 			),

 		'REGEXPS' => array(

 			)

diff --git a/inc/geshi/sql.php b/inc/geshi/sql.php
index ebf3f4783..fbd0e38dc 100644
--- a/inc/geshi/sql.php
+++ b/inc/geshi/sql.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Nigel McNie (oracle.shinoda@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/06/04
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/tsql.php b/inc/geshi/tsql.php
index 7eadd34ab..9ed689a6f 100644
--- a/inc/geshi/tsql.php
+++ b/inc/geshi/tsql.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Duncan Lock (dunc@dflock.co.uk)
  * Copyright: (c) 2006 Duncan Lock (http://dflock.co.uk/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.2 $
  * Date Started: 2005/11/22
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/vb.php b/inc/geshi/vb.php
index 4a793de67..c5cb570df 100644
--- a/inc/geshi/vb.php
+++ b/inc/geshi/vb.php
@@ -4,7 +4,7 @@
  * ------
  * 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2004/08/30
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/vbnet.php b/inc/geshi/vbnet.php
index e36fc9fd1..918b20e81 100644
--- a/inc/geshi/vbnet.php
+++ b/inc/geshi/vbnet.php
@@ -4,7 +4,7 @@
  * ---------

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

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

- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.10 $

  * Date Started: 2004/06/04

  * Last Modified: $Date: 2006/02/25 00:46:33 $

diff --git a/inc/geshi/vhdl.php b/inc/geshi/vhdl.php
index 40e79de38..725968e34 100644
--- a/inc/geshi/vhdl.php
+++ b/inc/geshi/vhdl.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Alexander 'E-Razor' Krause (admin@erazor-zone.de)
  * Copyright: (c) 2005 Alexander Krause
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2005/06/15
  * Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/visualfoxpro.php b/inc/geshi/visualfoxpro.php
index 00f2e0abf..632e7811d 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.7.7
+ * Release Version: 1.0.7.8
  * CVS Revision Version: $Revision: 1.8 $

  * Date Started: 2004/09/17

  * Last Modified: 2004/09/18

diff --git a/inc/geshi/xml.php b/inc/geshi/xml.php
index 67739381a..b0ab247f9 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.7.7
- * CVS Revision Version: $Revision: 1.12 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 1.13 $
  * Date Started: 2004/09/01
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/03/23 07:31:32 $
  *
  * XML language file for GeSHi. Based on the idea/file by Christian Weiske
  *
@@ -107,14 +107,14 @@ $language_data = array (
 			GESHI_AFTER => '\\4'
 			),
 		1 => array(
-			GESHI_SEARCH => '(&lt;/?[a-z0-9_]*(&gt;)?)',
+			GESHI_SEARCH => '(&lt;[/?|(\?xml)]?[a-z0-9_]*(\??&gt;)?)',
 			GESHI_REPLACE => '\\1',
 			GESHI_MODIFIERS => 'i',
 			GESHI_BEFORE => '',
 			GESHI_AFTER => ''
 			),
 		2 => array(
-			GESHI_SEARCH => '((/)?&gt;)',
+			GESHI_SEARCH => '(([/|\?])?&gt;)',
 			GESHI_REPLACE => '\\1',
 			GESHI_MODIFIERS => 'i',
 			GESHI_BEFORE => '',