From 8ab4f3c65d26a82bf1636122e75598ac2eeaaf4f Mon Sep 17 00:00:00 2001
From: mrward <ward.matt@gmail.com>
Date: Mon, 7 Mar 2011 21:10:03 +0000
Subject: [PATCH] Support background colour when syntax highlighting.

---
 .../Highlighting/HighlightingColorizer.cs                    | 5 +++++
 .../ICSharpCode.AvalonEdit/Highlighting/Resources/ASPX.xshd  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingColorizer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingColorizer.cs
index ecebe980a4..236664a8aa 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingColorizer.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingColorizer.cs
@@ -154,6 +154,11 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 				if (b != null)
 					element.TextRunProperties.SetForegroundBrush(b);
 			}
+			if (color.Background != null) {
+				Brush b = color.Background.GetBrush(CurrentContext);
+				if (b != null)
+					element.TextRunProperties.SetBackgroundBrush(b);
+			}
 			if (color.FontStyle != null || color.FontWeight != null) {
 				Typeface tf = element.TextRunProperties.Typeface;
 				element.TextRunProperties.SetTypeface(new Typeface(
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ASPX.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ASPX.xshd
index f780a5843e..a72187941d 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ASPX.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ASPX.xshd
@@ -4,7 +4,7 @@
 	<Color name="ASPSectionStartEndTags" foreground="Black" background="Yellow" exampleText="&lt;% System.Console.WriteLine(&quot;Hello World!&quot;); %&gt;" /> 
 	<Color name="ASPSection" foreground="Black" background="#FFF7F2E3" exampleText="&lt;% System.Console.WriteLine(&quot;Hello World!&quot;); %&gt;" />
 	<RuleSet ignoreCase="true">
-		<Span color="ASPSection" ruleSet="ASP" multiline="true">
+		<Span ruleSet="ASP" multiline="true">
 			<Begin color="ASPSectionStartEndTags">&lt;%</Begin>
 			<End color="ASPSectionStartEndTags">%&gt;</End>
 		</Span>