From 2b8d02bf0a560f0ee8fa887fed0d2bbf66b10bae Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 23 Mar 2009 10:42:53 +0100
Subject: GeSHi 1.0.8.3 update

Ignore-this: d204f804a634d5a537737dc4a50c3c13

darcs-hash:20090323094253-7ad00-003ea6c7b9cb1306ad0623274917bbfc042a0103.gz
---
 inc/geshi/dos.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'inc/geshi/dos.php')

diff --git a/inc/geshi/dos.php b/inc/geshi/dos.php
index bf2023e14..af8fdaee2 100644
--- a/inc/geshi/dos.php
+++ b/inc/geshi/dos.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Alessandro Staltari (staltari@geocities.com)
  * Copyright: (c) 2005 Alessandro Staltari (http://www.geocities.com/SiliconValley/Vista/8155/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.3
  * Date Started: 2005/07/05
  *
  * DOS language file for GeSHi.
@@ -64,7 +64,7 @@ $language_data = array (
     'COMMENT_SINGLE' => array(),
     'COMMENT_MULTI' => array(),
     //DOS comment lines
-    'COMMENT_REGEXP' => array(1 => "/^\s*@?REM/mi"),
+    'COMMENT_REGEXP' => array(1 => "/^\s*@?REM.*$/mi"),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array(),
     'ESCAPE_CHAR' => '',
@@ -84,10 +84,11 @@ $language_data = array (
         /* Internal commands */
         3 => array(
             'cd', 'md', 'rd', 'chdir', 'mkdir', 'rmdir', 'dir',
-            'del', 'copy',
+            'del', 'copy', 'move', 'ren', 'rename',
             'echo',
             'setlocal', 'endlocal', 'set',
-            'pause'
+            'pause',
+            'pushd', 'popd', 'title', 'verify'
             ),
         /* Special files */
         4 => array(
@@ -172,7 +173,7 @@ $language_data = array (
         /* Arguments or variable evaluation */
         2 => array(
 /*            GESHI_SEARCH => '(%)([\d*]|[^%\s]*(?=%))((?<!%\d)%|)',*/
-            GESHI_SEARCH => '(%)([\d*]|[^%]*(?=%))((?<!%\d)%|)',
+            GESHI_SEARCH => '(%(?:%(?=[a-z0-9]))?)([\d*]|(?:~[adfnpstxz]*(?:$\w+:)?)?[a-z0-9](?!\w)|[^%\n]*(?=%))((?<!%\d)%|)',
             GESHI_REPLACE => '\\2',
             GESHI_MODIFIERS => 'si',
             GESHI_BEFORE => '\\1',
@@ -184,7 +185,14 @@ $language_data = array (
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
         ),
-    'TAB_WIDTH' => 4
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)'
+                )
+            )
+        )
 );
 
 ?>
-- 
cgit v1.2.3