diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
| commit | 2c053ed58376c6709596ab48fc40dceb90d4e89d (patch) | |
| tree | c8d0f78c2f47f373473419396d3c0855ec671eca /inc/geshi/ruby.php | |
| parent | cb4a07568e84d853fbcd9d5eca37f572fa10786f (diff) | |
| parent | 5479a8c3341247ca228026819f20f3ab5c34a80f (diff) | |
| download | rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.gz rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
conf/msg
lib/plugins/acl/ajax.php
Diffstat (limited to 'inc/geshi/ruby.php')
| -rw-r--r-- | inc/geshi/ruby.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/inc/geshi/ruby.php b/inc/geshi/ruby.php index 8c2b7d829..47ecbb2e2 100644 --- a/inc/geshi/ruby.php +++ b/inc/geshi/ruby.php @@ -4,7 +4,7 @@ * -------- * Author: Moises Deniz * Copyright: (c) 2007 Moises Deniz - * Release Version: 1.0.8.4 + * Release Version: 1.0.8.8 * Date Started: 2007/03/21 * * Ruby language file for GeSHi. @@ -40,6 +40,10 @@ $language_data = array ( 'LANG_NAME' => 'Ruby', 'COMMENT_SINGLE' => array(1 => "#"), 'COMMENT_MULTI' => array("=begin" => "=end"), + 'COMMENT_REGEXP' => array( + //Heredoc + 4 => '/<<\s*?(\w+)\\n.*?\\n\\1(?![a-zA-Z0-9])/si', + ), 'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE, 'QUOTEMARKS' => array('"', '`','\''), 'ESCAPE_CHAR' => '\\', @@ -50,7 +54,7 @@ $language_data = array ( 'ensure', 'for', 'if', 'in', 'module', 'while', 'next', 'not', 'or', 'redo', 'rescue', 'yield', 'retry', 'super', 'then', 'undef', 'unless', - 'until', 'when', 'BEGIN', 'END', 'include' + 'until', 'when', 'include' ), 2 => array( '__FILE__', '__LINE__', 'false', 'nil', 'self', 'true', @@ -145,6 +149,7 @@ $language_data = array ( ), 'COMMENTS' => array( 1 => 'color:#008000; font-style:italic;', + 4 => 'color: #cc0000; font-style: italic;', 'MULTI' => 'color:#000080; font-style:italic;' ), 'ESCAPE_CHAR' => array( @@ -223,4 +228,4 @@ $language_data = array ( 'TAB_WIDTH' => 2 ); -?> +?>
\ No newline at end of file |