Merge branch 'next'

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,19 +1749,23 @@ namespace LSLEditor
 		{
 			BeginUpdate();
 
-			ResetHighlichting();
+			ResetHighlighting();
 
 			string strW = GetNewWhiteSpace(-1);
 			int intTabs = (int)(strW.Length / AutoFormatter.GetTab().Length);
 
-			if (this.SelectionLength == 0)
+			int intLastLine = this.GetLineFromCharIndex(this.SelectionStart + this.SelectionLength);
-			{
+
 			int intLine = this.GetLineFromCharIndex(this.SelectionStart);
-				int intStart = this.GetFirstCharIndexFromLine(intLine);
+			this.SelectionStart = this.GetFirstCharIndexFromLine(intLine);
-				int intLength = this.Lines[intLine].Length + 1;
+			int intLength = 0;
-				this.SelectionStart = intStart;
+			do
+			{
+				intLength += this.Lines[intLine].Length + 1;
+				intLine++;
+			} while (intLine <= intLastLine);
 			this.SelectionLength = intLength;
-			}
+
 			string strSelectedText = AutoFormatter.MultiLineComment(blnAdd, intTabs, this.SelectedText);
 
 			int intBackup = this.SelectionStart;
@@ -1888,7 +1898,7 @@ namespace LSLEditor
 			}
 		}
 
-		private void ResetHighlichting()
+		private void ResetHighlighting()
 		{
 			if (HighLightList.Count == 0)
 				return;

trunk/Helpers/LSL2CSharp.cs

@@ -175,7 +175,7 @@ namespace LSLEditor
 
 			// State change, excluding global functions
 			regex = new Regex(
-				@"(\s+)state\s+(\w*)(\s*;)",
+				@"(\s+)state\s+(\w+)(\s*;)",
 				RegexOptions.IgnorePatternWhitespace
 				| RegexOptions.Compiled
 				);

trunk/LSLEditorForm.Designer.cs

@@ -127,8 +127,8 @@ namespace LSLEditor
             this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
             this.makeBugReporttoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
             this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
             this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
@@ -140,6 +140,7 @@ namespace LSLEditor
             this.openFileDialog2 = new System.Windows.Forms.OpenFileDialog();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.dockPanel = new LSLEditor.Docking.DockPanel();
+            this.releaseNotesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.contextMenuStrip1.SuspendLayout();
@@ -732,7 +733,7 @@ namespace LSLEditor
             // optionsToolStripMenuItem
             // 
             this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
-            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
             this.optionsToolStripMenuItem.Text = "Options...";
             this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click);
             // 
@@ -785,6 +786,7 @@ namespace LSLEditor
             this.toolStripSeparator9,
             this.makeBugReporttoolStripMenuItem,
             this.toolStripSeparator12,
+            this.releaseNotesToolStripMenuItem,
             this.aboutToolStripMenuItem});
             this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
             this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
@@ -830,11 +832,6 @@ namespace LSLEditor
             this.toolStripSeparator9.Name = "toolStripSeparator9";
             this.toolStripSeparator9.Size = new System.Drawing.Size(207, 6);
             // 
-            // toolStripSeparator12
-            // 
-            this.toolStripSeparator12.Name = "toolStripSeparator12";
-            this.toolStripSeparator12.Size = new System.Drawing.Size(207, 6);
-            // 
             // makeBugReporttoolStripMenuItem
             // 
             this.makeBugReporttoolStripMenuItem.Name = "makeBugReporttoolStripMenuItem";
@@ -842,6 +839,11 @@ namespace LSLEditor
             this.makeBugReporttoolStripMenuItem.Text = "Bug report...";
             this.makeBugReporttoolStripMenuItem.Click += new System.EventHandler(this.makeBugReporttoolStripMenuItem_Click);
             // 
+            // toolStripSeparator12
+            // 
+            this.toolStripSeparator12.Name = "toolStripSeparator12";
+            this.toolStripSeparator12.Size = new System.Drawing.Size(207, 6);
+            // 
             // aboutToolStripMenuItem
             // 
             this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
@@ -940,6 +942,13 @@ namespace LSLEditor
             this.dockPanel.Skin = dockPanelSkin1;
             this.dockPanel.TabIndex = 10;
             // 
+            // releaseNotesToolStripMenuItem
+            // 
+            this.releaseNotesToolStripMenuItem.Name = "releaseNotesToolStripMenuItem";
+            this.releaseNotesToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
+            this.releaseNotesToolStripMenuItem.Text = "Release Notes...";
+            this.releaseNotesToolStripMenuItem.Click += new System.EventHandler(this.releaseNotesToolStripMenuItem_Click);
+            // 
             // LSLEditorForm
             // 
             this.AllowDrop = true;
@@ -1066,5 +1075,6 @@ namespace LSLEditor
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator16;
         private System.Windows.Forms.ToolStripMenuItem closeActiveWindowToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem9;
+        private System.Windows.Forms.ToolStripMenuItem releaseNotesToolStripMenuItem;
 	}
 }

trunk/LSLEditorForm.cs

@@ -1245,7 +1245,7 @@ namespace LSLEditor
 			}
 		}
 
-		private void ReleaseNotesToolStripMenuItem_Click(object sender, EventArgs e)
+		private void releaseNotesToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			Browser browser = GetBrowser();
 			string strExeFileName = Path.GetFileName(Assembly.GetExecutingAssembly().CodeBase);
@@ -1699,11 +1699,7 @@ namespace LSLEditor
 			{
 				if (lslint.HasErrors)
 				{
-                    //TODO: Show errors somewhere else
+					this.SyntaxErrors.Show(dockPanel);
-					//this.panel1.Controls.Clear();
-					//this.panel1.Controls.Add(this.SyntaxErrors);
-					//this.panel1.Visible = true;
-					//this.splitter1.SplitPosition = Properties.Settings.Default.SimulatorSize.Height;
 				}
 				else
 				{

trunk/Properties/Settings.Designer.cs

@@ -866,18 +866,6 @@ namespace LSLEditor.Properties {
             }
         }
 
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("ANSI")]
-        public string OutputFormat {
-            get {
-                return ((string)(this["OutputFormat"]));
-            }
-            set {
-                this["OutputFormat"] = value;
-            }
-        }
-
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
@@ -1222,11 +1210,23 @@ namespace LSLEditor.Properties {
 
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("2.43")]
+        [global::System.Configuration.DefaultSettingValueAttribute("2.44.0")]
         public string Version {
             get {
                 return ((string)(this["Version"]));
             }
         }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("UTF-8")]
+        public string OutputFormat {
+            get {
+                return ((string)(this["OutputFormat"]));
+            }
+            set {
+                this["OutputFormat"] = value;
+            }
+        }
     }
 }

trunk/Properties/Settings.settings

@@ -221,9 +221,6 @@
     <Setting Name="SvnPassword" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="OutputFormat" Type="System.String" Scope="User">
-      <Value Profile="(Default)">ANSI</Value>
-    </Setting>
     <Setting Name="ShowSolutionExplorer" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -330,7 +327,10 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="Version" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">2.43</Value>
+      <Value Profile="(Default)">2.44.0</Value>
+    </Setting>
+    <Setting Name="OutputFormat" Type="System.String" Scope="User">
+      <Value Profile="(Default)">UTF-8</Value>
     </Setting>
   </Settings>
 </SettingsFile>

trunk/Resource/About.htm

@@ -10,7 +10,6 @@
 		<br />
 		<marquee direction="up" SCROLLAMOUNT="2" height="120">
 		<ul>
-		
 		    <li>Vlad Bjornson</li>
             <li>Mazok Nishi</li>
             <li>Sonja Manatiso</li>
@@ -205,9 +204,9 @@
 			<li>Toran Cult </li>
 			<li>Strife Onizuka </li>
 			<li>Sandra Tsure</li>
+			<li>Moundsa Mayo</li>
+			<li>Ima Mechanique</li>
 		</ul>
 		</marquee>
-
-	
 	</body>
 </html>

trunk/Resource/AssemblyInfo.cs

@@ -69,7 +69,7 @@ using System.Runtime.CompilerServices;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.43.*")]
+[assembly: AssemblyVersion("2.44.*")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

trunk/Resource/ReleaseNotes.htm

@@ -1,10 +1,38 @@
-<div style="font-family: Verdana, sans-serif;font-size: 13px;line-height: 1.3;">
+<html>
+	<head>
+		<title>Release Notes</title>
+	</head>
+	<body style="background-color: white; font-family: Verdana, sans-serif;font-size: 13px;line-height: 1.3">
+		<div>
+			<div>
+				<h3><u>2012-01</u> - Release 2.44.0</h3>
+				- Added
+				<ul>
+					<li>"Release Notes..." to help menu.</li>
+				</ul>
+
+				- Changed
+				<ul>
+					<li>Updated About.htm</li>
+					<li>Tools => Options => Text Editor => General - Changed labels to properly reflect the output file format.</li>
+					<li>UTF-8 output no longer prefixes the B.O.M. character.</li>
+					<li>UTF-8 is now the default file output format. ANSI is deprecated and will be removed at a later date.</li>
+				</ul>
+
+				- Fixed:
+				<ul>
+					<li>SF ID: 2995296 - Search | Comment Line (Ctl+K) Breaks Line After Search Term.</li>
+					<li>SF ID: 3461546 - ReleaseNotes.htm in source, but never used</li>
+					<li>SF ID: none - Fix for state change without state name passing syntax-check.</li>
+					<li>SF ID: 3465488 - lslint does not show errors.</li>
+					<li>SF ID: 2999054 - Unicode characters do not paste correctly.</li>
+					<li>SF ID: none - Fixed typo in Font/Colour options dialogue.</li>
+				</ul>
+			</div>
 
 			<div>
-		<h3>Release 2.43.1</h3>
+				<h3><u>2011-12-12</u> - Release 2.43.1</h3>
-
+				- Added: constants
-		<u>2011-12-09</u><br />
-		* Added: constants
 				<ul>
 					<li>CONTENT_TYPE_HTML</li>
 					<li>DENSITY</li>
@@ -85,27 +113,25 @@
 					<li>TEXTURE_TRANSPARENT</li>
 					<li>TOUCH_INVALID_TEXCOORD</li>
 				</ul>
-		* other changes: Cleaned up parts of the highlighting XML file generally, and reordered some entries.
+				- other changes: Cleaned up parts of the highlighting XML file generally, and reordered some entries.
 			</div>
 
 			<div>
-	<h3>Release 2.43</h3>
+				<h3><u>2011-12-06</u> - Release 2.43</h3>
-
+				- Added: event
-		<u>2011-11-30</u><br />
-    * Added: event
 				<ul>
 				  <li>transaction_result</li>
 				</ul>
-    * Added: stub functions for:
+				- Added: functions:
 				<ul>
-      <li>llCastRay</li>
+				  <li>llCastRay - syntax-checker only, highlighting added previously.</li>
-      <li>llClearLinkMedia</li>
+				  <li>llClearLinkMedia - syntax-checker only, highlighting added previously.</li>
 				  <li>llGetDisplayName</li>
 				  <li>llGetLinkMedia</li>
 				  <li>llGetMassMKS</li>
 				  <li>llGetMemoryLimit</li>
 				  <li>llGetPhysicsMaterial</li>
-      <li>llLinkSitTarget</li>
+				  <li>llLinkSitTarget - syntax-checker only, highlighting added previously.</li>
 				  <li>llManageEstateAccess</li>
 				  <li>llScriptProfiler</li>
 				  <li>llSetAngularVelocity</li>
@@ -116,11 +142,37 @@
 				  <li>llSetVelocity</li>
 				  <li>llTransferLindenDollars</li>
 				</ul>
-    * Fixed UTF-8 file format from prefixing with a BOM. While not invalid, it confuses some apps.
+				- Fixed UTF-8 file format from prefixing with a BOM. While not invalid, it confuses some apps.
 				<br />
 			</div>
 
 
+			<div>
+				<h3><u>2011-04-21</u> - Release 2.42</h3>
+				* Added: constants
+				<ul>
+					<li>CHANGED_REGION_START</li>
+					<li>PRIM_DESC</li>
+					<li>PRIM_NAME</li>
+				</ul>
+				* Added: functions (highlighting only):
+				<ul>
+					<li>llCastRay</li>
+					<li>llGetLinkNumberOfSides</li>
+					<li>llGetSPMaxMemory</li>
+					<li>llGetUsedMemory</li>
+					<li>llGetUsername</li>
+					<li>llRequestDisplayName</li>
+					<li>llRequestUsername</li>
+				</ul>
+			</div>
+
+
+			<div>
+				<h3><u>2010</u> - Release 2.41</h3>
+			</div>
+
+
 		  <h3>Release 2.40</h3>
 
 			<p><u>April 17 2010 14:51 (local time)</u><br />
@@ -151,7 +203,7 @@
 					<li>llDetectedTouchST </li>
 					<li>llSHA1String </li>
 				</ul>
-<br />
+		<br />
 			</p>
 
 			<h3>Release 2.38</h3>
@@ -1500,4 +1552,6 @@
 
 			<p><u>Oct 1, 2006 (local time)</u></p>
 
-</div>
+		</div>
+	</body>
+</html>

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();

trunk/Tools/TextEditorGeneral.Designer.cs

@@ -224,7 +224,7 @@ namespace LSLEditor.Tools
 			this.radioButton6.Size = new System.Drawing.Size(65, 17);
 			this.radioButton6.TabIndex = 1;
 			this.radioButton6.TabStop = true;
-			this.radioButton6.Text = "Unicode";
+			this.radioButton6.Text = "UTF-16 LE";
 			this.radioButton6.UseVisualStyleBackColor = true;
 			// 
 			// radioButton7
@@ -235,7 +235,7 @@ namespace LSLEditor.Tools
 			this.radioButton7.Size = new System.Drawing.Size(117, 17);
 			this.radioButton7.TabIndex = 2;
 			this.radioButton7.TabStop = true;
-			this.radioButton7.Text = "Unicode big endian";
+			this.radioButton7.Text = "UTF-16 BE";
 			this.radioButton7.UseVisualStyleBackColor = true;
 			// 
 			// radioButton8

trunk/app.config

@@ -185,9 +185,6 @@
       <setting name="SvnPassword" serializeAs="String">
         <value />
       </setting>
-      <setting name="OutputFormat" serializeAs="String">
-        <value>ANSI</value>
-      </setting>
       <setting name="ShowSolutionExplorer" serializeAs="String">
         <value>False</value>
       </setting>
@@ -239,6 +236,9 @@
       <setting name="VersionControlSVN" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="OutputFormat" serializeAs="String">
+        <value>UTF-8</value>
+      </setting>
     </LSLEditor.Properties.Settings>
   </userSettings>
   <applicationSettings>
@@ -325,7 +325,7 @@
         <value />
       </setting>
       <setting name="Version" serializeAs="String">
-        <value>2.43</value>
+        <value>2.44.0</value>
       </setting>
     </LSLEditor.Properties.Settings>
   </applicationSettings>