diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php')
| -rw-r--r-- | extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php b/extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php index 42ab311c..05cadf06 100644 --- a/extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php +++ b/extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php @@ -7,7 +7,7 @@ * - M. Uli Kusterer (witness.of.teachtext@gmx.net) * - Jack Lloyd (lloyd@randombit.net) * Copyright: (c) 2004 Dennis Bayer, Nigel McNie (http://qbnz.com/highlighter) - * Release Version: 1.0.8.11 + * Release Version: 1.0.8.12 * Date Started: 2004/09/27 * * C++ language file for GeSHi. @@ -56,14 +56,18 @@ $language_data = array ( //Multiline-continued single-line comments 1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m', //Multiline-continued preprocessor define - 2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m' + 2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m', + //C++ 11 string literal extensions + 3 => '/(?:L|u8?|U)(?=")/', + //C++ 11 string literal extensions (raw) + 4 => '/R"([^()\s\\\\]*)\((?:(?!\)\\1").)*\)\\1"/ms' ), 'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE, 'QUOTEMARKS' => array("'", '"'), 'ESCAPE_CHAR' => '', 'ESCAPE_REGEXP' => array( //Simple Single Char Escapes - 1 => "#\\\\[abfnrtv\\\'\"?\n]#i", + 1 => "#\\\\[abfnrtv\\\'\"?\n]#", //Hexadecimal Char Specs 2 => "#\\\\x[\da-fA-F]{2}#", //Hexadecimal Char Specs @@ -167,6 +171,8 @@ $language_data = array ( 'COMMENTS' => array( 1 => 'color: #666666;', 2 => 'color: #339900;', + 3 => 'color: #FF0000;', + 4 => 'color: #FF0000;', 'MULTI' => 'color: #ff0000; font-style: italic;' ), 'ESCAPE_CHAR' => array( @@ -236,5 +242,3 @@ $language_data = array ( ) ) ); - -?>
\ No newline at end of file |