summaryrefslogtreecommitdiff
path: root/inc/geshi/javascript.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2008-06-20 18:06:28 +0200
committerAndreas Gohr <andi@splitbrain.org>2008-06-20 18:06:28 +0200
commitbb62d5fbe1aa438a9e655573ea9d8c8d3183006b (patch)
tree050838041b33d8e8c5a8d4d9c93472ce099b2ed0 /inc/geshi/javascript.php
parent715bdf1fe13fba0611cf88311bbc3d7945b4a544 (diff)
downloadrpg-bb62d5fbe1aa438a9e655573ea9d8c8d3183006b.tar.gz
rpg-bb62d5fbe1aa438a9e655573ea9d8c8d3183006b.tar.bz2
GeSHi update to 1.0.7.22
darcs-hash:20080620160628-7ad00-1bfd8f407b5b38c29c7879d67da2ea3dbd0d1816.gz
Diffstat (limited to 'inc/geshi/javascript.php')
-rw-r--r--inc/geshi/javascript.php23
1 files changed, 15 insertions, 8 deletions
diff --git a/inc/geshi/javascript.php b/inc/geshi/javascript.php
index 9135ef4ca..5384f037d 100644
--- a/inc/geshi/javascript.php
+++ b/inc/geshi/javascript.php
@@ -4,13 +4,15 @@
* --------------
* 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.21
+ * Release Version: 1.0.7.22
* Date Started: 2004/06/20
*
* JavaScript language file for GeSHi.
*
* CHANGES
* -------
+ * 2008/05/23 (1.0.7.22)
+ * - Added description of extra language features (SF#1970248)
* 2004/11/27 (1.0.1)
* - Added support for multiple object splitters
* 2004/10/27 (1.0.0)
@@ -43,6 +45,8 @@ $language_data = array (
'LANG_NAME' => 'Javascript',
'COMMENT_SINGLE' => array(1 => '//'),
'COMMENT_MULTI' => array('/*' => '*/'),
+ //Regular Expressions
+ 'COMMENT_REGEXP' => array(2 => "/(?<=[\\s^])s\\/(?:\\\\.|[^\\/\\\\])+\\/(?:\\\\.|[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
'QUOTEMARKS' => array("'", '"'),
'ESCAPE_CHAR' => '\\',
@@ -68,7 +72,11 @@ $language_data = array (
)
),
'SYMBOLS' => array(
- '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
+ '(', ')', '[', ']', '{', '}',
+ '+', '-', '*', '/', '%',
+ '!', '@', '&', '|', '^',
+ '<', '>', '=',
+ ',', ';', '?', ':'
),
'CASE_SENSITIVE' => array(
GESHI_COMMENTS => false,
@@ -83,14 +91,15 @@ $language_data = array (
3 => 'color: #000066;'
),
'COMMENTS' => array(
- 1 => 'color: #009900; font-style: italic;',
- 'MULTI' => 'color: #009900; font-style: italic;'
+ 1 => 'color: #006600; font-style: italic;',
+ 2 => 'color: #009966; font-style: italic;',
+ 'MULTI' => 'color: #006600; font-style: italic;'
),
'ESCAPE_CHAR' => array(
0 => 'color: #000099; font-weight: bold;'
),
'BRACKETS' => array(
- 0 => 'color: #66cc66;'
+ 0 => 'color: #009900;'
),
'STRINGS' => array(
0 => 'color: #3366CC;'
@@ -102,10 +111,9 @@ $language_data = array (
1 => 'color: #006600;'
),
'SYMBOLS' => array(
- 0 => 'color: #66cc66;'
+ 0 => 'color: #339933;'
),
'REGEXPS' => array(
- 0 => 'color: #0066FF;'
),
'SCRIPT' => array(
0 => '',
@@ -124,7 +132,6 @@ $language_data = array (
1 => '.'
),
'REGEXPS' => array(
- 0 => "/.*/([igm]*)?" // matches js reg exps
),
'STRICT_MODE_APPLIES' => GESHI_MAYBE,
'SCRIPT_DELIMITERS' => array(