diff --git a/PowerEditor/bin/NppHelp.chm b/PowerEditor/bin/NppHelp.chm index 7cc1a8454..a17d44fe8 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 cb01007d7..a0b32c5aa 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,3 +1,12 @@ +Notepad++ v5.8.1 new features and fixed bugs (from v5.8) : + +1. Fix Actionscript lexer crash problem. +2. Fix saving UCS-2 text file corrupted bug. +3. Add word count in Summary feature. +4. Fix macro record bug from ANSI document. +5. Fix hidding/showing status bar bug. + + Notepad++ v5.8 new features and fixed bugs (from v5.7) : 1. Upgrade Scintilla to version 2.21. @@ -29,12 +38,11 @@ Included plugins (Unicode): 1. TextFX v0.26 2. Spell Checker v1.3.3 -3. MIME Tools v1.6 +3. NppFTP 0.23 4. NppExport v0.2.8 5. Compare Plugin 1.5.6.1 6. Plugin Manager 0.9.3.1 -7. NppFTP 0.23 -8. Select 'N' Launch 1.0 + Included plugins (ANSI): diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index e82185061..eeb8cf8b0 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index a75962fa1..d7efb4ec0 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -1,7 +1,7 @@ - +
@@ -184,6 +184,7 @@ + diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml index 79c58d733..6679a4a09 100644 --- a/PowerEditor/installer/nativeLang/italian.xml +++ b/PowerEditor/installer/nativeLang/italian.xml @@ -1,7 +1,7 @@ @@ -185,6 +185,7 @@ + diff --git a/PowerEditor/installer/nativeLang/turkish.xml b/PowerEditor/installer/nativeLang/turkish.xml index 9dc18308b..efea45886 100644 --- a/PowerEditor/installer/nativeLang/turkish.xml +++ b/PowerEditor/installer/nativeLang/turkish.xml @@ -1,538 +1,599 @@ - +
- - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + +
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + + + + + + + + + - - - + + + + - - - - - + + + + - - - - - - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 2ab758309..ae1daa452 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -18,10 +18,10 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "5.8" -!define APPNAMEANDVERSION "Notepad++ v5.8" +!define APPVERSION "5.8.1" +!define APPNAMEANDVERSION "Notepad++ v5.8.1" !define VERSION_MAJOR 5 -!define VERSION_MINOR 8 +!define VERSION_MINOR 81 !define APPWEBSITE "http://notepad-plus.sourceforge.net/" @@ -29,7 +29,7 @@ Name "${APPNAMEANDVERSION}" InstallDir "$PROGRAMFILES\Notepad++" InstallDirRegKey HKLM "Software\${APPNAME}" "" -OutFile ".\build\npp.5.8.Installer.exe" +OutFile ".\build\npp.5.8.1.Installer.exe" ; GetWindowsVersion ; diff --git a/PowerEditor/misc/npp.help/HTML/Bookmarks.html b/PowerEditor/misc/npp.help/HTML/Bookmarks.html index 223b42c94..b53ce6937 100644 --- a/PowerEditor/misc/npp.help/HTML/Bookmarks.html +++ b/PowerEditor/misc/npp.help/HTML/Bookmarks.html @@ -1,6 +1,6 @@ - -Bookmarks - + +Bookmarks +

Bookmarks

@@ -10,24 +10,25 @@ bookmark margin. With this you can easily search for lines and perform certain operations on them.

Adding/Removing -bookmarks: +bookmarks:

You can toggle a bookmark on a single line by clicking on the bookmark margin in front of the line, or by selecting Search->Toggle -Bookmark +Bookmark. The Search->Reverse +Bookmarks command toggles bookmarks on each line of the currently opened document.

-To remove all bookmarks +To remove all bookmarks

Select Search->Clear all Bookmarks.

Navigating -with bookmarks:

+with bookmarks:

To Jump with the cursor to the next line containing a bookmark, select Search->Next Bookmark, to go to the previous bookmarked line -select Search->Previous Bookmark. +select Search->Previous Bookmark.

Modifying -bookmarked lines:

-

+bookmarked lines: +

You can perform a single operation on all bookmarked lines.

@@ -35,20 +36,20 @@ can perform a single operation on all bookmarked lines. To cut each bookmarked line, select Search->Cut Bookmarked Lines. Every line will be cut from the file and added to the clipboard, so -they can all be pasted at once. +they can all be pasted at once.

  • To copy, select Search->Copy bookmarked Lines instead. -
  • +
  • To replace each bookmarked line with the current clipboard contents, select Search->Paste to (Replace) bookmarked lines. /li>
  • To remove all bookmarked lines, select Search->Delete bookmarked -lines. +lines.

    • The Delete option allows you to search for lines first, mark them with a bookmark using search (see Search), then remove all of them based on -a certain trait. +a certain trait. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Commands.html b/PowerEditor/misc/npp.help/HTML/Commands.html index 00881bcb4..a35ab7245 100644 --- a/PowerEditor/misc/npp.help/HTML/Commands.html +++ b/PowerEditor/misc/npp.help/HTML/Commands.html @@ -1,46 +1,46 @@ - -Commands - + +Commands + -Commands +Commands

    Commands allow you to execute applications from Notepad++, for example to open your current file in a browser or compile it with some external compiler. You can pass the program command line parameters based on -the current status of your document. +the current status of your document.

    -

    -

    To run a new command:

    +

    +

    To run a new command:

    Sselect Run->Run.... A dialog will pop up asking for the path to the program and possible any command line parameters. You can use the browse button to search for your program. The drop down list provides recently run programs. The command line arguments can also be based on the status of the current document, and are always enclosed in $(...), where … can be: -

    -
    FULL_CURRENT_PATH -
    the fully qualified path to the current document. +
    +
    FULL_CURRENT_PATH +
    the fully qualified path to the current document.
    CURRENT_DIRECTORY -
    The directory the current document resides in. +
    The directory the current document resides in.
    FILE_NAME -
    The filename of the document, without the directory. +
    The filename of the document, without the directory.
    NAME_PART -
    The filename without the extension. +
    The filename without the extension.
    EXT_PART -
    The extension of the current document. +
    The extension of the current document.
    NPP_DIRECTORY
    The directory that contains the notepad++.exe executable that is -currently running. +currently running.
    >CURRENT_WORD -
    The currently selected text in the document. +
    The currently selected text in the document.
    CURRENT_LINE
    The current line number that is selected in the document (0 based -index, the first line is 0). +index, the first line is 0).
    CURRENT_COLUMN
    The current column the cursor resides in (0 based index, the first -position on the line is 0). -
    +position on the line is 0). +

    For example, @@ -52,20 +52,27 @@ example, -multiInst "$(FULL_CURRENT_PATH)" - +

    would start a new instance of Notepad++ opening the current file. Remember to put quotes around paths if it can contain spaces. For the Notepad++ command line options, see Command Line.

    -

    To run an existing command:

    +

    To run an existing command:

    Select it from the Run menu below the Run... -option. If no commands are saved, the list will be empty. +option. If no commands are saved, the list will be empty.

    -

    To save the command:

    +

    To save the command:

    Sselect Run->Run..., enter the command and press Save.... A dialog will pop up asking for a name of the command and -the default key combination. These can later be changed (and deleted) -using the Shortcut Mapper (see Shortcut Mapper). When saved -the command will be available from the Run menu. +the default key combination. Once saved, +the command will be available from the Run menu. +

    +

    To edit or delete an existing command:

    +

    +The Shortcut Mapper (see Shortcut Mapper) displays all available commands in a uniform way, so you can modify or delete +any shortcut you defined, including Run commands. This procedure is also available from +Run -> Modify shortcut / Delete command. +As the name suggests, this does not extend to editing the command text proper - you need to edit +shortcuts.xml to do that. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Document properties.html b/PowerEditor/misc/npp.help/HTML/Document properties.html index 207850ad2..153de8da3 100644 --- a/PowerEditor/misc/npp.help/HTML/Document properties.html +++ b/PowerEditor/misc/npp.help/HTML/Document properties.html @@ -9,4 +9,6 @@ Note: both the default Newline format and the encoding of new files can be set, see New document settings for more details. +

    The current properties of a document, like its character count, selection statistics and such, are available through the View -> Summary. +Because this information is readily available from the status bar, a detailed description of the displayed properties will be found there. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Folding.html b/PowerEditor/misc/npp.help/HTML/Folding.html index 6b560ce9d..d1995a338 100644 --- a/PowerEditor/misc/npp.help/HTML/Folding.html +++ b/PowerEditor/misc/npp.help/HTML/Folding.html @@ -26,7 +26,9 @@ horizontal line where the text is collapsed. The first line of the collapsed text will always remain visible. Lines on the fold margin indicate that the textlines they run by are foldable. Vertical lines () indicate multiple lines that can be folded together as a group, -which is terminated with a small horizontal line() or a box. +which is terminated with a small horizontal line() or a box.

    +

    Rhe images shown above are from the default style, one among the 4 supported. Also, you may decide to hide the margin completely, + even when the language of the document allows for folding.

    There are multiple ways to fold text.

    • The diff --git a/PowerEditor/misc/npp.help/HTML/Images/Screenshots/shortcut_mapper.png b/PowerEditor/misc/npp.help/HTML/Images/Screenshots/shortcut_mapper.png index d9dc0461c..5fae49bdf 100644 Binary files a/PowerEditor/misc/npp.help/HTML/Images/Screenshots/shortcut_mapper.png and b/PowerEditor/misc/npp.help/HTML/Images/Screenshots/shortcut_mapper.png differ diff --git a/PowerEditor/misc/npp.help/HTML/Images/Screenshots/shortcut_mapper_scint.png b/PowerEditor/misc/npp.help/HTML/Images/Screenshots/shortcut_mapper_scint.png index 64a3ad709..987d6a064 100644 Binary files a/PowerEditor/misc/npp.help/HTML/Images/Screenshots/shortcut_mapper_scint.png and b/PowerEditor/misc/npp.help/HTML/Images/Screenshots/shortcut_mapper_scint.png differ diff --git a/PowerEditor/misc/npp.help/HTML/Incremental search.html b/PowerEditor/misc/npp.help/HTML/Incremental search.html index ed49769da..04363a4bf 100644 --- a/PowerEditor/misc/npp.help/HTML/Incremental search.html +++ b/PowerEditor/misc/npp.help/HTML/Incremental search.html @@ -12,4 +12,5 @@ consecutive results.

      have the same case as the query.
    • The > button searches for the next occurrence, the < button for the -previous one.

    Finally, the X button will close the Incremental Search dialog.

    \ No newline at end of file +previous one. This is the same as hitting Enter or Shift-Enter respectively.

    +

    Finally, the X button will close the Incremental Search dialog.

    \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Macros.html b/PowerEditor/misc/npp.help/HTML/Macros.html index 2d37ec80d..4413bd589 100644 --- a/PowerEditor/misc/npp.help/HTML/Macros.html +++ b/PowerEditor/misc/npp.help/HTML/Macros.html @@ -1,8 +1,8 @@ - + Macros -

    Macros

    +

    Macros

    Notepad++ is capable of recording some of your actions you perform while editing a document, and replaying those later on to avoid having to @@ -13,17 +13,17 @@ can save them for later use and assign keystrokes to them for fast access (See Shortcut Mapper). Macro's are sensitive to the current position of the cursor and will -(normally speaking) operate relative on it. +(normally speaking) operate relative on it.

    To record a macro, select Macro->Start Recording or press the  button on the toolbar. Notepad++ will now keep track of the changes -you make on a document or certain actions you perform. +you make on a document or certain actions you perform.

    To stop recording, select Macro->Stop Recording or select the  button on the toolbar. As an exception to most commands, you can toggle this behavior with a special shortcut combination that is not listed in the menu but solely in the Shortcut mapper (see Settings, -Shortcutmapper). By default, this is the combination Ctrl-Shift-R. +Shortcutmapper). By default, this is the combination Ctrl-Shift-R.

    After the recording is stopped, it will be stored in a temporary buffer. If you haven't performed any actions, this buffer will be cleared. If you start recording another macro without saving your earlier work, it will be lost. @@ -36,7 +36,7 @@ macro or press the Shortcut Mapper). When saved, the macro will be available from the Macro menu or the Macro playlist. -

    +

    To play the current macro in the buffer or any saved macro once or multiple times, select Macro->Run a macro multiple times... or press the  button. A @@ -44,7 +44,10 @@ dialog will pop up allowing you to select what macro to perform (buffer macro or any saved macro) and how many times. You can also opt to perform the macro until the cursor reaches the end of the current file (starting from its current position). Note that if no -macro's are available, this dialog is inaccessible. -

    Currently -(v5.4.3), macro's cannot save Find(/Replace) operations. +macro's are available, this dialog is inaccessible. +

    To +edit or delete an existing macro shortcut, +you can use the Shortcut mapper, which displays all shortcuts of all kinds, +and allows changing or removing a key binding. The interface is also available through the Macro -> Modify shortcut / Delete macro +entry on the Macros menu. Note that the contents of a macro efinition can be edited only in the shortcuts.xml file. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Multi View.html b/PowerEditor/misc/npp.help/HTML/Multi View.html index e55569f9a..2cf3682dd 100644 --- a/PowerEditor/misc/npp.help/HTML/Multi View.html +++ b/PowerEditor/misc/npp.help/HTML/Multi View.html @@ -1,5 +1,5 @@ -Multi View +Multi View

    Multi @@ -48,14 +48,14 @@ include:
  • Zoom level;
  • Scroll position;
  • Cursor position; -
  • RTL modus (see RTL). +
  • RTL modus (see RTL) +
  • Line wrap modus +
  • Overtype mode +
  • Nonprintable characters rendering +
    • -

    Additionally, -each view can have its own properties which can be set in -the Preferences -> Settings -> Editing tab, use the dropdown list to choose between -the views. Each view can also independently show unprintable -characters, determine the linewrapping modus and control the overtype -option.

    + +

    If you open a new document or a file, it will do so in the currently active view. Additionally, closing the last document of a view will diff --git a/PowerEditor/misc/npp.help/HTML/Preferences.html b/PowerEditor/misc/npp.help/HTML/Preferences.html index 59f48c571..2851552cb 100644 --- a/PowerEditor/misc/npp.help/HTML/Preferences.html +++ b/PowerEditor/misc/npp.help/HTML/Preferences.html @@ -99,16 +99,19 @@ will stop the blinking.
    You can change the caret color with the

    Multi-Editing
    You can enable or disable this feature through the checkbox. This both controls the ability to select multiple areas (see Selecting text) and to get typed text mirrored in all the areas in the selection. - -

    -The -following options are changed per view (See Multi View). Select the -view to adjust form the combo box. -

    Folder margin style
    The style of the icons that indicate folding (See Folding). Select from 4 -types. +types. The None style hides the margin even if the document type would support it. +
    Line wrap + +
    • DefaultThe wrapped part of the line +shows as several lines starting on the left margin +
    • AlignedThe wrapped part of the line +shows as several lines starting right below the unwrapped part. +
    • IndentedThe wrapped part of the line +shows as several lines starting with some indentation relative to the unwrapped part. +
    Vertical Edge Setting
    • Show diff --git a/PowerEditor/misc/npp.help/HTML/Shortcut Mapper.html b/PowerEditor/misc/npp.help/HTML/Shortcut Mapper.html index 4ef5f0b22..4eeaa4bb4 100644 --- a/PowerEditor/misc/npp.help/HTML/Shortcut Mapper.html +++ b/PowerEditor/misc/npp.help/HTML/Shortcut Mapper.html @@ -25,6 +25,9 @@ shortcut. Use the checkboxes to control what modifier keys to use (note that Sci the dropdownlist to choose the key to press. Selecting 'none' from the list will disable the shortcut key (a warning will appear). Pressing OK applies any changes, Cancel or closing the dialog aborts. +

      +Changing or deleting a shortcut can be done using the Modify or +Delete respectively: they act exactly like their right click counterparts.

      The dialog for Scintilla shortcuts is a bit different because you can add @@ -42,7 +45,7 @@ Apply

      The OK button will save any added or changed shortcuts, but you have to specifically perform the change before it is saved. ->p>In +<p>In all cases, if a shortcut is determined to be invalid, you cannot press OK or Apply to add or modify the shortcut.

      diff --git a/PowerEditor/misc/npp.help/HTML/Status Bar.html b/PowerEditor/misc/npp.help/HTML/Status Bar.html index 4cb127a93..d06ba324c 100644 --- a/PowerEditor/misc/npp.help/HTML/Status Bar.html +++ b/PowerEditor/misc/npp.help/HTML/Status Bar.html @@ -10,15 +10,24 @@ 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 that the -current document contains. This is not equal to the filesize of the -document (except for ANSI documents, see -Encoding for more details). The filssize, s well as the line count, is also shown. +second section shows the filssize of the document ("length"), as well as its line count ("lines"). +Doubleclicking this section brings up the Summary message box, +which contains more information: +
          +
        • Fully qualified active document path +
        • Creation date +
        • Last modification date +
        • Byte size of document +
        • Character count of the document, blanks excluded +
        • Character count of the document +
        • Line count +
        • Size of selection (characters, bytes and ranges) +
        +Note that the character count and byte count are not a function of each other in UTF-8 +(see Encoding).
      • 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), 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 +that you find the current line ('Ln', first line is line 1), and the +current column ('Col', first position is 1). 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/Wrapping.html b/PowerEditor/misc/npp.help/HTML/Wrapping.html index 6c41ad386..8fe99f5d6 100644 --- a/PowerEditor/misc/npp.help/HTML/Wrapping.html +++ b/PowerEditor/misc/npp.help/HTML/Wrapping.html @@ -11,5 +11,7 @@ actually inserting any newline characters. enable line wrapping, select View->Wrap or press .

        To enable a visual cue where a line is wrapped as opposed to be ended -with a newline character, select View->Show Symbol->Show wrap symbol. Display of where a line could wrap because its length exceeds some theshhold can be enabled and configured in both Preferences and Styler Configurator. +with a newline character, select View->Show Symbol->Show wrap symbol. Display of where a line could wrap because its length +exceeds some threshold can be enabled and configured in both Preferences and Styler Configurator. +When choosing to just have a line break, you can control whether and where a wrap symbol is displayed. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/Notepad++Help.hhp b/PowerEditor/misc/npp.help/Notepad++Help.hhp index de1bc3c1b..2ab754a23 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.7 +Title=Notepad++ Reference Manual - version 5.8.1 [WINDOWS] -WinType1="Notepad++ Reference Manual - Version 5.7","Table of Contents.hhc","Index.hhk","HTML\Introduction.html",,,,,,0x3120,,0x300e,[104,86,765,538],0x10080000,0x404,,,,,0 +WinType1="Notepad++ Reference Manual - Version 5.8.1","Table of Contents.hhc","Index.hhk","HTML\Introduction.html",,,,,,0x3120,,0x300e,[104,86,765,538],0x10080000,0x404,,,,,0 [FILES] diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index a4f76b295..bf88c8d48 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -18,12 +18,12 @@ #ifndef RESOURCE_H #define RESOURCE_H -#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.8") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.8.1") // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 // ex : #define VERSION_VALUE TEXT("5.63\0") -#define VERSION_VALUE TEXT("5.8\0") -#define VERSION_DIGITALVALUE 5, 8, 0, 0 +#define VERSION_VALUE TEXT("5.81\0") +#define VERSION_DIGITALVALUE 5, 8, 1, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)")