diff --git a/inc/geshi.php b/inc/geshi.php
index ef12b10c6a504cdee1a7006b6f78c42b998806ff..11e347105dbf3145037874ac2a5739d6c7306950 100644
--- a/inc/geshi.php
+++ b/inc/geshi.php
@@ -28,7 +28,7 @@
* @author Nigel McNie <nigel@geshi.org>
* @copyright Copyright © 2004, 2005, Nigel McNie
* @license http://gnu.org/copyleft/gpl.html GNU GPL
- * @version $Id: geshi.php,v 1.30 2006/02/25 00:46:33 oracleshinoda Exp $
+ * @version $Id: geshi.php,v 1.32 2006/03/23 07:24:17 oracleshinoda Exp $
*
*/
@@ -40,7 +40,7 @@
//
/** The version of this GeSHi file */
-define('GESHI_VERSION', '1.0.7.7');
+define('GESHI_VERSION', '1.0.7.8');
/** Set the correct directory separator */
define('GESHI_DIR_SEPARATOR', ('WIN' != substr(PHP_OS, 0, 3)) ? '/' : '\\');
@@ -1985,7 +1985,8 @@ class GeSHi
*/
function parse_non_string_part (&$stuff_to_parse)
{
- $stuff_to_parse = ' ' . quotemeta(@htmlspecialchars($stuff_to_parse, ENT_COMPAT, $this->encoding));
+ $stuff_to_parse = ' ' . @htmlspecialchars($stuff_to_parse, ENT_COMPAT, $this->encoding);
+ $stuff_to_parse_pregquote = preg_quote($stuff_to_parse, '/');
// These vars will disappear in the future
$func = '$this->change_case';
$func2 = '$this->add_url_to_keyword';
@@ -1997,14 +1998,14 @@ class GeSHi
if ($this->lexic_permissions['REGEXPS'][$key]) {
if (is_array($regexp)) {
$stuff_to_parse = preg_replace(
- "#" .
- $regexp[GESHI_SEARCH] .
- "#{$regexp[GESHI_MODIFIERS]}",
+ "/" .
+ str_replace('/', '\/', $regexp[GESHI_SEARCH]) .
+ "/{$regexp[GESHI_MODIFIERS]}",
"{$regexp[GESHI_BEFORE]}<|!REG3XP$key!>{$regexp[GESHI_REPLACE]}|>{$regexp[GESHI_AFTER]}",
$stuff_to_parse
);
} else {
- $stuff_to_parse = preg_replace( "#(" . $regexp . ")#", "<|!REG3XP$key!>\\1|>", $stuff_to_parse);
+ $stuff_to_parse = preg_replace( "/(" . str_replace('/', '\/', $regexp) . ")/", "<|!REG3XP$key!>\\1|>", $stuff_to_parse);
}
}
}
@@ -2032,30 +2033,31 @@ class GeSHi
foreach ($this->language_data['KEYWORDS'] as $k => $keywordset) {
if ($this->lexic_permissions['KEYWORDS'][$k]) {
foreach ($keywordset as $keyword) {
- $keyword = quotemeta($keyword);
+ $keyword = preg_quote($keyword, '/');
//
// This replacement checks the word is on it's own (except if brackets etc
// are next to it), then highlights it. We don't put the color=" for the span
// in just yet - otherwise languages with the keywords "color" or "or" have
// a fit.
//
- if (false !== stristr($stuff_to_parse, $keyword )) {
+ if (false !== stristr($stuff_to_parse_pregquote, $keyword )) {
$stuff_to_parse .= ' ';
// Might make a more unique string for putting the number in soon
// Basically, we don't put the styles in yet because then the styles themselves will
// get highlighted if the language has a CSS keyword in it (like CSS, for example ;))
$styles = "/$k/";
- $keyword = quotemeta($keyword);
if ($this->language_data['CASE_SENSITIVE'][$k]) {
$stuff_to_parse = preg_replace(
- "#([^a-zA-Z0-9\$_\|\#;>])($keyword)(?=[^a-zA-Z0-9_<\|%\-&])#e",
+ "/([^a-zA-Z0-9\$_\|\#;>|^])($keyword)(?=[^a-zA-Z0-9_<\|%\-&])/e",
"'\\1' . $func2('\\2', '$k', 'BEGIN') . '<|$styles>' . $func('\\2') . '|>' . $func2('\\2', '$k', 'END')",
$stuff_to_parse
);
} else {
// Change the case of the word.
+ // hackage again... must... release... 1.2...
+ if ('smarty' == $this->language) { $hackage = '\/'; } else { $hackage = ''; }
$stuff_to_parse = preg_replace(
- "#([^a-zA-Z0-9\$_\|\#;>])($keyword)(?=[^a-zA-Z0-9_<\|%\-&])#ie",
+ "/([^a-zA-Z0-9\$_\|\#;>$hackage|^])($keyword)(?=[^a-zA-Z0-9_<\|%\-&])/ie",
"'\\1' . $func2('\\2', '$k', 'BEGIN') . '<|$styles>' . $func('\\2') . '|>' . $func2('\\2', '$k', 'END')",
$stuff_to_parse
);
@@ -2098,7 +2100,7 @@ class GeSHi
} else {
$attributes = ' class="me' . $key . '"';
}
- $stuff_to_parse = preg_replace("#(" . quotemeta($this->language_data['OBJECT_SPLITTERS'][$key]) . "[\s]*)([a-zA-Z\*\(][a-zA-Z0-9_\*]*)#", "\\1<|$attributes>\\2|>", $stuff_to_parse);
+ $stuff_to_parse = preg_replace("/(" . preg_quote($this->language_data['OBJECT_SPLITTERS'][$key], 1) . "[\s]*)([a-zA-Z\*\(][a-zA-Z0-9_\*]*)/", "\\1<|$attributes>\\2|>", $stuff_to_parse);
}
}
}
diff --git a/inc/geshi/actionscript-french.php b/inc/geshi/actionscript-french.php
index 23de81f64be7fe5fcb2887c4837649f5e77ef0bf..4bbc7a38e1d456ee51d4c535a0878c84e1034564 100644
--- a/inc/geshi/actionscript-french.php
+++ b/inc/geshi/actionscript-french.php
@@ -4,7 +4,7 @@
* ----------------
* Author: Steffen Krause (Steffen.krause@muse.de)
* Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.7 $
* Date Started: 2004/06/20
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/actionscript.php b/inc/geshi/actionscript.php
index 7eb235cd2b96bbfd27ef528d1b16503f4d45efea..876edc1c3759f20d750b7aa0722d9d6d46b87e7f 100644
--- a/inc/geshi/actionscript.php
+++ b/inc/geshi/actionscript.php
@@ -4,7 +4,7 @@
* ----------------
* Author: Steffen Krause (Steffen.krause@muse.de)
* Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/06/20
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/ada.php b/inc/geshi/ada.php
index 7665d2b5eaa46c1e3745952d084a691867d6b2f7..d01e01d87bd2479ba24d4ef1de43eaca7c131b74 100644
--- a/inc/geshi/ada.php
+++ b/inc/geshi/ada.php
@@ -4,7 +4,7 @@
* -------
* Author: Tux (tux@inmail.cz)
* Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.9 $
* Date Started: 2004/07/29
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/apache.php b/inc/geshi/apache.php
index 88c76f47d0c170e97f5ada5766a4a037f02b2e7f..07d01f9b536fcd5764ff635a96000396a2d9b9f2 100644
--- a/inc/geshi/apache.php
+++ b/inc/geshi/apache.php
@@ -4,7 +4,7 @@
* ----------
* Author: Tux (tux@inmail.cz)
* Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.9 $
* Date Started: 2004/29/07
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/applescript.php b/inc/geshi/applescript.php
index eb1e55f671846b04f23e3cd04e96313c44c1f5c2..2e53893d6e25fd721b50ab0672ded36149023e68 100644
--- a/inc/geshi/applescript.php
+++ b/inc/geshi/applescript.php
@@ -4,7 +4,7 @@
* --------
* Author: Stephan Klimek (http://www.initware.org)
* Copyright: Stephan Klimek (http://www.initware.org)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.7 $
* Date Started: 2005/07/20
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/asm.php b/inc/geshi/asm.php
index fb7abe69475adf3d9b1d09fda0a9c3cef52225d3..6868749fab5e78453dfe6ead646e0ea419794c29 100644
--- a/inc/geshi/asm.php
+++ b/inc/geshi/asm.php
@@ -4,7 +4,7 @@
* -------
* Author: Tux (tux@inmail.cz)
* Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.10 $
* Date Started: 2004/07/27
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/asp.php b/inc/geshi/asp.php
index 77fdcf5056f22502eb4019812db4b3f0773685ab..6adab92599adef62e6d84dc342c71790d0843162 100644
--- a/inc/geshi/asp.php
+++ b/inc/geshi/asp.php
@@ -4,7 +4,7 @@
* --------
* Author: Amit Gupta (http://blog.igeek.info/)
* Copyright: (c) 2004 Amit Gupta (http://blog.igeek.info/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.9 $
* Date Started: 2004/08/13
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/autoit.php b/inc/geshi/autoit.php
index b811b725152aa3200ebe01629d2ea2e18074dc34..521f7fd481e7060e9a8a9ea35860eb6925e0bd9f 100644
--- a/inc/geshi/autoit.php
+++ b/inc/geshi/autoit.php
@@ -4,7 +4,7 @@
* --------
* Author: mastrboy
* Copyright: (c) 2006 and to GESHi ;)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* Date Started: 26.01.2006
*
* Current bugs & todo:
diff --git a/inc/geshi/bash.php b/inc/geshi/bash.php
index 489bd42730f5897373d36862af2b3325a8734c68..01069b0b8f06fef3c8a44a8e71f62e9187b89894 100644
--- a/inc/geshi/bash.php
+++ b/inc/geshi/bash.php
@@ -4,7 +4,7 @@
* --------
* Author: Andreas Gohr (andi@splitbrain.org)
* Copyright: (c) 2004 Andreas Gohr, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/08/20
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/blitzbasic.php b/inc/geshi/blitzbasic.php
index 5acdae74abe68868775438ba2d2ff3f746a0f520..1fafc75aa4af49519c859fa42e3e4959193a4b41 100644
--- a/inc/geshi/blitzbasic.php
+++ b/inc/geshi/blitzbasic.php
@@ -4,7 +4,7 @@
* --------------
* Author: Pàdraig O`Connel (info@moonsword.info)
* Copyright: (c) 2005 Pàdraig O`Connel (http://moonsword.info)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.6 $
* Date Started: 16.10.2005
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/c.php b/inc/geshi/c.php
index b8fd2287fe1dc99ed25783fdbaac3513079c9259..42dd01a7bc8d5fa46a8f67dcda4adc780805c0fd 100644
--- a/inc/geshi/c.php
+++ b/inc/geshi/c.php
@@ -6,7 +6,7 @@
* Contributors:
* - Jack Lloyd (lloyd@randombit.net)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/06/04
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/c_mac.php b/inc/geshi/c_mac.php
index d05ce0b37c917aa6dd366c3c2356378f21e7dae0..6d1fdd84f5f4e9040e9f4fb6b908083fbc04447c 100644
--- a/inc/geshi/c_mac.php
+++ b/inc/geshi/c_mac.php
@@ -4,7 +4,7 @@
* ---------
* Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
* Copyright: (c) 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/06/04
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/caddcl.php b/inc/geshi/caddcl.php
index ad084803f0bdc15b5b7cf7467c16843d3d969705..ac358c4d6cc7c095e00dc40a72bd03ee49518026 100644
--- a/inc/geshi/caddcl.php
+++ b/inc/geshi/caddcl.php
@@ -4,7 +4,7 @@
* ----------
* Author: Roberto Rossi (rsoftware@altervista.org)
* Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/08/30
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/cadlisp.php b/inc/geshi/cadlisp.php
index 340dc8e5e2a89373c34a9e522c944dd2617e2cba..6c4e35277dcfce4dff18d4b7dd8ead162fe40e23 100644
--- a/inc/geshi/cadlisp.php
+++ b/inc/geshi/cadlisp.php
@@ -4,7 +4,7 @@
* -----------
* Author: Roberto Rossi (rsoftware@altervista.org)
* Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/blog)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/08/30
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/cfm.php b/inc/geshi/cfm.php
index 4858c31eaf08954910649d60aebd0ce8d4c77614..2f2ba259a7f5368b155549561f5e08bac7621452 100644
--- a/inc/geshi/cfm.php
+++ b/inc/geshi/cfm.php
@@ -4,7 +4,7 @@
* -------
* Author: Diego ()
* Copyright: (c) 2006 Diego
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.2 $
* Date Started: 2006/02/25
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/cpp.php b/inc/geshi/cpp.php
index b4c939a2b32917f75183f3357580ccd2b125dccd..357eb41fa9f566fb42162bb91c2bd06bcac00935 100644
--- a/inc/geshi/cpp.php
+++ b/inc/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.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.10 $
* Date Started: 2004/09/27
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/csharp.php b/inc/geshi/csharp.php
index 077c540e7e9a8da766b0faa407c23195392f2142..3d1a7ed39c88fa57cfc91b570351a1577d8245cc 100644
--- a/inc/geshi/csharp.php
+++ b/inc/geshi/csharp.php
@@ -4,7 +4,7 @@
* ----------
* Author: Alan Juden (alan@judenware.org)
* Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.9 $
* Date Started: 2004/06/04
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/css.php b/inc/geshi/css.php
index 3abfeb9535783adc3d8e5523e4a3106ba143f0b0..73e7281ae5b0544a13a8fe3090ebeefc96d325f7 100644
--- a/inc/geshi/css.php
+++ b/inc/geshi/css.php
@@ -4,7 +4,7 @@
* -------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.10 $
* Date Started: 2004/06/18
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/d.php b/inc/geshi/d.php
index 6da17a5b50173f844fd0f5979eaef1ddf8405064..e23cb6467792fe0a3963c9d1bf8e1aa9d1df2295 100644
--- a/inc/geshi/d.php
+++ b/inc/geshi/d.php
@@ -4,7 +4,7 @@
* -----
* Author: Thomas Kuehne (thomas@kuehne.cn)
* Copyright: (c) 2005 Thomas Kuehne (http://thomas.kuehne.cn/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2005/04/22
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/delphi.php b/inc/geshi/delphi.php
index 2ecb21d93be7f529ef6c26275142db0335602f65..5fedb7d0b6729934ef1dee91e88078cff63a2d5b 100644
--- a/inc/geshi/delphi.php
+++ b/inc/geshi/delphi.php
@@ -4,7 +4,7 @@
* ----------
* Author: Járja Norbert (jnorbi@vipmail.hu)
* Copyright: (c) 2004 Járja Norbert, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.12 $
* Date Started: 2004/07/26
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/diff.php b/inc/geshi/diff.php
index 732411b309f03bdb640b3fef946ffe59bd76f1fc..926aeff892ca9ec30a8a25d3b1cdcc65a391a694 100644
--- a/inc/geshi/diff.php
+++ b/inc/geshi/diff.php
@@ -2,25 +2,26 @@
/*************************************************************************************
* diff.php
* --------
- * Author: Conny Brunnkvist (conny@fuchsia.se)
+ * Author: Conny Brunnkvist (conny@fuchsia.se), W. Tasin (tasin@fhm.edu)
* Copyright: (c) 2004 Fuchsia Open Source Solutions (http://www.fuchsia.se/)
- * Release Version: 1.0.7.7
- * CVS Revision Version: $Revision: 1.8 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 1.9 $
* Date Started: 2004/12/29
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/03/23 07:28:46 $
*
* Diff-output language file for GeSHi.
*
* CHANGES
* -------
+ * 2006/02/27
+ * - changing language file to use matching of start (^) and end ($) (wt)
+ *
* 2004/12/29 (1.0.0)
* - First Release
*
- * TODO (updated 2004/12/29)
+ * TODO (updated 2006/02/27)
* -------------------------
- * * Find out why GeSHi doesn't seem to allow matching of start (^) and end ($)
- * * So that we can stop pretending that we are dealing with single-line comments
- * * Should be able to cover all sorts of diff-output
+ *
*
*************************************************************************************
*
@@ -45,72 +46,64 @@
$language_data = array (
'LANG_NAME' => 'Diff',
- 'COMMENT_SINGLE' => array(
- 0 => '--- ',
- 1 => '+++ ',
- 2 => '<',
- 3 => '>',
- 4 => '-',
- 5 => '+',
- 6 => '!',
- 7 => '@@',
- 8 => '*** ',
- /*9 => '***************',*/
- /*10 => ' ', // All other rows starts with a space (bug?) */
- ),
+ 'COMMENT_SINGLE' => array(),
'COMMENT_MULTI' => array(),
'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
'QUOTEMARKS' => array(),
'ESCAPE_CHAR' => ' ',
'KEYWORDS' => array(
- 0 => array(
- '\ No newline at end of file',
- ),
1 => array(
+ '\ No newline at end of file'
+ ),
+ 2 => array(
'***************' /* This only seems to works in some cases? */
),
),
'SYMBOLS' => array(
),
'CASE_SENSITIVE' => array(
- GESHI_COMMENTS => false,
+ 1 => false,
+ 2 => false
),
'STYLES' => array(
'KEYWORDS' => array(
- 0 => 'color: #aaaaaa; font-style: italic;',
- 1 => 'color: #dd6611;',
+ 1 => 'color: #aaaaaa; font-style: italic;',
+ 2 => 'color: #dd6611;',
),
'COMMENTS' => array(
- 0 => 'color: #228822;',
- 1 => 'color: #228822;',
- 2 => 'color: #991111;',
- 3 => 'color: #00aaee;',
- 4 => 'color: #991111;',
- 5 => 'color: #00b000;',
- /*6 => 'color: #dd6611;', */
- 6 => 'color: #0011dd;',
- 7 => 'color: #aaaa88;',
- 8 => 'color: #228822;',
- /*9 => 'color: #aaaa88;',*/
- /*10 => 'color: #000000;',*/
- ),
+ ),
'ESCAPE_CHAR' => array(
+ 0 => ''
),
'BRACKETS' => array(
+ 0 => ''
),
'STRINGS' => array(
+ 0 => ''
),
'NUMBERS' => array(
+ 0 => ''
),
'METHODS' => array(
+ 0 => ''
),
'SYMBOLS' => array(
+ 0 => ''
),
'SCRIPT' => array(
+ 0 => ''
),
- 'REGEXPS' => array(
- 0 => 'color: #aaaaaa;',
- /*1 => 'color: #000000;',*/
+ 'REGEXPS' => array(
+ 0 => 'color: #440088;',
+ 1 => 'color: #991111;',
+ 2 => 'color: #00b000;',
+ 3 => 'color: #888822;',
+ 4 => 'color: #888822;',
+ 5 => 'color: #0011dd;',
+ 6 => 'color: #440088;',
+ 7 => 'color: #991111;',
+ 8 => 'color: #00b000;',
+ 9 => 'color: #888822;',
),
),
'URLS' => array(
@@ -119,14 +112,70 @@ $language_data = array (
'OBJECT_SPLITTER' => '',
'REGEXPS' => array(
0 => "[0-9,]+[acd][0-9,]+",
- /*1 => array( // Match all other lines - again this also doesn't work.
- GESHI_SEARCH => '(\ )(.+)',
- GESHI_REPLACE => '\\2\\3',
- GESHI_MODIFIERS => '',
- GESHI_BEFORE => '\\1',
- GESHI_AFTER => ''
- ),*/
- ),
+ 1 => array(
+ GESHI_SEARCH => '^\\<.*$',
+ GESHI_REPLACE => '\\0',
+ GESHI_MODIFIERS => 'm',
+ GESHI_BEFORE => '',
+ GESHI_AFTER => ''
+ ),
+ 2 => array(
+ GESHI_SEARCH => '^\\>.*$',
+ GESHI_REPLACE => '\\0',
+ GESHI_MODIFIERS => 'm',
+ GESHI_BEFORE => '',
+ GESHI_AFTER => ''
+ ),
+ 3 => array(
+ GESHI_SEARCH => '^[\\-]{3}\\s.*$',
+ GESHI_REPLACE => '\\0',
+ GESHI_MODIFIERS => 'm',
+ GESHI_BEFORE => '',
+ GESHI_AFTER => ''
+ ),
+ 4 => array(
+ GESHI_SEARCH => '^(\\+){3}\\s.*$',
+ GESHI_REPLACE => '\\0',
+ GESHI_MODIFIERS => 'm',
+ GESHI_BEFORE => '',
+ GESHI_AFTER => ''
+ ),
+ 5 => array(
+ GESHI_SEARCH => '^\\!.*$',
+ GESHI_REPLACE => '\\0',
+ GESHI_MODIFIERS => 'm',
+ GESHI_BEFORE => '',
+ GESHI_AFTER => ''
+ ),
+ 6 => array(
+ GESHI_SEARCH => '^[\\@]{2}.*$',
+ GESHI_REPLACE => '\\0',
+ GESHI_MODIFIERS => 'm',
+ GESHI_BEFORE => '',
+ GESHI_AFTER => ''
+ ),
+ 7 => array(
+ GESHI_SEARCH => '^\\-.*$',
+ GESHI_REPLACE => '\\0',
+ GESHI_MODIFIERS => 'm',
+ GESHI_BEFORE => '',
+ GESHI_AFTER => ''
+ ),
+ 8 => array(
+ GESHI_SEARCH => '^\\+.*$',
+ GESHI_REPLACE => '\\0',
+ GESHI_MODIFIERS => 'm',
+ GESHI_BEFORE => '',
+ GESHI_AFTER => ''
+ ),
+ 9 => array(
+ GESHI_SEARCH => '^(\\*){3}\\s.*$',
+ GESHI_REPLACE => '\\0',
+ GESHI_MODIFIERS => 'm',
+ GESHI_BEFORE => '',
+ GESHI_AFTER => ''
+ ),
+ ),
'STRICT_MODE_APPLIES' => GESHI_NEVER,
'SCRIPT_DELIMITERS' => array(
),
diff --git a/inc/geshi/div.php b/inc/geshi/div.php
index 5252feb90d1b6f87cfcf567ed0df080f901cf45b..b4bc08576db8a45f932b4dd83ef5cea7e7590ad2 100644
--- a/inc/geshi/div.php
+++ b/inc/geshi/div.php
@@ -4,7 +4,7 @@
* ---------------------------------
* Author: Gabriel Lorenzo (ermakina@gmail.com)
* Copyright: (c) 2005 Gabriel Lorenzo (http://ermakina.gazpachito.net)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2005/06/19
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/dos.php b/inc/geshi/dos.php
index ee31c3f7f6523df81355d4703e90a760172501ea..28189f24624df87276f57bbff49def764382f95c 100644
--- a/inc/geshi/dos.php
+++ b/inc/geshi/dos.php
@@ -4,7 +4,7 @@
* -------
* Author: Alessandro Staltari (staltari@geocities.com)
* Copyright: (c) 2005 Alessandro Staltari (http://www.geocities.com/SiliconValley/Vista/8155/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2005/07/05
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/eiffel.php b/inc/geshi/eiffel.php
index d9b1909852090b5fcc2dfc8e35fc1000e3679c2f..c93677034ab56e28449049729898b54004676205 100644
--- a/inc/geshi/eiffel.php
+++ b/inc/geshi/eiffel.php
@@ -4,7 +4,7 @@
* ----------
* Author: Zoran Simic (zsimic@axarosenberg.com)
* Copyright: (c) 2005 Zoran Simic
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2005/06/30
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/freebasic.php b/inc/geshi/freebasic.php
index f0f6069f6709f3f3314e433eda2291d55491ae5b..2d671c925a31107d3e184ffd7fd1535f85320ccc 100644
--- a/inc/geshi/freebasic.php
+++ b/inc/geshi/freebasic.php
@@ -4,7 +4,7 @@
* -------------
* Author: Roberto Rossi
* Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* Date Started: 2005/08/19
*
* FreeBasic (http://www.freebasic.net/) language file for GeSHi.
diff --git a/inc/geshi/gml.php b/inc/geshi/gml.php
index 3ffd229d1286243047e4a5c0389af7a587340861..2e149f836b200d2c4a2c716994757b927f13228f 100644
--- a/inc/geshi/gml.php
+++ b/inc/geshi/gml.php
@@ -4,10 +4,10 @@
* --------
* Author: José Jorge Enríquez (jenriquez@users.sourceforge.net)
* Copyright: (c) 2005 José Jorge Enríquez Rodríguez (http://www.zonamakers.com)
- * Release Version: 1.0.7.7
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 1.10 $
* Date Started: 2005/06/21
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/03/23 07:30:24 $
*
* GML language file for GeSHi.
*
@@ -471,8 +471,7 @@ $language_data = array (
0 => 'color: #cc66cc;'
),
'METHODS' => array(
- 1 => 'color: #202020;',
- 2 => 'color: #202020;'
+ 1 => 'color: #202020;'
),
'SYMBOLS' => array(
0 => 'color: #66cc66; font-weight: bold;'
diff --git a/inc/geshi/html4strict.php b/inc/geshi/html4strict.php
index dd27f25e0aa7fe4e636cd0d6edb8ec7c6a5133b0..f3e886a09f5d8c1ad1aeacffe6ee3e896838fbeb 100644
--- a/inc/geshi/html4strict.php
+++ b/inc/geshi/html4strict.php
@@ -4,7 +4,7 @@
* ---------------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.10 $
* Date Started: 2004/07/10
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/ini.php b/inc/geshi/ini.php
index 8a647329e52cf7f557dd5654efa64ffa09ee011d..9130aaf62f54042f78af22ff7e868a25f1f0d8dd 100644
--- a/inc/geshi/ini.php
+++ b/inc/geshi/ini.php
@@ -4,7 +4,7 @@
* --------
* Author: deguix (cevo_deguix@yahoo.com.br)
* Copyright: (c) 2005 deguix
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.9 $
* Date Started: 2005/03/27
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/inno.php b/inc/geshi/inno.php
index bad7f0fa6ebae87d5fd3a930b132f6588bf8d615..297f7d2284a65bc18d80b2cc590ccb0c151fc41d 100644
--- a/inc/geshi/inno.php
+++ b/inc/geshi/inno.php
@@ -4,7 +4,7 @@
* ----------
* Author: Thomas Klingler (hotline@theratech.de) based on delphi.php from Járja Norbert (jnorbi@vipmail.hu)
* Copyright: (c) 2004 Járja Norbert, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.7 $
* Date Started: 2005/07/29
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/java.php b/inc/geshi/java.php
index b0d133b3beefba4a50ef25800e1409cd98cb099b..91aa1add5f8d6eed23bb302e754f885251db2704 100644
--- a/inc/geshi/java.php
+++ b/inc/geshi/java.php
@@ -4,7 +4,7 @@
* --------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.14 $
* Date Started: 2004/07/10
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/java5.php b/inc/geshi/java5.php
index 2b541f6ee5d85f054f7d8c24e7fb0d78a3796fa9..f99b6e7292c12feeb57b9b68b6013c82cbb0da73 100644
--- a/inc/geshi/java5.php
+++ b/inc/geshi/java5.php
@@ -4,7 +4,7 @@
* --------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.2 $
* Date Started: 2004/07/10
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/javascript.php b/inc/geshi/javascript.php
index 419e3ee40501b81731bedf1032981b313496954a..81b7e7640addccca75e1194d1474be010321d63f 100644
--- a/inc/geshi/javascript.php
+++ b/inc/geshi/javascript.php
@@ -4,7 +4,7 @@
* --------------
* 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.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/06/20
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/lisp.php b/inc/geshi/lisp.php
index 63fd85e4b57b37448cdae3d25a91edada65e7e24..a20ce0627cd4afcde3682675b001d1083c23fa25 100644
--- a/inc/geshi/lisp.php
+++ b/inc/geshi/lisp.php
@@ -4,7 +4,7 @@
* --------
* Author: Roberto Rossi (rsoftware@altervista.org)
* Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.9 $
* Date Started: 2004/08/30
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/lua.php b/inc/geshi/lua.php
index 09a61495ba44a797acf2c6a9974f83617ebd2e4a..e4585a530fa2603d713c36f920d4be4d5104911a 100644
--- a/inc/geshi/lua.php
+++ b/inc/geshi/lua.php
@@ -4,7 +4,7 @@
* -------
* Author: Roberto Rossi (rsoftware@altervista.org)
* Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.10 $
* Date Started: 2004/07/10
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/matlab.php b/inc/geshi/matlab.php
index fef97f4b5e86a76c8ea9e401c0a17fde67affc57..48d7866ea71af08833c6b24c35e2f2f0cdf0bc1a 100644
--- a/inc/geshi/matlab.php
+++ b/inc/geshi/matlab.php
@@ -4,7 +4,7 @@
* -----------
* Author: Florian Knorn (floz@gmx.de)
* Copyright: (c) 2004 Florian Knorn (http://www.florian-knorn.com)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2005/02/09
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/mpasm.php b/inc/geshi/mpasm.php
index 59a470a4c14acb0f9940dff874f4d8e96b7fbfa2..bfde9214cb1e5ac9510bf4b1d82230845f761bc9 100644
--- a/inc/geshi/mpasm.php
+++ b/inc/geshi/mpasm.php
@@ -4,7 +4,7 @@
* ---------
* Author: Bakalex (bakalex@gmail.com)
* Copyright: (c) 2004 Bakalex, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/12/6
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/mysql.php b/inc/geshi/mysql.php
index 63094a15882b54a2b273b15d5151410db8f35174..d1584c86f6233f5fcaf64a3c487528d2e3e83380 100644
--- a/inc/geshi/mysql.php
+++ b/inc/geshi/mysql.php
@@ -1,13 +1,13 @@
- <?php
+<?php
/*************************************************************************************
* mysql.php
* ---------
* Author: Carl Fürstenberg (azatoth@gmail.com)
* Copyright: (c) 2005 Carl Fürstenberg, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
- * CVS Revision Version: $Revision: 1.5 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 1.6 $
* Date Started: 2004/06/04
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/03/11 21:44:08 $
*
* MySQL language file for GeSHi.
*
diff --git a/inc/geshi/nsis.php b/inc/geshi/nsis.php
index 0d15683c75716c0fee17c73a3c7ad56a0ee312c6..d414d5707245b10c472e756a3fb0c0a91e035389 100644
--- a/inc/geshi/nsis.php
+++ b/inc/geshi/nsis.php
@@ -4,7 +4,7 @@
* --------
* Author: deguix (cevo_deguix@yahoo.com.br), Tux (http://tux.a4.cz/)
* Copyright: (c) 2005 deguix, 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.10 $
* Date Started: 2005/12/03
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/objc.php b/inc/geshi/objc.php
index f5ff1c2c972ce87d3d9300af6321e6584f8e0c6c..c508575bd1f4fd6f82bcb1cc40db7b88534cf9a5 100644
--- a/inc/geshi/objc.php
+++ b/inc/geshi/objc.php
@@ -4,7 +4,7 @@
* --------
* Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
* Copyright: (c) 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/06/04
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/ocaml-brief.php b/inc/geshi/ocaml-brief.php
index 5c8feb77da5b6e317fa63e39763bd52a2c63b56f..fdf1255ccdb84e615222f16f3b37e2664811db13 100644
--- a/inc/geshi/ocaml-brief.php
+++ b/inc/geshi/ocaml-brief.php
@@ -4,7 +4,7 @@
* ----------
* Author: Flaie (fireflaie@gmail.com)
* Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.6 $
* Date Started: 2005/08/27
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/ocaml.php b/inc/geshi/ocaml.php
index 9d28624c14926fb6f4746223e8a2df1aaee7db7d..5d5664927f3122749b13e9e4ead1361b742a7e92 100644
--- a/inc/geshi/ocaml.php
+++ b/inc/geshi/ocaml.php
@@ -4,7 +4,7 @@
* ----------
* Author: Flaie (fireflaie@gmail.com)
* Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.6 $
* Date Started: 2005/08/27
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/oobas.php b/inc/geshi/oobas.php
index 425d8c748e5e3d9b4d3bfd2680fb0e177fca9752..bcd942661a691244b4700b1604158d05fde75e8b 100644
--- a/inc/geshi/oobas.php
+++ b/inc/geshi/oobas.php
@@ -4,7 +4,7 @@
* ---------
* Author: Roberto Rossi (rsoftware@altervista.org)
* Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/08/30
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/oracle8.php b/inc/geshi/oracle8.php
index bb88f222c9847c0f0baf21ad6af5109da51dea0d..57b0c0b6d3c4ca0dff0fd2888b6b266aa6f372d1 100644
--- a/inc/geshi/oracle8.php
+++ b/inc/geshi/oracle8.php
@@ -4,7 +4,7 @@
* -----------
* Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/06/04
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/pascal.php b/inc/geshi/pascal.php
index 69feccf6ac096089485f146baca24c262ff78005..2250dd92a9fb5ea9daa4c551aae80db268c02259 100644
--- a/inc/geshi/pascal.php
+++ b/inc/geshi/pascal.php
@@ -4,7 +4,7 @@
* ----------
* Author: Tux (tux@inamil.cz)
* Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/07/26
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/perl.php b/inc/geshi/perl.php
index 489b010fbca7aca426562f386004dea022523bce..2d48e8aa4fd495de31d5448c280e41a1a8f61293 100644
--- a/inc/geshi/perl.php
+++ b/inc/geshi/perl.php
@@ -4,7 +4,7 @@
* --------
* Author: Andreas Gohr (andi@splitbrain.org), Ben Keen (ben.keen@gmail.com)
* Copyright: (c) 2004 Andreas Gohr, Ben Keen (http://www.benjaminkeen.org/), Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.9 $
* Date Started: 2004/08/20
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/php-brief.php b/inc/geshi/php-brief.php
index 8ae5c0bc1779d5dc7d6e1a503bed3525447f45ae..6fb380d0ded033ee40d1fdddaf1e66c32dc129f9 100644
--- a/inc/geshi/php-brief.php
+++ b/inc/geshi/php-brief.php
@@ -4,7 +4,7 @@
* -------------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/06/02
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/php.php b/inc/geshi/php.php
index f6a11eeddea4e07709babb8f9889409eaf41f97f..046a4f4622689f59bf9fd24043d0ab5c2862974b 100644
--- a/inc/geshi/php.php
+++ b/inc/geshi/php.php
@@ -4,7 +4,7 @@
* --------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.9 $
* Date Started: 2004/06/20
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/python.php b/inc/geshi/python.php
index ecd4faa56f3ea598f470d2575b52063c39524fed..578042c81e2019b16f74ae35c63493a1bdb0a140 100644
--- a/inc/geshi/python.php
+++ b/inc/geshi/python.php
@@ -4,7 +4,7 @@
* ----------
* Author: Roberto Rossi (rsoftware@altervista.org)
* Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.9 $
* Date Started: 2004/08/30
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/qbasic.php b/inc/geshi/qbasic.php
index bfcfb1aecaa4d9baaf58f834587c114ad9de88c5..e5f6c874afa71e3a8513eaf86472fe36bf378d49 100644
--- a/inc/geshi/qbasic.php
+++ b/inc/geshi/qbasic.php
@@ -4,7 +4,7 @@
* ----------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.9 $
* Date Started: 2004/06/20
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/robots.php b/inc/geshi/robots.php
index bdcbfd6f4a550f023a12a63f5f2d49e05b5e2855..84c5b876888ebe1c9c9b47bba286d6acf3513036 100644
--- a/inc/geshi/robots.php
+++ b/inc/geshi/robots.php
@@ -4,7 +4,7 @@
* --------
* Author: Christian Lescuyer (cl@goelette.net)
* Copyright: (c) 2006 Christian Lescuyer http://xtian.goelette.info
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.2 $
* Date Started: 2006/02/17
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/ruby.php b/inc/geshi/ruby.php
index e535348ee3a37ed705da9da046cfe5acd6df4a59..29b428e48292e283f751d0c8e875112f107ab211 100644
--- a/inc/geshi/ruby.php
+++ b/inc/geshi/ruby.php
@@ -4,7 +4,7 @@
* --------
* Author: Amit Gupta (http://blog.igeek.info/)
* Copyright: (c) 2005 Amit Gupta (http://blog.igeek.info/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2005/09/05
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/scheme.php b/inc/geshi/scheme.php
index c02b6c44a81c348ca0665768f83d7a72a6a5089e..f0c86533d1c56bec71df5e7f9eaa95b13060d809 100644
--- a/inc/geshi/scheme.php
+++ b/inc/geshi/scheme.php
@@ -4,7 +4,7 @@
* ----------
* Author: Jon Raphaelson (jonraphaelson@gmail.com)
* Copyright: (c) 2005 Jon Raphaelson, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.6 $
* Date Started: 2004/08/30
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/sdlbasic.php b/inc/geshi/sdlbasic.php
index 6e8c832e0e9b34b68396b177c15fd178268a0227..de408a12aecbb6ea7a829843011ca6bf413388cf 100644
--- a/inc/geshi/sdlbasic.php
+++ b/inc/geshi/sdlbasic.php
@@ -4,7 +4,7 @@
* ------------
* Author: Roberto Rossi
* Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.7 $
* Date Started: 2005/08/19
* Date Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/smarty.php b/inc/geshi/smarty.php
index db27c993a8007cdee39f29949ec61c90d4013f91..c877a99987b6a25f8ea688d9cc355f9afe0ee4e2 100644
--- a/inc/geshi/smarty.php
+++ b/inc/geshi/smarty.php
@@ -4,10 +4,10 @@
* ----------
* Author: Alan Juden (alan@judenware.org)
* Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
- * CVS Revision Version: $Revision: 1.9 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 1.10 $
* Date Started: 2004/07/10
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/03/11 21:44:08 $
*
* Smarty template language file for GeSHi.
*
@@ -134,6 +134,7 @@ $language_data = array (
0 => 'color: #D36900;'
),
'SCRIPT' => array(
+ 0 => ''
),
'REGEXPS' => array(
)
diff --git a/inc/geshi/sql.php b/inc/geshi/sql.php
index ebf3f4783e53ce30eddab22c92a8e1949c0f6217..fbd0e38dc2463f566b5a61eff78b7f0ac35654d1 100644
--- a/inc/geshi/sql.php
+++ b/inc/geshi/sql.php
@@ -4,7 +4,7 @@
* -------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.10 $
* Date Started: 2004/06/04
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/tsql.php b/inc/geshi/tsql.php
index 7eadd34ab979bb3b73fd72bf2b71e2b5443b8992..9ed689a6fcc681dd4e3460f26f365509df05c7d4 100644
--- a/inc/geshi/tsql.php
+++ b/inc/geshi/tsql.php
@@ -4,7 +4,7 @@
* --------
* Author: Duncan Lock (dunc@dflock.co.uk)
* Copyright: (c) 2006 Duncan Lock (http://dflock.co.uk/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.2 $
* Date Started: 2005/11/22
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/vb.php b/inc/geshi/vb.php
index 4a793de673a81a85de6ee4cce675a3178ecfe19e..c5cb570dfa016f988144b01ea10d359dba1cc1a4 100644
--- a/inc/geshi/vb.php
+++ b/inc/geshi/vb.php
@@ -4,7 +4,7 @@
* ------
* Author: Roberto Rossi (rsoftware@altervista.org)
* Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.9 $
* Date Started: 2004/08/30
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/vbnet.php b/inc/geshi/vbnet.php
index e36fc9fd1be0611ef6c8037c5776f0fd3007b03d..918b20e81b9888c397f2c7cdb6ea636b3b9c5fad 100644
--- a/inc/geshi/vbnet.php
+++ b/inc/geshi/vbnet.php
@@ -4,7 +4,7 @@
* ---------
* Author: Alan Juden (alan@judenware.org)
* Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.10 $
* Date Started: 2004/06/04
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/vhdl.php b/inc/geshi/vhdl.php
index 40e79de38981af6258becaf596789bdfbc1ce4ea..725968e34bd59270e45092e9e220b93114393790 100644
--- a/inc/geshi/vhdl.php
+++ b/inc/geshi/vhdl.php
@@ -4,7 +4,7 @@
* --------
* Author: Alexander 'E-Razor' Krause (admin@erazor-zone.de)
* Copyright: (c) 2005 Alexander Krause
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2005/06/15
* Last Modified: $Date: 2006/02/25 00:46:33 $
diff --git a/inc/geshi/visualfoxpro.php b/inc/geshi/visualfoxpro.php
index 00f2e0abf13168e5ce294c62ffc431c3106ca74e..632e7811d7ddfdba4827e3a183018d4184f79703 100644
--- a/inc/geshi/visualfoxpro.php
+++ b/inc/geshi/visualfoxpro.php
@@ -4,7 +4,7 @@
* ----------------
* Author: Roberto Armellin (r.armellin@tin.it)
* Copyright: (c) 2004 Roberto Armellin, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
+ * Release Version: 1.0.7.8
* CVS Revision Version: $Revision: 1.8 $
* Date Started: 2004/09/17
* Last Modified: 2004/09/18
diff --git a/inc/geshi/xml.php b/inc/geshi/xml.php
index 67739381a6f3f6acb4ba8a49e81adf3722640730..b0ab247f905ab2da21d6776b804d9d6ae1f4bd65 100644
--- a/inc/geshi/xml.php
+++ b/inc/geshi/xml.php
@@ -4,10 +4,10 @@
* -------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.7.7
- * CVS Revision Version: $Revision: 1.12 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 1.13 $
* Date Started: 2004/09/01
- * Last Modified: $Date: 2006/02/25 00:46:33 $
+ * Last Modified: $Date: 2006/03/23 07:31:32 $
*
* XML language file for GeSHi. Based on the idea/file by Christian Weiske
*
@@ -107,14 +107,14 @@ $language_data = array (
GESHI_AFTER => '\\4'
),
1 => array(
- GESHI_SEARCH => '(</?[a-z0-9_]*(>)?)',
+ GESHI_SEARCH => '(<[/?|(\?xml)]?[a-z0-9_]*(\??>)?)',
GESHI_REPLACE => '\\1',
GESHI_MODIFIERS => 'i',
GESHI_BEFORE => '',
GESHI_AFTER => ''
),
2 => array(
- GESHI_SEARCH => '((/)?>)',
+ GESHI_SEARCH => '(([/|\?])?>)',
GESHI_REPLACE => '\\1',
GESHI_MODIFIERS => 'i',
GESHI_BEFORE => '',