diff --git a/trunk/Editor/SyntaxRichTextBox.cs b/trunk/Editor/SyntaxRichTextBox.cs
index 61e622f..2a1866a 100644
--- a/trunk/Editor/SyntaxRichTextBox.cs
+++ b/trunk/Editor/SyntaxRichTextBox.cs
@@ -899,9 +899,15 @@ namespace LSLEditor
public new void Paste()
{
- ResetHighlichting();
+ ResetHighlighting();
- if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text, true))
+ // First try with Unicode
+ if (Clipboard.GetDataObject().GetDataPresent(DataFormats.UnicodeText, true))
+ {
+ string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.UnicodeText, true).ToString().Replace("\r", "");
+ this.ColoredText = strTextToPaste;
+ } // failing that try ANSI text.
+ else if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text, true))
{
string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.Text, true).ToString().Replace("\r", "");
this.ColoredText = strTextToPaste;
@@ -1147,7 +1153,7 @@ namespace LSLEditor
protected override void OnKeyPress(KeyPressEventArgs e)
{
- ResetHighlichting();
+ ResetHighlighting();
char keyChar = e.KeyChar;
@@ -1743,7 +1749,7 @@ namespace LSLEditor
{
BeginUpdate();
- ResetHighlichting();
+ ResetHighlighting();
string strW = GetNewWhiteSpace(-1);
int intTabs = (int)(strW.Length / AutoFormatter.GetTab().Length);
@@ -1892,7 +1898,7 @@ namespace LSLEditor
}
}
- private void ResetHighlichting()
+ private void ResetHighlighting()
{
if (HighLightList.Count == 0)
return;
diff --git a/trunk/Resource/ReleaseNotes.htm b/trunk/Resource/ReleaseNotes.htm
index 2feab3e..ab280af 100644
--- a/trunk/Resource/ReleaseNotes.htm
+++ b/trunk/Resource/ReleaseNotes.htm
@@ -11,7 +11,7 @@
"Release Notes..." to help menu.
- * Changed
+ - Changed
- Updated About.htm
- Tools => Options => Text Editor => General - Changed labels to properly reflect the output file format.
@@ -19,12 +19,14 @@
- UTF-8 is now the default file output format. ANSI is deprecated and will be removed at a later date.
- * Fixed:
+ - Fixed:
- - 2995296 - Search | Comment Line (Ctl+K) Breaks Line After Search Term
- - 3461546 - ReleaseNotes.htm in source, but never used
- - no id - Fix for state change without state name passing syntax-check.
- - 3465488 - lslint does not show errors.
+ - SF ID: 2995296 - Search | Comment Line (Ctl+K) Breaks Line After Search Term.
+ - SF ID: 3461546 - ReleaseNotes.htm in source, but never used
+ - SF ID: none - Fix for state change without state name passing syntax-check.
+ - SF ID: 3465488 - lslint does not show errors.
+ - SF ID: 2999054 - Unicode characters do not paste correctly.
+ - SF ID: none - Fixed typo in Font/Colour options dialogue.
diff --git a/trunk/Tools/TextEditorFontColors.Designer.cs b/trunk/Tools/TextEditorFontColors.Designer.cs
index 55e261d..6b13855 100644
--- a/trunk/Tools/TextEditorFontColors.Designer.cs
+++ b/trunk/Tools/TextEditorFontColors.Designer.cs
@@ -128,18 +128,18 @@ namespace LSLEditor.Tools
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(16, 24);
this.checkBox1.Name = "checkBox1";
- this.checkBox1.Size = new System.Drawing.Size(142, 17);
+ this.checkBox1.Size = new System.Drawing.Size(145, 17);
this.checkBox1.TabIndex = 0;
- this.checkBox1.Text = "use original colorscheme";
+ this.checkBox1.Text = "use original color scheme";
this.checkBox1.UseVisualStyleBackColor = true;
//
- // EnvironmentFontColors
+ // TextEditorFontColors
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox1);
- this.Name = "EnvironmentFontColors";
+ this.Name = "TextEditorFontColors";
this.Size = new System.Drawing.Size(392, 272);
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();