Permalink
Browse files

GeSHi updated to 1.0.8.7

git-svn-id: http://svn.wp-plugins.org/codecolorer/trunk@225731 b8457f37-d9ea-0310-8a92-e5e31aec5664
  • Loading branch information...
1 parent 912e607 commit 52419f3b928d9dc956a1171cc053902f6d94e001 @kpumuk committed Apr 6, 2010
Showing with 1,594 additions and 207 deletions.
  1. +2 −1 .gitignore
  2. +1 −1 codecolorer-core.php
  3. +5 −4 lib/geshi.php
  4. +1 −1 lib/geshi/4cs.php
  5. +1 −1 lib/geshi/abap.php
  6. +1 −1 lib/geshi/actionscript.php
  7. +1 −1 lib/geshi/actionscript3.php
  8. +1 −1 lib/geshi/ada.php
  9. +1 −1 lib/geshi/apache.php
  10. +1 −1 lib/geshi/applescript.php
  11. +1 −1 lib/geshi/apt_sources.php
  12. +1 −1 lib/geshi/asm.php
  13. +1 −1 lib/geshi/asp.php
  14. +512 −0 lib/geshi/autoconf.php
  15. +1 −1 lib/geshi/autohotkey.php
  16. +8 −4 lib/geshi/autoit.php
  17. +1 −1 lib/geshi/avisynth.php
  18. +1 −1 lib/geshi/awk.php
  19. +1 −1 lib/geshi/bash.php
  20. +1 −1 lib/geshi/basic4gl.php
  21. +1 −1 lib/geshi/bf.php
  22. +1 −1 lib/geshi/bibtex.php
  23. +1 −1 lib/geshi/blitzbasic.php
  24. +16 −7 lib/geshi/bnf.php
  25. +1 −1 lib/geshi/boo.php
  26. +17 −3 lib/geshi/c.php
  27. +18 −3 lib/geshi/c_mac.php
  28. +1 −1 lib/geshi/caddcl.php
  29. +1 −1 lib/geshi/cadlisp.php
  30. +1 −1 lib/geshi/cfdg.php
  31. +1 −1 lib/geshi/cfm.php
  32. +1 −1 lib/geshi/cil.php
  33. +5 −5 lib/geshi/clojure.php
  34. +1 −1 lib/geshi/cmake.php
  35. +1 −1 lib/geshi/cobol.php
  36. +17 −3 lib/geshi/cpp-qt.php
  37. +17 −3 lib/geshi/cpp.php
  38. +1 −1 lib/geshi/csharp.php
  39. +1 −1 lib/geshi/css.php
  40. +1 −1 lib/geshi/cuesheet.php
  41. +1 −1 lib/geshi/d.php
  42. +1 −1 lib/geshi/dcs.php
  43. +1 −1 lib/geshi/delphi.php
  44. +1 −1 lib/geshi/diff.php
  45. +1 −1 lib/geshi/div.php
  46. +8 −4 lib/geshi/dos.php
  47. +1 −1 lib/geshi/dot.php
  48. +210 −0 lib/geshi/ecmascript.php
  49. +1 −1 lib/geshi/eiffel.php
  50. +1 −1 lib/geshi/email.php
  51. +3 −3 lib/geshi/erlang.php
  52. +1 −1 lib/geshi/fo.php
  53. +1 −1 lib/geshi/fortran.php
  54. +1 −1 lib/geshi/freebasic.php
  55. +1 −1 lib/geshi/fsharp.php
  56. +1 −1 lib/geshi/gambas.php
  57. +1 −1 lib/geshi/gdb.php
  58. +1 −1 lib/geshi/genero.php
  59. +1 −1 lib/geshi/gettext.php
  60. +1 −1 lib/geshi/glsl.php
  61. +1 −1 lib/geshi/gml.php
  62. +1 −1 lib/geshi/gnuplot.php
  63. +1 −1 lib/geshi/groovy.php
  64. +8 −4 lib/geshi/haskell.php
  65. +1 −1 lib/geshi/hq9plus.php
  66. +1 −1 lib/geshi/html4strict.php
  67. +1 −1 lib/geshi/idl.php
  68. +1 −1 lib/geshi/ini.php
  69. +1 −1 lib/geshi/inno.php
  70. +1 −1 lib/geshi/intercal.php
  71. +1 −1 lib/geshi/io.php
  72. +246 −0 lib/geshi/j.php
  73. +1 −1 lib/geshi/java.php
  74. +8 −2 lib/geshi/java5.php
  75. +1 −1 lib/geshi/javascript.php
  76. +1 −1 lib/geshi/jquery.php
  77. +1 −1 lib/geshi/kixtart.php
  78. +1 −1 lib/geshi/klonec.php
  79. +1 −1 lib/geshi/klonecpp.php
  80. +2 −2 lib/geshi/latex.php
  81. +3 −3 lib/geshi/lisp.php
  82. +1 −1 lib/geshi/locobasic.php
  83. +1 −1 lib/geshi/logtalk.php
  84. +1 −1 lib/geshi/lolcode.php
  85. +1 −1 lib/geshi/lotusformulas.php
  86. +1 −1 lib/geshi/lotusscript.php
  87. +1 −1 lib/geshi/lscript.php
  88. +1 −1 lib/geshi/lsl2.php
  89. +1 −1 lib/geshi/lua.php
  90. +1 −1 lib/geshi/m68k.php
  91. +1 −1 lib/geshi/make.php
  92. +1 −1 lib/geshi/mapbasic.php
  93. +1 −1 lib/geshi/matlab.php
  94. +1 −1 lib/geshi/mirc.php
  95. +1 −1 lib/geshi/mmix.php
  96. +1 −1 lib/geshi/modula3.php
  97. +1 −1 lib/geshi/mpasm.php
  98. +1 −1 lib/geshi/mxml.php
  99. +1 −1 lib/geshi/mysql.php
  100. +1 −1 lib/geshi/newlisp.php
  101. +1 −1 lib/geshi/nsis.php
  102. +1 −1 lib/geshi/oberon2.php
  103. +1 −1 lib/geshi/objc.php
  104. +1 −1 lib/geshi/ocaml-brief.php
  105. +1 −1 lib/geshi/ocaml.php
  106. +1 −1 lib/geshi/oobas.php
  107. +1 −1 lib/geshi/oracle11.php
  108. +1 −1 lib/geshi/oracle8.php
  109. +152 −0 lib/geshi/oxygene.php
  110. +1 −1 lib/geshi/pascal.php
  111. +1 −1 lib/geshi/per.php
  112. +1 −1 lib/geshi/perl.php
  113. +1 −1 lib/geshi/perl6.php
  114. +178 −0 lib/geshi/pf.php
  115. +1 −1 lib/geshi/php-brief.php
  116. +1 −1 lib/geshi/php.php
  117. +1 −1 lib/geshi/pic16.php
  118. +1 −1 lib/geshi/pike.php
  119. +1 −1 lib/geshi/pixelbender.php
  120. +1 −1 lib/geshi/plsql.php
  121. +1 −1 lib/geshi/povray.php
  122. +1 −1 lib/geshi/powerbuilder.php
  123. +1 −1 lib/geshi/powershell.php
  124. +1 −1 lib/geshi/progress.php
  125. +3 −3 lib/geshi/prolog.php
  126. +1 −1 lib/geshi/properties.php
  127. +1 −1 lib/geshi/providex.php
  128. +1 −1 lib/geshi/purebasic.php
  129. +1 −1 lib/geshi/python.php
  130. +1 −1 lib/geshi/qbasic.php
  131. +1 −1 lib/geshi/rails.php
  132. +1 −1 lib/geshi/rebol.php
  133. +1 −1 lib/geshi/reg.php
  134. +1 −1 lib/geshi/robots.php
  135. +1 −1 lib/geshi/rsplus.php
  136. +1 −1 lib/geshi/ruby.php
  137. +1 −1 lib/geshi/sas.php
  138. +1 −1 lib/geshi/scala.php
  139. +1 −1 lib/geshi/scheme.php
  140. +1 −1 lib/geshi/scilab.php
  141. +1 −1 lib/geshi/sdlbasic.php
  142. +1 −1 lib/geshi/smalltalk.php
  143. +1 −1 lib/geshi/smarty.php
  144. +1 −1 lib/geshi/sql.php
  145. +1 −1 lib/geshi/systemverilog.php
  146. +4 −4 lib/geshi/tcl.php
  147. +1 −1 lib/geshi/teraterm.php
  148. +1 −1 lib/geshi/text.php
  149. +1 −1 lib/geshi/thinbasic.php
  150. +2 −2 lib/geshi/tsql.php
  151. +1 −1 lib/geshi/typoscript.php
  152. +1 −1 lib/geshi/vb.php
  153. +1 −1 lib/geshi/vbnet.php
  154. +1 −1 lib/geshi/verilog.php
  155. +1 −1 lib/geshi/vhdl.php
  156. +7 −5 lib/geshi/vim.php
  157. +1 −1 lib/geshi/visualfoxpro.php
  158. +1 −1 lib/geshi/visualprolog.php
  159. +1 −1 lib/geshi/whitespace.php
  160. +1 −1 lib/geshi/whois.php
  161. +1 −1 lib/geshi/winbatch.php
  162. +1 −1 lib/geshi/xml.php
  163. +1 −1 lib/geshi/xorg_conf.php
  164. +1 −1 lib/geshi/xpp.php
  165. +1 −1 lib/geshi/z80.php
  166. +2 −1 readme.txt
View
@@ -1 +1,2 @@
-.DS_Store
+.DS_Store
+support
View
@@ -159,7 +159,7 @@ function PerformHighlightGeshi($content, $options) {
if (!is_null($options['strict'])) $geshi->enable_strict_mode($options['strict']);
if ($options['no_links']) $geshi->enable_keyword_links(false);
if ($options['highlight']) {
- $hlines = explode(',',$options['highlight']);
+ $hlines = explode(',', $options['highlight']);
$highlight = array(); /* Empty array to store processed line numbers*/
foreach($hlines as $v) {
list($from, $to) = explode('-', $v);
View
@@ -41,7 +41,7 @@
//
/** The version of this GeSHi file */
-define('GESHI_VERSION', '1.0.8.6');
+define('GESHI_VERSION', '1.0.8.7');
// Define the root directory for the GeSHi code tree
if (!defined('GESHI_ROOT')) {
@@ -1971,7 +1971,7 @@ function build_parse_cache() {
//All this formats are matched case-insensitively!
static $numbers_format = array(
GESHI_NUMBER_INT_BASIC =>
- '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])([1-9]\d*?|0)(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+ '(?:(?<![0-9a-z_\.%])|(?<=\.\.))(?<![\d\.]e[+\-])([1-9]\d*?|0)(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
GESHI_NUMBER_INT_CSTYLE =>
'(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])([1-9]\d*?|0)l(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
GESHI_NUMBER_BIN_SUFFIX =>
@@ -2019,7 +2019,7 @@ function build_parse_cache() {
}
$this->language_data['NUMBERS_RXCACHE'][$key] =
- "/(?<!<\|\/)(?<!<\|!REG3XP)(?<!<\|\/NUM!)(?<!\d\/>)($regexp)(?!(?:<DOT>|[^\<])+>)(?![^<]*>)(?!\|>)(?!\/>)/i"; //
+ "/(?<!<\|\/)(?<!<\|!REG3XP)(?<!<\|\/NUM!)(?<!\d\/>)($regexp)(?!(?:<DOT>|(?>[^\<]))+>)(?![^<]*>)(?!\|>)(?!\/>)/i"; //
}
}
@@ -2651,7 +2651,8 @@ function parse_code () {
$start = $i + $hq_strlen;
while ($close_pos = strpos($part, $this->language_data['HARDQUOTE'][1], $start)) {
$start = $close_pos + 1;
- if ($this->lexic_permissions['ESCAPE_CHAR'] && $part[$close_pos - 1] == $this->language_data['HARDCHAR']) {
+ if ($this->lexic_permissions['ESCAPE_CHAR'] && $part[$close_pos - 1] == $this->language_data['HARDCHAR'] &&
+ (($i + $hq_strlen) != ($close_pos))) { //Support empty string for HQ escapes if Starter = Escape
// make sure this quote is not escaped
foreach ($this->language_data['HARDESCAPE'] as $hardescape) {
if (substr($part, $close_pos - 1, strlen($hardescape)) == $hardescape) {
View
@@ -4,7 +4,7 @@
* ------
* Author: Jason Curl (jason.curl@continental-corporation.com)
* Copyright: (c) 2009 Jason Curl
- * Release Version: 1.0.8.6
+ * Release Version: 1.0.8.7
* Date Started: 2009/09/05
*
* 4CS language file for GeSHi.
View
@@ -7,7 +7,7 @@
* - Sandra Rossi (sandra.rossi@gmail.com)
* - Jacob Laursen (jlu@kmd.dk)
* Copyright: (c) 2007 Andres Picazo
- * Release Version: 1.0.8.6
+ * Release Version: 1.0.8.7
* Date Started: 2004/06/04
*
* ABAP language file for GeSHi.
@@ -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.8.6
+ * Release Version: 1.0.8.7
* Date Started: 2004/06/20
*
* Actionscript language file for GeSHi.
@@ -4,7 +4,7 @@
* ----------------
* Author: Jordi Boggiano (j.boggiano@seld.be)
* Copyright: (c) 2007 Jordi Boggiano (http://www.seld.be/), Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.6
+ * Release Version: 1.0.8.7
* Date Started: 2007/11/26
*
* ActionScript3 language file for GeSHi.
View
@@ -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.8.6
+ * Release Version: 1.0.8.7
* Date Started: 2004/07/29
*
* Ada language file for GeSHi.
View
@@ -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.8.6
+ * Release Version: 1.0.8.7
* Date Started: 2004/29/07
*
* Apache language file for GeSHi.
@@ -4,7 +4,7 @@
* --------
* Author: Stephan Klimek (http://www.initware.org)
* Copyright: Stephan Klimek (http://www.initware.org)
- * Release Version: 1.0.8.6
+ * Release Version: 1.0.8.7
* Date Started: 2005/07/20
*
* AppleScript language file for GeSHi.
@@ -4,7 +4,7 @@
* ----------
* Author: Milian Wolff (mail@milianw.de)
* Copyright: (c) 2008 Milian Wolff (http://milianw.de)
- * Release Version: 1.0.8.6
+ * Release Version: 1.0.8.7
* Date Started: 2008/06/17
*
* Apt sources.list language file for GeSHi.
View
@@ -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.8.6
+ * Release Version: 1.0.8.7
* Date Started: 2004/07/27
*
* x86 Assembler language file for GeSHi.
View
@@ -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.8.6
+ * Release Version: 1.0.8.7
* Date Started: 2004/08/13
*
* ASP language file for GeSHi.
Oops, something went wrong.

0 comments on commit 52419f3

Please sign in to comment.