debian/patches/fix_broken_output.patch

--- geshi/geshi.php.orig        2008-05-29 18:25:56.000000000 -0400
+++ geshi/geshi.php     2008-05-29 18:26:08.000000000 -0400
@@ -1920,6 +1920,10 @@
             }
         }
 
+        //This fix is related to SF#1923020, but has to be applied regardless of
+        //actually highlighting symbols.
+        $result = str_replace('&#semi;', ';', $result);
+
         // Parse the last stuff (redundant?)
         $result .= $this->parse_non_string_part($stuff_to_parse);
 
@@ -2177,7 +2181,7 @@
                             $modifiers = ($this->language_data['CASE_SENSITIVE'][$k]) ? "e" : "ie";
 
                             $disallowed_before = "a-zA-Z0-9\$_\|\#;>|^";
-                            $disallowed_after = "a-zA-Z0-9_<\|%\\-&";
+                            $disallowed_after = "a-zA-Z0-9_<\|%\\-";
                             if(isset($this->language_data['PARSER_CONTROL'])) {
                                 if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'])) {
                                     if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'])) {
@@ -2870,6 +2874,14 @@
             $aTransSpecchar["'"] = '&#39;'; // (apos) htmlspecialchars() uses '&#039;'
         }
 
+        //This fix is related to SF#1923020, but has to be applied regardless of
+        //actually highlighting symbols.
+
+        //Circumvent a bug with symbol highlighting
+        //This is required as ; would produce undesirable side-effects if it
+        //was not to be processed as an entity.
+        $aTransSpecchar[';'] = '&#semi;'; // Force ; to be processed as entity
+
         // return translated string
         return strtr($string,$aTransSpecchar);
     }
1	--- geshi/geshi.php.orig 2008-05-29 18:25:56.000000000 -0400
2	+++ geshi/geshi.php 2008-05-29 18:26:08.000000000 -0400
3	@@ -1920,6 +1920,10 @@
4	}
5	}
6
7	+ //This fix is related to SF#1923020, but has to be applied regardless of
8	+ //actually highlighting symbols.
9	+ $result = str_replace('&#semi;', ';', $result);
10	+
11	// Parse the last stuff (redundant?)
12	$result .= $this->parse_non_string_part($stuff_to_parse);
13
14	@@ -2177,7 +2181,7 @@
15	$modifiers = ($this->language_data['CASE_SENSITIVE'][$k]) ? "e" : "ie";
16
17	$disallowed_before = "a-zA-Z0-9\$_\\|\#;>\|^";
18	- $disallowed_after = "a-zA-Z0-9_<\\|%\\-&";
19	+ $disallowed_after = "a-zA-Z0-9_<\\|%\\-";
20	if(isset($this->language_data['PARSER_CONTROL'])) {
21	if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'])) {
22	if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'])) {
23	@@ -2870,6 +2874,14 @@
24	$aTransSpecchar["'"] = '''; // (apos) htmlspecialchars() uses '''
25	}
26
27	+ //This fix is related to SF#1923020, but has to be applied regardless of
28	+ //actually highlighting symbols.
29	+
30	+ //Circumvent a bug with symbol highlighting
31	+ //This is required as ; would produce undesirable side-effects if it
32	+ //was not to be processed as an entity.
33	+ $aTransSpecchar[';'] = '&#semi;'; // Force ; to be processed as entity
34	+
35	// return translated string
36	return strtr($string,$aTransSpecchar);
37	}