diff --git a/PowerEditor/bin/NppHelp.chm b/PowerEditor/bin/NppHelp.chm index 53f3412f1..f38706cae 100644 Binary files a/PowerEditor/bin/NppHelp.chm and b/PowerEditor/bin/NppHelp.chm differ diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 31d74e671..8a198c34c 100644 --- 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 diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 73e602c00..badcbec28 100644 --- 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" diff --git a/PowerEditor/misc/npp.help/HTML/Built-in Languages.html b/PowerEditor/misc/npp.help/HTML/Built-in Languages.html index f9eafe236..924fcb254 100644 --- a/PowerEditor/misc/npp.help/HTML/Built-in Languages.html +++ b/PowerEditor/misc/npp.help/HTML/Built-in Languages.html @@ -5,7 +5,7 @@

Built-in languages

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 and configure their style using the Styler Configurator. Most often the correct language is selected when opening a file based on the diff --git a/PowerEditor/misc/npp.help/HTML/Command Line.html b/PowerEditor/misc/npp.help/HTML/Command Line.html index 4705858e2..1bab15de7 100644 --- a/PowerEditor/misc/npp.help/HTML/Command Line.html +++ b/PowerEditor/misc/npp.help/HTML/Command Line.html @@ -18,8 +18,12 @@ Notepad++ supports a few command line parameters to control its startup. The following options are supported (they are case sensitive): p>

+
-nline number +
Line number to go to for each file opened.
-c
Start editing in Column mode. +
--help +
Displays this list, i.e. all the command line switches
-multiInst
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.
Do not load the previous session if Notepad++ is started. Do not save the session on exit either.
-notabbar
Hide the Tab Bar, even if the settings say otherwise. -
-nline number -
Line number to go to for each file opened. +
-systemtray +
Start Notepad++ minimised in the system tray, aka notification area
-xline number
Specify the horizontal position (in pixels) at which Notepad++ main window is to open.
-yline number
Specify the vertical position (in pixels) at which Notepad++ main window is to open.
-llanguage short name
Language to set for each file opened. $$$ is a short identifier -string, of which the following are allowed:
normal, php, c, cpp, cs, objc, +string, of which the following are allowed:
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
+vhdl, kix, autoit, Gui4Cli, powershell, caml, ada, verilog, matlab, haskell, inno, cmake, +yaml, r
Files
Anything else will be interpreted as a filename. Always quote your filename to allow the path to contain spaces, otherwise Notepad++ diff --git a/PowerEditor/misc/npp.help/HTML/Display.html b/PowerEditor/misc/npp.help/HTML/Display.html index 7d2c1ef9a..0a96bf529 100644 --- a/PowerEditor/misc/npp.help/HTML/Display.html +++ b/PowerEditor/misc/npp.help/HTML/Display.html @@ -1,7 +1,7 @@ - -Display - + +Display + -

Display

-

The subjects described here control the appearance of the text in the screen.

Viewing modes

Unprintable Characters

Line Wrapping

Zooming

Folding

Hiding Lines

Multi View

Right-to-Left modus

+

Display

+

The subjects described here control the appearance of the text in the screen.

Viewing modes

Unprintable Characters

Line Wrapping

Zooming

Folding

Hiding Lines

Multi View

Right-to-Left modus

System tray

Right-to-Left modus

\ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Encoding.html b/PowerEditor/misc/npp.help/HTML/Encoding.html index 69b520d5f..13807a50a 100644 --- a/PowerEditor/misc/npp.help/HTML/Encoding.html +++ b/PowerEditor/misc/npp.help/HTML/Encoding.html @@ -1,12 +1,12 @@ - -Encoding - + +Encoding + -

Encoding

+

Encoding

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, @@ -23,19 +23,20 @@ reopening it in Notepad++ it is detected with another encoding. This is a technical limitation and happens because sometimes the resulting file will not differ even though different encodings are used. This is most noticeable if the file is saved without a special BOM (Byte -Order Mark) indicating the used encoding.

Notepad++ offers the following encoding schemes: -

-
ANSI -
Older encoding, smallest filesize but error prone due to use of various codepages +Order Mark) indicating the used encoding.

Notepad++ offers the following encoding schemes: +

+
ANSI +
Older encoding, smallest filesize but error prone due to use of various codepages
UTF-8
Unicode encoding, most Western character take one byte of filesize, but other character can take up more, 3 to 4 most commonly. A three -byte BOM will be added upon save. -
UTF-8 without BOM -
Like UTF-8, but no BOM is added. Saves three bytes, but makes encoding detection harder. -
UTF-16 Little Endian -
All characters are two bytes in size, pairs are Little Endian ordered. A 4 byte BOM is added upon save. -
UTF-16 Big Endian -
All characters are two bytes in size, pairs are Big Endian ordered. A 4 byte BOM is added upon save. -
+byte BOM will be added upon save. +
UTF-8 without BOM +
Like UTF-8, but no BOM is added. Saves three bytes, but makes encoding detection harder. +
UTF-16 Little Endian +
All characters are two bytes in size, pairs are Little Endian ordered. A 4 byte BOM is added upon save. +
UTF-16 Big Endian +
All characters are two bytes in size, pairs are Big Endian ordered. A 4 byte BOM is added upon save. +
+

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 More menu entry which comes right after the Encode in ... family items. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Feature Requests.html b/PowerEditor/misc/npp.help/HTML/Feature Requests.html index f468fb362..a9e62f34d 100644 --- a/PowerEditor/misc/npp.help/HTML/Feature Requests.html +++ b/PowerEditor/misc/npp.help/HTML/Feature Requests.html @@ -5,10 +5,12 @@

Feature Requests

If you have a (very) good idea on how to improve Notepad++, you can -request a feature using the Feature Request tracker -(http://sourceforge.net/tracker2/?group_id=95717&atid=612385). -If it hasn't been asked for before, you can do so here. There is no +request a feature using IdeaTorrent. You can also use the Feature Request tracker +(http://sourceforge.net/tracker2/?group_id=95717&atid=612385), 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. +

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 the Scintilla project +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. +

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 the Scintilla project. 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. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Images/Screenshots/srwindow.png b/PowerEditor/misc/npp.help/HTML/Images/Screenshots/srwindow.png index 5515f48f7..9aeeb7eee 100644 Binary files a/PowerEditor/misc/npp.help/HTML/Images/Screenshots/srwindow.png and b/PowerEditor/misc/npp.help/HTML/Images/Screenshots/srwindow.png differ diff --git a/PowerEditor/misc/npp.help/HTML/Images/Screenshots/systemtray.png b/PowerEditor/misc/npp.help/HTML/Images/Screenshots/systemtray.png new file mode 100644 index 000000000..f89117183 Binary files /dev/null and b/PowerEditor/misc/npp.help/HTML/Images/Screenshots/systemtray.png differ diff --git a/PowerEditor/misc/npp.help/HTML/Marking search results.html b/PowerEditor/misc/npp.help/HTML/Marking search results.html index 95d80ca80..db5334ca7 100644 --- a/PowerEditor/misc/npp.help/HTML/Marking search results.html +++ b/PowerEditor/misc/npp.help/HTML/Marking search results.html @@ -4,4 +4,6 @@

Marking search results

All->Using xxx Style, where xxx is 1st, 2nd, 3rd, 4th or 5th. To remove the marks of a given style select Search->Unmark All->Clear xxx style. It is also possible to remove all sort of markings by using the Search->Unmark All->Clear all styles. -You can use the Styler Configurator to change the color of any of the mark styles. \ No newline at end of file +You can use the Styler Configurator to change the color of any of the mark styles. +

You can navigate marked text using the Jump Up or . 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. + \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Opening and Saving.html b/PowerEditor/misc/npp.help/HTML/Opening and Saving.html index 7c51d30fe..9a4444764 100644 --- a/PowerEditor/misc/npp.help/HTML/Opening and Saving.html +++ b/PowerEditor/misc/npp.help/HTML/Opening and Saving.html @@ -43,7 +43,7 @@ select File->Save All or press File->Save As, 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.

  • An useful variant is File->Save a Copy As. The difference with File->Save As is that, after the latter, your work continues on the new file, while with the former it continues on the old file.
  • The filter at the bottom of the dialog can automatically add or change diff --git a/PowerEditor/misc/npp.help/HTML/Preferences.html b/PowerEditor/misc/npp.help/HTML/Preferences.html index a3d62ee64..2bfa07261 100644 --- 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. You can change the

    New -Document/Open Save directory +Document/Default directory

    These options change the way new documents are created and what the default diff --git a/PowerEditor/misc/npp.help/HTML/Search window.html b/PowerEditor/misc/npp.help/HTML/Search window.html index 2e51ab8e7..d490d0f33 100644 --- a/PowerEditor/misc/npp.help/HTML/Search window.html +++ b/PowerEditor/misc/npp.help/HTML/Search window.html @@ -18,8 +18,8 @@ Commands that make use of the facility are:

    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. Doubleclicking on a result will open that file and go to its -location. + and asted for further processing. Double-clicking on a result will open that file and go to its +location. Using the Open All right-click menu entry will open all of the files which the collection of displayed search results, collapsed or not, references.

    Search->Switch to found results window shows this window if hidden and not empty, and toggles focus between it and the main Notepad++ window. When the window is not shown, Go to Next found result and Go to Previous found result navigate among results. @@ -28,5 +28,5 @@ On earlier versions of Notepad++, the three menu entries are not there, and the

    The results will be colored depending on the type of result. See  Styler Configurator for information on how to change these -colors. +colours. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Selecting.html b/PowerEditor/misc/npp.help/HTML/Selecting.html new file mode 100644 index 000000000..c8da3ba8d --- /dev/null +++ b/PowerEditor/misc/npp.help/HTML/Selecting.html @@ -0,0 +1,40 @@ + + + + + +Selecting text + + + + + +

    Selecting text

    +

    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. +

    How to select text

    +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. +

    When using the keyboard, the expected procedure is to use navigation keys +in conjunction with the Shift modifier. These keyboard shortcuts can be changed at any time using the Shortcut Mapper. +

    Stream vs rectangular selection

    +

    The above procedures are known to define a stream selection, which encompasses +a contiguous range of text. +

    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 Alt modifier key down. For exmple, the basic way with +the mouse is to Alt-click 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. +

    It is possible to combine a stream selection and arectangular selection, using the keyboard. +This is probably less useful, but is not a bug. +

    The Edit -> Line operations -> Move Up/Down current line commands also move the selected area, if it is not rectangular. This ability is lost when several selections are made - see below. +

    Multiple stream selections

    +

    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. +

    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. + + \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Shell Extension.html b/PowerEditor/misc/npp.help/HTML/Shell Extension.html index d6e391517..9217c67a6 100644 --- a/PowerEditor/misc/npp.help/HTML/Shell Extension.html +++ b/PowerEditor/misc/npp.help/HTML/Shell Extension.html @@ -1,10 +1,10 @@ - -Shell Extension - + +Shell Extension +

    Shell -Extension

    -

    By default the Notepad++ installer comes with an Shell +Extension +

    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 “Edit with Notepad++” with the Notepad++ @@ -12,9 +12,10 @@ icon.

    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 Ctrl+Alt+Shift+Del.

    If the Shell extension is already installed, the Notepad++ installer cannot update or overwrite -it, you first have to uninstall it and restart Explorer. +it, you first have to uninstall it and restart Explorer. +

    If you issue the install command for the dll, which is regsvr32 /i NppShell.dll, a dialog box will pop up from which various details of the behaviour of the extension can be tweaked. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Status Bar.html b/PowerEditor/misc/npp.help/HTML/Status Bar.html index f96651ef7..4cb127a93 100644 --- a/PowerEditor/misc/npp.help/HTML/Status Bar.html +++ b/PowerEditor/misc/npp.help/HTML/Status Bar.html @@ -10,15 +10,15 @@ document and consists of six sections.

    • The first section shows the current language that is selected for that document (see Languages).
    • 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 -Encoding for more details). +document (except for ANSI documents, see +Encoding for more details). The filssize, s well as the line count, is also shown.
    • 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 Encoding). If you doubleclick on this +current column ('Col', first position is 1), the length of the +selection both in characters and bytes (see Encoding). The number of selected range is also displayed. If you doubleclick on this section, the Go to Line dialog will pop up.
    • The fourth section shows the current newline format (see Newline format). diff --git a/PowerEditor/misc/npp.help/HTML/System Tray.html b/PowerEditor/misc/npp.help/HTML/System Tray.html new file mode 100644 index 000000000..52a2058a5 --- /dev/null +++ b/PowerEditor/misc/npp.help/HTML/System Tray.html @@ -0,0 +1,14 @@ + +Status Bar + + +

      System Tray

      +

      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. +

      +

      You can send any running instance of Notepad++ to the system tray: +

      +

      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. + \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Tab Bar.html b/PowerEditor/misc/npp.help/HTML/Tab Bar.html index 9a469bbf8..110e6025c 100644 --- a/PowerEditor/misc/npp.help/HTML/Tab Bar.html +++ b/PowerEditor/misc/npp.help/HTML/Tab Bar.html @@ -19,7 +19,7 @@ If more tabs are visible than can be shown on the display, then:

      • If you did not enable multine tab bar from Preferences, 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.
      • If you did, then several rows of tabs will be visible.
      The active tab can show an orange line (enabled by default). If two views diff --git a/PowerEditor/misc/npp.help/Notepad++Help.hhp b/PowerEditor/misc/npp.help/Notepad++Help.hhp index e9c65f60e..303d3b73d 100644 --- 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] diff --git a/PowerEditor/misc/npp.help/Table of Contents.hhc b/PowerEditor/misc/npp.help/Table of Contents.hhc index 773c59ae8..e045beb16 100644 --- a/PowerEditor/misc/npp.help/Table of Contents.hhc +++ b/PowerEditor/misc/npp.help/Table of Contents.hhc @@ -205,6 +205,10 @@ +
    • + + +
    • diff --git a/PowerEditor/src/MISC/Common/Common.h b/PowerEditor/src/MISC/Common/Common.h index 4adc1e79a..f88420f2a 100644 --- a/PowerEditor/src/MISC/Common/Common.h +++ b/PowerEditor/src/MISC/Common/Common.h @@ -18,22 +18,27 @@ #ifndef M30_IDE_COMMUN_H #define M30_IDE_COMMUN_H -#define NPP_CP_WIN_1250 1250 -#define NPP_CP_WIN_1251 1251 -#define NPP_CP_WIN_1252 1252 -#define NPP_CP_WIN_1253 1253 -#define NPP_CP_WIN_1254 1254 -#define NPP_CP_WIN_1255 1255 -#define NPP_CP_WIN_1256 1256 -#define NPP_CP_WIN_1257 1257 -#define NPP_CP_WIN_1258 1258 - -#define NPP_CP_BIG5 950 -#define NPP_CP_EUC_KR 51949 -#define NPP_CP_SHIFT_JIS 932 -#define NPP_CP_GB2312 936 -#define NPP_CP_ISO_8859_8 28598 -#define NPP_CP_TIS_620 874 +#define NPP_CP_WIN_1250 1250 +#define NPP_CP_WIN_1251 1251 +#define NPP_CP_WIN_1252 1252 +#define NPP_CP_WIN_1253 1253 +#define NPP_CP_WIN_1254 1254 +#define NPP_CP_WIN_1255 1255 +#define NPP_CP_WIN_1256 1256 +#define NPP_CP_WIN_1257 1257 +#define NPP_CP_WIN_1258 1258 + +#define NPP_CP_BIG5 950 +#define NPP_CP_EUC_KR 51949 +#define NPP_CP_SHIFT_JIS 932 +#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 diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 850112c03..53f4c68c9 100644 --- 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) - _smartHighlighter.highlightView(notifyView); - + { + 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; diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 0dc062060..084dbff98 100644 --- 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 diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index c66397f0d..8c5fbd48f 100644 --- 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 & patternVect) { TCHAR str2scan[MAX_PATH]; diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h index 57d67be4f..e381409ad 100644 --- 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; diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index 31db8aa61..9295d092f 100644 --- 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; diff --git a/PowerEditor/src/font/LINEDRAW.TTF b/PowerEditor/src/font/LINEDRAW.TTF deleted file mode 100644 index 5f57f8447..000000000 Binary files a/PowerEditor/src/font/LINEDRAW.TTF and /dev/null differ diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h index 63f36022b..5532d828d 100644 --- 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) diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index f21a9cee8..a1e82f30c 100644 --- 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)") diff --git a/PowerEditor/visual.net/notepadPlus.vcproj b/PowerEditor/visual.net/notepadPlus.vcproj index bb39f11e5..f35e057b3 100644 --- a/PowerEditor/visual.net/notepadPlus.vcproj +++ b/PowerEditor/visual.net/notepadPlus.vcproj @@ -103,7 +103,7 @@ />