summaryrefslogtreecommitdiff
path: root/inc/geshi/haskell.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2010-08-29 09:53:46 +0200
committerAndreas Gohr <andi@splitbrain.org>2010-08-29 09:53:46 +0200
commit7f0d7314a01c4e97a23d7d89bd9a839accd2776a (patch)
treedf8b38bf05fff59f8ddc06c7ca521f019ed8d81d /inc/geshi/haskell.php
parent272000286c073349cd0ba898df00c4fe81492461 (diff)
downloadrpg-7f0d7314a01c4e97a23d7d89bd9a839accd2776a.tar.gz
rpg-7f0d7314a01c4e97a23d7d89bd9a839accd2776a.tar.bz2
GeSHi updated to 1.0.8.8
Diffstat (limited to 'inc/geshi/haskell.php')
-rw-r--r--inc/geshi/haskell.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/inc/geshi/haskell.php b/inc/geshi/haskell.php
index 024382deb..4997a26c3 100644
--- a/inc/geshi/haskell.php
+++ b/inc/geshi/haskell.php
@@ -4,7 +4,7 @@
* ----------
* Author: Jason Dagit (dagit@codersbase.com) based on ocaml.php by Flaie (fireflaie@gmail.com)
* Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.6
+ * Release Version: 1.0.8.8
* Date Started: 2005/08/27
*
* Haskell language file for GeSHi.
@@ -41,7 +41,10 @@ $language_data = array (
'LANG_NAME' => 'Haskell',
'COMMENT_SINGLE' => array( 1 => '--'),
'COMMENT_MULTI' => array('{-' => '-}'),
- 'COMMENT_REGEXP' => array(2 => "/-->/"),
+ 'COMMENT_REGEXP' => array(
+ 2 => "/-->/",
+ 3 => "/{-(?:(?R)|.)-}/s", //Nested Comments
+ ),
'CASE_KEYWORDS' => 0,
'QUOTEMARKS' => array('"'),
'ESCAPE_CHAR' => "\\",
@@ -146,7 +149,8 @@ $language_data = array (
'COMMENTS' => array(
1 => 'color: #5d478b; font-style: italic;',
2 => 'color: #339933; font-weight: bold;',
- 'MULTI' => 'color: #5d478b; font-style: italic;' /* light purpHle */
+ 3 => 'color: #5d478b; font-style: italic;', /* light purple */
+ 'MULTI' => 'color: #5d478b; font-style: italic;' /* light purple */
),
'ESCAPE_CHAR' => array(
0 => 'background-color: #3cb371; font-weight: bold;'
@@ -195,4 +199,4 @@ $language_data = array (
)
);
-?>
+?> \ No newline at end of file