diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 09:53:46 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 09:53:46 +0200 |
| commit | 7f0d7314a01c4e97a23d7d89bd9a839accd2776a (patch) | |
| tree | df8b38bf05fff59f8ddc06c7ca521f019ed8d81d /inc/geshi/java5.php | |
| parent | 272000286c073349cd0ba898df00c4fe81492461 (diff) | |
| download | rpg-7f0d7314a01c4e97a23d7d89bd9a839accd2776a.tar.gz rpg-7f0d7314a01c4e97a23d7d89bd9a839accd2776a.tar.bz2 | |
GeSHi updated to 1.0.8.8
Diffstat (limited to 'inc/geshi/java5.php')
| -rw-r--r-- | inc/geshi/java5.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/inc/geshi/java5.php b/inc/geshi/java5.php index 4abffc663..bc9af739a 100644 --- a/inc/geshi/java5.php +++ b/inc/geshi/java5.php @@ -4,7 +4,7 @@ * -------- * Author: Nigel McNie (nigel@geshi.org) * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/) - * Release Version: 1.0.8.6 + * Release Version: 1.0.8.8 * Date Started: 2004/07/10 * * Java language file for GeSHi. @@ -56,7 +56,7 @@ $language_data = array ( 'COMMENT_MULTI' => array('/*' => '*/'), 'COMMENT_REGEXP' => array( //Import and Package directives (Basic Support only) - 2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i', + 2 => '/(?:(?<=import[\\n\\s](?!static))|(?<=import[\\n\\s]static[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i', // javadoc comments 3 => '#/\*\*(?![\*\/]).*\*/#sU' ), @@ -1025,6 +1025,12 @@ $language_data = array ( 'SCRIPT_DELIMITERS' => array( ), 'HIGHLIGHT_STRICT_BLOCK' => array( + ), + 'PARSER_CONTROL' => array( + 'KEYWORDS' => array( + 'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^&"\'])', + 'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-;"\'])' + ) ) ); |