Updates for 3.0.4.

5 files changed, 173 insertions, 12 deletions

diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 1c1c033ca..973611fce 100644
--- a/doc/ScintillaDownload.html
+++ b/doc/ScintillaDownload.html
@@ -25,9 +25,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla303.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla304.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla303.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla304.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -49,8 +49,8 @@
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla303.zip?download">zip format</a> (1200K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla303.tgz?download">tgz format</a> (1080K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla304.zip?download">zip format</a> (1200K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla304.tgz?download">tgz format</a> (1080K) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 3cfe93aa9..99bf09df7 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -406,6 +406,166 @@
       </li>
     </ul>
     <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite304.zip?download">Release 3.0.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 March 2012.
+	</li>
+	<li>
+	SciTE scripts can create user interfaces as strips.
+	</li>
+	<li>
+	SciTE can save files automatically in the background.
+	</li>
+	<li>
+	Pinch zoom implemented on Cocoa.
+	</li>
+	<li>
+	ECL lexer added.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3488209&group_id=2439">Feature #3488209.</a>
+	</li>
+	<li>
+	CPP lexer fixes styling after document comment keywords. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495445&group_id=2439">Bug #3495445.</a>
+	</li>
+	<li>
+	Pascal folder improves handling of some constructs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486385&group_id=2439">Feature #3486385.</a>
+	</li>
+	<li>
+	XML lexer avoids entering a bad mode due to complex preprocessor instructions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488060&group_id=2439">Bug #3488060.</a>
+	</li>
+	<li>
+	Duplicate command is always remembered as a distinct command for undo.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495836&group_id=2439">Bug #3495836.</a>
+	</li>
+	<li>
+	SciTE xml.auto.close.tags no longer closes with PHP code similar to &lt;a $this-&gt; 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488067&group_id=2439">Bug #3488067.</a>
+	</li>
+	<li>
+	Fix bug where setting an indicator for the whole document would fail.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487440&group_id=2439">Bug #3487440.</a>
+	</li>
+	<li>
+	Crash fixed for SCI_MOVESELECTEDLINESDOWN with empty vertical selection. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3496403&group_id=2439">Bug #3496403.</a>
+	</li>
+	<li>
+	Differences between buffered and unbuffered mode on Direct2D eliminated. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495791&group_id=2439">Bug #3495791.</a>
+	</li>
+	<li>
+	Font leading implemented for Direct2D to improve display of character blobs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494744&group_id=2439">Bug #3494744.</a>
+	</li>
+	<li>
+	Fractional widths used for line numbers, character markers and other situations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494492&group_id=2439">Bug #3494492.</a>
+	</li>
+	<li>
+	Translucent rectangles drawn using Direct2D with sharper corners.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494492&group_id=2439">Bug #3494492.</a>
+	</li>
+	<li>
+	RGBA markers drawn sharper when centred using Direct2D.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494202&group_id=2439">Bug #3494202.</a>
+	</li>
+	<li>
+	RGBA markers are drawn centred when taller than line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494184&group_id=2439">Bug #3494184.</a>
+	</li>
+	<li>
+	Image marker drawing problem fixed for markers taller than line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3493503&group_id=2439">Bug #3493503.</a>
+	</li>
+	<li>
+	Markers are drawn horizontally off-centre based on margin type instead of dimensions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488696&group_id=2439">Bug #3488696.</a>
+	</li>
+	<li>
+	Fold tail markers drawn vertically centred.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3488289&group_id=2439">Feature #3488289.</a>
+	</li>
+	<li>
+	On Windows, Scintilla is more responsive in wrap mode.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487397&group_id=2439">Bug #3487397.</a>
+	</li>
+	<li>
+	Unimportant "Gdk-CRITICAL" messages are no longer displayed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488481&group_id=2439">Bug #3488481.</a>
+	</li>
+	<li>
+	SciTE on Windows Find in Files sets focus to dialog when already created; allows opening dialog when a job is running. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3480635&group_id=2439">Bug #3480635.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3486657&group_id=2439">Bug #3486657.</a>
+	</li>
+	<li>
+	Fixed problems with multiple clicks in margin and with mouse actions combined with virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484370&group_id=2439">Bug #3484370.</a>
+	</li>
+	<li>
+	Fixed bug with using page up and down and not returning to original line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3485669&group_id=2439">Bug #3485669.</a>
+	</li>
+	<li>
+	Down arrow with wrapped text no longer skips lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1776560&group_id=2439">Bug #1776560.</a>
+	</li>
+	<li>
+	Fix problem with dwell ending immediately due to word wrap.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484416&group_id=2439">Bug #3484416.</a>
+	</li>
+	<li>
+	Wrapped lines are rewrapped more consistently while resizing window.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484179&group_id=2439">Bug #3484179.</a>
+	</li>
+	<li>
+	Selected line ends are highlighted more consistently. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484330&group_id=2439">Bug #3484330.</a>
+	</li>
+	<li>
+	Fix grey background on files that use shbang to choose language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3482777&group_id=2439">Bug #3482777.</a>
+	</li>
+	<li>
+	Fix failure messages from empty commands in SciTE. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3480645&group_id=2439">Bug #3480645.</a>
+	</li>
+	<li>
+	Redrawing reduced for some marker calls.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3493530&group_id=2439">Feature #3493530.</a>
+	</li>
+	<li>
+	Match brace and select brace commands work in SciTE output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486598&group_id=2439">Feature #3486598.</a>
+	</li>
+	<li>
+	Performing SciTE "Show Calltip" command when a calltip is already visible shows the next calltip.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3487017&group_id=2439">Feature #3487017.</a>
+	</li>
+	<li>
+	SciTE allows saving file even when file unchanged.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486654&group_id=2439">Feature #3486654.</a>
+	</li>
+	<li>
+	SciTE allows optional use of character escapes in calltips. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495239&group_id=2439">Feature #3495239.</a>
+	</li>
+	<li>
+	SciTE can open file:// URLs with Ctrl+Shift+O.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495389&group_id=2439">Feature #3495389.</a>
+	</li>
+	<li>
+	Key modifiers updated for GTK+ on OS X to match upstream changes.
+	</li>
+	<li>
+	SciTE hang when marking all occurrences of regular expressions fixed.
+	</li>
+    </ul>
+    <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite303.zip?download">Release 3.0.3</a>
     </h3>
     <ul>
diff --git a/doc/index.html b/doc/index.html
index de746ed36..9c7dd0390 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20120128" />
+    <meta name="Date.Modified" content="20120308" />
     <style type="text/css">
         #versionlist {
             margin: 0;
@@ -55,8 +55,8 @@
           GTK+</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 3.0.3<br />
-           Site last modified January 28 2012</font>
+          <font color="#FFCC99" size="3"> Release version 3.0.4<br />
+           Site last modified March 8 2012</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,6 +71,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.0.4 fixes minor problems particularly with Direct2D.</li>
       <li>Version 3.0.3 uses fractional positioning in more situations.</li>
       <li>Version 3.0.2 fixes bugs.</li>
       <li>Version 3.0.1 fixes bugs, most notably display bugs on Windows.</li>
diff --git a/version.txt b/version.txt
index 81606223f..873b744bc 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-303
+304
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 9f527e2f1..3305fd8d7 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -5,8 +5,8 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION	3, 0, 3, 0
-PRODUCTVERSION	3, 0, 3, 0
+FILEVERSION	3, 0, 4, 0
+PRODUCTVERSION	3, 0, 4, 0
 FILEFLAGSMASK	0x3fL
 FILEFLAGS 0
 FILEOS VOS_NT_WINDOWS32
@@ -23,12 +23,12 @@ BEGIN
 		BEGIN
 			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"
 			VALUE	"FileDescription",	"Scintilla.DLL - a Source Editing Component\0"
-			VALUE	"FileVersion",	"3.0.3\0"
+			VALUE	"FileVersion",	"3.0.4\0"
 			VALUE	"InternalName",	"Scintilla\0"
 			VALUE	"LegalCopyright",	"Copyright 1998-2012 by Neil Hodgson\0"
 			VALUE	"OriginalFilename",	"Scintilla.DLL\0"
 			VALUE	"ProductName",	"Scintilla\0"
-			VALUE	"ProductVersion",	"3.0.3\0"
+			VALUE	"ProductVersion",	"3.0.4\0"
 		END
 	END
 END