Browse Source

fix culture-specific code in importer

pull/28/head
Siegfried Pammer 14 years ago
parent
commit
a36516af13
  1. 16
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs
  2. 8
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/HTML-Mode.xshd

16
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs

@ -783,16 +783,16 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options @@ -783,16 +783,16 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
return null;
if (s.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
s = s.Substring(2);
if (s.Substring(0, 2) == "02")
if (string.CompareOrdinal(s.Substring(0, 2), "02") == 0)
return null;
try {
byte b = byte.Parse(s.Substring(2, 2), NumberStyles.HexNumber);
byte g = byte.Parse(s.Substring(4, 2), NumberStyles.HexNumber);
byte r = byte.Parse(s.Substring(6, 2), NumberStyles.HexNumber);
return Color.FromRgb(r, g, b);
} catch (FormatException) {
byte r, g, b;
if (!byte.TryParse(s.Substring(2, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out b))
return Colors.Transparent;
}
if (!byte.TryParse(s.Substring(4, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out g))
return Colors.Transparent;
if (!byte.TryParse(s.Substring(6, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out r))
return Colors.Transparent;
return Color.FromRgb(r, g, b);
}
bool CheckVersionAndFindCategory(XDocument document, out XElement[] categoryItems)

8
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/HTML-Mode.xshd

@ -39,14 +39,14 @@ @@ -39,14 +39,14 @@
<Begin color="VBScriptTag">&lt;script\ lang="VBScript"&gt;</Begin>
<End color="VBScriptTag">&lt;/script&gt;</End>
</Span>
<Span multiline="true">
<Begin color="UnknownScriptTag">&lt;script[^\w\d_]&gt;</Begin>
<End color="UnknownScriptTag">&lt;/script&gt;</End>
</Span>
<Span ruleSet="JavaScriptSet" multiline="true">
<Begin color="ScriptTag">&lt;script&gt;</Begin>
<End color="ScriptTag">&lt;/script&gt;</End>
</Span>
<Span multiline="true">
<Begin color="UnknownScriptTag">&lt;script[^\w\d_]</Begin>
<End color="UnknownScriptTag">&lt;/script&gt;</End>
</Span>
<Span color="HtmlTag" ruleSet="HtmlTagSet" multiline="true">
<Begin>&lt;</Begin>
<End>&gt;</End>

Loading…
Cancel
Save