updated GeSHi to 1.0.8.10

lib/geshi.php

@@ -41,7 +41,7 @@
 //
 
 /** The version of this GeSHi file */
-define('GESHI_VERSION', '1.0.8.9');
+define('GESHI_VERSION', '1.0.8.10');
 
 // Define the root directory for the GeSHi code tree
 if (!defined('GESHI_ROOT')) {
@@ -3339,7 +3339,7 @@ function parse_non_string_part($stuff_to_parse) {
         $stuff_to_parse = ' ' . $this->hsc($stuff_to_parse);
 
         // Highlight keywords
-        $disallowed_before = "(?<![a-zA-Z0-9\$_\|\#;>|^&";
+        $disallowed_before = "(?<![a-zA-Z0-9\$_\|\#|^&";
         $disallowed_after = "(?![a-zA-Z0-9_\|%\\-&;";
         if ($this->lexic_permissions['STRINGS']) {
             $quotemarks = preg_quote(implode($this->language_data['QUOTEMARKS']), '/');
@@ -3397,7 +3397,7 @@ function parse_non_string_part($stuff_to_parse) {
                     // 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 ;))
                     $stuff_to_parse = preg_replace_callback(
-                        "/$disallowed_before_local({$keywordset})(?!\<DOT\>(?:htm|php))$disallowed_after_local/$modifiers",
+                        "/$disallowed_before_local({$keywordset})(?!\<DOT\>(?:htm|php|aspx?))$disallowed_after_local/$modifiers",
                         array($this, 'handle_keyword_replace'),
                         $stuff_to_parse
                         );
@@ -4564,7 +4564,7 @@ function get_line_style($line) {
     * @access private
     */
     function optimize_regexp_list($list, $regexp_delimiter = '/') {
-        $regex_chars = array('.', '\\', '+', '*', '?', '[', '^', ']', '$',
+        $regex_chars = array('.', '\\', '+', '-', '*', '?', '[', '^', ']', '$',
             '(', ')', '{', '}', '=', '!', '<', '>', '|', ':', $regexp_delimiter);
         sort($list);
         $regexp_list = array('');

lib/geshi/4cs.php

@@ -4,7 +4,7 @@
  * ------
  * Author: Jason Curl ([email protected])
  * Copyright: (c) 2009 Jason Curl
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2009/09/05
  *
  * 4CS language file for GeSHi.

lib/geshi/6502acme.php

@@ -4,7 +4,7 @@
  * -------
  * Author: Warren Willmey
  * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2010/05/26
  *
  * MOS 6502 (more specifically 6510) ACME Cross Assembler 0.93 by Marco Baye language file for GeSHi.

lib/geshi/6502kickass.php

@@ -4,7 +4,7 @@
  * -------
  * Author: Warren Willmey
  * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2010/06/07
  *
  * MOS 6502 (6510) Kick Assembler 3.13 language file for GeSHi.

lib/geshi/6502tasm.php

@@ -4,7 +4,7 @@
  * -------
  * Author: Warren Willmey
  * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2010/06/02
  *
  * MOS 6502 (6510) TASM/64TASS (64TASS being the super set of TASM) language file for GeSHi.

lib/geshi/68000devpac.php

@@ -4,7 +4,7 @@
  * -------
  * Author: Warren Willmey
  * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2010/06/09
  *
  * Motorola 68000 - HiSoft Devpac ST 2 Assembler language file for GeSHi.

lib/geshi/abap.php

@@ -7,7 +7,7 @@
  *  - Sandra Rossi ([email protected])
  *  - Jacob Laursen ([email protected])
  * Copyright: (c) 2007 Andres Picazo
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2004/06/04
  *
  * ABAP language file for GeSHi.

lib/geshi/actionscript.php

@@ -4,7 +4,7 @@
  * ----------------
  * Author: Steffen Krause ([email protected])
  * Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2004/06/20
  *
  * Actionscript language file for GeSHi.

lib/geshi/actionscript3.php

@@ -4,7 +4,7 @@
  * ----------------
  * Author: Jordi Boggiano ([email protected])
  * Copyright: (c) 2007 Jordi Boggiano (http://www.seld.be/), Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2007/11/26
  *
  * ActionScript3 language file for GeSHi.
@@ -60,7 +60,7 @@
     'COMMENT_MULTI' => array('/*' => '*/'),
     'COMMENT_REGEXP' => array(
         //Regular expressions
-        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
+        2 => "/(?<=[\\s^])(s|tr|y)\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])*(?<!\s)\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
         ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),

lib/geshi/ada.php

@@ -4,7 +4,7 @@
  * -------
  * Author: Tux ([email protected])
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2004/07/29
  *
  * Ada language file for GeSHi.

lib/geshi/apache.php

@@ -4,7 +4,7 @@
  * ----------
  * Author: Tux ([email protected])
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2004/29/07
  *
  * Apache language file for GeSHi.
@@ -344,6 +344,9 @@
 
             //mod_unique_id.c
 
+            //mod_upload_progress
+            'ReportUploads', 'TrackUploads', 'UploadProgressSharedMemorySize',
+
             //mod_userdir.c
             'UserDir',
 

lib/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.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2005/07/20
  *
  * AppleScript language file for GeSHi.

lib/geshi/apt_sources.php

@@ -4,7 +4,7 @@
  * ----------
  * Author: Milian Wolff ([email protected])
  * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2008/06/17
  *
  * Apt sources.list language file for GeSHi.
@@ -55,7 +55,7 @@
             'stable/updates',
             //Debian
             'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge',
-            'etch', 'lenny', 'sid',
+            'etch', 'lenny', 'wheezy', 'sid',
             //Ubuntu
             'warty', 'warty-updates', 'warty-security', 'warty-proposed', 'warty-backports',
             'hoary', 'hoary-updates', 'hoary-security', 'hoary-proposed', 'hoary-backports',
@@ -65,7 +65,11 @@
             'feisty', 'feisty-updates', 'feisty-security', 'feisty-proposed', 'feisty-backports',
             'gutsy', 'gutsy-updates', 'gutsy-security', 'gutsy-proposed', 'gutsy-backports',
             'hardy', 'hardy-updates', 'hardy-security', 'hardy-proposed', 'hardy-backports',
-            'intrepid', 'intrepid-updates', 'intrepid-security', 'intrepid-proposed', 'intrepid-backports'
+            'intrepid', 'intrepid-updates', 'intrepid-security', 'intrepid-proposed', 'intrepid-backports',
+            'jaunty', 'jaunty-updates', 'jaunty-security', 'jaunty-proposed', 'jaunty-backports',
+            'karmic', 'karmic-updates', 'karmic-security', 'karmic-proposed', 'karmic-backports',
+            'lucid', 'lucid-updates', 'lucid-security', 'lucid-proposed', 'lucid-backports',
+            'maverick', 'maverick-updates', 'maverick-security', 'maverick-proposed', 'maverick-backports'
             ),
         3 => array(
             'main', 'restricted', 'preview', 'contrib', 'non-free',
@@ -141,4 +145,4 @@
     'TAB_WIDTH' => 4
 );
 
-?>
+?>

lib/geshi/asm.php

@@ -4,7 +4,7 @@
  * -------
  * Author: Tux ([email protected])
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2004/07/27
  *
  * x86 Assembler language file for GeSHi.
@@ -99,9 +99,9 @@
         4 => array(
             '186','286','286c','286p','287','386','386c','386p','387','486','486p',
             '8086','8087','alpha','break','code','const','continue','cref','data','data?',
-            'dosseg','else','elseif','endif','endw','err','err1','err2','errb',
+            'dosseg','else','elseif','endif','endw','equ','err','err1','err2','errb',
             'errdef','errdif','errdifi','erre','erridn','erridni','errnb','errndef',
-            'errnz','exit','fardata','fardata?','if','lall','lfcond','list','listall',
+            'errnz','exit','fardata','fardata?','global','if','lall','lfcond','list','listall',
             'listif','listmacro','listmacroall',' model','no87','nocref','nolist',
             'nolistif','nolistmacro','radix','repeat','sall','seq','sfcond','stack',
             'startup','tfcond','type','until','untilcxz','while','xall','xcref',
@@ -114,7 +114,7 @@
             'irp','irpc','label','le','length','lengthof','local','low','lowword','lroffset',
             'macro','mask','mod','msfloat','name','ne','offset','opattr','option','org','%out',
             'page','popcontext','private','proc','proto','ptr','public','purge','pushcontext','record',
-            'rept','seg','segment','short','size','sizeof','sizestr','struc','struct',
+            'resb','resd','resw','rept','section','seg','segment','short','size','sizeof','sizestr','struc','struct',
             'substr','subtitle','subttl','textequ','this','title','typedef','union','width',
             '.model', '.stack', '.code', '.data'
             ),
@@ -222,4 +222,4 @@
     )
 );
 
-?>
+?>

lib/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.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2004/08/13
  *
  * ASP language file for GeSHi.

lib/geshi/autoconf.php

@@ -4,7 +4,7 @@
  * -----
  * Author: Mihai Vasilian ([email protected])
  * Copyright: (c) 2010 Mihai Vasilian
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2010/01/25
  *
  * autoconf language file for GeSHi.

lib/geshi/autohotkey.php

@@ -4,7 +4,7 @@
  * --------
  * Author: Naveen Garg ([email protected])
  * Copyright: (c) 2009 Naveen Garg and GeSHi
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2009/06/11
  *
  * Autohotkey language file for GeSHi.

lib/geshi/autoit.php

@@ -4,7 +4,7 @@
  * --------
  * Author: big_daddy ([email protected])
  * Copyright: (c) 2006 and to GESHi ;)
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2006/01/26
  *
  * AutoIT language file for GeSHi.

lib/geshi/avisynth.php

@@ -4,7 +4,7 @@
  * --------
  * Author: Ryan Jones ([email protected])
  * Copyright: (c) 2008 Ryan Jones
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2008/10/08
  *
  * AviSynth language file for GeSHi.

lib/geshi/awk.php

@@ -4,7 +4,7 @@
  * -------
  * Author: George Pollard ([email protected])
  * Copyright: (c) 2009 George Pollard
- * Release Version: 1.0.8.9
+ * Release Version: 1.0.8.10
  * Date Started: 2009/01/28
  *
  * Awk language file for GeSHi.