From 0f1fb047b63e947cc8fda0f49b03a3101a0e8c7b Mon Sep 17 00:00:00 2001 From: "METANEOCORTEX\\Kotti" Date: Mon, 25 Apr 2022 09:02:44 +0200 Subject: [PATCH 1/2] +upd: version info for MS VS2019 (v16.11.13) update --- src/Version.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Version.h b/src/Version.h index a747607d9..6306b65a6 100644 --- a/src/Version.h +++ b/src/Version.h @@ -95,7 +95,9 @@ #define VER_CPL MS Visual C++ 2022 v17.0.(0-1) #endif #elif (_MSC_VER == 1929) - #if (_MSC_FULL_VER >= 192930142) + #if (_MSC_FULL_VER >= 192930143) + #define VER_CPL MS Visual C++ 2019 v16.11.13 + #elif (_MSC_FULL_VER >= 192930142) #define VER_CPL MS Visual C++ 2019 v16.11.12 #elif (_MSC_FULL_VER >= 192930141) #define VER_CPL MS Visual C++ 2019 v16.11.11 From 33acb62b4cd23c4332a1cbeaea49df070991a728 Mon Sep 17 00:00:00 2001 From: "METANEOCORTEX\\Kotti" Date: Mon, 2 May 2022 10:07:41 +0200 Subject: [PATCH 2/2] +fix: "Text File" Scheme: using Common (2nd) Base Font +fix: Using "Cascadia Mono" over "Cascadia Code" if applicable (regarding to "Text File" Scheme change) --- src/StyleLexers/styleLexStandard.c | 4 ++-- src/Styles.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/StyleLexers/styleLexStandard.c b/src/StyleLexers/styleLexStandard.c index 901759ee5..2f2cf231e 100644 --- a/src/StyleLexers/styleLexStandard.c +++ b/src/StyleLexers/styleLexStandard.c @@ -62,8 +62,8 @@ EDITLEXER lexTEXT = { SCLEX_NULL, "null", IDS_LEX_TEXT_FILES, L"Text Files", L"txt; text; tmp; log; asc; doc; scp; wtx", L"", &KeyWords_NULL,{ - { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"font:$Text", L"" }, - //{ {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, + //~{ {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"font:$Text", L"" }, + { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, { {STYLE_LINENUMBER}, IDS_LEX_STD_MARGIN, L"Margins and Line Numbers", L"font:Consolas; size:-2", L"" }, { {SCI_SETEXTRAASCENT + SCI_SETEXTRADESCENT}, IDS_LEX_STD_X_SPC, L"Extra Line Spacing (Size)", L"size:-1", L"" }, EDITLEXER_SENTINEL diff --git a/src/Styles.c b/src/Styles.c index 67e0869e7..5508b4070 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -2810,10 +2810,10 @@ static inline bool GetDefaultCodeFont(LPWSTR pwchFontName, int cchFont) } LPCWSTR const FontNamePrioList[] = { + L"Cascadia Mono", L"Cascadia Code", L"Fira Code", L"Source Code Pro", - L"Cascadia Mono", L"Roboto Mono", L"DejaVu Sans Mono", L"Consolas",