diff --git a/language/common_res.h b/language/common_res.h index 78b3dfdb8..5881fd464 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -498,59 +498,62 @@ #define IDM_VIEW_SHOWEOLS 40408 #define IDM_VIEW_WORDWRAPSYMBOLS 40409 #define IDM_VIEW_MATCHBRACES 40410 -#define IDM_VIEW_HIGHLIGHTCURRENTLINE 40411 -#define IDM_VIEW_LINENUMBERS 40412 -#define IDM_VIEW_MARGIN 40413 -#define IDM_VIEW_ZOOMIN 40414 -#define IDM_VIEW_ZOOMOUT 40415 -#define IDM_VIEW_RESETZOOM 40416 -#define IDM_VIEW_TABSASSPACES 40417 -#define IDM_VIEW_TABSETTINGS 40418 -#define IDM_VIEW_WORDWRAPSETTINGS 40419 -#define IDM_VIEW_LONGLINESETTINGS 40420 -#define IDM_VIEW_AUTOINDENTTEXT 40421 -#define IDM_VIEW_AUTOCLOSETAGS 40422 -#define IDM_VIEW_REUSEWINDOW 40423 -#define IDM_VIEW_STICKYWINPOS 40424 -#define IDM_VIEW_ALWAYSONTOP 40425 -#define IDM_VIEW_MINTOTRAY 40426 -#define IDM_VIEW_TRANSPARENT 40427 -#define IDM_VIEW_SINGLEFILEINSTANCE 40428 -#define IDM_VIEW_CHANGENOTIFY 40429 -#define IDM_VIEW_SHOWFILENAMEONLY 40430 -#define IDM_VIEW_SHOWFILENAMEFIRST 40431 -#define IDM_VIEW_SHOWFULLPATH 40432 -#define IDM_VIEW_SHOWEXCERPT 40433 -#define IDM_VIEW_NOESCFUNC 40434 -#define IDM_VIEW_ESCMINIMIZE 40435 -#define IDM_VIEW_ESCEXIT 40436 -#define IDM_VIEW_SAVEBEFORERUNNINGTOOLS 40437 -#define IDM_VIEW_NOSAVERECENT 40438 -#define IDM_VIEW_NOSAVEFINDREPL 40439 -#define IDM_VIEW_TOOLBAR 40440 -#define IDM_VIEW_CUSTOMIZETB 40441 -#define IDM_VIEW_STATUSBAR 40442 -#define IDM_VIEW_SAVESETTINGS 40443 -#define IDM_VIEW_SAVESETTINGSNOW 40444 -#define IDM_VIEW_FOLDING 40445 -#define IDM_VIEW_TOGGLEFOLDS 40446 -#define IDM_VIEW_TOGGLE_CURRENT_FOLD 40447 -#define IDM_VIEW_MARKOCCUR_ONOFF 40448 -#define IDM_VIEW_MARKOCCUR_CASE 40449 -#define IDM_VIEW_MARKOCCUR_WNONE 40450 -#define IDM_VIEW_MARKOCCUR_WORD 40451 -#define IDM_VIEW_MARKOCCUR_CURRENT 40452 -#define IDM_VIEW_MARKOCCUR_VISIBLE 40453 -#define IDM_VIEW_AUTOCOMPLETEWORDS 40454 -#define IDM_VIEW_AUTOCLEXKEYWORDS 40455 -#define IDM_VIEW_ACCELWORDNAV 40456 -#define IDM_VIEW_NOPRESERVECARET 40457 -#define IDM_VIEW_HYPERLINKHOTSPOTS 40458 -#define IDM_VIEW_CURRENTSCHEME 40459 -#define IDM_VIEW_SCROLLPASTEOF 40460 -#define IDM_VIEW_TOGGLE_VIEW 40461 -#define IDM_VIEW_CHASING_DOCTAIL 40462 -#define IDM_VIEW_TOGGLETB 40463 +#define IDM_VIEW_TOGGLE_HILITCURLN 40411 +#define IDM_VIEW_HILITCURLN_NONE 40412 +#define IDM_VIEW_HILITCURLN_BACK 40413 +#define IDM_VIEW_HILITCURLN_FRAME 40414 +#define IDM_VIEW_LINENUMBERS 40415 +#define IDM_VIEW_MARGIN 40416 +#define IDM_VIEW_ZOOMIN 40417 +#define IDM_VIEW_ZOOMOUT 40418 +#define IDM_VIEW_RESETZOOM 40419 +#define IDM_VIEW_TABSASSPACES 40420 +#define IDM_VIEW_TABSETTINGS 40421 +#define IDM_VIEW_WORDWRAPSETTINGS 40422 +#define IDM_VIEW_LONGLINESETTINGS 40423 +#define IDM_VIEW_AUTOINDENTTEXT 40424 +#define IDM_VIEW_AUTOCLOSETAGS 40425 +#define IDM_VIEW_REUSEWINDOW 40426 +#define IDM_VIEW_STICKYWINPOS 40427 +#define IDM_VIEW_ALWAYSONTOP 40428 +#define IDM_VIEW_MINTOTRAY 40429 +#define IDM_VIEW_TRANSPARENT 40430 +#define IDM_VIEW_SINGLEFILEINSTANCE 40431 +#define IDM_VIEW_CHANGENOTIFY 40432 +#define IDM_VIEW_SHOWFILENAMEONLY 40433 +#define IDM_VIEW_SHOWFILENAMEFIRST 40434 +#define IDM_VIEW_SHOWFULLPATH 40435 +#define IDM_VIEW_SHOWEXCERPT 40436 +#define IDM_VIEW_NOESCFUNC 40437 +#define IDM_VIEW_ESCMINIMIZE 40438 +#define IDM_VIEW_ESCEXIT 40439 +#define IDM_VIEW_SAVEBEFORERUNNINGTOOLS 40440 +#define IDM_VIEW_NOSAVERECENT 40441 +#define IDM_VIEW_NOSAVEFINDREPL 40442 +#define IDM_VIEW_TOOLBAR 40443 +#define IDM_VIEW_CUSTOMIZETB 40444 +#define IDM_VIEW_STATUSBAR 40445 +#define IDM_VIEW_SAVESETTINGS 40446 +#define IDM_VIEW_SAVESETTINGSNOW 40447 +#define IDM_VIEW_FOLDING 40448 +#define IDM_VIEW_TOGGLEFOLDS 40449 +#define IDM_VIEW_TOGGLE_CURRENT_FOLD 40450 +#define IDM_VIEW_MARKOCCUR_ONOFF 40451 +#define IDM_VIEW_MARKOCCUR_CASE 40452 +#define IDM_VIEW_MARKOCCUR_WNONE 40453 +#define IDM_VIEW_MARKOCCUR_WORD 40454 +#define IDM_VIEW_MARKOCCUR_CURRENT 40455 +#define IDM_VIEW_MARKOCCUR_VISIBLE 40456 +#define IDM_VIEW_AUTOCOMPLETEWORDS 40457 +#define IDM_VIEW_AUTOCLEXKEYWORDS 40458 +#define IDM_VIEW_ACCELWORDNAV 40459 +#define IDM_VIEW_NOPRESERVECARET 40460 +#define IDM_VIEW_HYPERLINKHOTSPOTS 40461 +#define IDM_VIEW_CURRENTSCHEME 40462 +#define IDM_VIEW_SCROLLPASTEOF 40463 +#define IDM_VIEW_TOGGLE_VIEW 40464 +#define IDM_VIEW_CHASING_DOCTAIL 40465 +#define IDM_VIEW_TOGGLETB 40466 #define IDM_SET_RENDER_TECH_DEFAULT 40500 #define IDM_SET_RENDER_TECH_D2D 40501 diff --git a/language/np3_af_za/lexer_af_za.rc b/language/np3_af_za/lexer_af_za.rc index 8805cace2..bfaff5484 100644 --- a/language/np3_af_za/lexer_af_za.rc +++ b/language/np3_af_za/lexer_af_za.rc @@ -137,7 +137,7 @@ BEGIN IDS_LEX_STD_INDENT "Indentasiegids (Kleur)" IDS_LEX_STD_SEL "Geselekteerde Teks (Kleure)" IDS_LEX_STD_WSPC "Wit spasie (Kleure, Grootte 0-12)" - IDS_LEX_STD_LN_BACKGR "Huidige Lyn Agtergrond (Kleur)" + IDS_LEX_STD_LN_BACKGR "Merk Huidige Lyn" IDS_LEX_STD_CARET "Caret (Kleur, Grootte 1-3)" IDS_LEX_STD_LONG_LN "Lang Lyn Merker (Kleure)" IDS_LEX_STD_X_SPC "Ekstra Lynspasie (Grootte)" @@ -153,7 +153,7 @@ END STRINGTABLE BEGIN - IDS_LEX_2ND_LN_BACKGR "2de Huidige Lyn Agtergrond (Kleur)" + IDS_LEX_2ND_LN_BACKGR "2de Huidige Lyn" IDS_LEX_2ND_CARET "2de Caret (Kleur, Grootte 1-3)" IDS_LEX_2ND_LONG_LN "2de Lang Lyn Merker (Kleure)" IDS_LEX_2ND_X_SPC "2de Ekstra Lynspasie (Grootte)" diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 7231b2b5a..9a4004323 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -305,7 +305,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Skakel &Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "&Visuele Hakie Passing\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES - MENUITEM "Merk Huidi&ge Lyn\tCtrl+Shift+I", IDM_VIEW_HIGHLIGHTCURRENTLINE + POPUP "Merk Huidi&ge Lyn\tCtrl+Shift+I" + BEGIN + MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE + MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK + MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + END POPUP "Mer&k Voorvalle" BEGIN MENUITEM "&Aktiewe\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF diff --git a/language/np3_be_by/lexer_be_by.rc b/language/np3_be_by/lexer_be_by.rc index 58e25c8dd..e740f8568 100644 --- a/language/np3_be_by/lexer_be_by.rc +++ b/language/np3_be_by/lexer_be_by.rc @@ -137,7 +137,7 @@ BEGIN IDS_LEX_STD_INDENT "Indentation Guide (Color)" IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 0-12)" - IDS_LEX_STD_LN_BACKGR "Current Line Background (Color)" + IDS_LEX_STD_LN_BACKGR "Highlight Current Line" IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" @@ -153,7 +153,7 @@ END STRINGTABLE BEGIN - IDS_LEX_2ND_LN_BACKGR "2nd Current Line Background (Color)" + IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index a26d81747..c0fba8e24 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -305,7 +305,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM " &\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM " &\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES - MENUITEM " & \tCtrl+Shift+I", IDM_VIEW_HIGHLIGHTCURRENTLINE + POPUP " & \tCtrl+Shift+I" + BEGIN + MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE + MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK + MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + END POPUP "& " BEGIN MENUITEM "&\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF diff --git a/language/np3_de_de/lexer_de_de.rc b/language/np3_de_de/lexer_de_de.rc index c9974e204..549edcad8 100644 --- a/language/np3_de_de/lexer_de_de.rc +++ b/language/np3_de_de/lexer_de_de.rc @@ -137,7 +137,7 @@ BEGIN IDS_LEX_STD_INDENT "Indentation Guide (Color)" IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 0-12)" - IDS_LEX_STD_LN_BACKGR "Current Line Background (Color)" + IDS_LEX_STD_LN_BACKGR "Highlight Current Line" IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" @@ -153,7 +153,7 @@ END STRINGTABLE BEGIN - IDS_LEX_2ND_LN_BACKGR "2nd Current Line Background (Color)" + IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index f18fe9861..270d15ed3 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -305,7 +305,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "H&yperlink Indikator\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "&Zeige passende Klammer\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES - MENUITEM "Aktuelle Zeile hervorheben\tCtrl+Shift+I", IDM_VIEW_HIGHLIGHTCURRENTLINE + POPUP "A&ktuelle Zeile hervorheben\tCtrl+Shift+I" + BEGIN + MENUITEM "&Ohne Hervorhebung", IDM_VIEW_HILITCURLN_NONE + MENUITEM "&Hintergrund Farbe", IDM_VIEW_HILITCURLN_BACK + MENUITEM "&Rahmen", IDM_VIEW_HILITCURLN_FRAME + END POPUP "Markiere Fundstellen" BEGIN MENUITEM "&Aktivieren\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF diff --git a/language/np3_en_gb/lexer_en_gb.rc b/language/np3_en_gb/lexer_en_gb.rc index 0754afbc2..9eba6e381 100644 --- a/language/np3_en_gb/lexer_en_gb.rc +++ b/language/np3_en_gb/lexer_en_gb.rc @@ -137,7 +137,7 @@ BEGIN IDS_LEX_STD_INDENT "Indentation Guide (Colour)" IDS_LEX_STD_SEL "Selected Text (Colours)" IDS_LEX_STD_WSPC "Whitespace (Colours, Size 0-12)" - IDS_LEX_STD_LN_BACKGR "Current Line Background (Colour)" + IDS_LEX_STD_LN_BACKGR "Highlight Current Line" IDS_LEX_STD_CARET "Caret (Colour, Size 1-3)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colours)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" @@ -153,7 +153,7 @@ END STRINGTABLE BEGIN - IDS_LEX_2ND_LN_BACKGR "2nd Current Line Background (Colour)" + IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-3)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colours)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index a0598048a..41559803f 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -305,7 +305,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "H&yperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES - MENUITEM "Hi&ghlight Current Line\tCtrl+Shift+I", IDM_VIEW_HIGHLIGHTCURRENTLINE + POPUP "Highlight C&urrent Line\tCtrl+Shift+I" + BEGIN + MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE + MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK + MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + END POPUP "Mar&k Occurrences" BEGIN MENUITEM "&Active\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF diff --git a/language/np3_en_us/lexer_en_us.rc b/language/np3_en_us/lexer_en_us.rc index 2c64c118b..78e9e117b 100644 --- a/language/np3_en_us/lexer_en_us.rc +++ b/language/np3_en_us/lexer_en_us.rc @@ -137,7 +137,7 @@ BEGIN IDS_LEX_STD_INDENT "Indentation Guide (Color)" IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 0-12)" - IDS_LEX_STD_LN_BACKGR "Current Line Background (Color)" + IDS_LEX_STD_LN_BACKGR "Highlight Current Line" IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" @@ -153,7 +153,7 @@ END STRINGTABLE BEGIN - IDS_LEX_2ND_LN_BACKGR "2nd Current Line Background (Color)" + IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 583cc1afc..580294495 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -305,7 +305,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "H&yperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES - MENUITEM "Hi&ghlight Current Line\tCtrl+Shift+I", IDM_VIEW_HIGHLIGHTCURRENTLINE + POPUP "Highlight C&urrent Line\tCtrl+Shift+I" + BEGIN + MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE + MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK + MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + END POPUP "Mar&k Occurrences" BEGIN MENUITEM "&Active\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF diff --git a/language/np3_es_es/lexer_es_es.rc b/language/np3_es_es/lexer_es_es.rc index 4c4fb0cf4..622a9ccd4 100644 --- a/language/np3_es_es/lexer_es_es.rc +++ b/language/np3_es_es/lexer_es_es.rc @@ -137,7 +137,7 @@ BEGIN IDS_LEX_STD_INDENT "Indentation Guide (Color)" IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 0-12)" - IDS_LEX_STD_LN_BACKGR "Current Line Background (Color)" + IDS_LEX_STD_LN_BACKGR "Highlight Current Line" IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" @@ -153,7 +153,7 @@ END STRINGTABLE BEGIN - IDS_LEX_2ND_LN_BACKGR "2nd Current Line Background (Color)" + IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index c31ffb37a..3ef107b97 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -305,7 +305,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Indicators H&yperlink\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "&Visual coincidencia de llave\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES - MENUITEM "Re&saltar la lnea actual\tCtrl+Shift+I", IDM_VIEW_HIGHLIGHTCURRENTLINE + POPUP "Re&saltar la lnea actual\tCtrl+Shift+I" + BEGIN + MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE + MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK + MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + END POPUP "Mar&car ocurrencias" BEGIN MENUITEM "&Activo\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF diff --git a/language/np3_fr_fr/lexer_fr_fr.rc b/language/np3_fr_fr/lexer_fr_fr.rc index d5297a315..e0d3b000e 100644 --- a/language/np3_fr_fr/lexer_fr_fr.rc +++ b/language/np3_fr_fr/lexer_fr_fr.rc @@ -137,7 +137,7 @@ BEGIN IDS_LEX_STD_INDENT "Indentation Guide (Color)" IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 0-12)" - IDS_LEX_STD_LN_BACKGR "Current Line Background (Color)" + IDS_LEX_STD_LN_BACKGR "Highlight Current Line" IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" @@ -153,7 +153,7 @@ END STRINGTABLE BEGIN - IDS_LEX_2ND_LN_BACKGR "2nd Current Line Background (Color)" + IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index f0020a033..1227de34c 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -305,7 +305,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Indicateurs H&yperlink\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "Correspondence &visuelle des accolades\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES - MENUITEM "Mise en b&rillance de la ligne actuelle\tCtrl+Shift+I", IDM_VIEW_HIGHLIGHTCURRENTLINE + POPUP "Mise en b&rillance de la ligne actuelle\tCtrl+Shift+I" + BEGIN + MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE + MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK + MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + END POPUP "Mar&quer occurrences" BEGIN MENUITEM "&Actif\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF diff --git a/language/np3_ja_jp/lexer_ja_jp.rc b/language/np3_ja_jp/lexer_ja_jp.rc index 5743c0216..e6e91c900 100644 --- a/language/np3_ja_jp/lexer_ja_jp.rc +++ b/language/np3_ja_jp/lexer_ja_jp.rc @@ -137,7 +137,7 @@ BEGIN IDS_LEX_STD_INDENT "Cfg̃KCh (F)" IDS_LEX_STD_SEL "I𕶎 (F)" IDS_LEX_STD_WSPC " (FATCY 0-12)" - IDS_LEX_STD_LN_BACKGR "݂̍s̔wi (F)" + IDS_LEX_STD_LN_BACKGR "Highlight Current Line" IDS_LEX_STD_CARET "Lbg (F, TCY 1-3)" IDS_LEX_STD_LONG_LN "s̒̃KCh (F)" IDS_LEX_STD_X_SPC "sԂ̗] (TCY)" @@ -153,7 +153,7 @@ END STRINGTABLE BEGIN - IDS_LEX_2ND_LN_BACKGR "2 ݂̍s̔wi (F)" + IDS_LEX_2ND_LN_BACKGR "2 Highlight Current Line" IDS_LEX_2ND_CARET "2 Lbg (F, TCY 1-3)" IDS_LEX_2ND_LONG_LN "2 s̒̃KCh (F)" IDS_LEX_2ND_X_SPC "2 sԂ̗] (TCY)" diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 22dda1f11..ce56ee31e 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -305,7 +305,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "AhXN(&H)\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "Ήʂ\(&V)\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES - MENUITEM "݂̍s\(&G)\tCtrl+Shift+I", IDM_VIEW_HIGHLIGHTCURRENTLINE + POPUP "݂̍s\(&G)\tCtrl+Shift+I" + BEGIN + MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE + MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK + MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + END POPUP "Po}[J[(&k)" BEGIN MENUITEM "I(&A)\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF diff --git a/language/np3_nl_nl/lexer_nl_nl.rc b/language/np3_nl_nl/lexer_nl_nl.rc index 7a044fef9..4e4342057 100644 --- a/language/np3_nl_nl/lexer_nl_nl.rc +++ b/language/np3_nl_nl/lexer_nl_nl.rc @@ -137,7 +137,7 @@ BEGIN IDS_LEX_STD_INDENT "Indentation Guide (Color)" IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 0-12)" - IDS_LEX_STD_LN_BACKGR "Current Line Background (Color)" + IDS_LEX_STD_LN_BACKGR "Highlight Current Line" IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" @@ -153,7 +153,7 @@ END STRINGTABLE BEGIN - IDS_LEX_2ND_LN_BACKGR "2nd Current Line Background (Color)" + IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index bec833692..2d68be46a 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -305,7 +305,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "H&yperlink Indicatoren\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "&Visuele Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES - MENUITEM "Mar&keer actueel lijn\tCtrl+Shift+I", IDM_VIEW_HIGHLIGHTCURRENTLINE + POPUP "Mar&keer actueel lijn\tCtrl+Shift+I" + BEGIN + MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE + MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK + MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + END POPUP "Mar&keer voorvallen" BEGIN MENUITEM "&Actief\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF diff --git a/language/np3_ru_ru/lexer_ru_ru.rc b/language/np3_ru_ru/lexer_ru_ru.rc index d06e50283..708790161 100644 --- a/language/np3_ru_ru/lexer_ru_ru.rc +++ b/language/np3_ru_ru/lexer_ru_ru.rc @@ -137,7 +137,7 @@ BEGIN IDS_LEX_STD_INDENT "Indentation Guide (Color)" IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 0-12)" - IDS_LEX_STD_LN_BACKGR "Current Line Background (Color)" + IDS_LEX_STD_LN_BACKGR "Highlight Current Line" IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" @@ -153,7 +153,7 @@ END STRINGTABLE BEGIN - IDS_LEX_2ND_LN_BACKGR "2nd Current Line Background (Color)" + IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 8624df62d..d1f45ad44 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -305,7 +305,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM " &\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "& \tCtrl+Shift+V", IDM_VIEW_MATCHBRACES - MENUITEM " & \tCtrl+Shift+I", IDM_VIEW_HIGHLIGHTCURRENTLINE + POPUP " & \tCtrl+Shift+I" + BEGIN + MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE + MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK + MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + END POPUP "& " BEGIN MENUITEM "&\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF diff --git a/language/np3_zh_cn/lexer_zh_cn.rc b/language/np3_zh_cn/lexer_zh_cn.rc index b47607981..db3264ee5 100644 --- a/language/np3_zh_cn/lexer_zh_cn.rc +++ b/language/np3_zh_cn/lexer_zh_cn.rc @@ -137,7 +137,7 @@ BEGIN IDS_LEX_STD_INDENT "ָɫ" IDS_LEX_STD_SEL "ѡıɫ" IDS_LEX_STD_WSPC "հ׷ɫСΪ 0-5" - IDS_LEX_STD_LN_BACKGR "ǰбɫ" + IDS_LEX_STD_LN_BACKGR "Highlight Current Line" IDS_LEX_STD_CARET "꣨ɫСΪ 1-3" IDS_LEX_STD_LONG_LN "гȱǣɫ" IDS_LEX_STD_X_SPC "мࣨС" @@ -153,7 +153,7 @@ END STRINGTABLE BEGIN - IDS_LEX_2ND_LN_BACKGR "ѡǰбɫ" + IDS_LEX_2ND_LN_BACKGR "ѡHighlight Current Line" IDS_LEX_2ND_CARET "ѡ꣨ɫСΪ 1-3" IDS_LEX_2ND_LONG_LN "ѡгȱǣɫ" IDS_LEX_2ND_X_SPC "ѡмࣨС" diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index fd38f0b36..3dedace20 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -305,7 +305,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "ⳬ(&Y)\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "ʾ(&V)\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES - MENUITEM "ʾǰ(&G)\tCtrl+Shift+I", IDM_VIEW_HIGHLIGHTCURRENTLINE + POPUP "ʾǰ(&G)\tCtrl+Shift+I" + BEGIN + MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE + MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK + MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + END POPUP "ƥ(&K)" BEGIN MENUITEM "(&A)\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF diff --git a/np3portableapp/Notepad3Portable/Other/Help/Changes.txt b/np3portableapp/Notepad3Portable/Other/Help/Changes.txt index 6d288a865..5a4b44023 100644 --- a/np3portableapp/Notepad3Portable/Other/Help/Changes.txt +++ b/np3portableapp/Notepad3Portable/Other/Help/Changes.txt @@ -19,8 +19,38 @@ LEGEND: 3) ENHANCEMENT: (Optimize) 4) FIXES: (Debug) 5) REMOVED: - -------------------------------------------------------------------------------- +ABBREV: +-------------------------------------------------- +CED - (C)ompact (E)ncoding (D)etection +NLS - (N)ew (L)anguage (S)trings +SCL - (SC)intilla (L)ibrary + + +================================================== +Current Version 5.19.112.build (12. Januar 2019) +================================================== + +-------------------------------------------------- +NEW: +-------------------------------------------------- +- Goto-Dlg (Line/Column) accepts TinyExpr (ignoring suffixes) +- add CED reliability option (NLS: dialogs) +- Indentation consistency check on file open (NLS: dialogs) +- End-of-Line (EOL) consistency check on file open (NLS: dialogs) +- checkbox for transparent Find/Replace Dialogbox on loosing focus + +-------------------------------------------------- +CHANGES: +-------------------------------------------------- +- Goto-Dlg (Line/Column) shows max line number +- Scintilla Library (SCL) version 4.1.3 (2019-01-10) +- SCL new Nim lexer replaces old Nimrod lexer (new highlighting) +- Up-to-Date SCL + +-------------------------------------------------- +FIXES: +-------------------------------------------------- ================================================================================ @@ -104,7 +134,7 @@ Version 4.18.511.992 (12 May 2018) - New: Menu entries for (hidden) Accelerator Keys. - New: Method to remove duplicate lines. - New: Names under Acknowledgments on About box. -- New: Version info for Microsoft Visual C+- 2017 v15.7.(0-1) (VC v191426428). +- New: Version info for Microsoft Visual C++ 2017 v15.7.(0-1) (VC v191426428). - New: X-CaretPolicy ([Settings2] CurrentLineHorizontalSlop=0). - New: 1st draft of "Toggle Visible" (hide non occurences lines). - New: Initial version of Doc tail Chasing. @@ -397,7 +427,7 @@ Version 3.18.131.862 (31 January 2018) - Fix: Initial .ini-file: unused section removed. - Fix: Support scintilla msg: SCN_NEEDSHOWN (EXPAND folded sections if needed). - Fix: Avoid some issues regarding folding, using SCI_SETAUTOMATICFOLD. -- Fix: Revert TAB - Selection action corresponding to VisualStudio's behavior. +- Fix: Revert TAB + Selection action corresponding to VisualStudio's behavior. - Fix: Sensible handling of "Block -> (Un)Indent" for different kinds of selections. - Fix: Font selection dialog does not reset some styles correctly. - Fix: Preserve selection on Line Comment toggle. @@ -413,7 +443,7 @@ Version 3.18.113.828 (13 January 2018) - Changed: Executables not compressed with UPX. - Changed: Menu "Mark Occurrences" whole word matching: radio button behavior. - Changed: Onigmo RegEx syntax dialect. -- Changed: Onigmo regex engine: use PERL 5.10 syntax - enable "\<" and "\>" word boundary matching. +- Changed: Onigmo regex engine: use PERL 5.10 syntax + enable "\<" and "\>" word boundary matching. - Changed: Option "after visible" for styling in background (idle time). - Changed: Replace Windows Notepad Installer version only. - Changed: View "2nd Default Style" as (dbl-clickable) status bar item. @@ -599,14 +629,14 @@ Version 3.17.1124.690 (24 November 2017) - New "D" and "Go" programming language support. - Update: Compiler version detection. - Update: Scintilla Lib v.4.0.2 (402). -- Adapt: C/C+- styles - keyword vs. typedefs. +- Adapt: C/C++ styles - keyword vs. typedefs. - Changed SDK version target to 10.0.16299.0 - Major refactoring of find/replace regex evaluation. - Optimized DeelX regex interface. - Minor fix for DeelX RegEx engine. - Move position after replacement (EditReplace()). - Refactoring of "Replace All" methods. -- Split C+- Keywords in two parts (1st: standard keywords, 2nd: keywords starting with double underscore "__xxx"). +- Split C++ Keywords in two parts (1st: standard keywords, 2nd: keywords starting with double underscore "__xxx"). - Minor polish of Readme.md. Put changes compared to Notepad2-mod into Readme.md. - Repair empty resource file (Notepad3.rc). @@ -626,7 +656,7 @@ Version 3.17.1124.690 (24 November 2017) - Fix: UpdateLineNumberWidth() triggers cleanup. - Fix: Issue with update of line number margin width. - Fix: Transform backslash issues. - Fix: C/C+- keywords and types. + Fix: C/C++ keywords and types. Timer call for mark occurrences during find/replace. - Fix: lookaround regex (DeelX) matches were not replaced. - Fix: Issue regarding find/replace empty-string. @@ -815,7 +845,7 @@ Version 2 Build 505 (23 September 2017) generalized UTF-8 codepage instead (conversions do not work as expected within scintilla lib) - Dropping Windows XP support , using compiler toolset vc141 Win SDK 10.0. - (current VC+- redistributable needed?) + (current VC++ redistributable needed?) - Replaced lstrcmp() and lstrcmpi() by StrSafe (helper.h defined) methods. - Relaunch elevated keeping current changes in a buffer. - Fixed some problems for feature "relaunch elevated preserve changes". @@ -911,7 +941,7 @@ Version 2 Build 411 (9 August 2017) ================================================================================ Version 2 Build 398 (13 June 2017) ================================================================================ -- Added Microsoft Visual C+- 2017 (vc141) support. +- Added Microsoft Visual C++ 2017 (vc141) support. - Updated Scintilla to version 3.7.5 - Don't use 2nd default syntax scheme by default. (Issue #21) - Bigger Toolbar Buttons (24px). Should be big enough now. (Issue #21) @@ -939,7 +969,7 @@ Version 1 Build 386 (08 December 2016) ================================================================================ Version 1 Build 350 (05 September 2016) ================================================================================ -- Added Microsoft Visual C+- Update 3 version number +- Added Microsoft Visual C++ Update 3 version number - Updated HTML Keywords - Updated Scintilla to version 3.6.7 diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html index fd0c851d2..af5a5f069 100644 --- a/scintilla/doc/ScintillaHistory.html +++ b/scintilla/doc/ScintillaHistory.html @@ -551,6 +551,22 @@ Icons Copyright(C) 1998 by Dean S. Jones
+

+ Release 4.1.4 +

+

Release 4.1.3

diff --git a/scintilla/lexers/LexNim.cxx b/scintilla/lexers/LexNim.cxx index 40755cd9d..52a8c7fd7 100644 --- a/scintilla/lexers/LexNim.cxx +++ b/scintilla/lexers/LexNim.cxx @@ -99,10 +99,8 @@ int GetIndent(const Sci_Position line, Accessor &styler) { bool inPrevPrefix = line > 0; Sci_Position posPrev = inPrevPrefix ? styler.LineStart(line - 1) : 0; - // No fold points inside block comments and triple literals - while ((IsASpaceOrTab(ch) - || IsStreamComment(style) - || IsTripleLiteral(style)) && (startPos < eolPos)) { + // No fold points inside triple literals + while ((IsASpaceOrTab(ch) || IsTripleLiteral(style)) && (startPos < eolPos)) { if (inPrevPrefix) { char chPrev = styler[posPrev++]; if (chPrev != ' ' && chPrev != '\t') { @@ -121,11 +119,14 @@ int GetIndent(const Sci_Position line, Accessor &styler) { style = styler.StyleAt(startPos); } - indent += SC_FOLDLEVELBASE; + // Prevent creating fold lines for comments if indented + if (!(IsStreamComment(style) || IsLineComment(style))) + indent += SC_FOLDLEVELBASE; if (styler.LineStart(line) == styler.Length() || IsASpaceOrTab(ch) || IsNewline(ch) + || IsStreamComment(style) || IsLineComment(style)) { return indent | SC_FOLDLEVELWHITEFLAG; } else { @@ -298,6 +299,7 @@ void SCI_METHOD LexerNim::Lex(Sci_PositionU startPos, Sci_Position length, bool funcNameExists = false; bool isStylingRawString = false; + bool isStylingRawStringIdent = false; for (; sc.More(); sc.Forward()) { if (sc.atLineStart) { @@ -432,6 +434,11 @@ void SCI_METHOD LexerNim::Lex(Sci_PositionU startPos, Sci_Position length, funcNameExists = false; } } + + if (IsAlphaNumeric(sc.ch) && sc.chNext == '\"') { + isStylingRawStringIdent = true; + sc.ForwardSetState(SCE_NIM_DEFAULT); + } break; case SCE_NIM_COMMENT: if (sc.Match(']', '#')) { @@ -478,10 +485,14 @@ void SCI_METHOD LexerNim::Lex(Sci_PositionU startPos, Sci_Position length, } break; case SCE_NIM_STRING: - if (sc.ch == '\\' && !isStylingRawString) { + if (!isStylingRawStringIdent && !isStylingRawString && sc.ch == '\\') { if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { sc.Forward(); } + } else if (isStylingRawString && sc.ch == '\"' && sc.chNext == '\"') { + // Forward in situations such as r"a""bc\" so that "bc\" wouldn't be + // considered a string of its own + sc.Forward(); } else if (sc.ch == '\"') { sc.ForwardSetState(SCE_NIM_DEFAULT); } else if (sc.atLineEnd) { @@ -508,8 +519,17 @@ void SCI_METHOD LexerNim::Lex(Sci_PositionU startPos, Sci_Position length, break; case SCE_NIM_TRIPLEDOUBLE: if (sc.Match(R"(""")")) { - sc.Forward(2); - sc.ForwardSetState(SCE_NIM_DEFAULT); + + // Outright forward all " after the closing """ as a triple double + // + // A valid example where this is needed is: """8 double quotes->"""""""" + // You can have as many """ at the end as you wish, as long as the actual + // closing literal is there + while (sc.ch == '"') { + sc.Forward(); + } + + sc.SetState(SCE_NIM_DEFAULT); } break; case SCE_NIM_TRIPLE: @@ -543,11 +563,28 @@ void SCI_METHOD LexerNim::Lex(Sci_PositionU startPos, Sci_Position length, } } // Raw string - else if ((sc.ch == 'r' || sc.ch == 'R') && sc.chNext == '\"') { + else if (IsAlphaNumeric(sc.ch) && sc.chNext == '\"') { isStylingRawString = true; - sc.SetState(SCE_NIM_STRING); - sc.Forward(); + // Triple doubles can be raw strings too. How sweet + if (styler.SafeGetCharAt(sc.currentPos + 2) == '\"' && + styler.SafeGetCharAt(sc.currentPos + 3) == '\"') { + sc.SetState(SCE_NIM_TRIPLEDOUBLE); + } else { + sc.SetState(SCE_NIM_STRING); + } + + if (sc.ch == 'r' || sc.ch == 'R') { + sc.Forward(); + + if (sc.state == SCE_NIM_TRIPLEDOUBLE) { + sc.Forward(2); + } + } else { + // Anything other than r/R is considered a general raw string identifier + isStylingRawStringIdent = true; + sc.SetState(SCE_NIM_IDENTIFIER); + } } // String and triple double literal else if (sc.ch == '\"') { @@ -555,6 +592,17 @@ void SCI_METHOD LexerNim::Lex(Sci_PositionU startPos, Sci_Position length, if (sc.Match(R"(""")")) { sc.SetState(SCE_NIM_TRIPLEDOUBLE); + + // Keep forwarding until the total opening literal count is 5 + // A valid example where this is needed is: """""<-5 double quotes""" + while (sc.ch == '"') { + sc.Forward(); + + if (sc.Match(R"(""")")) { + sc.Forward(); + break; + } + } } else { sc.SetState(SCE_NIM_STRING); } @@ -616,6 +664,8 @@ void SCI_METHOD LexerNim::Lex(Sci_PositionU startPos, Sci_Position length, if (sc.atLineEnd) { funcNameExists = false; + isStylingRawString = false; + isStylingRawStringIdent = false; } } @@ -708,4 +758,4 @@ void SCI_METHOD LexerNim::Fold(Sci_PositionU startPos, Sci_Position length, int, } } -LexerModule lmNim(SCLEX_NIM, LexerNim::LexerFactoryNim, "nim", nimWordListDesc); +LexerModule lmNim(SCLEX_NIM, LexerNim::LexerFactoryNim, "nim", nimWordListDesc); \ No newline at end of file diff --git a/scintilla/lexlib/StyleContext.cxx b/scintilla/lexlib/StyleContext.cxx index 683e21453..fe56e53d7 100644 --- a/scintilla/lexlib/StyleContext.cxx +++ b/scintilla/lexlib/StyleContext.cxx @@ -7,7 +7,6 @@ #include #include -#include #include "ILexer.h" diff --git a/scintilla/src/CharClassify.cxx b/scintilla/src/CharClassify.cxx index ba8433e62..5ae47a2ef 100644 --- a/scintilla/src/CharClassify.cxx +++ b/scintilla/src/CharClassify.cxx @@ -6,10 +6,11 @@ // The License.txt file describes the conditions under which this software may be distributed. #include -#include +#include #include +#include "CharacterSet.h" #include "CharClassify.h" using namespace Scintilla; @@ -25,7 +26,7 @@ void CharClassify::SetDefaultCharClasses(bool includeWordClass) { charClass[ch] = ccNewLine; else if (ch < 0x20 || ch == ' ') charClass[ch] = ccSpace; - else if (includeWordClass && (ch >= 0x80 || isalnum(ch) || ch == '_')) + else if (includeWordClass && (ch >= 0x80 || IsAlphaNumeric(ch) || ch == '_')) charClass[ch] = ccWord; else charClass[ch] = ccPunctuation; diff --git a/scintilla/src/EditView.cxx b/scintilla/src/EditView.cxx index 0578672b0..30f5a86a0 100644 --- a/scintilla/src/EditView.cxx +++ b/scintilla/src/EditView.cxx @@ -9,7 +9,6 @@ #include #include #include -#include #include #include diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx index 447258078..0f36115f4 100644 --- a/scintilla/src/Editor.cxx +++ b/scintilla/src/Editor.cxx @@ -9,7 +9,6 @@ #include #include #include -#include #include #include diff --git a/scintilla/src/MarginView.cxx b/scintilla/src/MarginView.cxx index 0b52056d4..9dcd81f3a 100644 --- a/scintilla/src/MarginView.cxx +++ b/scintilla/src/MarginView.cxx @@ -9,7 +9,6 @@ #include #include #include -#include #include #include diff --git a/scintilla/win32/PlatWin.cxx b/scintilla/win32/PlatWin.cxx index 44c8ddf58..67307bbaf 100644 --- a/scintilla/win32/PlatWin.cxx +++ b/scintilla/win32/PlatWin.cxx @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/scintilla/win32/ScintillaWin.cxx b/scintilla/win32/ScintillaWin.cxx index 4df0bbd40..4a40617ce 100644 --- a/scintilla/win32/ScintillaWin.cxx +++ b/scintilla/win32/ScintillaWin.cxx @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include diff --git a/src/Helpers.h b/src/Helpers.h index 2d53b083e..706ee3439 100644 --- a/src/Helpers.h +++ b/src/Helpers.h @@ -482,6 +482,11 @@ void UrlUnescapeEx(LPWSTR lpURL, LPWSTR lpUnescaped, DWORD* pcchUnescaped); int ReadStrgsFromCSV(LPCWSTR wchCSVStrg, prefix_t sMatrix[], int iCount, int iLen, LPCWSTR sDefault); int ReadVectorFromString(LPCWSTR wchStrg, int iVector[], int iCount, int iMin, int iMax, int iDefault); +inline bool Char2IntW(LPCWSTR str, int* value) { + LPWSTR end; + *value = (int)wcstol(str, &end, 10); + return (str != end); +} bool Char2FloatW(WCHAR* wnumber, float* fresult); void Float2String(float fValue, LPWSTR lpszStrg, int cchSize); diff --git a/src/Notepad3.c b/src/Notepad3.c index dd1f2728b..591c91f75 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -2887,10 +2887,12 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) i = SciCall_GetLexer(); //EnableCmd(hmenu,IDM_VIEW_AUTOCLOSETAGS,(i == SCLEX_HTML || i == SCLEX_XML)); CheckCmd(hmenu, IDM_VIEW_AUTOCLOSETAGS, Settings.AutoCloseTags /*&& (i == SCLEX_HTML || i == SCLEX_XML)*/); - CheckCmd(hmenu, IDM_VIEW_HIGHLIGHTCURRENTLINE, Settings.HighlightCurrentLine); + + i = IDM_VIEW_HILITCURLN_NONE + Settings.HighlightCurrentLine; + CheckMenuRadioItem(hmenu, IDM_VIEW_HILITCURLN_NONE, IDM_VIEW_HILITCURLN_FRAME, i, MF_BYCOMMAND); + CheckCmd(hmenu, IDM_VIEW_HYPERLINKHOTSPOTS, Settings.HyperlinkHotspot); CheckCmd(hmenu, IDM_VIEW_SCROLLPASTEOF, Settings.ScrollPastEOF); - i = Flags.ReuseWindow; CheckCmd(hmenu,IDM_VIEW_REUSEWINDOW,i); @@ -4727,13 +4729,11 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) SendMessage(Globals.hwndEdit,SCI_SETVIEWWS,(Settings.ViewWhiteSpace)?SCWS_VISIBLEALWAYS:SCWS_INVISIBLE,0); break; - case IDM_VIEW_SHOWEOLS: Settings.ViewEOLs = !Settings.ViewEOLs; SendMessage(Globals.hwndEdit,SCI_SETVIEWEOL,Settings.ViewEOLs,0); break; - case IDM_VIEW_MATCHBRACES: Settings.MatchBraces = !Settings.MatchBraces; if (Settings.MatchBraces) @@ -4742,14 +4742,19 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) SciCall_BraceHighLight(INVALID_POSITION, INVALID_POSITION); break; - case IDM_VIEW_AUTOCLOSETAGS: Settings.AutoCloseTags = !Settings.AutoCloseTags; break; - case IDM_VIEW_HIGHLIGHTCURRENTLINE: - Settings.HighlightCurrentLine = !Settings.HighlightCurrentLine; - Style_SetCurrentLineBackground(Globals.hwndEdit, Settings.HighlightCurrentLine); + case IDM_VIEW_TOGGLE_HILITCURLN: + case IDM_VIEW_HILITCURLN_NONE: + case IDM_VIEW_HILITCURLN_BACK: + case IDM_VIEW_HILITCURLN_FRAME: + { + int set = LOWORD(wParam) - IDM_VIEW_HILITCURLN_NONE; + Settings.HighlightCurrentLine = (set >= 0) ? set : ((Settings.HighlightCurrentLine + 1) % 3); + Style_HighlightCurrentLine(Globals.hwndEdit, Settings.HighlightCurrentLine); + } break; case IDM_VIEW_HYPERLINKHOTSPOTS: @@ -6808,7 +6813,7 @@ void LoadSettings() GET_BOOL_VALUE_FROM_INISECTION(ShowWordWrapSymbols, true); GET_BOOL_VALUE_FROM_INISECTION(MatchBraces, true); GET_BOOL_VALUE_FROM_INISECTION(AutoCloseTags, false); - GET_BOOL_VALUE_FROM_INISECTION(HighlightCurrentLine, true); + GET_INT_VALUE_FROM_INISECTION(HighlightCurrentLine, 1, 0, 2); GET_BOOL_VALUE_FROM_INISECTION(HyperlinkHotspot, true); GET_BOOL_VALUE_FROM_INISECTION(ScrollPastEOF, false); GET_BOOL_VALUE_FROM_INISECTION(AutoIndent, true); @@ -7170,7 +7175,7 @@ void SaveSettings(bool bSaveSettingsNow) SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ShowWordWrapSymbols); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, MatchBraces); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AutoCloseTags); - SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, HighlightCurrentLine); + SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, HighlightCurrentLine); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, HyperlinkHotspot); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ScrollPastEOF); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AutoIndent); diff --git a/src/Notepad3.rc b/src/Notepad3.rc index 8981f6209..4422d6cc9 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -127,7 +127,7 @@ BEGIN "I", IDM_EDIT_SPLITLINES, VIRTKEY, CONTROL, NOINVERT "I", IDM_FILE_OPENFAV, VIRTKEY, ALT, NOINVERT "I", IDM_EDIT_TITLECASE, VIRTKEY, CONTROL, ALT, NOINVERT - "I", IDM_VIEW_HIGHLIGHTCURRENTLINE, VIRTKEY, SHIFT, CONTROL, NOINVERT + "I", IDM_VIEW_TOGGLE_HILITCURLN, VIRTKEY, SHIFT, CONTROL, NOINVERT "J", IDM_EDIT_JOINLINES, VIRTKEY, CONTROL, NOINVERT "J", IDM_EDIT_JOINLN_NOSP, VIRTKEY, CONTROL, ALT, NOINVERT "J", IDM_EDIT_JOINLINES_PARA, VIRTKEY, SHIFT, CONTROL, NOINVERT diff --git a/src/StyleLexers/EditLexer.h b/src/StyleLexers/EditLexer.h index d0336608b..a79cce2e1 100644 --- a/src/StyleLexers/EditLexer.h +++ b/src/StyleLexers/EditLexer.h @@ -79,7 +79,7 @@ typedef enum { STY_INDENT_GUIDE = 5, STY_SEL_TXT = 6, STY_WHITESPACE = 7, - STY_CUR_LN_BCK = 8, + STY_CUR_LN = 8, STY_CARET = 9, STY_LONG_LN_MRK = 10, STY_X_LN_SPACE = 11, diff --git a/src/StyleLexers/styleLexStandard.c b/src/StyleLexers/styleLexStandard.c index 2923d6eb2..f67d73804 100644 --- a/src/StyleLexers/styleLexStandard.c +++ b/src/StyleLexers/styleLexStandard.c @@ -43,7 +43,7 @@ SCLEX_NULL, IDS_LEX_DEF_TXT, L"Default Text", L"txt; text; wtx; log; asc; doc", /* 5 */ { {STYLE_INDENTGUIDE}, IDS_LEX_STD_INDENT, L"Indentation Guide (Color)", L"fore:#A0A0A0", L"" }, /* 6 */ { {_STYLE_GETSTYLEID(STY_SEL_TXT)}, IDS_LEX_STD_SEL, L"Selected Text (Colors)", L"back:#4040FF; eolfilled; alpha:80", L"" }, /* 7 */ { {_STYLE_GETSTYLEID(STY_WHITESPACE)}, IDS_LEX_STD_WSPC, L"Whitespace (Colors, Size 0-12)", L"fore:#FF4000", L"" }, - /* 8 */ { {_STYLE_GETSTYLEID(STY_CUR_LN_BCK)}, IDS_LEX_STD_LN_BACKGR, L"Current Line Background (Color)", L"back:#FFFF00; alpha:50", L"" }, + /* 8 */ { {_STYLE_GETSTYLEID(STY_CUR_LN)}, IDS_LEX_STD_LN_BACKGR, L"Current Line Background (Color)", L"size:2; fore:#A0A0A0; back:#FFFF00; alpha:50", L"" }, /* 9 */ { {_STYLE_GETSTYLEID(STY_CARET)}, IDS_LEX_STD_CARET, L"Caret (Color, Size 1-3)", L"", L"" }, /* 10 */ { {_STYLE_GETSTYLEID(STY_LONG_LN_MRK)}, IDS_LEX_STD_LONG_LN, L"Long Line Marker (Colors)", L"fore:#FFC000", L"" }, /* 11 */ { {_STYLE_GETSTYLEID(STY_X_LN_SPACE)}, IDS_LEX_STD_X_SPC, L"Extra Line Spacing (Size)", L"size:2", L"" }, @@ -66,7 +66,7 @@ SCLEX_NULL, IDS_LEX_STR_63266, L"2nd Default Text", L"txt; text; wtx; log; asc; /* 5 */ { {STYLE_INDENTGUIDE}, IDS_LEX_2ND_INDENT, L"2nd Indentation Guide (Color)", L"fore:#A0A0A0", L"" }, /* 6 */ { {_STYLE_GETSTYLEID(STY_SEL_TXT)}, IDS_LEX_2ND_SEL, L"2nd Selected Text (Colors)", L"eolfilled", L"" }, /* 7 */ { {_STYLE_GETSTYLEID(STY_WHITESPACE)}, IDS_LEX_2ND_WSPC, L"2nd Whitespace (Colors, Size 0-12)", L"fore:#FF4000", L"" }, - /* 8 */ { {_STYLE_GETSTYLEID(STY_CUR_LN_BCK)}, IDS_LEX_2ND_LN_BACKGR, L"2nd Current Line Background (Color)", L"back:#FFFF00; alpha:50", L"" }, + /* 8 */ { {_STYLE_GETSTYLEID(STY_CUR_LN)}, IDS_LEX_2ND_LN_BACKGR, L"2nd Current Line Background (Color)", L"size:2; fore:#0000B0; back:#FFFF00; alpha:50", L"" }, /* 9 */ { {_STYLE_GETSTYLEID(STY_CARET)}, IDS_LEX_2ND_CARET, L"2nd Caret (Color, Size 1-3)", L"", L"" }, /* 10 */ { {_STYLE_GETSTYLEID(STY_LONG_LN_MRK)}, IDS_LEX_2ND_LONG_LN, L"2nd Long Line Marker (Colors)", L"fore:#FFC000", L"" }, /* 11 */ { {_STYLE_GETSTYLEID(STY_X_LN_SPACE)}, IDS_LEX_2ND_X_SPC, L"2nd Extra Line Spacing (Size)", L"", L"" }, diff --git a/src/Styles.c b/src/Styles.c index 65930da64..891e1ec7b 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -830,7 +830,7 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew) SendMessage(hwnd, SCI_SETWHITESPACESIZE, iValue, 0); // current line background - Style_SetCurrentLineBackground(hwnd, Settings.HighlightCurrentLine); + Style_HighlightCurrentLine(hwnd, Settings.HighlightCurrentLine); // bookmark line or marker Style_SetBookmark(hwnd, Settings.ShowSelectionMargin); @@ -1131,46 +1131,60 @@ void Style_SetLongLineColors(HWND hwnd) if (SendMessage(hwnd,SCI_GETEDGEMODE,0,0) == EDGE_LINE) { - if (Style_StrGetColor(true, GetCurrentStdLexer()->Styles[STY_LONG_LN_MRK].szValue,&rgb)) // edge fore - SendMessage(hwnd,SCI_SETEDGECOLOUR,rgb,0); - else - SendMessage(hwnd,SCI_SETEDGECOLOUR,GetSysColor(COLOR_3DLIGHT),0); + if (!Style_StrGetColor(true, GetCurrentStdLexer()->Styles[STY_LONG_LN_MRK].szValue, &rgb)) { // edge fore + rgb = GetSysColor(COLOR_3DLIGHT); + } + SendMessage(hwnd,SCI_SETEDGECOLOUR,rgb,0); } else { - if (Style_StrGetColor(false, GetCurrentStdLexer()->Styles[STY_LONG_LN_MRK].szValue,&rgb)) // edge back - SendMessage(hwnd,SCI_SETEDGECOLOUR,rgb,0); - else - SendMessage(hwnd,SCI_SETEDGECOLOUR,GetSysColor(COLOR_3DLIGHT),0); + if (Style_StrGetColor(false, GetCurrentStdLexer()->Styles[STY_LONG_LN_MRK].szValue, &rgb)) { // edge back + rgb = GetSysColor(COLOR_3DLIGHT); + } + SendMessage(hwnd,SCI_SETEDGECOLOUR,rgb,0); } } //============================================================================= // -// Style_SetCurrentLineBackground() +// Style_HighlightCurrentLine() // -void Style_SetCurrentLineBackground(HWND hwnd, bool bHiLitCurrLn) +void Style_HighlightCurrentLine(HWND hwnd, int iHiLitCurLn) { - if (bHiLitCurrLn) - { - COLORREF rgb = 0; - if (Style_StrGetColor(false, GetCurrentStdLexer()->Styles[STY_CUR_LN_BCK].szValue, &rgb)) // caret line back - { - SendMessage(hwnd, SCI_SETCARETLINEVISIBLEALWAYS, true, 0); - SendMessage(hwnd, SCI_SETCARETLINEVISIBLE, true, 0); - SendMessage(hwnd, SCI_SETCARETLINEBACK, rgb, 0); - - int alpha = 0; - if (Style_StrGetAlpha(GetCurrentStdLexer()->Styles[STY_CUR_LN_BCK].szValue, &alpha, true)) - SendMessage(hwnd,SCI_SETCARETLINEBACKALPHA,alpha,0); - else - SendMessage(hwnd,SCI_SETCARETLINEBACKALPHA,SC_ALPHA_NOALPHA,0); - - return; - } - } + SendMessage(hwnd, SCI_SETCARETLINEFRAME, 0, 0); SendMessage(hwnd, SCI_SETCARETLINEVISIBLE, false, 0); SendMessage(hwnd, SCI_SETCARETLINEVISIBLEALWAYS, false, 0); + + if (iHiLitCurLn > 0) + { + bool const backgrColor = (iHiLitCurLn == 1); + + LPCWSTR szValue = GetCurrentStdLexer()->Styles[STY_CUR_LN].szValue; + + COLORREF rgb; + if (!Style_StrGetColor(!backgrColor, szValue, &rgb)) { + rgb = (backgrColor ? RGB(0xFF, 0xFF, 0x00) : RGB(0xC2, 0xC0, 0xC3)); + } + + int alpha = 0; + if (!Style_StrGetAlpha(GetCurrentStdLexer()->Styles[STY_CUR_LN].szValue, &alpha, true)) { + alpha = SC_ALPHA_NOALPHA; + } + + if (!backgrColor) { + int iFrameSize = 0; + if (!Style_StrGetSizeInt(szValue, &iFrameSize)) { + iFrameSize = 2; + } + iFrameSize = max_i(1, ScaleIntToCurrentDPI(iFrameSize)); + SendMessage(hwnd, SCI_SETCARETLINEFRAME, iFrameSize, 0); + } + + SendMessage(hwnd, SCI_SETCARETLINEBACK, rgb, 0); + SendMessage(hwnd, SCI_SETCARETLINEBACKALPHA, alpha, 0); + SendMessage(hwnd, SCI_SETCARETLINEVISIBLEALWAYS, true, 0); + SendMessage(hwnd, SCI_SETCARETLINEVISIBLE, true, 0); + } } @@ -1836,17 +1850,12 @@ bool Style_StrGetFontQuality(LPCWSTR lpszStyle,LPWSTR lpszQuality,int cchQuality // bool Style_StrGetCharSet(LPCWSTR lpszStyle, int* i) { - WCHAR tch[BUFSIZE_STYLE_VALUE] = { L'\0' }; WCHAR *p = StrStrI(lpszStyle, L"charset:"); if (p) { - StringCchCopy(tch,COUNTOF(tch),p + CSTRLEN(L"charset:")); - p = StrChr(tch, L';'); - if (p) { *p = L'\0'; } - TrimStringW(tch); + p += CSTRLEN(L"charset:"); int iValue = 0; - if (1 == swscanf_s(tch, L"%i", &iValue)) - { + if (Char2IntW(p, &iValue)) { *i = max_i(SC_CHARSET_ANSI, iValue); return true; } @@ -1855,6 +1864,22 @@ bool Style_StrGetCharSet(LPCWSTR lpszStyle, int* i) } +//============================================================================= +// +// Style_StrGetIntSizeInt() +// +bool Style_StrGetSizeInt(LPCWSTR lpszStyle, int* i) +{ + WCHAR *p = StrStrI(lpszStyle, L"size:"); + if (p) + { + p += CSTRLEN(L"size:"); + return Char2IntW(p, i); + } + return false; +} + + //============================================================================= // // Style_StrGetSize() diff --git a/src/Styles.h b/src/Styles.h index e3e7ce805..eda68f0b5 100644 --- a/src/Styles.h +++ b/src/Styles.h @@ -39,7 +39,7 @@ void Style_SetUrlHotSpot(HWND hwnd, bool); void Style_SetInvisible(HWND hwnd, bool); void Style_SetReadonly(HWND hwnd, bool); void Style_SetLongLineColors(HWND hwnd); -void Style_SetCurrentLineBackground(HWND hwnd, bool); +void Style_HighlightCurrentLine(HWND hwnd, int); void Style_SetFolding(HWND hwnd, bool); void Style_SetBookmark(HWND hwnd, bool); void Style_SetMargin(HWND hwnd, int iStyle, LPCWSTR lpszStyle); @@ -60,6 +60,7 @@ bool Style_GetOpenDlgFilterStr(LPWSTR lpszFilter,int cchFilter); bool Style_StrGetFont(LPCWSTR lpszStyle,LPWSTR lpszFont,int cchFont); bool Style_StrGetFontQuality(LPCWSTR lpszStyle,LPWSTR lpszQuality,int cchQuality); bool Style_StrGetCharSet(LPCWSTR lpszStyle,int* i); +bool Style_StrGetSizeInt(LPCWSTR lpszStyle, int* i); bool Style_StrGetSize(LPCWSTR lpszStyle,float* f); bool Style_StrGetSizeStr(LPCWSTR lpszStyle,LPWSTR lpszSize,int cchSize); bool Style_StrGetColor(bool,LPCWSTR lpszStyle, COLORREF* rgb); diff --git a/src/TypeDefs.h b/src/TypeDefs.h index a86d1355a..9939fdc4a 100644 --- a/src/TypeDefs.h +++ b/src/TypeDefs.h @@ -311,7 +311,7 @@ typedef struct _settings_t bool ShowWordWrapSymbols; bool MatchBraces; bool AutoCloseTags; - bool HighlightCurrentLine; + int HighlightCurrentLine; bool HyperlinkHotspot; bool ScrollPastEOF; bool AutoIndent;