diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 271446442..83a81da34 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,19 +1,23 @@ -Notepad++ v6.1.8 fixed bug (from v6.1.7): - -1. Fix a regression of wrong behaviour while save an empty file. - - -Notepad++ v6.1.7 new features and fixed bugs: - -1. Fix config.xml zero length bug after Windows' update (Notepad++ is forced to quit). -2. Fix a crash issue on save as command. -3. Fix saving file fails silently bug. -4. Fix a buffer overflow bug. -5. Add case sensitive option for smart highlighting feature. -6. Enhance the localization system. -7. Fix a behavior issue on Windows shutdown. -8. Enhance comment operations: add stream Uncomment command and cross-calling of block feature. -9. Enhance TAB to space and space to TAB commands. +Notepad++ v6.2 includes a new User Defined Languge (UDL2) system, the key features of UDL2 are: + +1. More keyword groups were added (more syntax highlighting can be defined): + - 3 folding groups + - 8 keyword groups + - 2 comment groups + - 1 number definitons + - 2 operators groups + - 8 delimiter sets +2. Multipart keywords are supported (for example: "else if" can be defined as a single keyword) +3. Whitespace is no longer mandatory as keyword separator: Operators, Delimiters and Folding keywords can be recognized with or without whitespace separators. +4. Numbers recognition support is greatly improved (prefix, suffix, range and extra symbols supported). +5. Operators and delimiters can be longer than one character. +6. The same characters can be used as comments AND operators. +7. Comments and delimiters support nesting (even within each other). +8. Improvments to Comments include: + - Comment folding + - Comment continuation + - Comment only start at the beginning of line +9. In the case of several comment pairs defined, comment open symbols match only with comment close symbols of the same order. (for example: /* C comment */, /+ D comment +/, but not /* mixed comment +/) Included plugins: diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index dd9e5262f..e180537d9 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml index 280dbd58c..d000fcaab 100644 --- a/PowerEditor/installer/nativeLang/catalan.xml +++ b/PowerEditor/installer/nativeLang/catalan.xml @@ -1,8 +1,8 @@ @@ -106,6 +106,7 @@ By Hiro5 [groccat at gmail] + @@ -214,9 +215,9 @@ By Hiro5 [groccat at gmail] + - @@ -272,7 +273,7 @@ By Hiro5 [groccat at gmail] - + @@ -636,16 +637,25 @@ By Hiro5 [groccat at gmail] - - - - + + + + - + diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml index 4cf34689d..186fd31c7 100644 --- a/PowerEditor/installer/nativeLang/german.xml +++ b/PowerEditor/installer/nativeLang/german.xml @@ -1,7 +1,7 @@ @@ -289,11 +289,11 @@ - + - + @@ -382,43 +382,6 @@ - - - @@ -427,9 +390,40 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -498,7 +492,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml index 5051c55eb..e571abc0b 100644 --- a/PowerEditor/installer/nativeLang/russian.xml +++ b/PowerEditor/installer/nativeLang/russian.xml @@ -20,7 +20,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -63,6 +63,7 @@ + @@ -72,7 +73,6 @@ - @@ -111,22 +111,25 @@ + - - - + + + + + - + @@ -183,6 +186,9 @@ + + + @@ -199,9 +205,10 @@ - + + - + @@ -218,10 +225,6 @@ - - - - @@ -240,16 +243,16 @@ - - - - + + + + @@ -261,7 +264,7 @@ - + @@ -454,7 +457,7 @@ - + @@ -499,7 +502,7 @@ - + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 4ed39638f..f6e25e5a2 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -28,10 +28,10 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "6.1.8" +!define APPVERSION "6.2" !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}" !define VERSION_MAJOR 6 -!define VERSION_MINOR 18 +!define VERSION_MINOR 2 !define APPWEBSITE "http://notepad-plus-plus.org/" diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 95a6406ed..1917a823a 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -2085,65 +2085,65 @@ void Notepad_plus::addHotSpot(bool docIsModifing) } else { - int fs = -1; - for (size_t i = 0 ; i < hotspotStylers.size() ; i++) - { - if (hotspotStylers[i].second == idStyle) + int fs = -1; + for (size_t i = 0 ; i < hotspotStylers.size() ; i++) { - fs = hotspotStylers[i].first; - break; + if (hotspotStylers[i].second == idStyle) + { + fs = hotspotStylers[i].first; + break; + } } - } - if (fs != -1) - { - _pEditView->execute(SCI_STARTSTYLING, start, 0xFF); - _pEditView->execute(SCI_SETSTYLING, foundTextLen, fs); + if (fs != -1) + { + _pEditView->execute(SCI_STARTSTYLING, start, 0xFF); + _pEditView->execute(SCI_SETSTYLING, foundTextLen, fs); - } - else - { - pair p(style_hotspot, idStyle); - hotspotStylers.push_back(p); - int activeFG = 0xFF0000; - char fontNameA[128]; + } + else + { + pair p(style_hotspot, idStyle); + hotspotStylers.push_back(p); + int activeFG = 0xFF0000; + char fontNameA[128]; - Style hotspotStyle; + Style hotspotStyle; - hotspotStyle._styleID = style_hotspot; - _pEditView->execute(SCI_STYLEGETFONT, idStyle, (LPARAM)fontNameA); - TCHAR *generic_fontname = new TCHAR[128]; + hotspotStyle._styleID = style_hotspot; + _pEditView->execute(SCI_STYLEGETFONT, idStyle, (LPARAM)fontNameA); + TCHAR *generic_fontname = new TCHAR[128]; #ifdef UNICODE - WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); - const wchar_t * fontNameW = wmc->char2wchar(fontNameA, _nativeLangSpeaker.getLangEncoding()); - lstrcpy(generic_fontname, fontNameW); + WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); + const wchar_t * fontNameW = wmc->char2wchar(fontNameA, _nativeLangSpeaker.getLangEncoding()); + lstrcpy(generic_fontname, fontNameW); #else - lstrcpy(generic_fontname, fontNameA); + lstrcpy(generic_fontname, fontNameA); #endif - hotspotStyle._fontName = generic_fontname; - - hotspotStyle._fgColor = _pEditView->execute(SCI_STYLEGETFORE, idStyle); - hotspotStyle._bgColor = _pEditView->execute(SCI_STYLEGETBACK, idStyle); - hotspotStyle._fontSize = _pEditView->execute(SCI_STYLEGETSIZE, idStyle); - - int isBold = _pEditView->execute(SCI_STYLEGETBOLD, idStyle); - int isItalic = _pEditView->execute(SCI_STYLEGETITALIC, idStyle); - int isUnderline = _pEditView->execute(SCI_STYLEGETUNDERLINE, idStyle); - hotspotStyle._fontStyle = (isBold?FONTSTYLE_BOLD:0) | (isItalic?FONTSTYLE_ITALIC:0) | (isUnderline?FONTSTYLE_UNDERLINE:0); - - int urlAction = (NppParameters::getInstance())->getNppGUI()._styleURL; - if (urlAction == 2) - hotspotStyle._fontStyle |= FONTSTYLE_UNDERLINE; - - _pEditView->setHotspotStyle(hotspotStyle); - - _pEditView->execute(SCI_STYLESETHOTSPOT, style_hotspot, TRUE); - _pEditView->execute(SCI_SETHOTSPOTACTIVEFORE, TRUE, activeFG); - _pEditView->execute(SCI_SETHOTSPOTSINGLELINE, style_hotspot, 0); - _pEditView->execute(SCI_STARTSTYLING, start, 0x1F); - _pEditView->execute(SCI_SETSTYLING, foundTextLen, style_hotspot); - if (style_hotspot > 24) - style_hotspot--; + hotspotStyle._fontName = generic_fontname; + + hotspotStyle._fgColor = _pEditView->execute(SCI_STYLEGETFORE, idStyle); + hotspotStyle._bgColor = _pEditView->execute(SCI_STYLEGETBACK, idStyle); + hotspotStyle._fontSize = _pEditView->execute(SCI_STYLEGETSIZE, idStyle); + + int isBold = _pEditView->execute(SCI_STYLEGETBOLD, idStyle); + int isItalic = _pEditView->execute(SCI_STYLEGETITALIC, idStyle); + int isUnderline = _pEditView->execute(SCI_STYLEGETUNDERLINE, idStyle); + hotspotStyle._fontStyle = (isBold?FONTSTYLE_BOLD:0) | (isItalic?FONTSTYLE_ITALIC:0) | (isUnderline?FONTSTYLE_UNDERLINE:0); + + int urlAction = (NppParameters::getInstance())->getNppGUI()._styleURL; + if (urlAction == 2) + hotspotStyle._fontStyle |= FONTSTYLE_UNDERLINE; + + _pEditView->setHotspotStyle(hotspotStyle); + + _pEditView->execute(SCI_STYLESETHOTSPOT, style_hotspot, TRUE); + _pEditView->execute(SCI_SETHOTSPOTACTIVEFORE, TRUE, activeFG); + _pEditView->execute(SCI_SETHOTSPOTSINGLELINE, style_hotspot, 0); + _pEditView->execute(SCI_STARTSTYLING, start, 0x1F); + _pEditView->execute(SCI_SETSTYLING, foundTextLen, style_hotspot); + if (style_hotspot > 24) + style_hotspot--; } } diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index f1818fe2d..97fb3f051 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -29,12 +29,12 @@ #ifndef RESOURCE_H #define RESOURCE_H -#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1.8") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.2") // 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("6.18\0") -#define VERSION_DIGITALVALUE 6, 1, 8, 0 +#define VERSION_VALUE TEXT("6.2\0") +#define VERSION_DIGITALVALUE 6, 2, 0, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)")