[NEW] Add new encodings.

[REMOVE] Remove Line Draw TTF for MSDOS ASCCI Art highlighter; using encoding Dos 437 instead. [UPDATE] (Author : Christian Cuvier) Update NppHelp to v5.6. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@569 f5eea248-9336-0410-98b8-ebc06183d4e3
2009-11-23 01:34:38 +00:00 · 2009-11-23 01:34:38 +00:00 · 5b4f8e3e11
commit 5b4f8e3e11
parent 8bb48853d9
31 changed files with 242 additions and 166 deletions
--- a/PowerEditor/bin/NppHelp.chm
+++ b/PowerEditor/bin/NppHelp.chm
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@ -1,42 +1,17 @@
-Notepad++ v5.5.1 new features and fixed bugs (from v5.5) :
+Notepad++ v5.6 new features and fixed bugs (from v5.5.1) :

-1.  Old icon is back.
-2.  Set ".txt" extension automatically while saving a document text.
-3.  Real characters count is added in status bar.
-4.  Fix some memory leaks.
-5.  Add "open all" capacity in finder (for find in files).
-6.  Replaced nppcm with NppShell (in installer).
-	- Dialog to allow change of various settings (cmd : regsvr32 /s /i NppShell.dll)
-	- Context menu icon properly rendered
-	- Incorporate dynamic icon for registered filetypes
-
-	
-Notepad++ v5.5 new features and fixed bugs (from v5.4.5) :
-
-1.  Update : upgrade Scintilla from v1.78 to v2.01.
-2.  New icon : change from old icon to a cool chamelon icon.
-3.  New feature : virtual space for column mode.
-4.  New feature : multi-editing / selection.
-5.  New feature : tab settings for per language.
-6.  New feature : selected lines moving up/down capacity.
-7.  New feature : incremental Search shows pink background when text not found (like Firefox).
-8.  New feature : rational number is recognized in User Defined Language System.
-9.  New feature : escape character capacity for the delimiter in User Defined Language System.
-10. Bug fixed : tool bar tip crash issue.
-11. Bug fixed : column editor inserting octal number broken issue.
-12. Changed behaviour : "-nosession" parameter's not only none of session is loaded, but also none of session is saved.
-13. Bug fixed : docking feature crash issue.
-14. New feature : the ability to not launch Auto-updater during a period (15 days by default).
-15. New feature : import plugins feature (load on the fly).
-16. New feature : import theme (stylers.xml) feature.
-17. Bug fixed : a crash issue while launch Fin in file (regression since v5.4.5).
-18. Bug fixed : a crash issue while deleting the last line.
-19. Bug fixed : a bug of plugin message NPPM_GETPLUGINSCONFIGDIR (regression since v5.4.5).
-20. New feature :  new plugin notification NPPN_DOCORDERCHANGED to notify plugins that document order is changed.
-21. Bug fixed : tool bar chevron disappeared bug (regression since previous versions).
-22. Bug fixed : a crash bug due to instability of FTP_synchronize plugin (enhance Docking feature).
-23. Bug fixed : getting fonts problem under Chines/Korean/Japanese environment.
-24. Bug fixed : wrong File encoding auto-detection problem : binary file is detected as UTF-16 big-endian.
+1.  Add languages encoding - Chinese traditional (BIG5), Chinese Simplified (GB2312), Japanese (Shift JIS), Korean (EUC), Thai (TIS-620), Hebrew (iso-8859-8), Hebrew (1255), Central European (1250), Cyrillic (1251), Cyrillic (KOI8-U), Cyrillic (KOI8-R), Cyrillic (Mac), Western European(1252), Greek (1253), Turkish(1254), Arabic (1256), Baltic (1257) and Vietnamese (1258).
+2.  Add COBOL, D, Gui4Cli, PowerShell and R language support.
+3.  Add Marker Jumper feature (Jump down/up : Ctrl+Num/Ctrl+Shift+Num).
+4.  Add system tray context menu and new command argument "-systemtray".
+5.  Add new command argument "--help".
+6.  Fix Calltip hint bug and add a new capacity in it.
+7.  Add the ability to add the second keyword group for user in both LISP and Scheme languages.
+8.  Fix the wrap symbol display problem.
+9.  Add SQL ESC symbol '\'.
+10. Fix column editor insert number bug in virtual space mode.
+11. Fix status bar displaying "-2 char" issue for a empty document.
+12. Fixed installation of NppShell64 failed issue in installer.


 Included plugins (Unicode):
@ -46,10 +21,9 @@ Included plugins (Unicode):
 3.  Spell Checker v1.3.3
 4.  MIME Tools v1.6
 5.  NppExport v0.2.8
-6.  Doc Monitor v2.2
-7.  NppNetNote v0.1
-8.  Compare Plugin 1.5.5
-9.  Plugin Manager 0.9.3.0
+6.  NppNetNote v0.1
+7.  Compare Plugin 1.5.5
+8.  Plugin Manager 0.9.3.0

 Included plugins (ANSI):

@ -59,8 +33,7 @@ Included plugins (ANSI):
 4.  MIME Tools v1.6
 5.  NppExport v0.2.8
 6.  Light Explorer v1.5
-7.  Doc Monitor v2.2
-8.  NppNetNote v0.1
-9.  Compare Plugin 1.5.5
-10. Plugin Manager 0.9.3.0
+7.  NppNetNote v0.1
+8.  Compare Plugin 1.5.5
+9.  Plugin Manager 0.9.3.0

--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@ -17,8 +17,8 @@

 ; Define the application name
 !define APPNAME "Notepad++"
-!define APPVERSION "5.5.2"
-!define APPNAMEANDVERSION "Notepad++ v5.5.2"
+!define APPVERSION "5.6"
+!define APPNAMEANDVERSION "Notepad++ v5.6"
 !define APPWEBSITE "http://notepad-plus.sourceforge.net/"

 !define VERSION_MAJOR 5
@ -28,7 +28,7 @@
 Name "${APPNAMEANDVERSION}"
 InstallDir "$PROGRAMFILES\Notepad++"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "..\bin\npp.5.5.2.Installer.exe"
+OutFile "..\bin\npp.5.6.Installer.exe"

 ; GetWindowsVersion
 ;
@ -382,7 +382,6 @@ GLOBAL_INST:
 	; Set Section Files and Shortcuts
 	SetOverwrite on
 	File "..\license.txt"
-	File "..\bin\LINEDRAW.TTF"
 	File "..\bin\SciLexer.dll"
 	File "..\bin\change.log"
 	File "..\bin\notepad++.exe"
--- a/PowerEditor/misc/npp.help/HTML/Built-in
+++ b/PowerEditor/misc/npp.help/HTML/Built-in
@ -5,7 +5,7 @@
 <body>
 <h1>Built-in languages</h1>
 <p>Standard
-Notepad++ comes preloaded with a list with some of the most popular
+Notepad++ comes preloaded with a list with over 50 among the most popular
 languages. You can select those languages using the Language
 menu&nbsp;and configure their style using the <a href="Styler%20Configurator.html">Styler Configurator</a>. Most
 often the correct language is selected when opening a file based on the
--- a/PowerEditor/misc/npp.help/HTML/Command
+++ b/PowerEditor/misc/npp.help/HTML/Command
@ -18,8 +18,12 @@ Notepad++
 supports a few command line parameters to control its startup. The
 following options are supported (they are case sensitive):</font>
 p><dl>
+<dt>-n<span style="font-weight: normal;"><i>line number</i></span>
+<dd>Line number to go to for each file opened. 
 <dt>-c
 <dd> Start editing in Column mode.
+<dt>--help
+<dd> Displays this list, i.e. all the command line switches
 <dt>-multiInst
 <dd> allow Notpead++ to start more than one instance. By default, if
 Notepad++ is already started files wil lbe opened in that instance,
@ -33,20 +37,20 @@ just do not wish to load them, add this option.
 <dd> Do not load the previous session if Notepad++ is started. Do not save the session on exit either.
 <dt>-notabbar
 <dd> Hide the Tab Bar, even if the settings say otherwise.
-<dt>-n<span style="font-weight: normal;"><i>line number</i></span>
-<dd>Line number to go to for each file opened. 
+<dt>-systemtray
+<dd> Start Notepad++ minimised in the system tray, aka notification area
 <dt>-x<span style="font-weight: normal;"><i>line number</i></span>
 <dd>Specify the horizontal position (in pixels) at which Notepad++ main window is to open.
 <dt>-y<span style="font-weight: normal;"><i>line number</i></span>
 <dd>Specify the vertical position (in pixels) at which Notepad++ main window is to open.
 <dt>-l<span style="font-weight: normal;"><i>language short name</i></span>
 <dd>Language to set for each file opened. $$$ is a short identifier
-string, of which the following are allowed:<br></font><table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="0" ><tbody><tr><td style="background-color:aquamarine;">normal, php, c, cpp, cs, objc,
+string, of which the following are allowed:<br></font><table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="0" ><tbody><tr><td style="background-color:aquamarine;">normal, php, c, cpp, cs, objc, d,
 java, rc, html, xml, makefile, pascal, batch, ini, nfo, asp, sql, vb,
-javascript, css, perl, python, lua, tex, fortran, bash, actionscript,
+javascript, css, perl, python, lua, tex, cobol, fortran, bash, actionscript,
 nsis, tcl, lisp, scheme, asm, diff, props, postscript, ruby, smalltalk,
-vhdl, kix, autoit, caml, ada, verilog, matlab, haskell, inno, cmake,
-yaml</td></tr></tbody></table>
+vhdl, kix, autoit, Gui4Cli, powershell, caml, ada, verilog, matlab, haskell, inno, cmake,
+yaml, r</td></tr></tbody></table>
 <dt>Files
 <dd>Anything else will be interpreted as a filename. Always quote your
 filename to allow the path to contain spaces, otherwise Notepad++
--- a/PowerEditor/misc/npp.help/HTML/Display.html
+++ b/PowerEditor/misc/npp.help/HTML/Display.html
@ -3,5 +3,5 @@
 <link rel="stylesheet" href="styles.css" type="text/css">
 </head>
 <body><h1>Display</h1>
-<p>The subjects described here control the appearance of the text in the screen.<br><p><a href="Viewing%20modes.html">Viewing modes</a></p><p><a href="Unprintable%20characters.html">Unprintable Characters</a></p><p><a href="Wrapping.html">Line Wrapping</a></p><p><a href="Zooming.html">Zooming</a></p><p><a href="Folding.html">Folding</a></p><p><a href="Hiding%20lines.html">Hiding Lines</a></p><p><a href="Multi%20View.html">Multi View</a></p><p><a href="RTL.html">Right-to-Left modus</a></p>
+<p>The subjects described here control the appearance of the text in the screen.<br><p><a href="Viewing%20modes.html">Viewing modes</a></p><p><a href="Unprintable%20characters.html">Unprintable Characters</a></p><p><a href="Wrapping.html">Line Wrapping</a></p><p><a href="Zooming.html">Zooming</a></p><p><a href="Folding.html">Folding</a></p><p><a href="Hiding%20lines.html">Hiding Lines</a></p><p><a href="Multi%20View.html">Multi View</a></p><p><a href="RTL.html">Right-to-Left modus</a></p><p><a href="System%20Tray.html">System tray</a></p><p><a href="RTL.html">Right-to-Left modus</a></p>
 </body></html>
--- a/PowerEditor/misc/npp.help/HTML/Encoding.html
+++ b/PowerEditor/misc/npp.help/HTML/Encoding.html
@ -6,7 +6,7 @@
 <h1>Encoding</h1>
 <p>
 Text
-can be encoded in multiple ways. Most (older) textfiles use an
+can be encoded in multiple ways. Most (older) text files use an
 encoding named ANSI, which has room for a limited amount of different
 characters, but is often sufficient to display all the text. However,
 Unicode encodings allow for a much richer amount of characters,
@ -38,4 +38,5 @@ byte BOM will be added upon save.
 <dt>UTF-16 Big Endian 
 <dd> All characters are two bytes in size, pairs are Big Endian ordered. A 4 byte BOM is added upon save.
 </dl>
+<p>In addition, since version 5.6, Notepad++ supports changing the character set being used to display the text, exactly the way you can change it on most web browsers. Thiese encodings are available using the <span class="menu_item">More</span> menu entry which comes right after the <span class="menu_item">Encode in ...</span> family items.
 </body></html>
--- a/PowerEditor/misc/npp.help/HTML/Feature
+++ b/PowerEditor/misc/npp.help/HTML/Feature
@ -5,10 +5,12 @@
 <h1>Feature Requests</h1>
 <p>If
 you have a (very) good idea on how to improve Notepad++, you can
-request a feature using the Feature Request tracker
-(<a target="_blank" href="http://sourceforge.net/tracker2/?group_id=95717&amp;atid=612385">http://sourceforge.net/tracker2/?group_id=95717&amp;atid=612385</a>).
-If it hasn't been asked for before, you can do so here. There is no
+request a feature using <a target="_blank" href="https://sourceforge.net/apps/ideatorrent/notepad-plus/ideatorrent/">IdeaTorrent</a>. You can also use the Feature Request tracker
+(<a target="_blank" href="http://sourceforge.net/tracker2/?group_id=95717&amp;atid=612385">http://sourceforge.net/tracker2/?group_id=95717&amp;atid=612385</a>), even though this facility may be phased out at some point. Using IdeaTorrent allows for competing solutions for a given issue, and voting for these so-called solutions.
+If your feature hasn't been asked for before, you can do so here, or vote for an already proposed solution. 
+<p>There is no
 guarantee it will be added however; what is a great feature for one
 person might be a big nuisance for another, or it simply is too
-difficult or time consuming to add it in. Also, some feature requests would involve modifying the Scintilla component, which would prove unpractical. In such a case, the feature request would be better filed with <a href="http://sourceforge.net/projects/scintilla/">the Scintilla project</a> 
+difficult or time consuming to add it in. They are hints as to what are the most wished-for additions or modifications to the software, and they will be considered on the basis of urgency, popularity, available developer time and technical feasibility.
+<p>Also, some feature requests would involve modifying the Scintilla component, which would prove unpractical. In such a case, the feature request would be better filed with <a href="http://sourceforge.net/projects/scintilla/">the Scintilla project</a>. When this project upgrades the Scintilla component, and when Notepad++ can take advantage of the new versions, all the new features become available - they may have been asked for by people who never heard of Notepad++ -, and the large tester pool for Scintilla will have probably weeded out any possible bugs therein.
 </body></html>
--- a/PowerEditor/misc/npp.help/HTML/Images/Screenshots/srwindow.png
+++ b/PowerEditor/misc/npp.help/HTML/Images/Screenshots/srwindow.png
--- a/PowerEditor/misc/npp.help/HTML/Images/Screenshots/systemtray.png
+++ b/PowerEditor/misc/npp.help/HTML/Images/Screenshots/systemtray.png
--- a/PowerEditor/misc/npp.help/HTML/Marking
+++ b/PowerEditor/misc/npp.help/HTML/Marking
@ -4,4 +4,6 @@
 <body><h1>Marking search results</h1>
 <p>
 All-&gt;Using xxx Style</span>, where xxx is 1st, 2nd, 3rd, 4th or 5th. To remove the marks of a given style select <span class="menu_item">Search-&gt;Unmark All-&gt;Clear xxx style</span>. It is also possible to remove all sort of markings by using the <span class="menu_item">Search-&gt;Unmark All-&gt;Clear all styles</span>.
-You can use the <a href="Styler%20Configurator.html#Find_Mark_Style">Styler Configurator</a> to change the color of any of the mark styles.</body></html>
+You can use the <a href="Styler%20Configurator.html#Find_Mark_Style">Styler Configurator</a> to change the color of any of the mark styles.</body>
+<p>You can navigate marked text using the <span class="menu_item">Jump Up</span> or <span class="Jump Down">. These submenus let you move to the next/previous word marked using the specified style - any of the supported five, plus the standard Find Style.
+</html>
--- a/PowerEditor/misc/npp.help/HTML/Opening
+++ b/PowerEditor/misc/npp.help/HTML/Opening
@ -43,7 +43,7 @@ select <span class="menu_item">File-&gt;Save All</span> or press  <img style="wi
 the file has yet no name (for example, if you had created a new
 file), or you selected <span class="menu_item">File-&gt;Save As</span>, the save file dialog will
 pop up, asking you for the name of the file. You can then choose the
-location and the name of the file.
+location and the name of the file. A .txt extension is assumed if the file name has no extension.
 </li><li>An useful variant  is <span class="menu_item">File-&gt;Save a Copy As</span>. The difference with <span class="menu_item">File-&gt;Save As</span> is that, after the latter, your work continues on the new file, while with the former it continues on the old file.
 </li><li>The
 filter at the bottom of the dialog can automatically add or change
--- a/PowerEditor/misc/npp.help/HTML/Preferences.html
+++ b/PowerEditor/misc/npp.help/HTML/Preferences.html
@ -138,7 +138,7 @@ present will be drawn with a special background color. </font>You can change the
 <p>

 <h2><a name="New_Document_Open_Save_directory"></a>New
-Document/Open Save directory
+Document/Default directory
 </h2>
 <p>These
 options change the way new documents are created and what the default
--- a/PowerEditor/misc/npp.help/HTML/Search
+++ b/PowerEditor/misc/npp.help/HTML/Search
@ -18,8 +18,8 @@ Commands that make use of the facility are:<p>

 <p>The results in the Search results window can be deleted using the DEL key, on an individual, per file or per search basis. They can be
 further manipulated using the right click popup menu for the window. Additionally, the text of the window is plain text that can be copied
- and asted for further processing. <span class="shortcut">Doubleclicking</span> on a result will open that file and go to its
-location.
+ and asted for further processing. <span class="shortcut">Double-clicking</span> on a result will open that file and go to its
+location. Using the <span class="menu_item">Open All</span> right-click menu entry will open all of the files which the collection of displayed search results, collapsed or not, references.

 <p><span class="menu_item">Search-&gt;Switch to found results window</span> shows this window if hidden and not empty, and toggles focus between 
 it and the main Notepad++ window. When the window is not shown, <span class="menu_item">Go to Next found result</span> and <span class="menu_item">Go to Previous found result</span> navigate among results. 
@ -28,5 +28,5 @@ On earlier versions of Notepad++, the three menu entries are not there, and the
 <p>
 The
 results will be colored depending on the type of result. See &nbsp;<a href="Styler%20Configurator.html#Search_result">Styler Configurator</a> for information on how to change these
-colors.
+colours.
 </body></html>
--- a/PowerEditor/misc/npp.help/HTML/Selecting.html
+++ b/PowerEditor/misc/npp.help/HTML/Selecting.html
@ -0,0 +1,40 @@
+<html>
+<!-- Generated by AceHTML Freeware http://freeware.acehtml.com -->
+<!-- Creation date: 06/09/2009 -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Selecting text</title>
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="author" content="christian.cuvier@agriculture.gouv.fr">
+<meta name="generator" content="AceHTML 5 Freeware">
+<link rel="stylesheet" href="styles.css" type="text/css"></
+</head>
+<body><h1>Selecting text</h1>
+<p>As with any known text editor, you can select text using either the mouse or keyboard.
+Selected text can be moved to some other part of the same document, copied elsewhere
+in the same or another document, searched for text, deleted, an more.
+</p><h2>How to select text</h2>
+When using the mouse, the most basic way - but there are other - is to drag
+ the mouse from start point to end point. You can also double click a word to 
+select it, or triple click on a line to select it. The same effect is achieved 
+by a simple click on the line number margin, when displayed.
+You can extend a selection by shift clicking its new insertion point.
+</p><p>When using the keyboard, the expected procedure is to use navigation keys
+in conjunction with the <span class="Shortcut">Shift</span> modifier. These keyboard shortcuts can be changed at any time using the Shortcut Mapper.
+</p><h2>Stream vs rectangular selection</h2>
+<p>The above procedures are known to define a <i>stream</i> selection, which encompasses 
+a contiguous range of text. 
+</p><p>However, Notepad++ also knows about rectangular selections, which define a rectangle of strips on contiguous lines. To select a rectangle, use the
+above methods while also holding the <span class="Shortcut">Alt</span> modifier key down. For exmple, the basic way with
+the mouse is to <span class="Shortcut">Alt-click</span> the start point and Alt-move the mouse to the end point, and so forth. The Alt- versions of keyboard shortcuts can be changed as well.
+</p><p>It is possible to combine a stream selection and arectangular selection, using the keyboard.
+This is probably less useful, but is not a bug.
+</p><p>The <span class="menu_item">Edit -> Line operations -> Move Up/Down current line</span> commands also move the selected area, if it is not rectangular. This ability is lost when several selections are made - see below.
+</p><h2>Multiple stream selections</h2>
+<p>If a stream area is selected, it is possible to add another, disjoint area by Ctrl-clicking its start point and moving the mouse to the end point.
+More than one extra selection can be added this way. However, this ability
+does not extend to rectangular selections. A rectangular selection may still cling to one of the stream selections though.
+</p><p>When copying or cutting a multiple selection, the text is recorded in the order the selections appear, regardless of the order in which they were made.
+</body>
+</html>
--- a/PowerEditor/misc/npp.help/HTML/Shell
+++ b/PowerEditor/misc/npp.help/HTML/Shell
@ -4,7 +4,7 @@
 </head><body>
 <h1>Shell
 Extension</h1>
-<p>By default the Notepad++ installer comes with an Shell
+<p>By default the Notepad++ installer comes with a Shell
 extension. This is not really part of the Notepad++ program but very
 useful. If you choose to install it, then any file you rightclick on
 will show an entry named &#8220;Edit with Notepad++&#8221; with the Notepad++
@ -12,9 +12,10 @@ icon.<p>
 Please
 note that to install or remove the extension, it sometimes is
 required to restart the Explorer process. For this you can reboot,
-logout and log back in or use the taskmanager to kill explorer
-(Windows NT and up) and restart it again.  Hitting Ctrl+Alt+Shift+Del works too.
+logout and log back in or use the task manager to kill explorer
+(Windows NT and up) and restart it again. You can do this by hitting <span class="shortcut">Ctrl+Alt+Shift+Del</span>.
 <p>If the Shell extension is
 already installed, the Notepad++ installer cannot update or overwrite
 it, you first have to uninstall it and restart Explorer. 
+<p>If you issue the install command for the dll, which is <tt>regsvr32 /i NppShell.dll</tt>, a dialog box will pop up from which various details of the behaviour of the extension can be tweaked.
 </body></html>
--- a/PowerEditor/misc/npp.help/HTML/Status
+++ b/PowerEditor/misc/npp.help/HTML/Status
@ -10,15 +10,15 @@ document and consists of six sections.
 <p><ul><li>The first section shows the current language that is
 selected for that document (see <a href="Languages.html">Languages</a>). 
 </li><li>The
-second section shows the amount of characters (in bytes) that the
+second section shows the amount of characters that the
 current document contains. This is not equal to the filesize of the
-document (except for ANSI documents), but the internal size (see
-<a href="Encoding.html">Encoding</a> for more details).
+document (except for ANSI documents, see
+<a href="Encoding.html">Encoding</a> for more details). The filssize, s well as the line count, is also shown.
 </li><li>After
 that you find information about the cursor in the document. It
 consists of the current line ('Ln', first line is line 1), the
-current column ('Col', first position is 1) and the length of the
-selection (in bytes, see&nbsp;<a href="Encoding.html">Encoding</a>). If you <span class="shortcut">doubleclick</span> on this
+current column ('Col', first position is 1), the length of the
+selection both in characters and bytes (see&nbsp;<a href="Encoding.html">Encoding</a>). The number of selected range is also displayed. If you <span class="shortcut">doubleclick</span> on this
 section, the <a href="Go%20to%20dialog.html">Go to Line dialog</a> will pop up.
 </li><li>The
 fourth section shows the current newline format (see <a href="Newline%20format.html">Newline format</a></a>).
--- a/PowerEditor/misc/npp.help/HTML/System
+++ b/PowerEditor/misc/npp.help/HTML/System
@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>Status Bar</title>
+<link rel="stylesheet" href="styles.css" type="text/css"></head>
+<body>
+<h1>System Tray</h1>
+<p>The system tray, aka notification area, is the area on the right or bottom of the Windows&tm;task bar which shows small icons related to running programs. It is common that double clicking the icon will bring the corresponding application to the front, or pop up some  dialog related to the application. Most of the time, right clicking such an icon pops up a menu of frequently used commands to ask the application to perform.
+<p align="center"><img src="images/screenshots/systemtray.png"/></p>
+<p>You can send any running instance of Notepad++ to the system tray:
+<ul>
+<li>at startup, by using the <b>-systemtray</b> <a href="Command%20Line">command line switch</A>
+<li>Using the minimise button, if you enabled this behaviour from the <a href="Prefernces.html">Preferences dialog</a>.
+</ul>
+<p>If you try to minimise a running instance of Notepad++ to the system tray while one is already there, the new instance will be minimised in the standard way, so that its button remains on the task bar.
+</body></html>
--- a/PowerEditor/misc/npp.help/HTML/Tab
+++ b/PowerEditor/misc/npp.help/HTML/Tab
@ -19,7 +19,7 @@ If
 more tabs are visible than can be shown on the display, then:
 <ul><li>If you did not enable multine tab bar from <a href="Preferences.html#Global">Preferences</a>, two small
 arrows appear on the right, allowing you to scroll through the tabs
-to find the correct one.
+to find the correct one. And if there is some empty space, double clicking in that space will create a new document.
 <li>If you did, then several rows of tabs will be visible.</ul></font>
 The
 active tab can show an orange line (enabled by default). If two views
--- a/PowerEditor/misc/npp.help/Notepad++Help.hhp
+++ b/PowerEditor/misc/npp.help/Notepad++Help.hhp
@ -7,10 +7,10 @@ Default topic=HTML\Introduction.html
 Display compile progress=No
 Index file=Index.hhk
 Language=0x809 Anglais (Royaume-Uni)
-Title=Notepad++ Reference Manual - version 5.5
+Title=Notepad++ Reference Manual - version 5.6

 [WINDOWS]
-WinType1="Notepad++ Reference Manual - Version 5.5","Table of Contents.hhc","Index.hhk","HTML\Introduction.html",,,,,,0x3120,,0x300e,[104,86,765,538],0x10080000,0x404,,,,,0
+WinType1="Notepad++ Reference Manual - Version 5.6","Table of Contents.hhc","Index.hhk","HTML\Introduction.html",,,,,,0x3120,,0x300e,[104,86,765,538],0x10080000,0x404,,,,,0


 [FILES]
--- a/PowerEditor/misc/npp.help/Table
+++ b/PowerEditor/misc/npp.help/Table
@ -205,6 +205,10 @@
 			<param name="Name" value="Multi View">
 			<param name="Local" value="HTML\Multi View.html">
 			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="System tray">
+			<param name="Local" value="HTML\System Tray.html">
+			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Right to Left Display">
 			<param name="Local" value="HTML\RTL.html">
--- a/PowerEditor/src/MISC/Common/Common.h
+++ b/PowerEditor/src/MISC/Common/Common.h
@ -34,6 +34,11 @@
 #define NPP_CP_GB2312             936
 #define NPP_CP_ISO_8859_8         28598
 #define NPP_CP_TIS_620            874
+#define NPP_CP_CYRILLIC_DOS       855
+#define NPP_CP_CYRILLIC_MAC       10007
+#define NPP_CP_CYRILLIC_KOI8_U    21866
+#define NPP_CP_CYRILLIC_KOI8_R    20866
+#define NPP_CP_DOS_437            437


 #ifdef UNICODE
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@ -40,22 +40,28 @@ const char *urlHttpRegExpr = "http://[a-z0-9_\\-\\+~.:?&@=/%#]*";
 int docTabIconIDs[] = {IDI_SAVED_ICON, IDI_UNSAVED_ICON, IDI_READONLY_ICON};
 enum tb_stat {tb_saved, tb_unsaved, tb_ro};

+// Don't change the order
 int encoding_table[] = {
-NPP_CP_WIN_1250,
-NPP_CP_WIN_1251,
-NPP_CP_WIN_1252,
-NPP_CP_WIN_1253,
-NPP_CP_WIN_1254,
-NPP_CP_WIN_1255,
-NPP_CP_WIN_1256,
-NPP_CP_WIN_1257,
-NPP_CP_WIN_1258,
-NPP_CP_BIG5,
-NPP_CP_GB2312,
-NPP_CP_SHIFT_JIS,
-NPP_CP_EUC_KR,
-NPP_CP_TIS_620,
-NPP_CP_ISO_8859_8
+NPP_CP_WIN_1250,        //IDM_FORMAT_WIN1250
+NPP_CP_WIN_1251,        //IDM_FORMAT_WIN1251
+NPP_CP_WIN_1252,        //IDM_FORMAT_WIN1252
+NPP_CP_WIN_1253,        //IDM_FORMAT_WIN1253
+NPP_CP_WIN_1254,        //IDM_FORMAT_WIN1254
+NPP_CP_WIN_1255,        //IDM_FORMAT_WIN1255
+NPP_CP_WIN_1256,        //IDM_FORMAT_WIN1256
+NPP_CP_WIN_1257,        //IDM_FORMAT_WIN1257
+NPP_CP_WIN_1258,        //IDM_FORMAT_WIN1258
+NPP_CP_BIG5,            //IDM_FORMAT_BIG5
+NPP_CP_GB2312,          //IDM_FORMAT_GB2312
+NPP_CP_SHIFT_JIS,       //IDM_FORMAT_SHIFT_JIS
+NPP_CP_EUC_KR,          //IDM_FORMAT_EUC_KR
+NPP_CP_TIS_620,         //IDM_FORMAT_TIS_620
+NPP_CP_ISO_8859_8,      //IDM_FORMAT_ISO_8859_8
+NPP_CP_CYRILLIC_DOS,    //IDM_FORMAT_CP855
+NPP_CP_CYRILLIC_MAC,    //IDM_FORMAT_MAC_CYRILLIC
+NPP_CP_CYRILLIC_KOI8_U, //IDM_FORMAT_KOI8U_CYRILLIC
+NPP_CP_CYRILLIC_KOI8_R, //IDM_FORMAT_KOI8R_CYRILLIC
+NPP_CP_DOS_437,         //IDM_FORMAT_DOS437
 };


@ -2677,7 +2683,7 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 		
        braceMatch();

-		const NppGUI & nppGui = nppParam->getNppGUI();
+		NppGUI & nppGui = (NppGUI &)nppParam->getNppGUI();

 		if (nppGui._enableTagsMatchHilite)
 		{
@ -2686,8 +2692,12 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 		}
 		
 		if (nppGui._enableSmartHilite)
+		{
+			if (nppGui._disableSmartHiliteTmp)
+				nppGui._disableSmartHiliteTmp = false;
+			else
 				_smartHighlighter.highlightView(notifyView);
-
+		}
 		updateStatusBar();
 		AutoCompletion * autoC = isFromPrimary?&_autoCompleteMain:&_autoCompleteSub;
 		autoC->update(0);
@ -9958,6 +9968,9 @@ bool Notepad_plus::goToPreviousIndicator(int indicID2Search, bool isWrap) const
 	// found
 	if (_pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search, posStart))
 	{
+		NppGUI & nppGUI = (NppGUI &)((NppParameters::getInstance())->getNppGUI());
+		nppGUI._disableSmartHiliteTmp = true;
+
 		_pEditView->execute(SCI_SETSEL, posEnd, posStart);
 		_pEditView->execute(SCI_SCROLLCARET);
 		return true;
@ -10005,6 +10018,9 @@ bool Notepad_plus::goToNextIndicator(int indicID2Search, bool isWrap) const
 	// found
 	if (_pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search, posStart))
 	{
+		NppGUI & nppGUI = (NppGUI &)((NppParameters::getInstance())->getNppGUI());
+		nppGUI._disableSmartHiliteTmp = true;
+		
 		_pEditView->execute(SCI_SETSEL, posStart, posEnd);
 		_pEditView->execute(SCI_SCROLLCARET);
 		return true;
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@ -277,6 +277,15 @@ BEGIN
            MENUITEM "Using 4th Style",    IDM_SEARCH_MARKALLEXT4
            MENUITEM "Using 5th Style",    IDM_SEARCH_MARKALLEXT5
        END
+        POPUP "Unmark All"
+        BEGIN
+            MENUITEM "Clear 1st Style",     IDM_SEARCH_UNMARKALLEXT1
+            MENUITEM "Clear 2nd Style",     IDM_SEARCH_UNMARKALLEXT2
+            MENUITEM "Clear 3rd Style",     IDM_SEARCH_UNMARKALLEXT3
+            MENUITEM "Clear 4th Style",     IDM_SEARCH_UNMARKALLEXT4
+            MENUITEM "Clear 5th Style",     IDM_SEARCH_UNMARKALLEXT5
+            MENUITEM "Clear all Styles",    IDM_SEARCH_CLEARALLMARKS
+        END
        POPUP "Jump up"
        BEGIN
            MENUITEM "1st Style",     IDM_SEARCH_GOPREVMARKER1
@ -295,15 +304,6 @@ BEGIN
            MENUITEM "5th Style",      IDM_SEARCH_GONEXTMARKER5
            MENUITEM "Find Style",     IDM_SEARCH_GONEXTMARKER_DEF
        END
-        POPUP "Unmark All"
-        BEGIN
-            MENUITEM "Clear 1st Style",     IDM_SEARCH_UNMARKALLEXT1
-            MENUITEM "Clear 2nd Style",     IDM_SEARCH_UNMARKALLEXT2
-            MENUITEM "Clear 3rd Style",     IDM_SEARCH_UNMARKALLEXT3
-            MENUITEM "Clear 4th Style",     IDM_SEARCH_UNMARKALLEXT4
-            MENUITEM "Clear 5th Style",     IDM_SEARCH_UNMARKALLEXT5
-            MENUITEM "Clear all Styles",    IDM_SEARCH_CLEARALLMARKS
-        END
        
        MENUITEM SEPARATOR
        MENUITEM "Toggle Bookmark" ,                       IDM_SEARCH_TOGGLE_BOOKMARK
@ -396,14 +396,19 @@ BEGIN
        MENUITEM "Encode in UTF-8",                   IDM_FORMAT_UTF_8
        MENUITEM "Encode in UCS-2 Big Endian",        IDM_FORMAT_UCS_2BE
        MENUITEM "Encode in UCS-2 Little Endian",     IDM_FORMAT_UCS_2LE
-        POPUP "More..."
+        POPUP "Character sets"
        BEGIN
            MENUITEM "Arabic(Windows)",               IDM_FORMAT_WIN1256
            MENUITEM "Baltic(Windows)",               IDM_FORMAT_WIN1257
+            MENUITEM "Cyrillic(DOS)",                 IDM_FORMAT_CP855
+            MENUITEM "Cyrillic(Macintosh)",           IDM_FORMAT_MAC_CYRILLIC
+            MENUITEM "Cyrillic(KOI8-R)",              IDM_FORMAT_KIO8R_CYRILLIC
+            MENUITEM "Cyrillic(KOI8-U)",              IDM_FORMAT_KIO8U_CYRILLIC
            MENUITEM "Cyrillic(Windows)",             IDM_FORMAT_WIN1251
            MENUITEM "Central European(Windows)",     IDM_FORMAT_WIN1250
            MENUITEM "Chinese Traditional(Big5)",     IDM_FORMAT_BIG5
            MENUITEM "Chinese Simplified(GB)",        IDM_FORMAT_GB2312
+            MENUITEM "DOS ASCII",                     IDM_FORMAT_DOS437
            MENUITEM "Greek(Windows)",                IDM_FORMAT_WIN1253
            MENUITEM "Hebrew(iso8859-8)",             IDM_FORMAT_ISO_8859_8
            MENUITEM "Hebrew(Windows)",               IDM_FORMAT_WIN1255
--- a/PowerEditor/src/Parameters.cpp
+++ b/PowerEditor/src/Parameters.cpp
@ -558,7 +558,6 @@ NppParameters::NppParameters() : _pXmlDoc(NULL),_pXmlUserDoc(NULL), _pXmlUserSty
 	PathAppend(notepadStylePath, notepadStyleFile);
 		
 	_asNotepadStyle = (PathFileExists(notepadStylePath.c_str()) == TRUE);
-	::AddFontResource(LINEDRAW_FONT);

 	//Load initial accelerator key definitions
 	initMenuKeys();
@ -583,9 +582,8 @@ NppParameters::~NppParameters()
 		delete (*it);
 	}
 	_pXmlExternalLexerDoc.clear();
-
-	::RemoveFontResource(LINEDRAW_FONT);
 }
+
 void cutString(const TCHAR *str2cut, vector<generic_string> & patternVect)
 {
 	TCHAR str2scan[MAX_PATH];
--- a/PowerEditor/src/Parameters.h
+++ b/PowerEditor/src/Parameters.h
@ -101,7 +101,6 @@ const bool SCIV_SECOND = true;

 const TCHAR fontSizeStrs[][3] = {TEXT(""), TEXT("8"), TEXT("9"), TEXT("10"), TEXT("11"), TEXT("12"), TEXT("14"), TEXT("16"), TEXT("18"), TEXT("20"), TEXT("22"), TEXT("24"), TEXT("26"), TEXT("28")};

-const TCHAR LINEDRAW_FONT[] =  TEXT("LINEDRAW.TTF");
 const TCHAR localConfFile[] = TEXT("doLocalConf.xml");
 const TCHAR notepadStyleFile[] = TEXT("asNotepad.xml");

@ -649,7 +648,7 @@ struct NppGUI
 	NppGUI() : _toolBarStatus(TB_LARGE), _toolbarShow(true), _statusBarShow(true), _menuBarShow(true),\
 		       _tabStatus(TAB_DRAWTOPBAR | TAB_DRAWINACTIVETAB | TAB_DRAGNDROP), _splitterPos(POS_HORIZOTAL),\
 	           _userDefineDlgStatus(UDD_DOCKED), _tabSize(8), _tabReplacedBySpace(false), _fileAutoDetection(cdEnabled), _fileAutoDetectionOriginalValue(_fileAutoDetection),\
-			   _checkHistoryFiles(true) ,_enableSmartHilite(true), _enableTagsMatchHilite(true), _enableTagAttrsHilite(true), _enableHiliteNonHTMLZone(false),\
+			   _checkHistoryFiles(true) ,_enableSmartHilite(true), _disableSmartHiliteTmp(false), _enableTagsMatchHilite(true), _enableTagAttrsHilite(true), _enableHiliteNonHTMLZone(false),\
 			   _isMaximized(false), _isMinimizedToTray(false), _rememberLastSession(true), _backup(bak_none), _useDir(false), _backupDir(TEXT("")),\
 			   _doTaskList(true), _maitainIndent(true), _openSaveDir(dir_followCurrent), _styleMRU(true), _styleURL(0),\
 			   _autocStatus(autoc_none), _autocFromLen(1), _funcParams(false), _definedSessionExt(TEXT("")),\
@ -695,6 +694,7 @@ struct NppGUI
 	bool _doTaskList;
 	bool _maitainIndent;
 	bool _enableSmartHilite;
+	bool _disableSmartHiliteTmp;
 	bool _enableTagsMatchHilite;
 	bool _enableTagAttrsHilite;
 	bool _enableHiliteNonHTMLZone;
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
@ -419,7 +419,6 @@ void ScintillaEditView::setHotspotStyle(Style& styleToSet)
 void ScintillaEditView::setStyle(Style styleToSet)
 {
 	GlobalOverride & go = _pParameter->getGlobalOverrideStyle();
-	//go.enableBg = true;

 	if (go.isEnable())
 	{
@ -1146,7 +1145,8 @@ void ScintillaEditView::defineDocType(LangType typeDoc)

 			Style nfoStyle;
 			nfoStyle._styleID = STYLE_DEFAULT;
-			nfoStyle._fontName = TEXT("MS LineDraw");
+			nfoStyle._fontName = TEXT("Lucida Console");
+			nfoStyle._fontSize = 10;

 			if (pStyler)
 			{
@ -1159,9 +1159,15 @@ void ScintillaEditView::defineDocType(LangType typeDoc)
 					nfoStyle._colorStyle = style._colorStyle;
 				}
 			}
-			setStyle(nfoStyle);
+			setSpecialStyle(nfoStyle);
 			execute(SCI_STYLECLEARALL);

+			Buffer * buf = MainFileManager->getBufferByID(_currentBufferID);
+			if (buf->getEncoding() != NPP_CP_DOS_437)
+			{
+			   buf->setEncoding(NPP_CP_DOS_437);
+			   ::SendMessage(_hParent, WM_COMMAND, IDM_FILE_RELOAD, 0);
+			} 
 		}
 		break;

--- a/PowerEditor/src/font/LINEDRAW.TTF
+++ b/PowerEditor/src/font/LINEDRAW.TTF
--- a/PowerEditor/src/menuCmdID.h
+++ b/PowerEditor/src/menuCmdID.h
@ -254,7 +254,13 @@
    #define    IDM_FORMAT_EUC_KR            (IDM_FORMAT_ENCODE + 12)
    #define    IDM_FORMAT_TIS_620           (IDM_FORMAT_ENCODE + 13)
    #define    IDM_FORMAT_ISO_8859_8        (IDM_FORMAT_ENCODE + 14)
-    #define    IDM_FORMAT_ENCODE_END        IDM_FORMAT_ISO_8859_8
+    #define    IDM_FORMAT_CP855             (IDM_FORMAT_ENCODE + 15)
+    #define    IDM_FORMAT_MAC_CYRILLIC      (IDM_FORMAT_ENCODE + 16)
+    #define    IDM_FORMAT_KIO8U_CYRILLIC    (IDM_FORMAT_ENCODE + 17)
+    #define    IDM_FORMAT_KIO8R_CYRILLIC    (IDM_FORMAT_ENCODE + 18)
+    #define    IDM_FORMAT_DOS437            (IDM_FORMAT_ENCODE + 19)
+
+    #define    IDM_FORMAT_ENCODE_END        IDM_FORMAT_DOS437

 #define    IDM_LANG    (IDM + 6000)
    #define    IDM_LANGSTYLE_CONFIG_DLG    (IDM_LANG + 1)
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@ -18,9 +18,9 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H

-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.5.2")
-#define VERSION_VALUE TEXT("5.5.2\0")  // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
-#define VERSION_DIGITALVALUE 5, 5, 2, 0
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.6")
+#define VERSION_VALUE TEXT("5.6\0")  // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
+#define VERSION_DIGITALVALUE 5, 6, 0, 0

 #ifdef UNICODE
 #define UNICODE_ANSI_MODE TEXT("(UNICODE)")
--- a/PowerEditor/visual.net/notepadPlus.vcproj
+++ b/PowerEditor/visual.net/notepadPlus.vcproj
@ -103,7 +103,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\src\config.xml ..\bin\config.xml&#x0D;&#x0A;copy ..\src\langs.xml ..\bin\langs.xml&#x0D;&#x0A;copy ..\src\stylers.xml ..\bin\stylers.xml&#x0D;&#x0A;copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF&#x0D;&#x0A;"
+				CommandLine="copy ..\src\config.xml ..\bin\config.xml&#x0D;&#x0A;copy ..\src\langs.xml ..\bin\langs.xml&#x0D;&#x0A;copy ..\src\stylers.xml ..\bin\stylers.xml&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -194,7 +194,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\src\config.xml ..\bin\config.xml&#x0D;&#x0A;copy ..\src\langs.xml ..\bin\langs.xml&#x0D;&#x0A;copy ..\src\stylers.xml ..\bin\stylers.xml&#x0D;&#x0A;copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF&#x0D;&#x0A;"
+				CommandLine="copy ..\src\config.xml ..\bin\config.xml&#x0D;&#x0A;copy ..\src\langs.xml ..\bin\langs.xml&#x0D;&#x0A;copy ..\src\stylers.xml ..\bin\stylers.xml&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\src\config.model.xml ..\bin\config.model.xml&#x0D;&#x0A;copy ..\src\langs.model.xml ..\bin\langs.model.xml&#x0D;&#x0A;copy ..\src\stylers.model.xml ..\bin\stylers.model.xml&#x0D;&#x0A;copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF&#x0D;&#x0A;copy ..\src\shortcuts.xml ..\bin\shortcuts.xml&#x0D;&#x0A;copy ..\src\contextMenu.xml ..\bin\contextMenu.xml&#x0D;&#x0A;"
+				CommandLine="copy ..\src\config.model.xml ..\bin\config.model.xml&#x0D;&#x0A;copy ..\src\langs.model.xml ..\bin\langs.model.xml&#x0D;&#x0A;copy ..\src\stylers.model.xml ..\bin\stylers.model.xml&#x0D;&#x0A;copy ..\src\shortcuts.xml ..\bin\shortcuts.xml&#x0D;&#x0A;copy ..\src\contextMenu.xml ..\bin\contextMenu.xml&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -387,7 +387,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\src\config.model.xml ..\bin\config.model.xml&#x0D;&#x0A;copy ..\src\langs.model.xml ..\bin\langs.model.xml&#x0D;&#x0A;copy ..\src\stylers.model.xml ..\bin\stylers.model.xml&#x0D;&#x0A;copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF&#x0D;&#x0A;copy ..\src\shortcuts.xml ..\bin\shortcuts.xml&#x0D;&#x0A;copy ..\src\contextMenu.xml ..\bin\contextMenu.xml&#x0D;&#x0A;"
+				CommandLine="copy ..\src\config.model.xml ..\bin\config.model.xml&#x0D;&#x0A;copy ..\src\langs.model.xml ..\bin\langs.model.xml&#x0D;&#x0A;copy ..\src\stylers.model.xml ..\bin\stylers.model.xml&#x0D;&#x0A;copy ..\src\shortcuts.xml ..\bin\shortcuts.xml&#x0D;&#x0A;copy ..\src\contextMenu.xml ..\bin\contextMenu.xml&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>