From f23cba41b160d8bbb6f2952d3dd9d353606ea55b Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Tue, 1 Dec 2009 15:25:44 +0000
Subject: [PATCH] Converted XML-Mode.xshd to new file format. Fixes forum-10434
 (bad XML highlighting in AvalonEdit).

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5288 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../Highlighting/Resources/XML-Mode.xshd      | 101 +++++++-----------
 1 file changed, 41 insertions(+), 60 deletions(-)

diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XML-Mode.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XML-Mode.xshd
index 56780483b6..1d59f2dec7 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XML-Mode.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XML-Mode.xshd
@@ -1,60 +1,41 @@
-<?xml version="1.0" ?>
-<!-- syntaxdefinition for XML 2000 by Mike Krueger -->
-<SyntaxDefinition name="XML" extensions=".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.booproj;.build;.xfrm;.targets;.xaml;.xpt;.xft;.map;.wsdl;.disco">
-	
-	<Properties>
-		<Property name="BlockCommentBegin" value="&lt;!--"/>
-		<Property name="BlockCommentEnd" value="--&gt;"/>
-	</Properties>
-	<Digits name="Digits" bold="false" italic="false" color="DarkBlue" />
-	<RuleSets>
-		<RuleSet ignorecase="false">
-			<!-- It is not necessary to define span-delimiting characters as delimiters -->
-			<Delimiters></Delimiters>
-
-			<Span name="Comment" bold="false" italic="false" color="Green" stopateol="false">
-				<Begin>&lt;!--</Begin>
-				<End>--&gt;</End>
-			</Span>
-			<Span name="CDataSection" bold="false" italic="false" color="Blue" stopateol="false">
-				<Begin>&lt;![CDATA[</Begin>
-				<End>]]&gt;</End>
-			</Span>
-			<Span name="DocTypeSection" bold="false" italic="false" color="Blue" stopateol="false">
-				<Begin>&lt;!DOCTYPE</Begin>
-				<End>&gt;</End>
-			</Span>
-			<Span name="XmlDecl" bold="false" italic="false" color="Blue" stopateol="false">
-				<Begin>&lt;?</Begin>
-				<End>?&gt;</End>
-			</Span>
-			<Span name="XmlTag" rule="XmlTagSet" bold="false" italic="false" color="DarkMagenta" stopateol="false">
-				<Begin>&lt;</Begin>
-				<End>&gt;</End>
-			</Span>
-			<Span name="EntityReference" bold="false" italic="false" color="Blue" stopateol="true">
-				<Begin>&amp;</Begin>
-				<End>;</End>
-			</Span>
-		</RuleSet>
-
-		<RuleSet name="XmlTagSet" ignorecase="false">
-			<Delimiters>/=</Delimiters>
-			<Span name="String" bold="false" italic="false" color="Blue" stopateol="true">
-				<Begin>&quot;</Begin>
-				<End>&quot;</End>
-			</Span>
-			<Span name="Char" bold="false" italic="false" color="Blue" stopateol="true">
-				<Begin>&apos;</Begin>
-				<End>&apos;</End>
-			</Span>
-			<MarkPrevious bold="false" italic="false" color="Red">=</MarkPrevious>
-			<KeyWords name="Slash" bold="false" italic="false" color="DarkMagenta">
-				<Key word="/" />
-			</KeyWords>
-			<KeyWords name="Assignment" bold="false" italic="false" color="Blue">
-				<Key word="=" />
-			</KeyWords>
-		</RuleSet>
-	</RuleSets>
-</SyntaxDefinition>
+<SyntaxDefinition name="XML" extensions=".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.booproj;.build;.xfrm;.targets;.xaml;.xpt;.xft;.map;.wsdl;.disco" xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008">
+	<RuleSet>
+		<Span foreground="Green" multiline="true">
+			<Begin>&lt;!--</Begin>
+			<End>--&gt;</End>
+		</Span>
+		<Span foreground="Blue" multiline="true">
+			<Begin>&lt;!\[CDATA\[</Begin>
+			<End>]]&gt;</End>
+		</Span>
+		<Span foreground="Blue" multiline="true">
+			<Begin>&lt;!DOCTYPE</Begin>
+			<End>&gt;</End>
+		</Span>
+		<Span foreground="Blue" multiline="true">
+			<Begin>&lt;\?</Begin>
+			<End>\?&gt;</End>
+		</Span>
+		<Span foreground="DarkMagenta" multiline="true">
+			<Begin>&lt;</Begin>
+			<End>&gt;</End>
+			<RuleSet>
+				<Span foreground="Blue" multiline="true">
+					<Begin>"</Begin>
+					<End>"</End>
+				</Span>
+				<Span foreground="Blue" multiline="true">
+					<Begin>'</Begin>
+					<End>'</End>
+				</Span>
+				<Rule foreground="Red">[\d\w_\-]+(?=(\s*=))</Rule>
+				<Rule foreground="Blue">=</Rule>
+				<Rule foreground="DarkMagenta">/</Rule>
+			</RuleSet>
+		</Span>
+		<Span foreground="Blue">
+			<Begin>&amp;</Begin>
+			<End>;</End>
+		</Span>
+	</RuleSet>
+</SyntaxDefinition>
\ No newline at end of file