diff --git a/inc/geshi.php b/inc/geshi.php
index 11e347105dbf3145037874ac2a5739d6c7306950..be62bee4076386279f08c630d51067f5f9ada4ca 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.32 2006/03/23 07:24:17 oracleshinoda Exp $
+ * @version   $Id: geshi.php,v 1.36 2006/04/23 00:15:26 oracleshinoda Exp $
  *
  */
 
@@ -40,7 +40,7 @@
 //
 
 /** The version of this GeSHi file */
-define('GESHI_VERSION', '1.0.7.8');
+define('GESHI_VERSION', '1.0.7.9');
 
 /** Set the correct directory separator */
 define('GESHI_DIR_SEPARATOR', ('WIN' != substr(PHP_OS, 0, 3)) ? '/' : '\\');
@@ -527,6 +527,10 @@ class GeSHi
             return;
         }
 		$this->header_type = $type;
+        // Set a default overall style if the header is a <div>
+        if (GESHI_HEADER_DIV == $type && !$this->overall_style) {
+            $this->overall_style = 'font-family: monospace;';
+        }
 	}
 
 	/**
@@ -1079,6 +1083,7 @@ class GeSHi
 				'c_mac' => array('c'),
 				'caddcl' => array(),
 				'cadlisp' => array(),
+                'cdfg' => array('cdfg'),
 				'cpp' => array('cpp'),
 				'csharp' => array(),
 				'css' => array('css'),
@@ -1098,6 +1103,7 @@ class GeSHi
 				'php' => array('php', 'php5', 'phtml', 'phps'),
 				'python' => array('py'),
 				'qbasic' => array('bi'),
+                'sas' => array('sas'),
 				'smarty' => array(),
 				'vb' => array('bas'),
 				'vbnet' => array(),
@@ -1551,7 +1557,7 @@ class GeSHi
                             // A match of a string delimiter
 							if (($this->lexic_permissions['ESCAPE_CHAR'] && $ESCAPE_CHAR_OPEN) ||
                                 ($this->lexic_permissions['STRINGS'] && !$ESCAPE_CHAR_OPEN)) {
-								$char .= '</span>';
+								$char = htmlspecialchars($char, ENT_COMPAT, $this->encoding) . '</span>';
 							}
 						    $escape_me = false;
     						if ($HARDQUOTE_OPEN)
@@ -1584,7 +1590,7 @@ class GeSHi
 							} else {
 								$attributes = ' class="st0"';
 							}
-							$char = "<span$attributes>" . $char;
+							$char = "<span$attributes>" . htmlspecialchars($char, ENT_COMPAT, $this->encoding);
 
 							$result .= $this->parse_non_string_part( $stuff_to_parse );
 							$stuff_to_parse = '';
@@ -1828,14 +1834,13 @@ class GeSHi
                     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);
@@ -1854,13 +1859,10 @@ class GeSHi
                             $IN_TAG = true;
                             $result_line .= '<';
                             ++$pos;
-                        } elseif (!$IN_TAG && '&' == $char) {
-                            //echo "matched &amp; in line... ";
-                            $substr = substr($line, $i + 3, 4);
+                        } elseif (!$IN_TAG && '&' == $char) {                            $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 .= '&';
@@ -1873,7 +1875,6 @@ class GeSHi
                             //  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--;
@@ -1882,7 +1883,6 @@ class GeSHi
 
                             if (false === strpos($line, "\t", $i + 1)) {
                                 //$lines[$key] = $result_line;
-                                //echo 'got here';
                                 $result_line .= substr($line, $i + 1);
                                 break;
                             }
@@ -1987,7 +1987,6 @@ class GeSHi
 	{
 		$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';
 
@@ -2169,7 +2168,7 @@ class GeSHi
 		$stuff_to_parse = str_replace('<|', '<span', $stuff_to_parse);
 		$stuff_to_parse = str_replace ( '|>', '</span>', $stuff_to_parse );
 
-		return substr(stripslashes($stuff_to_parse), 1);
+		return substr($stuff_to_parse, 1);
 	}
 
 	/**
@@ -2266,6 +2265,8 @@ class GeSHi
             // Set vars to defaults for following loop
             $parsed_code = '';
             $i = 0;
+            $attrs = array();
+                        
             // Foreach line...
             foreach ($code as $line) {
                 $line = ( $line ) ? $line : '&nbsp;';
@@ -2274,10 +2275,12 @@ class GeSHi
                     $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
             		// Set the attributes to style the line
                     if ($this->use_classes) {
-            			$attr = ' class="li2"';
+            			//$attr = ' class="li2"';
+                        $attrs['class'][] = 'li2';
             			$def_attr = ' class="de2"';
                     } else {
-            			$attr = ' style="' . $this->line_style2 . '"';
+            			//$attr = ' style="' . $this->line_style2 . '"';
+                        $attrs['style'][] = $this->line_style2;
             			// This style "covers up" the special styles set for special lines
             			// so that styles applied to special lines don't apply to the actual
             			// code on that line
@@ -2288,10 +2291,12 @@ class GeSHi
             		$end = '</div>';
             	} else {
             		if ($this->use_classes) {
-                        $attr = ' class="li1"';
+                        //$attr = ' class="li1"';
+                        $attrs['class'][] = 'li1';
             			$def_attr = ' class="de1"';
             		} else {
-                        $attr = ' style="' . $this->line_style1 . '"';
+                        //$attr = ' style="' . $this->line_style1 . '"';
+                        $attrs['style'][] = $this->line_style1;
             			$def_attr = ' style="' . $this->code_style . '"';
             		}
             		$start = "<div$def_attr>";
@@ -2301,17 +2306,25 @@ class GeSHi
             	++$i;
             	// Are we supposed to use ids? If so, add them
             	if ($this->add_ids) {
-            		$attr .= " id=\"{$this->overall_id}-{$i}\"";
+            		//$attr .= " id=\"{$this->overall_id}-{$i}\"";
+                    $attrs['id'][] = "$this->overall_id-$i";
             	}
             	if ($this->use_classes && in_array($i, $this->highlight_extra_lines)) {
-            		$attr .= " class=\"ln-xtra\"";
+            		//$attr .= " class=\"ln-xtra\"";
+                    $attrs['class'][] = 'ln-xtra';
             	}
             	if (!$this->use_classes && in_array($i, $this->highlight_extra_lines)) {
-            		$attr .= " style=\"{$this->highlight_extra_lines_style}\"";
+            		//$attr .= " style=\"{$this->highlight_extra_lines_style}\"";
+                    $attrs['style'][] = $this->highlight_extra_lines_style;
             	}
 
             	// Add in the line surrounded by appropriate list HTML
-            	$parsed_code .= "<li$attr>$start$line$end</li>$ls";
+                $attr_string = ' ';
+                foreach ($attrs as $key => $attr) {
+                    $attr_string .= $key . '="' . implode(' ', $attr) . '"';
+                }
+            	$parsed_code .= "<li$attr_string>$start$line$end</li>$ls";
+                $attrs = array();
         	}
         } else {
             // No line numbers, but still need to handle highlighting lines extra.
@@ -2329,7 +2342,8 @@ class GeSHi
             		} else {
             			$parsed_code .= "<div style=\"{$this->highlight_extra_lines_style}\">";
             		}
-            		$parsed_code .= $line . "</div>\n";
+                    // Remove \n because it stuffs up <pre> header
+            		$parsed_code .= $line . "</div>";
             	} else {
             		$parsed_code .= $line . "\n";
             	}
diff --git a/inc/geshi/actionscript-french.php b/inc/geshi/actionscript-french.php
index 4bbc7a38e1d456ee51d4c535a0878c84e1034564..e816050980298a1b6910f7fd5cdb9405276f88cd 100644
--- a/inc/geshi/actionscript-french.php
+++ b/inc/geshi/actionscript-french.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.7.8
- * CVS Revision Version: $Revision: 1.7 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2004/06/20
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Actionscript language file for GeSHi.
  *
diff --git a/inc/geshi/actionscript.php b/inc/geshi/actionscript.php
index 876edc1c3759f20d750b7aa0722d9d6d46b87e7f..5b02f8bdf9429efb7974fb350c26d823078c492e 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.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/06/20
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * Actionscript language file for GeSHi.
  *
diff --git a/inc/geshi/ada.php b/inc/geshi/ada.php
index d01e01d87bd2479ba24d4ef1de43eaca7c131b74..97d5f70b0307b05e8f69af0129a5b4a4537d84a1 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.7.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2004/07/29
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * Ada language file for GeSHi.
  * Words are from SciTe configuration file
diff --git a/inc/geshi/apache.php b/inc/geshi/apache.php
index 07d01f9b536fcd5764ff635a96000396a2d9b9f2..e371bb56973d909eaec3ba46fd9b1827cceb666c 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.7.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2004/29/07
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * Apache language file for GeSHi.
  * Words are from SciTe configuration file
diff --git a/inc/geshi/applescript.php b/inc/geshi/applescript.php
index 2e53893d6e25fd721b50ab0672ded36149023e68..31fd115372369b07bf851ac9e6e935ac79e99aee 100644
--- a/inc/geshi/applescript.php
+++ b/inc/geshi/applescript.php
@@ -4,10 +4,10 @@
  * --------
  * Author: Stephan Klimek (http://www.initware.org)
  * Copyright: Stephan Klimek (http://www.initware.org)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.7 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2005/07/20
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * AppleScript language file for GeSHi.
  *
diff --git a/inc/geshi/asm.php b/inc/geshi/asm.php
index 6868749fab5e78453dfe6ead646e0ea419794c29..e5d3c206dd53f81de6ab9ddb057b4ddce3cbd4cf 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.7.8
- * CVS Revision Version: $Revision: 1.10 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.12 $
  * Date Started: 2004/07/27
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * 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 6adab92599adef62e6d84dc342c71790d0843162..e8b0ae252351b8bc5d859b68c9ce706fbe8a5300 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.7.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2004/08/13
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * ASP language file for GeSHi.
  *
diff --git a/inc/geshi/autoit.php b/inc/geshi/autoit.php
index 521f7fd481e7060e9a8a9ea35860eb6925e0bd9f..5e0180de3c6850c0880871a043bef0da181d9171 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.8
+ * Release Version: 1.0.7.9
  * Date Started: 26.01.2006
  *
  * Current bugs & todo:
diff --git a/inc/geshi/bash.php b/inc/geshi/bash.php
index 01069b0b8f06fef3c8a44a8e71f62e9187b89894..95e38b92a8dc561c6e3cdec71bc17e822512778d 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.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/08/20
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * BASH language file for GeSHi.
  *
diff --git a/inc/geshi/blitzbasic.php b/inc/geshi/blitzbasic.php
index 1fafc75aa4af49519c859fa42e3e4959193a4b41..3699e5a2738235e34714ccfddc596a8431d09da1 100644
--- a/inc/geshi/blitzbasic.php
+++ b/inc/geshi/blitzbasic.php
@@ -4,10 +4,10 @@
  * --------------
  * Author: Pàdraig O`Connel (info@moonsword.info)
  * Copyright: (c) 2005 Pàdraig O`Connel (http://moonsword.info)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.6 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 16.10.2005
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * BlitzBasic language file for GeSHi.
  *
diff --git a/inc/geshi/c.php b/inc/geshi/c.php
index 42dd01a7bc8d5fa46a8f67dcda4adc780805c0fd..92cfa8b366d15ea41bc16229996fe85da987cd5c 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.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/06/04
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * C language file for GeSHi.
  *
diff --git a/inc/geshi/c_mac.php b/inc/geshi/c_mac.php
index 6d1fdd84f5f4e9040e9f4fb6b908083fbc04447c..d652bee91ab747b4a143037f2a56aeb3dc462a9e 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.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/06/04
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * C for Macs language file for GeSHi.
  *
diff --git a/inc/geshi/caddcl.php b/inc/geshi/caddcl.php
index ac358c4d6cc7c095e00dc40a72bd03ee49518026..b4553f0192c088a0f3ac2fa2388dda078fc1b562 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.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * CAD DCL (Dialog Control Language) file for GeSHi.
  *
diff --git a/inc/geshi/cadlisp.php b/inc/geshi/cadlisp.php
index 6c4e35277dcfce4dff18d4b7dd8ead162fe40e23..a4c32c62e6b73a78fa2a5eaeb71adf5905b07a59 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.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * AutoCAD/IntelliCAD Lisp language file for GeSHi.
  *
diff --git a/inc/geshi/cfdg.php b/inc/geshi/cfdg.php
new file mode 100644
index 0000000000000000000000000000000000000000..895f4a9d915de083c9be71676a26be1da77d12b7
--- /dev/null
+++ b/inc/geshi/cfdg.php
@@ -0,0 +1,128 @@
+<?php
+/*************************************************************************************
+ * cfdg.php
+ * --------
+ * Author: John Horigan <john@glyphic.com>
+ * Copyright: (c) 2006 John Horigan http://www.ozonehouse.com/john/
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.2 $
+ * Date Started: 2006/03/11
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
+ *
+ * CFDG language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006/03/11 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/03/11)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     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' => 'CFDG',
+	'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+	'COMMENT_MULTI' => array('/*' => '*/'),
+	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+	'QUOTEMARKS' => array("'", '"'),
+	'ESCAPE_CHAR' => '',
+	'KEYWORDS' => array(
+		1 => array(
+			'include', 'startshape', 'rule', 'background'
+			),
+		2 => array(
+			'SQUARE', 'CIRCLE', 'TRIANGLE',
+			),
+		3 => array(
+			'b','brightness','h','hue','sat','saturation',
+			'a','alpha','x','y','z','s','size',
+			'r','rotate','f','flip','skew','xml_set_object'
+			)
+		),
+	'SYMBOLS' => array(
+		'[', ']', '{', '}', '*', '|'
+		),
+	'CASE_SENSITIVE' => array(
+		GESHI_COMMENTS => false,
+		1 => false,
+		2 => false,
+		3 => false,
+		),
+	'STYLES' => array(
+		'KEYWORDS' => array(
+			1 => 'color: #717100;',
+			2 => 'color: #000000; font-weight: bold;',
+			3 => 'color: #006666;'
+			),
+		'COMMENTS' => array(
+			1 => 'color: #808080; font-style: italic;',
+			2 => 'color: #808080; font-style: italic;',
+			'MULTI' => 'color: #808080; font-style: italic;'
+			),
+		'ESCAPE_CHAR' => array(
+			0 => 'color: #000099; font-weight: bold;'
+			),
+		'BRACKETS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'STRINGS' => array(
+			0 => 'color: #ff0000;'
+			),
+		'NUMBERS' => array(
+			0 => 'color: #cc66cc;'
+			),
+		'METHODS' => array(
+			1 => 'color: #006600;',
+			2 => 'color: #006600;'
+			),
+		'SYMBOLS' => array(
+			0 => 'color: #66cc66;'
+			),
+		'REGEXPS' => array(
+			),
+		'SCRIPT' => array(
+			0 => '',
+			1 => '',
+			2 => '',
+			3 => ''
+			)
+		),
+	'URLS' => array(
+		1 => '',
+		2 => '',
+		3 => '',
+		4 => ''
+		),
+	'OOLANG' => false,
+	'OBJECT_SPLITTERS' => '',
+	'REGEXPS' => array(
+		),
+	'STRICT_MODE_APPLIES' => GESHI_NEVER,
+	'SCRIPT_DELIMITERS' => array(
+		),
+	'HIGHLIGHT_STRICT_BLOCK' => array(
+		)
+);
+
+?>
+
diff --git a/inc/geshi/cfm.php b/inc/geshi/cfm.php
index 2f2ba259a7f5368b155549561f5e08bac7621452..66b2de349507978c7639a932a663813b0429c764 100644
--- a/inc/geshi/cfm.php
+++ b/inc/geshi/cfm.php
@@ -4,10 +4,10 @@
  * -------
  * Author: Diego ()
  * Copyright: (c) 2006 Diego
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.2 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.4 $
  * Date Started: 2006/02/25
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * ColdFusion language file for GeSHi.
  *
diff --git a/inc/geshi/cpp.php b/inc/geshi/cpp.php
index 357eb41fa9f566fb42162bb91c2bd06bcac00935..9cba142f8e37ea59a6529cd9c962b9acbe0ec851 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.7.8
- * CVS Revision Version: $Revision: 1.10 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.12 $
  * Date Started: 2004/09/27
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * C++ language file for GeSHi.
  *
diff --git a/inc/geshi/csharp.php b/inc/geshi/csharp.php
index 3d1a7ed39c88fa57cfc91b570351a1577d8245cc..ce35ebfae88a3412ed1213c346d7bff3ec7d507a 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.7.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2004/06/04
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * C# language file for GeSHi.
  *
diff --git a/inc/geshi/css.php b/inc/geshi/css.php
index 73e7281ae5b0544a13a8fe3090ebeefc96d325f7..537e97ce6d747986a1fe6ed3c169cbd42fdf48b8 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.7.8
- * CVS Revision Version: $Revision: 1.10 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.12 $
  * Date Started: 2004/06/18
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * CSS language file for GeSHi.
  *
diff --git a/inc/geshi/d.php b/inc/geshi/d.php
index e23cb6467792fe0a3963c9d1bf8e1aa9d1df2295..c21e843700b69fa67f652ec30fd71e4378ac947f 100644
--- a/inc/geshi/d.php
+++ b/inc/geshi/d.php
@@ -4,10 +4,10 @@
  * -----
  * Author: Thomas Kuehne (thomas@kuehne.cn)
  * Copyright: (c) 2005 Thomas Kuehne (http://thomas.kuehne.cn/)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2005/04/22
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * D language file for GeSHi.
  *
diff --git a/inc/geshi/delphi.php b/inc/geshi/delphi.php
index 5fedb7d0b6729934ef1dee91e88078cff63a2d5b..d7b7e6185d393f3ec0f22853934bc4ad1824242b 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.7.8
- * CVS Revision Version: $Revision: 1.12 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.14 $
  * Date Started: 2004/07/26
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * Delphi (Object Pascal) language file for GeSHi.
  *
diff --git a/inc/geshi/diff.php b/inc/geshi/diff.php
index 926aeff892ca9ec30a8a25d3b1cdcc65a391a694..c9ca094588003d7c6e3c5dd5888417e3bacef2a2 100644
--- a/inc/geshi/diff.php
+++ b/inc/geshi/diff.php
@@ -4,10 +4,10 @@
  * --------
  * 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.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2004/12/29
- * Last Modified: $Date: 2006/03/23 07:28:46 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Diff-output language file for GeSHi.
  *
diff --git a/inc/geshi/div.php b/inc/geshi/div.php
index b4bc08576db8a45f932b4dd83ef5cea7e7590ad2..628f49e0303e59c519b3e53b02e471f3f08302ef 100644
--- a/inc/geshi/div.php
+++ b/inc/geshi/div.php
@@ -4,10 +4,10 @@
  * ---------------------------------
  * Author: Gabriel Lorenzo (ermakina@gmail.com)
  * Copyright: (c) 2005 Gabriel Lorenzo (http://ermakina.gazpachito.net)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2005/06/19
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * DIV language file for GeSHi.
  *
diff --git a/inc/geshi/dos.php b/inc/geshi/dos.php
index 28189f24624df87276f57bbff49def764382f95c..8acdad4210f99fca488ed5726cc1c358c2ff5d2b 100644
--- a/inc/geshi/dos.php
+++ b/inc/geshi/dos.php
@@ -4,10 +4,10 @@
  * -------
  * Author: Alessandro Staltari (staltari@geocities.com)
  * Copyright: (c) 2005 Alessandro Staltari (http://www.geocities.com/SiliconValley/Vista/8155/)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2005/07/05
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * DOS language file for GeSHi.
  *
diff --git a/inc/geshi/eiffel.php b/inc/geshi/eiffel.php
index c93677034ab56e28449049729898b54004676205..c2041660587116314e1430a5fb381856760b19c2 100644
--- a/inc/geshi/eiffel.php
+++ b/inc/geshi/eiffel.php
@@ -4,10 +4,10 @@
  * ----------
  * Author: Zoran Simic (zsimic@axarosenberg.com)
  * Copyright: (c) 2005 Zoran Simic
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2005/06/30
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Eiffel language file for GeSHi.
  *
diff --git a/inc/geshi/fortran.php b/inc/geshi/fortran.php
new file mode 100644
index 0000000000000000000000000000000000000000..494761905cc1c8e7d54a8603ee22f35ed43768e9
--- /dev/null
+++ b/inc/geshi/fortran.php
@@ -0,0 +1,158 @@
+<?php
+/*************************************************************************************
+ * fortran.php
+ * -----------
+ * Author: Cedric Arrabie (cedric.arrabie@univ-pau.fr)
+ * Copyright: (C) 2006 Cetric Arrabie
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.1 $
+ * Date Started: 2006/04/22
+ * Last Modified: $Date: 2006/04/21 22:24:47 $
+ * 
+ * Fortran language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006/04/20 (1.0.0)
+ *   -  First Release
+ *
+ * TODO 
+ * -------------------------
+ *  -  Get a list of inbuilt functions to add (and explore fortran more
+ *     to complete this rather bare language file)
+ *
+ *************************************************************************************
+ *
+ *     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'=>'Fortran',
+	'COMMENT_SINGLE'=> array(1 =>'!',2=>'Cf2py'),
+	'COMMENT_MULTI'=> array(),
+	'CASE_KEYWORDS'=> GESHI_CAPS_NO_CHANGE,
+	'QUOTEMARKS'=> array("'",'"'),
+	'ESCAPE_CHAR'=>'\\',
+	'KEYWORDS'=> array(
+		1 => array(
+			'allocate','block','call','case','contains','continue','cycle','deallocate',
+			'default','do','else','elseif','elsewhere','end','enddo','endif','endwhere',
+			'entry','exit','function','go','goto','if','interface','module','nullify','only', 
+			'operator','procedure','program','recursive','return','select','stop', 
+			'subroutine','then','to','where','while',
+            'access','action','advance','blank','blocksize','carriagecontrol',
+			'delim','direct','eor','err','exist','file','flen','fmt','form','formatted',
+			'iostat','name','named','nextrec','nml','number','opened','pad','position',
+			'readwrite','recl','sequential','status','unformatted','unit'
+			),
+		2 => array(
+			'.AND.','.EQ.','.EQV.','.GE.','.GT.','.LE.','.LT.','.NE.','.NEQV.','.NOT.',
+			'.OR.','.TRUE.','.FALSE.'
+			),
+		3 => array(
+			'allocatable','character','common','complex','data','dimension','double',
+			'equivalence','external','implicit','in','inout','integer','intent','intrinsic',
+			'kind','logical','namelist','none','optional','out','parameter','pointer',
+			'private','public','real','result','save','sequence','target','type','use'
+			),
+		4 => array(
+			'abs','achar','acos','adjustl','adjustr','aimag','aint','all','allocated',
+			'anint','any','asin','atan','atan2','bit_size','break','btest','carg',
+			'ceiling','char','cmplx','conjg','cos','cosh','cpu_time','count','cshift',
+			'date_and_time','dble','digits','dim','dot_product','dprod dvchk',
+			'eoshift','epsilon','error','exp','exponent','floor','flush','fraction',
+			'getcl','huge','iachar','iand','ibclr','ibits','ibset','ichar','ieor','index',
+			'int','intrup','invalop','ior','iostat_msg','ishft','ishftc','lbound',
+			'len','len_trim','lge','lgt','lle','llt','log','log10','matmul','max','maxexponent',
+			'maxloc','maxval','merge','min','minexponent','minloc','minval','mod','modulo',
+			'mvbits','nbreak','ndperr','ndpexc','nearest','nint','not','offset','ovefl',
+			'pack','precfill','precision','present','product','prompt','radix',
+			'random_number','random_seed','range','repeat','reshape','rrspacing',
+			'scale','scan','segment','selected_int_kind','selected_real_kind',
+			'set_exponent','shape','sign','sin','sinh','size','spacing','spread','sqrt',
+			'sum system','system_clock','tan','tanh','timer','tiny','transfer','transpose',
+			'trim','ubound','undfl','unpack','val','verify'
+			),
+		),
+	'SYMBOLS'=> array(
+		'(',')','{','}','[',']','=','+','-','*','/','!','%','^','&',':'
+		),
+	'CASE_SENSITIVE'=> array(
+		GESHI_COMMENTS => true,
+		1 => false,
+		2 => false,
+		3 => false,
+		4 => false,
+		),
+	'STYLES'=> array(
+		'KEYWORDS'=> array(
+			1 =>'color: #b1b100;',
+			2 =>'color: #000000; font-weight: bold;',
+			3 =>'color: #000066;',
+			4 =>'color: #993333;'
+			),
+		'COMMENTS'=> array(
+			1 =>'color: #808080; font-style: italic;',
+			2 =>'color: #339933;',
+			'MULTI'=>'color: #808080; font-style: italic;'
+			),
+		'ESCAPE_CHAR'=> array(
+			0 =>'color: #000099; font-weight: bold;'
+			),
+		'BRACKETS'=> array(
+			0 =>'color: #66cc66;'
+			),
+		'STRINGS'=> array(
+			0 =>'color: #ff0000;'
+			),
+		'NUMBERS'=> array(
+			0 =>'color: #cc66cc;'
+			),
+		'METHODS'=> array(
+			1 =>'color: #202020;',
+			2 =>'color: #202020;'
+			),
+		'SYMBOLS'=> array(
+			0 =>'color: #66cc66;'
+			),
+		'REGEXPS'=> array(
+			),
+		'SCRIPT'=> array(
+			)
+		),
+	'URLS'=> array(
+		1 =>'',
+		2 =>'',
+		3 =>'',
+		4 =>''
+		),
+	'OOLANG'=> true,
+	'OBJECT_SPLITTERS'=> array(
+		1 =>'.',
+		2 =>'::'
+		),
+	'REGEXPS'=> array(
+		),
+	'STRICT_MODE_APPLIES'=> GESHI_NEVER,
+	'SCRIPT_DELIMITERS'=> array(
+		),
+	'HIGHLIGHT_STRICT_BLOCK'=> array(
+		)
+);
+
+?>
diff --git a/inc/geshi/freebasic.php b/inc/geshi/freebasic.php
index 2d671c925a31107d3e184ffd7fd1535f85320ccc..4342d13a9aa76d99476cc9763137c4ada1aa6837 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.8
+ * Release Version: 1.0.7.9
  * 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 2e149f836b200d2c4a2c716994757b927f13228f..62cc8bd50a2351eaef1625bb3d48547da540b2d5 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.8
- * CVS Revision Version: $Revision: 1.10 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.12 $
  * Date Started: 2005/06/21
- * Last Modified: $Date: 2006/03/23 07:30:24 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * GML language file for GeSHi.
  *
diff --git a/inc/geshi/html4strict.php b/inc/geshi/html4strict.php
index f3e886a09f5d8c1ad1aeacffe6ee3e896838fbeb..96562da15f1fca0c6b7839054864c19264ab1ddd 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.7.8
- * CVS Revision Version: $Revision: 1.10 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.12 $
  * Date Started: 2004/07/10
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * HTML 4.01 strict language file for GeSHi.
  *
diff --git a/inc/geshi/ini.php b/inc/geshi/ini.php
index 9130aaf62f54042f78af22ff7e868a25f1f0d8dd..a111a90273ba8d7bc23a8a0085a1ded8fadb372a 100644
--- a/inc/geshi/ini.php
+++ b/inc/geshi/ini.php
@@ -4,10 +4,10 @@
  * --------
  * Author: deguix (cevo_deguix@yahoo.com.br)
  * Copyright: (c) 2005 deguix
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2005/03/27
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * INI language file for GeSHi.
  *
diff --git a/inc/geshi/inno.php b/inc/geshi/inno.php
index 297f7d2284a65bc18d80b2cc590ccb0c151fc41d..0b35e8ddde7f21b803683d863df1f19bc053f33f 100644
--- a/inc/geshi/inno.php
+++ b/inc/geshi/inno.php
@@ -4,10 +4,10 @@
  * ----------
  * 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.8
- * CVS Revision Version: $Revision: 1.7 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2005/07/29
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Inno Script language inkl. Delphi (Object Pascal) language file for GeSHi.
  *
diff --git a/inc/geshi/java.php b/inc/geshi/java.php
index 91aa1add5f8d6eed23bb302e754f885251db2704..37a5f37ad8c6e6c89a1669c3f5b880b77db04d8c 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.7.8
- * CVS Revision Version: $Revision: 1.14 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.16 $
  * Date Started: 2004/07/10
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Java language file for GeSHi.
  *
diff --git a/inc/geshi/java5.php b/inc/geshi/java5.php
index f99b6e7292c12feeb57b9b68b6013c82cbb0da73..9e2ab9a41ef1d6a134fbdef912c8d328af6d7cc7 100644
--- a/inc/geshi/java5.php
+++ b/inc/geshi/java5.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.8
- * CVS Revision Version: $Revision: 1.2 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.5 $
  * Date Started: 2004/07/10
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * Java language file for GeSHi.
  *
@@ -1004,7 +1004,7 @@ $language_data = array (
 		164 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/xml/sax/ext/{FNAME}.html',
 		165 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/xml/sax/helpers/{FNAME}.html',
 		/* ambiguous class names (appear in more than one package) */
-		166 => 'http://www.google.com/search?sitesearch=java.sun.com&q=allinurl%3Aj2se%2F1+5+0%2Fdocs%2Fapi+{FNAME}'
+		166 => 'http://www.google.com/search?sitesearch=java.sun.com&amp;q=allinurl%3Aj2se%2F1+5+0%2Fdocs%2Fapi+{FNAME}'
 		),
 	'OOLANG' => true,
 	'OBJECT_SPLITTERS' => array(
diff --git a/inc/geshi/javascript.php b/inc/geshi/javascript.php
index 81b7e7640addccca75e1194d1474be010321d63f..4c9f94f57c397ebb5003055936eaeb045dff6127 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.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/06/20
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * JavaScript language file for GeSHi.
  *
diff --git a/inc/geshi/lisp.php b/inc/geshi/lisp.php
index a20ce0627cd4afcde3682675b001d1083c23fa25..ac018854f458c59b7fa5a9c71a25d1207bceef2c 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.7.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Generic Lisp language file for GeSHi.
  *
diff --git a/inc/geshi/lua.php b/inc/geshi/lua.php
index e4585a530fa2603d713c36f920d4be4d5104911a..8663711766c49c65e4b1dadfc1f3ac86f89f0afd 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/highlighter)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.10 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.12 $
  * Date Started: 2004/07/10
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * LUA language file for GeSHi.
  *
diff --git a/inc/geshi/matlab.php b/inc/geshi/matlab.php
index 48d7866ea71af08833c6b24c35e2f2f0cdf0bc1a..40c85e58ddc89c1a853a78aadb68999310735a7e 100644
--- a/inc/geshi/matlab.php
+++ b/inc/geshi/matlab.php
@@ -4,15 +4,20 @@
  * -----------
  * Author: Florian Knorn (floz@gmx.de)
  * Copyright: (c) 2004 Florian Knorn (http://www.florian-knorn.com)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2005/02/09
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Matlab M-file language file for GeSHi. 
  *
  * CHANGES
- * -------
+ * -------
+ * 2006-03-25
+ *   - support for the transpose operator
+ *   - many keywords added
+ *   - links to the matlab documentation at mathworks
+ *      by: Olivier Verdier (olivier.verdier@free.fr)
  * 2005/05/07 (1.0.0)
  *   -  First Release
  *
@@ -38,18 +43,757 @@
  ************************************************************************************/
 
 $language_data = array (
-	'LANG_NAME' => 'M',
+	'LANG_NAME' => 'Matlab M',
 	'COMMENT_SINGLE' => array(1 => '%'),
 	'COMMENT_MULTI' => array(),
 	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-	'QUOTEMARKS' => array("'"),
+	'QUOTEMARKS' => array(),
 	'ESCAPE_CHAR' => '',
 	'KEYWORDS' => array(
 		1 => array(
 			'break', 'case', 'catch', 'continue', 'elseif', 'else', 'end', 'for', 
 			'function', 'global', 'if', 'otherwise', 'persistent', 'return', 
 			'switch', 'try', 'while','...'
-			),
+			),
+        2 => array(
+                            'all',
+							'any',
+							'exist',
+							'find',
+							'is',
+							'isa',
+							'logical',
+							'mislocked',
+							
+							'builtin',
+							'eval',
+							'evalc',
+							'evalin',
+							'feval',
+							'function',
+							'global',
+							'nargchk',
+							'persistent',
+							'script',
+							'break',
+							'case',
+							'catch',
+							'else',
+							'elseif',
+							'end',
+							'error',
+							'for',
+							'if',
+							'otherwise',
+							'return',
+							'switch',
+							'try',
+							'warning',
+							'while',
+							'input',
+							'keyboard',
+							'menu',
+							'pause',
+							'class',
+							'double',
+							'inferiorto',
+							'inline',
+							'int8',
+							'int16',
+							'int32',
+							'isa',
+							'loadobj',
+							'saveobj',
+							'single',
+							'superiorto',
+							'uint8',
+							'int16',
+							'uint32',
+							'dbclear',
+							'dbcont',
+							'dbdown',
+							'dbmex',
+							'dbquit',
+							'dbstack',
+							'dbstatus',
+							'dbstep',
+							'dbstop',
+							'dbtype',
+							'dbup',
+								
+							'blkdiag',
+							'eye',
+							'linspace',
+							'logspace',
+							'ones',
+							'rand',
+							'randn',
+							'zeros',
+							'ans',
+							'computer',
+							'eps',
+							'flops',
+							'i',
+							'Inf',
+							'inputname',
+							'j',
+							'NaN',
+							'nargin',
+							'nargout',
+							'pi',
+							'realmax',
+							'realmin',
+							'varargin',
+							'varargout',
+							'calendar',
+							'clock',
+							'cputime',
+							'date',
+							'datenum',
+							'datestr',
+							'datevec',
+							'eomday',
+							'etime',
+							'now',
+							'tic',
+							'toc',
+							'weekday',
+							'cat',
+							'diag',
+							'fliplr',
+							'flipud',
+							'repmat',
+							'reshape',
+							'rot90',
+							'tril',
+							'triu',
+							'compan',
+							'gallery',
+							'hadamard',
+							'hankel',
+							'hilb',
+							'invhilb',
+							'magic',
+							'pascal',
+							'toeplitz',
+							'wilkinson',
+							'abs',
+							'acos',
+							'acosh',
+							'acot',
+							'acoth',
+							'acsc',
+							'acsch',
+							'angle',
+							'asec',
+							'asech',
+							'asin',
+							'asinh',
+							'atan',
+							'atanh',
+							'atan2',
+							'ceil',
+							'complex',
+							'conj',
+							'cos',
+							'cosh',
+							'cot',
+							'coth',
+							'csc',
+							'csch',
+							'exp',
+							'fix',
+							'floor',
+							'gcd',
+							'imag',
+							'lcm',
+							'log',
+							'log2',
+							'log10',
+							'mod',
+							'nchoosek',
+							'real',
+							'rem',
+							'round',
+							'sec',
+							'sech',
+							'sign',
+							'sin',
+							'sinh',
+							'sqrt',
+							'tan',
+							'tanh',
+							'airy',
+							'besselh',
+							'besseli',
+							'besselk',
+							'besselj',
+							'Bessely',
+							'beta',
+							'betainc',
+							'betaln',
+							'ellipj',
+							'ellipke',
+							'erf',
+							'erfc',
+							'erfcx',
+							'erfiny',
+							'expint',
+							'factorial',
+							'gamma',
+							'gammainc',
+							'gammaln',
+							'legendre',
+							'pow2',
+							'rat',
+							'rats',
+							'cart2pol',
+							'cart2sph',
+							'pol2cart',
+							'sph2cart',
+							'abs',
+							'eval',
+							'real',
+							'strings',
+							'deblank',
+							'findstr',
+							'lower',
+							'strcat',
+							'strcmp',
+							'strcmpi',
+							'strjust',
+							'strmatch',
+							'strncmp',
+							'strrep',
+							'strtok',
+							'strvcat',
+							'symvar',
+							'texlabel',
+							'upper',
+							'char',
+							'int2str',
+							'mat2str',
+							'num2str',
+							'sprintf',
+							'sscanf',
+							'str2double',
+							'str2num',
+							'bin2dec',
+							'dec2bin',
+							'dec2hex',
+							'hex2dec',
+							'hex2num',
+							'fclose',
+							'fopen',
+							'fread',
+							'fwrite',
+							'fgetl',
+							'fgets',
+							'fprintf',
+							'fscanf',
+							'feof',
+							'ferror',
+							'frewind',
+							'fseek',
+							'ftell',
+							'sprintf',
+							'sscanf',
+							'dlmread',
+							'dlmwrite',
+							'hdf',
+							'imfinfo',
+							'imread',
+							'imwrite',
+							'textread',
+							'wk1read',
+							'wk1write',
+							'bitand',
+							'bitcmp',
+							'bitor',
+							'bitmax',
+							'bitset',
+							'bitshift',
+							'bitget',
+							'bitxor',
+							'fieldnames',
+							'getfield',
+							'rmfield',
+							'setfield',
+							'struct',
+							'struct2cell',
+							'class',
+							'isa',
+							'cell',
+							'cellfun',
+							'cellstr',
+							'cell2struct',
+							'celldisp',
+							'cellplot',
+							'num2cell',
+							'cat',
+							'flipdim',
+							'ind2sub',
+							'ipermute',
+							'ndgrid',
+							'ndims',
+							'permute',
+							'reshape',
+							'shiftdim',
+							'squeeze',
+							'sub2ind',
+							'cond',
+							'condeig',
+							'det',
+							'norm',
+							'null',
+							'orth',
+							'rank',
+							'rcond',
+							'rref',
+							'rrefmovie',
+							'subspace',
+							'trace',
+							'chol',
+							'inv',
+							'lscov',
+							'lu',
+							'nnls',
+							'pinv',
+							'qr',
+							'balance',
+							'cdf2rdf',
+							'eig',
+							'gsvd',
+							'hess',
+							'poly',
+							'qz',
+							'rsf2csf',
+							'schur',
+							'svd',
+							'expm',
+							'funm',
+							'logm',
+							'sqrtm',
+							'qrdelete',
+							'qrinsert',
+							'bar',
+							'barh',
+							'hist',
+							'hold',
+							'loglog',
+							'pie',
+							'plot',
+							'polar',
+							'semilogx',
+							'semilogy',
+							'subplot',
+							'bar3',
+							'bar3h',
+							'comet3',
+							'cylinder',
+							'fill3',
+							'plot3',
+							'quiver3',
+							'slice',
+							'sphere',
+							'stem3',
+							'waterfall',
+							'clabel',
+							'datetick',
+							'grid',
+							'gtext',
+							'legend',
+							'plotyy',
+							'title',
+							'xlabel',
+							'ylabel',
+							'zlabel',
+							'contour',
+							'contourc',
+							'contourf',
+							'hidden',
+							'meshc',
+							'mesh',
+							'peaks',
+							'surf',
+							'surface',
+							'surfc',
+							'surfl',
+							'trimesh',
+							'trisurf',
+							'coneplot',
+							'contourslice',
+							'isocaps',
+							'isonormals',
+							'isosurface',
+							'reducepatch',
+							'reducevolume',
+							'shrinkfaces',
+							'smooth3',
+							'stream2',
+							'stream3',
+							'streamline',
+							'surf2patch',
+							'subvolume',
+							'griddata',
+							'meshgrid',
+							'area',
+							'box',
+							'comet',
+							'compass',
+							'errorbar',
+							'ezcontour',
+							'ezcontourf',
+							'ezmesh',
+							'ezmeshc',
+							'ezplot',
+							'ezplot3',
+							'ezpolar',
+							'ezsurf',
+							'ezsurfc',
+							'feather',
+							'fill',
+							'fplot',
+							'pareto',
+							'pie3',
+							'plotmatrix',
+							'pcolor',
+							'rose',
+							'quiver',
+							'ribbon',
+							'stairs',
+							'scatter',
+							'scatter3',
+							'stem',
+							'convhull',
+							'delaunay',
+							'dsearch',
+							'inpolygon',
+							'polyarea',
+							'tsearch',
+							'voronoi',
+							'camdolly',
+							'camlookat',
+							'camorbit',
+							'campan',
+							'campos',
+							'camproj',
+							'camroll',
+							'camtarget',
+							'camup',
+							'camva',
+							'camzoom',
+							'daspect',
+							'pbaspect',
+							'view',
+							'viewmtx',
+							'xlim',
+							'ylim',
+							'zlim',
+							'camlight',
+							'diffuse',
+							'lighting',
+							'lightingangle',
+							'material',
+							'specular',
+							'brighten',
+							'bwcontr',
+							'caxis',
+							'colorbar',
+							'colorcube',
+							'colordef',
+							'colormap',
+							'graymon',
+							'hsv2rgb',
+							'rgb2hsv',
+							'rgbplot',
+							'shading',
+							'spinmap',
+							'surfnorm',
+							'whitebg',
+							'autumn',
+							'bone',
+							'contrast',
+							'cool',
+							'copper',
+							'flag',
+							'gray',
+							'hot',
+							'hsv',
+							'jet',
+							'lines',
+							'prism',
+							'spring',
+							'summer',
+							'winter',
+							'orient',
+							'print',
+							'printopt',
+							'saveas',
+							'copyobj',
+							'findobj',
+							'gcbo',
+							'gco',
+							'get',
+							'rotate',
+							'ishandle',
+							'set',
+							'axes',
+							'figure',
+							'image',
+							'light',
+							'line',
+							'patch',
+							'rectangle',
+							'surface',
+							'text Create',
+							'uicontext Create',
+							'capture',
+							'clc',
+							'clf',
+							'clg',
+							'close',
+							'gcf',
+							'newplot',
+							'refresh',
+							'saveas',
+							'axis',
+							'cla',
+							'gca',
+							'propedit',
+							'reset',
+							'rotate3d',
+							'selectmoveresize',
+							'shg',
+							'ginput',
+							'zoom',
+							'dragrect',
+							'drawnow',
+							'rbbox',
+							'dialog',
+							'errordlg',
+							'helpdlg',
+							'inputdlg',
+							'listdlg',
+							'msgbox',
+							'pagedlg',
+							'printdlg',
+							'questdlg',
+							'uigetfile',
+							'uiputfile',
+							'uisetcolor',
+							'uisetfont',
+							'warndlg',
+							'menu',
+							'menuedit',
+							'uicontextmenu',
+							'uicontrol',
+							'uimenu',
+							'dragrect',
+							'findfigs',
+							'gcbo',
+							'rbbox',
+							'selectmoveresize',
+							'textwrap',
+							'uiresume',
+							'uiwait Used',
+							'waitbar',
+							'waitforbuttonpress',
+							'convhull',
+							'cumprod',
+							'cumsum',
+							'cumtrapz',
+							'delaunay',
+							'dsearch',
+							'factor',
+							'inpolygon',
+							'max',
+							'mean',
+							'median',
+							'min',
+							'perms',
+							'polyarea',
+							'primes',
+							'prod',
+							'sort',
+							'sortrows',
+							'std',
+							'sum',
+							'trapz',
+							'tsearch',
+							'var',
+							'voronoi',
+							'del2',
+							'diff',
+							'gradient',
+							'corrcoef',
+							'cov',
+							'conv',
+							'conv2',
+							'deconv',
+							'filter',
+							'filter2',
+							'abs',
+							'angle',
+							'cplxpair',
+							'fft',
+							'fft2',
+							'fftshift',
+							'ifft',
+							'ifft2',
+							'ifftn',
+							'ifftshift',
+							'nextpow2',
+							'unwrap',
+							'cross',
+							'intersect',
+							'ismember',
+							'setdiff',
+							'setxor',
+							'union',
+							'unique',
+							'conv',
+							'deconv',
+							'poly',
+							'polyder',
+							'polyeig',
+							'polyfit',
+							'polyval',
+							'polyvalm',
+							'residue',
+							'roots',
+							'griddata',
+							'interp1',
+							'interp2',
+							'interp3',
+							'interpft',
+							'interpn',
+							'meshgrid',
+							'ndgrid',
+							'spline',
+							'dblquad',
+							'fmin',
+							'fmins',
+							'fzero',
+							'ode45,',
+							'ode113,',
+							'ode15s,',
+							'ode23s,',
+							'ode23t,',
+							'ode23tb',
+							'odefile',
+							'odeget',
+							'odeset',
+							'quad,',
+							'vectorize',
+							'spdiags',
+							'speye',
+							'sprand',
+							'sprandn',
+							'sprandsym',
+							'find',
+							'full',
+							'sparse',
+							'spconvert',
+							'nnz',
+							'nonzeros',
+							'nzmax',
+							'spalloc',
+							'spfun',
+							'spones',
+							'colmmd',
+							'colperm',
+							'dmperm',
+							'randperm',
+							'symmmd',
+							'symrcm',
+							'condest',
+							'normest',
+							'bicg',
+							'bicgstab',
+							'cgs',
+							'cholinc',
+							'cholupdate',
+							'gmres',
+							'luinc',
+							'pcg',
+							'qmr',
+							'qr',
+							'qrdelete',
+							'qrinsert',
+							'qrupdate',
+							'eigs',
+							'svds',
+							'spparms',
+							'lin2mu',
+							'mu2lin',
+							'sound',
+							'soundsc',
+							'auread',
+							'auwrite',
+							'wavread',
+							'wavwrite',
+							'[Keywords 6]',
+							'addpath',
+							'doc',
+							'docopt',
+							'help',
+							'helpdesk',
+							'helpwin',
+							'lasterr',
+							'lastwarn',
+							'lookfor',
+							'partialpath',
+							'path',
+							'pathtool',
+							'profile',
+							'profreport',
+							'rmpath',
+							'type',
+							'ver',
+							'version',
+							'web',
+							'what',
+							'whatsnew',
+							'which',
+							'clear',
+							'disp',
+							'length',
+							'load',
+							'mlock',
+							'munlock',
+							'openvar',
+							'pack',
+							'save',
+							'saveas',
+							'size',
+							'who',
+							'whos',
+							'workspace',
+							'clc',
+							'echo',
+							'format',
+							'home',
+							'more',
+							'cd',
+							'copyfile',
+							'delete',
+							'diary',
+							'dir',
+							'edit',
+							'fileparts',
+							'fullfile',
+							'inmem',
+							'ls',
+							'matlabroot',
+							'mkdir',
+							'open',
+							'pwd',
+							'tempdir',
+							'tempname',
+							'matlabrc',
+							'quit',                            
+)
 		),
 	'SYMBOLS' => array( 
 		'...' 
@@ -58,37 +802,46 @@ $language_data = array (
 		GESHI_COMMENTS => true,
 		1 => false,
 		2 => false,
-		3 => false,
-		4 => false,
+		//3 => false,
+		//4 => false,
 		),
 	'STYLES' => array(
 		'KEYWORDS' => array(
 			1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
 			),
 		'COMMENTS' => array(
 			1 => 'color: #228B22;',
 			),
 		'ESCAPE_CHAR' => array(
+            0 => ''
 			),
 		'BRACKETS' => array(
+            0 => ''
 			),
 		'STRINGS' => array(
-			0 => 'color: #A020F0;'
+			//0 => 'color: #A020F0;'
 			),
 		'NUMBERS' => array(
+            0 => ''
 			),
 		'METHODS' => array(
+            1 => '',
+            2 => ''
 			),
 		'SYMBOLS' => array(
+            0 => ''
 			),
 		'REGEXPS' => array(
+            0 => 'color:#A020F0;'
 			),
 		'SCRIPT' => array(
+            0 => ''
 			)
 		),
 	'URLS' => array(
 		1 => '',
-		2 => '',
+		2 => 'http://www.mathworks.com/access/helpdesk/help/techdoc/ref/{FNAME}.html',
 		3 => '',
 		4 => ''
 		),
@@ -98,6 +851,13 @@ $language_data = array (
 		2 => '::'
 		),
 	'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => "([^\w])'([^\\n\\r']*)'",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => "\\1'",
+            GESHI_AFTER => "'"
+		)
 		),
 	'STRICT_MODE_APPLIES' => GESHI_NEVER,
 	'SCRIPT_DELIMITERS' => array(
diff --git a/inc/geshi/mpasm.php b/inc/geshi/mpasm.php
index bfde9214cb1e5ac9510bf4b1d82230845f761bc9..f4150125f4e54c153942e0642c71029ca033ba7d 100644
--- a/inc/geshi/mpasm.php
+++ b/inc/geshi/mpasm.php
@@ -4,10 +4,10 @@
  * ---------
  * Author: Bakalex (bakalex@gmail.com)
  * Copyright: (c) 2004 Bakalex, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/12/6
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Microchip Assembler language file for GeSHi.
  *
diff --git a/inc/geshi/mysql.php b/inc/geshi/mysql.php
index d1584c86f6233f5fcaf64a3c487528d2e3e83380..e324ace2e92e5febdb1f90cf06ba2bfd6a00613b 100644
--- a/inc/geshi/mysql.php
+++ b/inc/geshi/mysql.php
@@ -2,12 +2,12 @@
  /************************************************************************************* 
  * 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.8
- * CVS Revision Version: $Revision: 1.6 $ 
+ * Author: Carl F�rstenberg (azatoth@gmail.com) 
+ * Copyright: (c) 2005 Carl F�rstenberg, Nigel McNie (http://qbnz.com/highlighter) 
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.9 $ 
  * Date Started: 2004/06/04 
- * Last Modified: $Date: 2006/03/11 21:44:08 $ 
+ * Last Modified: $Date: 2006/04/23 01:14:42 $ 
  * 
  * MySQL language file for GeSHi. 
  * 
@@ -62,12 +62,13 @@ $language_data = array (
   /* Control Flow Functions */ 
   'CASE', 'WHEN', 'THEN', 'ELSE', 'END', 
   /* String Functions */ 
-  'BIN', 'BIT_LENGTH', 'CHAR_LENGTH', 'CHARACTER_LENGTH', 'COMPRESS', 'CONCAT', 
+  'UNHEX', 'BIN', 'BIT_LENGTH', 'CHAR_LENGTH', 'CHARACTER_LENGTH', 'COMPRESS', 'CONCAT', 
   'CONCAT_WS', 'CONV', 'ELT', 'EXPORT_SET', 'FIELD', 'FIND_IN_SET', 'FORMAT', 'HEX',  
   'INSERT', 'INSTR', 'LCASE', 'LEFT', 'LENGTH', 'LOAD_FILE', 'LOCATE', 'LOWER', 'LPAD', 
   'LTRIM', 'MAKE_SET', 'MID', 'OCT', 'OCTET_LENGTH', 'ORD', 'POSITION', 'QUOTE', 'REPEAT', 
   'REPLACE', 'REVERSE', 'RIGHT', 'RPAD', 'RTRIM', 'SOUNDEX', 'SPACE', 'SUBSTRING',  
-  'SUBSTRING_INDEX', 'TRIM', 'UCASE', 'UPPER', 'UNCOMPRESS', 'UNCOMPRESSD_LENGTH', 'UNHEX',  
+  'SUBSTRING_INDEX', 'TRIM', 'UCASE', 'UPPER', 'UNCOMPRESS', 'UNCOMPRESSD_LENGTH',
+  'MD5', 'SHA1',  
   /* Numeric Functions */ 
   'ABS', 'ACOS', 'ASIN', 'ATAN', 'ATAN2', 'CEILING', 'CEIL', 'COS', 'COT', 'CRC32', 'DEGREES', 
   'EXP', 'FLOOR', 'LN', 'LOG', 'LOG2', 'LOG10', 'MOD', 'PI', 'POW', 'POWER', 'RADIANS', 'RAND', 
diff --git a/inc/geshi/nsis.php b/inc/geshi/nsis.php
index d414d5707245b10c472e756a3fb0c0a91e035389..0f84ecd0892b0252fa9d053de83750671aba9ca7 100644
--- a/inc/geshi/nsis.php
+++ b/inc/geshi/nsis.php
@@ -4,10 +4,10 @@
  * --------
  * 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.8
- * CVS Revision Version: $Revision: 1.10 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.12 $
  * Date Started: 2005/12/03
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Nullsoft Scriptable Install System language file for GeSHi.
  *
diff --git a/inc/geshi/objc.php b/inc/geshi/objc.php
index c508575bd1f4fd6f82bcb1cc40db7b88534cf9a5..d44a79c13b1f127cd7ad53bed1c9d57f987067dd 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.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/06/04
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * Objective C language file for GeSHi.
  *
diff --git a/inc/geshi/ocaml-brief.php b/inc/geshi/ocaml-brief.php
index fdf1255ccdb84e615222f16f3b37e2664811db13..d156a6850cfa129bc89e7b46ec9856463298d9c8 100644
--- a/inc/geshi/ocaml-brief.php
+++ b/inc/geshi/ocaml-brief.php
@@ -4,10 +4,10 @@
  * ----------
  * Author: Flaie (fireflaie@gmail.com)
  * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.6 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2005/08/27
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * OCaml (Objective Caml) language file for GeSHi.
  *
diff --git a/inc/geshi/ocaml.php b/inc/geshi/ocaml.php
index 5d5664927f3122749b13e9e4ead1361b742a7e92..2c3c3f930316dbb2b00279f4814ee4f81ccc1295 100644
--- a/inc/geshi/ocaml.php
+++ b/inc/geshi/ocaml.php
@@ -4,10 +4,10 @@
  * ----------
  * Author: Flaie (fireflaie@gmail.com)
  * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.6 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2005/08/27
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * OCaml (Objective Caml) language file for GeSHi.
  *
diff --git a/inc/geshi/oobas.php b/inc/geshi/oobas.php
index bcd942661a691244b4700b1604158d05fde75e8b..222caf02b570c58155902e437eb9d01323bd662b 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.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * OpenOffice.org Basic language file for GeSHi.
  *
diff --git a/inc/geshi/oracle8.php b/inc/geshi/oracle8.php
index 57b0c0b6d3c4ca0dff0fd2888b6b266aa6f372d1..a5547109b20dae4721409c6d8126b5f02eab7b0a 100644
--- a/inc/geshi/oracle8.php
+++ b/inc/geshi/oracle8.php
@@ -4,10 +4,10 @@
  * -----------
  * Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/06/04
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * Oracle 8 language file for GeSHi
  *
diff --git a/inc/geshi/pascal.php b/inc/geshi/pascal.php
index 2250dd92a9fb5ea9daa4c551aae80db268c02259..5ca9a0b5fdd642581cbfb1b26a8e616e32041f6f 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.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/07/26
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * Pascal language file for GeSHi.
  *
diff --git a/inc/geshi/perl.php b/inc/geshi/perl.php
index 2d48e8aa4fd495de31d5448c280e41a1a8f61293..96ed92f2a64a7fea021a6a626d1ed36e7514d9aa 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.7.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2004/08/20
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Perl language file for GeSHi.
  *
diff --git a/inc/geshi/php-brief.php b/inc/geshi/php-brief.php
index 6fb380d0ded033ee40d1fdddaf1e66c32dc129f9..e7da02eb12a5e210656890f4b1821961f86a4471 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.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/06/02
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * PHP language file for GeSHi (brief version).
  *
diff --git a/inc/geshi/php.php b/inc/geshi/php.php
index 046a4f4622689f59bf9fd24043d0ab5c2862974b..c84cc344ac50a112d3350c5be74f8faccaa42fc9 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.7.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2004/06/20
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * PHP language file for GeSHi.
  *
diff --git a/inc/geshi/python.php b/inc/geshi/python.php
index 578042c81e2019b16f74ae35c63493a1bdb0a140..1293613787b2544eac98c5e4257fcc0143457676 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.7.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * Python language file for GeSHi.
  *
diff --git a/inc/geshi/qbasic.php b/inc/geshi/qbasic.php
index e5f6c874afa71e3a8513eaf86472fe36bf378d49..5a13a768bfc6e79816fdbce939b3f88fdf382c0b 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.7.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2004/06/20
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * QBasic/QuickBASIC language file for GeSHi.
  *
diff --git a/inc/geshi/robots.php b/inc/geshi/robots.php
index 84c5b876888ebe1c9c9b47bba286d6acf3513036..2313d3e74c60c626f8d42f6249cfb28af7419027 100644
--- a/inc/geshi/robots.php
+++ b/inc/geshi/robots.php
@@ -4,10 +4,10 @@
  * --------
  * Author: Christian Lescuyer (cl@goelette.net)
  * Copyright: (c) 2006 Christian Lescuyer http://xtian.goelette.info
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.2 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.4 $
  * Date Started: 2006/02/17
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * robots.txt language file for GeSHi.
  *
diff --git a/inc/geshi/ruby.php b/inc/geshi/ruby.php
index 29b428e48292e283f751d0c8e875112f107ab211..8342dd3b3310674e1a82636b81316380ce8c228d 100644
--- a/inc/geshi/ruby.php
+++ b/inc/geshi/ruby.php
@@ -4,10 +4,10 @@
  * --------
  * Author: Amit Gupta (http://blog.igeek.info/)
  * Copyright: (c) 2005 Amit Gupta (http://blog.igeek.info/)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2005/09/05
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * Ruby language file for GeSHi
  *
diff --git a/inc/geshi/sas.php b/inc/geshi/sas.php
new file mode 100644
index 0000000000000000000000000000000000000000..9e209cb619a1bb554af2d16971f000f9a768c0d4
--- /dev/null
+++ b/inc/geshi/sas.php
@@ -0,0 +1,359 @@
+<?php
+/*************************************************************************************
+ * sas.php
+ * -------
+ * Author: Galen Johnson (solitaryr@gmail.com)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.2 $
+ * Date Started: 2005/12/27
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
+ *
+ * SAS language file for GeSHi. Based on the sas vim file.
+ *
+ * CHANGES
+ * -------
+ * 2005/12/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/12/27)
+ * -------------------------
+ *
+ * * Check highlighting stuff works
+ *
+ *************************************************************************************
+ *
+ *     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' => 'SAS',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            '_NULL_', '_INFILE_', '_N_', '_WEBOUT_', '_NUMERIC_', '_CHARACTER_', '_ALL_'
+            ),
+        2 => array(
+            '%BQUOTE', '%NRBQUOTE', '%CMPRES', '%QCMPRES',
+
+            '%COMPSTOR', '%DATATYP', '%DISPLAY', '%DO',
+            '%ELSE', '%END', '%EVAL', '%GLOBAL',
+            '%GOTO', '%IF', '%INDEX', '%INPUT',
+            '%KEYDEF', '%LABEL', '%LEFT', '%LENGTH',
+            '%LET', '%LOCAL', '%LOWCASE', '%MACRO',
+            '%MEND', '%NRBQUOTE', '%NRQUOTE', '%NRSTR',
+
+            '%PUT', '%QCMPRES', '%QLEFT', '%QLOWCASE',
+            '%QSCAN', '%QSUBSTR', '%QSYSFUNC', '%QTRIM',
+            '%QUOTE', '%QUPCASE', '%SCAN', '%STR',
+            '%SUBSTR', '%SUPERQ', '%SYSCALL', '%SYSEVALF',
+            '%SYSEXEC', '%SYSFUNC', '%SYSGET', '%SYSLPUT',
+            '%SYSPROD', '%SYSRC', '%SYSRPUT', '%THEN',
+
+            '%TO', '%TRIM', '%UNQUOTE', '%UNTIL',
+            '%UPCASE', '%VERIFY', '%WHILE', '%WINDOW'
+            ),
+        3 => array(
+            'ABS', 'ADDR', 'AIRY', 'ARCOS', 'ARSIN', 'ATAN', 'ATTRC', 'ATTRN',
+
+            'BAND', 'BETAINV', 'BLSHIFT', 'BNOT', 'BOR', 'BRSHIFT', 'BXOR',
+            'BYTE', 'CDF', 'CEIL', 'CEXIST', 'CINV', 'CLOSE', 'CNONCT', 'COLLATE',
+            'COMPBL', 'COMPOUND', 'COMPRESS', 'COSH', 'COS', 'CSS', 'CUROBS',
+            'CV', 'DACCDBSL', 'DACCDB', 'DACCSL', 'DACCSYD', 'DACCTAB',
+            'DAIRY', 'DATETIME', 'DATEJUL', 'DATEPART', 'DATE', 'DAY',
+            'DCLOSE', 'DEPDBSL', 'DEPDB', 'DEPSL',
+
+            'DEPSYD', 'DEPSYD', 'DEPTAB', 'DEPTAB', 'DEQUOTE', 'DHMS',
+            'DIF', 'DIGAMMA', 'DIM', 'DINFO', 'DNUM', 'DOPEN', 'DOPTNAME',
+            'DOPTNUM', 'DREAD', 'DROPNOTE', 'DSNAME', 'ERFC', 'ERF', 'EXIST',
+            'EXP', 'FAPPEND', 'FCLOSE', 'FCOL', 'FDELETE', 'FETCHOBS', 'FETCH',
+            'FEXIST', 'FGET', 'FILEEXIST', 'FILENAME', 'FILEREF', 'FINFO',
+            'FINV', 'FIPNAMEL', 'FIPNAME', 'FIPSTATE', 'FLOOR', 'FNONCT',
+
+            'FNOTE', 'FOPEN', 'FOPTNAME', 'FOPTNUM', 'FPOINT', 'FPOS',
+            'FPUT', 'FREAD', 'FREWIND', 'FRLEN', 'FSEP', 'FUZZ', 'FWRITE',
+            'GAMINV', 'GAMMA', 'GETOPTION', 'GETVARC', 'GETVARN', 'HBOUND',
+            'HMS', 'HOSTHELP', 'HOUR', 'IBESSEL', 'INDEXW', 'INDEXC',
+            'INDEX', 'INPUTN', 'INPUTC', 'INPUT', 'INTRR', 'INTCK', 'INTNX',
+            'INT', 'IRR', 'JBESSEL', 'JULDATE', 'KURTOSIS', 'LAG', 'LBOUND',
+
+            'LEFT', 'LENGTH', 'LGAMMA', 'LIBNAME', 'LIBREF', 'LOG10',
+            'LOG2', 'LOGPDF', 'LOGPMF', 'LOGSDF', 'LOG', 'LOWCASE', 'MAX', 'MDY',
+            'MEAN', 'MINUTE', 'MIN', 'MOD', 'MONTH', 'MOPEN', 'MORT',
+            'NETPV', 'NMISS', 'NORMAL', 'NPV', 'N', 'OPEN', 'ORDINAL',
+            'PATHNAME', 'PDF', 'PEEKC', 'PEEK', 'PMF', 'POINT', 'POISSON', 'POKE',
+            'PROBBETA', 'PROBBNML', 'PROBCHI', 'PROBF', 'PROBGAM',
+
+            'PROBHYPR', 'PROBIT', 'PROBNEGB', 'PROBNORM', 'PROBT', 'PUTN',
+            'PUTC', 'PUT', 'QTR', 'QUOTE', 'RANBIN', 'RANCAU', 'RANEXP',
+            'RANGAM', 'RANGE', 'RANK', 'RANNOR', 'RANPOI', 'RANTBL', 'RANTRI',
+            'RANUNI', 'REPEAT', 'RESOLVE', 'REVERSE', 'REWIND', 'RIGHT',
+            'ROUND', 'SAVING', 'SCAN', 'SDF', 'SECOND', 'SIGN', 'SINH', 'SIN',
+            'SKEWNESS', 'SOUNDEX', 'SPEDIS', 'SQRT', 'STDERR', 'STD', 'STFIPS',
+
+            'STNAME', 'STNAMEL', 'SUBSTR', 'SUM', 'SYMGET', 'SYSGET', 'SYSMSG',
+            'SYSPROD', 'SYSRC', 'SYSTEM', 'TANH', 'TAN', 'TIMEPART', 'TIME',
+            'TINV', 'TNONCT', 'TODAY', 'TRANSLATE', 'TRANWRD', 'TRIGAMMA',
+            'TRIMN', 'TRIM', 'TRUNC', 'UNIFORM', 'UPCASE', 'USS',
+            'VARFMT', 'VARINFMT', 'VARLABEL', 'VARLEN', 'VARNAME',
+            'VARNUM', 'VARRAYX', 'VARRAY', 'VARTYPE', 'VAR', 'VERIFY', 'VFORMATX',
+
+            'VFORMATDX', 'VFORMATD', 'VFORMATNX', 'VFORMATN', 'VFORMATWX',
+            'VFORMATW', 'VFORMAT', 'VINARRAYX', 'VINARRAY', 'VINFORMATX',
+            'VINFORMATDX', 'VINFORMATD', 'VINFORMATNX', 'VINFORMATN',
+            'VINFORMATWX', 'VINFORMATW', 'VINFORMAT', 'VLABELX',
+            'VLABEL', 'VLENGTHX', 'VLENGTH', 'VNAMEX', 'VNAME', 'VTYPEX',
+            'VTYPE', 'WEEKDAY', 'YEAR', 'YYQ', 'ZIPFIPS', 'ZIPNAME', 'ZIPNAMEL',
+
+            'ZIPSTATE'
+            ),
+        4 => array(
+            'ABORT', 'ARRAY', 'ATTRIB', 'BY', 'CALL', 'CARDS4', 'CATNAME',
+            'CONTINUE', 'DATALINES4', 'DELETE', 'DISPLAY',
+
+            'DM', 'DROP', 'ENDSAS', 'FILENAME', 'FILE', 'FOOTNOTE',
+            'FORMAT', 'GOTO', 'INFILE', 'INFORMAT', 'INPUT', 'KEEP',
+            'LABEL', 'LEAVE', 'LENGTH', 'LIBNAME', 'LINK', 'LIST', 'LOSTCARD',
+            'MERGE', 'MISSING', 'MODIFY', 'OPTIONS', 'OUTPUT', 'PAGE',
+            'PUT', 'REDIRECT', 'REMOVE', 'RENAME', 'REPLACE', 'RETAIN',
+            'RETURN', 'SELECT', 'SET', 'SKIP', 'STARTSAS', 'STOP', 'TITLE',
+
+            'UPDATE', 'WAITSAS', 'WHERE', 'WINDOW', 'X', 'SYSTASK',
+            'ADD', 'AND', 'ALTER', 'AS', 'CASCADE', 'CHECK', 'CREATE',
+            'DELETE', 'DESCRIBE', 'DISTINCT', 'DROP', 'FOREIGN',
+            'FROM', 'GROUP', 'HAVING', 'INDEX', 'INSERT', 'INTO', 'IN',
+            'KEY', 'LIKE', 'MESSAGE', 'MODIFY', 'MSGTYPE', 'NOT',
+            'NULL', 'ON', 'OR', 'ORDER', 'PRIMARY', 'REFERENCES',
+
+            'RESET', 'RESTRICT', 'SELECT', 'SET', 'TABLE',
+            'UNIQUE', 'UPDATE', 'VALIDATE', 'VIEW', 'WHERE'
+            ),
+        5 => array(
+            'DO', 'ELSE', 'END', 'IF', 'THEN', 'UNTIL', 'WHILE'
+
+            ),
+        6 => array(
+            'RUN', 'QUIT', 'DATA'
+            ),
+        7 => array(
+
+            'ERROR'
+            ),
+        8 => array(
+            'WARNING'
+            ),
+
+        9 => array(
+            'NOTE'
+            )
+        ),
+    'SYMBOLS' => array(
+
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false
+
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #0000ff;',
+            5 => 'color: #0000ff;',
+
+            6 => 'color: #000080; font-weight: bold;',
+            7 => 'color: #ff0000;',
+            8 => 'color: #00ff00;',
+            9 => 'color: #0000ff;'
+
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #006400; font-style: italic;',
+            'MULTI' => 'color: #006400; font-style: italic;'
+
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a020f0;'
+
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #2e8b57; font-weight: bold;'
+            ),
+        'METHODS' => array(
+
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff; font-weight: bold;',
+            1 => 'color: #000080; font-weight: bold;',
+
+            2 => 'color: #006400; font-style: italic;',
+            3 => 'color: #006400; font-style: italic;',
+            4 => 'color: #006400; font-style: italic;',
+            5 => 'color: #ff0000; font-weight: bold;',
+
+            6 => 'color: #00ff00; font-style: italic;',
+            7 => 'color: #0000ff; font-style: normal;',
+            8 => 'color: #b218b2; font-weight: bold;',
+            9 => 'color: #b218b2; font-weight: bold;'
+
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+
+        7 => '',
+        8 => '',
+        9 => ''
+        ),
+
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+
+        0 => "&amp;[a-zA-Z_][a-zA-Z0-9_]*",
+        1 => array(
+            GESHI_SEARCH => '(^\\s*)(PROC \\w+)',
+            GESHI_REPLACE => '\\2',
+
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+
+        2 => array(
+            GESHI_SEARCH => '(^\\s*)(\\*.*;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+
+            GESHI_SEARCH => '(.*;\\s*)(\\*.*;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+
+            GESHI_AFTER => ''
+            ),
+        4 => array(
+            GESHI_SEARCH => '(^\\s*)(%\\*.*;)',
+
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+
+            ),
+        5 => array(
+            GESHI_SEARCH => '(^ERROR.*)',
+            GESHI_REPLACE => '\\1',
+
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+
+        6 => array(
+            GESHI_SEARCH => '(^WARNING.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        7 => array(
+
+            GESHI_SEARCH => '(^NOTE.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+
+            GESHI_AFTER => ''
+            ),
+        8 => array(
+            GESHI_SEARCH => '(^\\s*)(CARDS.*)(^\\s*;\\s*$)',
+
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'sim',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+
+            ),
+        9 => array(
+            GESHI_SEARCH => '(^\\s*)(DATALINES.*)(^\\s*;\\s*$)',
+            GESHI_REPLACE => '\\2',
+
+            GESHI_MODIFIERS => 'sim',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            )
+
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/inc/geshi/scheme.php b/inc/geshi/scheme.php
index f0c86533d1c56bec71df5e7f9eaa95b13060d809..2b13b5471c82e5d856a56b4f8b6207d936ab3056 100644
--- a/inc/geshi/scheme.php
+++ b/inc/geshi/scheme.php
@@ -4,10 +4,10 @@
  * ----------
  * Author: Jon Raphaelson (jonraphaelson@gmail.com)
  * Copyright: (c) 2005 Jon Raphaelson, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.6 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.8 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Scheme language file for GeSHi.
  *
diff --git a/inc/geshi/sdlbasic.php b/inc/geshi/sdlbasic.php
index de408a12aecbb6ea7a829843011ca6bf413388cf..b895b6bb8ac0adb66cf8a96858252d6c53b1f942 100644
--- a/inc/geshi/sdlbasic.php
+++ b/inc/geshi/sdlbasic.php
@@ -4,10 +4,10 @@
  * ------------
  * Author: Roberto Rossi 
  * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.7 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.9 $
  * Date Started: 2005/08/19
- * Date Modified: $Date: 2006/02/25 00:46:33 $
+ * Date Modified: $Date: 2006/04/23 01:14:41 $
  *
  * sdlBasic (http://sdlbasic.sf.net) language file for GeSHi.
  *
diff --git a/inc/geshi/smarty.php b/inc/geshi/smarty.php
index c877a99987b6a25f8ea688d9cc355f9afe0ee4e2..9351df46a268d5ea3bf23d7f2e7ecdb24cbd16a9 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.8
- * CVS Revision Version: $Revision: 1.10 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.12 $
  * Date Started: 2004/07/10
- * Last Modified: $Date: 2006/03/11 21:44:08 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * Smarty template language file for GeSHi.
  *
diff --git a/inc/geshi/sql.php b/inc/geshi/sql.php
index fbd0e38dc2463f566b5a61eff78b7f0ac35654d1..514571e14f0b161ab256a25756467071c96f4637 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.7.8
- * CVS Revision Version: $Revision: 1.10 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.12 $
  * Date Started: 2004/06/04
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * SQL language file for GeSHi.
  *
diff --git a/inc/geshi/tsql.php b/inc/geshi/tsql.php
index 9ed689a6fcc681dd4e3460f26f365509df05c7d4..f1877d0c2fd6e73e5cd6fe8098a3de0ff03039d7 100644
--- a/inc/geshi/tsql.php
+++ b/inc/geshi/tsql.php
@@ -4,10 +4,10 @@
  * --------
  * 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.8
- * CVS Revision Version: $Revision: 1.2 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.4 $
  * Date Started: 2005/11/22
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * T-SQL language file for GeSHi.
  *
diff --git a/inc/geshi/vb.php b/inc/geshi/vb.php
index c5cb570dfa016f988144b01ea10d359dba1cc1a4..a8c1d7eadb4df32c1f28d5a76c8a37fafde215ce 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.7.8
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.11 $
  * Date Started: 2004/08/30
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * Visual Basic language file for GeSHi.
  *
diff --git a/inc/geshi/vbnet.php b/inc/geshi/vbnet.php
index 918b20e81b9888c397f2c7cdb6ea636b3b9c5fad..3dcffb5ff10c3db979a63973ca3c30063a927329 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.7.8
- * CVS Revision Version: $Revision: 1.10 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.12 $
  * Date Started: 2004/06/04
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:42 $
  *
  * VB.NET language file for GeSHi.
  *
diff --git a/inc/geshi/vhdl.php b/inc/geshi/vhdl.php
index 725968e34bd59270e45092e9e220b93114393790..dc3d3880185e28f95022d8cb8a5010bc676a9c37 100644
--- a/inc/geshi/vhdl.php
+++ b/inc/geshi/vhdl.php
@@ -4,10 +4,10 @@
  * --------
  * Author: Alexander 'E-Razor' Krause (admin@erazor-zone.de)
  * Copyright: (c) 2005 Alexander Krause
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2005/06/15
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  * 
  * VHDL (VHSICADL, very high speed integrated circuit HDL) language file for GeSHi.
  *
diff --git a/inc/geshi/visualfoxpro.php b/inc/geshi/visualfoxpro.php
index 632e7811d7ddfdba4827e3a183018d4184f79703..c8a6084d7aca313aa789b7f63bd54e64d8e51217 100644
--- a/inc/geshi/visualfoxpro.php
+++ b/inc/geshi/visualfoxpro.php
@@ -4,8 +4,8 @@
  * ----------------
  * Author: Roberto Armellin (r.armellin@tin.it)
  * Copyright: (c) 2004 Roberto Armellin, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.8
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.10 $
  * Date Started: 2004/09/17
  * Last Modified: 2004/09/18
  *
diff --git a/inc/geshi/xml.php b/inc/geshi/xml.php
index b0ab247f905ab2da21d6776b804d9d6ae1f4bd65..73329c572864ad0e4153d44940e243767fc99621 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.8
- * CVS Revision Version: $Revision: 1.13 $
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.15 $
  * Date Started: 2004/09/01
- * Last Modified: $Date: 2006/03/23 07:31:32 $
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
  *
  * XML language file for GeSHi. Based on the idea/file by Christian Weiske
  *