[GeSHi-commit] SF.net SVN: geshi: [1185] trunk/geshi-1.0.X/src/geshi.php

[<be...@us...>]

Revision: 1185
          http://geshi.svn.sourceforge.net/geshi/?rev=1185&view=rev
Author:   benbe
Date:     2008-05-31 03:11:42 -0700 (Sat, 31 May 2008)

Log Message:
-----------
fix: SF#1979653: Problem with multiple matches of keywords in different groups creating cascaded markup.

Modified Paths:
--------------
    trunk/geshi-1.0.X/src/geshi.php

Modified: trunk/geshi-1.0.X/src/geshi.php
===================================================================
--- trunk/geshi-1.0.X/src/geshi.php	2008-05-25 23:02:04 UTC (rev 1184)
+++ trunk/geshi-1.0.X/src/geshi.php	2008-05-31 10:11:42 UTC (rev 1185)
@@ -350,7 +350,7 @@
      *  The style for the actual code
      * @var string
      */
-    var $code_style = 'font-family: \'Courier New\', Courier, monospace; font-weight: normal;';
+    var $code_style = 'font-family: \'Courier New\', Courier, monospace; font-weight: normal; font-style: normal;';
 
     /**
      * The overall class for this code block
@@ -368,7 +368,7 @@
      * Line number styles
      * @var string
      */
-    var $line_style1 = 'font-family: \'Courier New\', Courier, monospace; color: black; font-weight: normal; font-style: normal;';
+    var $line_style1 = 'font-weight: normal;';
 
     /**
      * Line number styles for fancy lines
@@ -2313,7 +2313,7 @@
 
                             $stuff_to_parse .= ' ';
                             $stuff_to_parse = preg_replace(
-                                "/([^$disallowed_before])($keyword)(?=[^$disallowed_after])/$modifiers",
+                                "/([^$disallowed_before])($keyword)(?!\<DOT\>(?:htm|php))(?=[^$disallowed_after])/$modifiers",
                                 "'\\1' . $func2('\\2', '$k', 'BEGIN') . '<|$styles>' . $func('\\2') . '|>' . $func2('\\2', '$k', 'END')",
                                 $stuff_to_parse
                             );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.