CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2305 from RaiKoHoff/grepWin_Integration

Browse Source 
Markdown Lexer: changed style of header lines
This commit is contained in:
Rainer Kottenhoff 2020-05-03 17:55:50 +02:00 committed by GitHub
commit aa85198080
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 80 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
1
2

1
language/common_res.h
View File

@ -1076,6 +1076,7 @@
#define IDS_LEX_STR_63364 63364
#define IDS_LEX_STR_63365 63365
#define IDS_LEX_STR_63366 63366
#define IDS_LEX_STR_63367 63367
#define IDS_LEX_CSV_COL_0 63400
#define IDS_LEX_CSV_COL_1 63401

8
language/np3_de_de/encode_de_de.rc
View File

@ -80,8 +80,8 @@ BEGIN
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
IDS_ENC_GBK_936 "C;Chinese Simplified (GBK-936);GBK-936"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@ -151,14 +151,14 @@ STRINGTABLE
BEGIN
IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
IDS_ENC_ISO_2022_CN "C;Chinese Traditional (ISO-2022);ISO-2022-CN"
IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB2312);HZ-GB2312"
IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
IDS_ENC_BIG5_HKSCS "C;Chinese Hong Kong (Big5HKSCS);Big5HKSCS"
IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
END

4
language/np3_de_de/lexer_de_de.rc
View File

@ -461,6 +461,10 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
IDS_LEX_STR_63364 "Eigenschaften Name"
IDS_LEX_STR_63365 "LD Keyword"
IDS_LEX_STR_63366 "ESC Sequenz"
IDS_LEX_STR_63367 "Header Text"
END
STRINGTABLE

3
language/np3_de_de/menu_de_de.rc
View File

@ -488,6 +488,8 @@ IDR_MUI_POPUPMENU MENU
BEGIN
POPUP "+"
BEGIN
MENUITEM "Öffne &Hyperlink", CMD_OPEN_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "&Rückgängig", IDM_EDIT_UNDO
MENUITEM "&Wiederholen", IDM_EDIT_REDO
MENUITEM SEPARATOR
@ -502,7 +504,6 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Öffne Web-Aktion &1", CMD_WEBACTION1
MENUITEM "Öffne Web Aktion &2", CMD_WEBACTION2
MENUITEM "Öffne &Hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
BEGIN

8
language/np3_en_gb/encode_en_gb.rc
View File

@ -80,8 +80,8 @@ BEGIN
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
IDS_ENC_GBK_936 "C;Chinese Simplified (GBK-936);GBK-936"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@ -151,14 +151,14 @@ STRINGTABLE
BEGIN
IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
IDS_ENC_ISO_2022_CN "C;Chinese Traditional (ISO-2022);ISO-2022-CN"
IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB2312);HZ-GB2312"
IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
IDS_ENC_BIG5_HKSCS "C;Chinese Hong Kong (Big5HKSCS);Big5HKSCS"
IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
END

3
language/np3_en_gb/menu_en_gb.rc
View File

@ -488,6 +488,8 @@ IDR_MUI_POPUPMENU MENU
BEGIN
POPUP "+"
BEGIN
MENUITEM "Open &Hyperlink", CMD_OPEN_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "&Undo", IDM_EDIT_UNDO
MENUITEM "&Redo", IDM_EDIT_REDO
MENUITEM SEPARATOR
@ -502,7 +504,6 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Open Web Action &1", CMD_WEBACTION1
MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Open &Hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
BEGIN

8
language/np3_en_us/encode_en_us.rc
View File

@ -80,8 +80,8 @@ BEGIN
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
IDS_ENC_GBK_936 "C;Chinese Simplified (GBK-936);GBK-936"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@ -151,14 +151,14 @@ STRINGTABLE
BEGIN
IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
IDS_ENC_ISO_2022_CN "C;Chinese Traditional (ISO-2022);ISO-2022-CN"
IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB2312);HZ-GB2312"
IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
IDS_ENC_BIG5_HKSCS "C;Chinese Hong Kong (Big5HKSCS);Big5HKSCS"
IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
END

1
language/np3_en_us/lexer_en_us.rc
View File

@ -464,6 +464,7 @@ BEGIN
IDS_LEX_STR_63364 "Property Name"
IDS_LEX_STR_63365 "LD Keyword"
IDS_LEX_STR_63366 "ESC Sequence"
IDS_LEX_STR_63367 "Header Text"
END
STRINGTABLE

3
language/np3_en_us/menu_en_us.rc
View File

@ -488,6 +488,8 @@ IDR_MUI_POPUPMENU MENU
BEGIN
POPUP "+"
BEGIN
MENUITEM "Open &Hyperlink", CMD_OPEN_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "&Undo", IDM_EDIT_UNDO
MENUITEM "&Redo", IDM_EDIT_REDO
MENUITEM SEPARATOR
@ -502,7 +504,6 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Open Web Action &1", CMD_WEBACTION1
MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Open &Hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
BEGIN

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.503.1"
version="5.20.503.2"
type="win32"
/>
<description>Notepad3 BETA</description>

1
scintilla/include/SciLexer.h
View File

@ -1520,6 +1520,7 @@
#define SCE_MARKDOWN_CODE 19
#define SCE_MARKDOWN_CODE2 20
#define SCE_MARKDOWN_CODEBK 21
#define SCE_MARKDOWN_HDRTEXT 22
#define SCE_TXT2TAGS_DEFAULT 0
#define SCE_TXT2TAGS_LINE_BEGIN 1
#define SCE_TXT2TAGS_STRONG1 2

69
scintilla/lexers/LexMarkdown.cxx
View File

@ -76,20 +76,23 @@ static bool FollowToLineEnd(const int ch, const int state, const Sci_PositionU e
// Set the state on text section from current to length characters,
// then set the rest until the newline to default, except for any characters matching token
constexpr bool IsHdrToken(const int ch, const int tok) noexcept {
return ((ch == tok) || (ch == ' ') || (ch == '\n') || (ch == '\r'));
}
static void SetStateAndZoom(const int state, const Sci_Position length, const int token, StyleContext &sc) {
sc.SetState(state);
sc.Forward(length);
sc.SetState(SCE_MARKDOWN_DEFAULT);
sc.Forward();
bool started = false;
while (sc.More() && !IsNewline(sc.ch)) {
if (sc.ch == token && !started) {
bool tokenState = true;
while (sc.More() && !sc.atLineStart) {
if (IsHdrToken(sc.ch, token) && !tokenState) {
sc.SetState(state);
started = true;
tokenState = true;
}
else if (sc.ch != token) {
sc.SetState(SCE_MARKDOWN_DEFAULT);
started = false;
else if (!IsHdrToken(sc.ch, token) && tokenState) {
sc.SetState(SCE_MARKDOWN_HDRTEXT);
tokenState = false;
}
sc.Forward();
}
@ -239,24 +242,36 @@ static void ColorizeMarkdownDoc(Sci_PositionU startPos, Sci_Position length, int
}
else if (sc.state == SCE_MARKDOWN_LINE_BEGIN) {
// Header
if (sc.Match("######"))
SetStateAndZoom(SCE_MARKDOWN_HEADER6, 6, '#', sc);
else if (sc.Match("#####"))
SetStateAndZoom(SCE_MARKDOWN_HEADER5, 5, '#', sc);
else if (sc.Match("####"))
SetStateAndZoom(SCE_MARKDOWN_HEADER4, 4, '#', sc);
else if (sc.Match("###"))
SetStateAndZoom(SCE_MARKDOWN_HEADER3, 3, '#', sc);
else if (sc.Match("##"))
SetStateAndZoom(SCE_MARKDOWN_HEADER2, 2, '#', sc);
if (sc.Match("######")) {
SetStateAndZoom(SCE_MARKDOWN_HEADER6, 6, '#', sc);
freezeCursor = true;
}
else if (sc.Match("#####")) {
SetStateAndZoom(SCE_MARKDOWN_HEADER5, 5, '#', sc);
freezeCursor = true;
}
else if (sc.Match("####")) {
SetStateAndZoom(SCE_MARKDOWN_HEADER4, 4, '#', sc);
freezeCursor = true;
}
else if (sc.Match("###")) {
SetStateAndZoom(SCE_MARKDOWN_HEADER3, 3, '#', sc);
freezeCursor = true;
}
else if (sc.Match("##")) {
SetStateAndZoom(SCE_MARKDOWN_HEADER2, 2, '#', sc);
freezeCursor = true;
}
else if (sc.Match("#")) {
// Catch the special case of an unordered list
if (sc.chNext == '.' && IsASpaceOrTab(sc.GetRelative(2))) {
precharCount = 0;
sc.SetState(SCE_MARKDOWN_PRECHAR);
}
else
SetStateAndZoom(SCE_MARKDOWN_HEADER1, 1, '#', sc);
else {
SetStateAndZoom(SCE_MARKDOWN_HEADER1, 1, '#', sc);
freezeCursor = true;
}
}
// Code block
else if (sc.Match("~~~")) {
@ -288,12 +303,12 @@ static void ColorizeMarkdownDoc(Sci_PositionU startPos, Sci_Position length, int
}
// The header lasts until the newline
else if (sc.state == SCE_MARKDOWN_HEADER1 || sc.state == SCE_MARKDOWN_HEADER2 ||
sc.state == SCE_MARKDOWN_HEADER3 || sc.state == SCE_MARKDOWN_HEADER4 ||
sc.state == SCE_MARKDOWN_HEADER5 || sc.state == SCE_MARKDOWN_HEADER6) {
if (IsNewline(sc.ch))
sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
}
else if (sc.state == SCE_MARKDOWN_HEADER1 || sc.state == SCE_MARKDOWN_HEADER2 ||
sc.state == SCE_MARKDOWN_HEADER3 || sc.state == SCE_MARKDOWN_HEADER4 ||
sc.state == SCE_MARKDOWN_HEADER5 || sc.state == SCE_MARKDOWN_HEADER6) {
if (IsNewline(sc.ch))
sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
}
// New state only within the initial whitespace
if (sc.state == SCE_MARKDOWN_PRECHAR) {

6
src/Notepad3.c
View File

@ -3515,10 +3515,10 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
i = IDM_VIEW_NOESCFUNC;
CheckMenuRadioItem(hmenu, IDM_VIEW_NOESCFUNC, IDM_VIEW_ESCEXIT, i, MF_BYCOMMAND);
EnableCmd(hmenu, CMD_WEBACTION1, !se && !mrs && bPosInSel);
EnableCmd(hmenu, CMD_WEBACTION2, !se && !mrs && bPosInSel);
bool const bIsHLink = (SciCall_IndicatorValueAt(INDIC_NP3_HYPERLINK, iCurPos) > 0);
EnableCmd(hmenu, CMD_OPEN_HYPERLINK, bIsHLink);
EnableCmd(hmenu, CMD_OPEN_HYPERLINK, !mrs && bIsHLink);
EnableCmd(hmenu, CMD_WEBACTION1, !se && !mrs && bPosInSel && !bIsHLink);
EnableCmd(hmenu, CMD_WEBACTION2, !se && !mrs && bPosInSel && !bIsHLink);
i = (int)StringCchLenW(Settings2.AdministrationTool, COUNTOF(Settings2.AdministrationTool));
EnableCmd(hmenu, IDM_HELP_ADMINEXE, i);

13
src/StyleLexers/styleLexMARKDOWN.c
View File

@ -13,12 +13,13 @@ SCLEX_MARKDOWN, IDS_LEX_MARKDOWN, L"Markdown", L"md; markdown; mdown; mkdn; mkd"
{ {SCE_MARKDOWN_LINE_BEGIN}, IDS_LEX_STR_63317, L"Line Begin", L"", L"" },
{ {MULTI_STYLE(SCE_MARKDOWN_STRONG1,SCE_MARKDOWN_STRONG2,0,0)}, IDS_LEX_STR_63318, L"Strong", L"bold", L"" },
{ {MULTI_STYLE(SCE_MARKDOWN_EM1,SCE_MARKDOWN_EM2,0,0)}, IDS_LEX_STR_63319, L"Emphasis", L"italic", L"" },
{ {SCE_MARKDOWN_HEADER1}, IDS_LEX_STR_63320, L"Header 1", L"bold; fore:#FF0088", L"" },
{ {SCE_MARKDOWN_HEADER2}, IDS_LEX_STR_63321, L"Header 2", L"bold; fore:#FF0088", L"" },
{ {SCE_MARKDOWN_HEADER3}, IDS_LEX_STR_63322, L"Header 3", L"bold; fore:#FF0088", L"" },
{ {SCE_MARKDOWN_HEADER4}, IDS_LEX_STR_63323, L"Header 4", L"bold; fore:#FF0088", L"" },
{ {SCE_MARKDOWN_HEADER5}, IDS_LEX_STR_63324, L"Header 5", L"bold; fore:#FF0088", L"" },
{ {SCE_MARKDOWN_HEADER6}, IDS_LEX_STR_63325, L"Header 6", L"bold; fore:#FF0088", L"" },
{ {SCE_MARKDOWN_HEADER1}, IDS_LEX_STR_63320, L"Header 1", L"bold; fore:#009D9D; back:#DDFFDD; eolfilled", L"" },
{ {SCE_MARKDOWN_HEADER2}, IDS_LEX_STR_63321, L"Header 2", L"bold; fore:#009D9D; back:#DDFFDD; eolfilled", L"" },
{ {SCE_MARKDOWN_HEADER3}, IDS_LEX_STR_63322, L"Header 3", L"bold; fore:#009D9D; back:#DDFFDD; eolfilled", L"" },
{ {SCE_MARKDOWN_HEADER4}, IDS_LEX_STR_63323, L"Header 4", L"bold; fore:#009D9D; back:#DDFFDD; eolfilled", L"" },
{ {SCE_MARKDOWN_HEADER5}, IDS_LEX_STR_63324, L"Header 5", L"bold; fore:#009D9D; back:#DDFFDD; eolfilled", L"" },
{ {SCE_MARKDOWN_HEADER6}, IDS_LEX_STR_63325, L"Header 6", L"bold; fore:#009D9D; back:#DDFFDD; eolfilled", L"" },
{ {SCE_MARKDOWN_HDRTEXT}, IDS_LEX_STR_63367, L"Header Text", L"bold; fore:#B0005C; back:#DDFFDD; eolfilled", L"" },
{ {SCE_MARKDOWN_PRECHAR}, IDS_LEX_STR_63326, L"Pre Char", L"fore:#00007F", L"" },
{ {SCE_MARKDOWN_ULIST_ITEM}, IDS_LEX_STR_63327, L"Unordered List", L"bold; fore:#0080FF", L"" },
{ {SCE_MARKDOWN_OLIST_ITEM}, IDS_LEX_STR_63268, L"Ordered List", L"bold; fore:#0080FF", L"" },

2
src/VersionEx.h
View File

@ -9,7 +9,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 503
#define VERSION_BUILD 1
#define VERSION_BUILD 2
#define SCINTILLA_VER 433
#define ONIGURUMA_REGEX_VER 6.9.5
#define UCHARDET_VER 2018.09.27