summaryrefslogtreecommitdiffstats
path: root/application/libraries/geshi/haskell.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-02-14 01:17:10 +0100
committerFlorian Pritz <bluewind@xinu.at>2012-02-14 01:17:10 +0100
commita635c931ff8aa79728d93a4835e06a75e8f90be8 (patch)
treeec99bc646bca4cd8d37e58378d07c1ebd1f0499f /application/libraries/geshi/haskell.php
parent798a4824a2aa099de9eb05454ebb62b1522bee65 (diff)
bump geshi to 1.0.8.10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/libraries/geshi/haskell.php')
-rw-r--r--application/libraries/geshi/haskell.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/application/libraries/geshi/haskell.php b/application/libraries/geshi/haskell.php
index 024382deb..ce1b3bf69 100644
--- a/application/libraries/geshi/haskell.php
+++ b/application/libraries/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.10
* 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