diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
| commit | 0c06a181819249c6a4a2a6c60e13f739df1f2253 (patch) | |
| tree | 859377c572d0acbfc520b02304ef515bf3aebbe0 /inc/geshi/dos.php | |
| parent | ef7e36e4fd2a168977754f0aac1d855fb651f104 (diff) | |
| parent | 5d0aaf958325f500ce69cfb79e69eb0d8f83fdeb (diff) | |
| download | rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.gz rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements
Conflicts:
lib/tpl/dokuwiki/css/basic.css
Diffstat (limited to 'inc/geshi/dos.php')
| -rw-r--r-- | inc/geshi/dos.php | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/inc/geshi/dos.php b/inc/geshi/dos.php index 9484d3766..e84e1550a 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.8 + * Release Version: 1.0.8.10 * Date Started: 2005/07/05 * * DOS language file for GeSHi. @@ -66,7 +66,8 @@ $language_data = array ( //DOS comment lines 'COMMENT_REGEXP' => array( 1 => "/^\s*@?REM\b.*$/mi", - 2 => "/^\s*::.*$/m" + 2 => "/^\s*::.*$/m", + 3 => "/\^./" ), 'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE, 'QUOTEMARKS' => array(), @@ -100,7 +101,7 @@ $language_data = array ( ) ), 'SYMBOLS' => array( - '(', ')', '@', '%' + '(', ')', '@', '%', '!', '|', '<', '>', '&' ), 'CASE_SENSITIVE' => array( GESHI_COMMENTS => false, @@ -119,6 +120,7 @@ $language_data = array ( 'COMMENTS' => array( 1 => 'color: #808080; font-style: italic;', 2 => 'color: #b100b1; font-style: italic;', + 3 => 'color: #33cc33;' ), 'ESCAPE_CHAR' => array( 0 => 'color: #ff0000; font-weight: bold;' @@ -143,7 +145,8 @@ $language_data = array ( 'REGEXPS' => array( 0 => 'color: #b100b1; font-weight: bold;', 1 => 'color: #448844;', - 2 => 'color: #448888;' + 2 => 'color: #448888;', + 3 => 'color: #448888;' ) ), 'OOLANG' => false, @@ -159,7 +162,7 @@ $language_data = array ( /* Label */ 0 => array( /* GESHI_SEARCH => '((?si:[@\s]+GOTO\s+|\s+:)[\s]*)((?<!\n)[^\s\n]*)',*/ - GESHI_SEARCH => '((?si:[@\s]+GOTO\s+|\s+:)[\s]*)((?<!\n)[^\n]*)', + GESHI_SEARCH => '((?si:[@\s]+GOTO\s+|\s+:)[\s]*)((?<!\n)[^\s\n]*)', GESHI_REPLACE => '\\2', GESHI_MODIFIERS => 'si', GESHI_BEFORE => '\\1', @@ -182,6 +185,15 @@ $language_data = array ( GESHI_MODIFIERS => 'si', GESHI_BEFORE => '\\1', GESHI_AFTER => '\\3' + ), + /* Arguments or variable evaluation */ + 3 => array( +/* GESHI_SEARCH => '(%)([\d*]|[^%\s]*(?=%))((?<!%\d)%|)',*/ + GESHI_SEARCH => '(!(?:!(?=[a-z0-9]))?)([\d*]|(?:~[adfnpstxz]*(?:$\w+:)?)?[a-z0-9](?!\w)|[^!>\n]*(?=!))((?<!%\d)%|)(?!!>)', + GESHI_REPLACE => '\\2', + GESHI_MODIFIERS => 'si', + GESHI_BEFORE => '\\1', + GESHI_AFTER => '\\3' ) ), 'STRICT_MODE_APPLIES' => GESHI_NEVER, @@ -191,7 +203,20 @@ $language_data = array ( ), 'TAB_WIDTH' => 4, 'PARSER_CONTROL' => array( + 'ENABLE_FLAGS' => array( + 'BRACKETS' => GESHI_NEVER, + 'NUMBERS' => GESHI_NEVER + ), 'KEYWORDS' => array( + 1 => array( + 'DISALLOWED_BEFORE' => '(?<![\w\-])' + ), + 2 => array( + 'DISALLOWED_BEFORE' => '(?<![\w\-])' + ), + 3 => array( + 'DISALLOWED_BEFORE' => '(?<![\w\-])' + ), 4 => array( 'DISALLOWED_BEFORE' => '(?<!\w)' ) |