Merge branch 'Dev_RC2_UTF8' into Dev_AccelKeys

# Conflicts:
#	ced/ced/compact_enc_det/compact_enc_det.cc
#	ced/targetver.h
#	language/common_res.h
#	language/common_res.rc
#	language/np3_af_za/dialogs_af_za.rc
#	language/np3_af_za/strings_af_za.rc
#	language/np3_be_by/dialogs_be_by.rc
#	language/np3_be_by/strings_be_by.rc
#	language/np3_de_de/dialogs_de_de.rc
#	language/np3_de_de/strings_de_de.rc
#	language/np3_en_gb/dialogs_en_gb.rc
#	language/np3_en_gb/strings_en_gb.rc
#	language/np3_en_us/dialogs_en_us.rc
#	language/np3_en_us/np3_en_us.rc
#	language/np3_en_us/strings_en_us.rc
#	language/np3_es_es/dialogs_es_es.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/dialogs_fr_fr.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/dialogs_ja_jp.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_nl_nl/dialogs_nl_nl.rc
#	language/np3_nl_nl/strings_nl_nl.rc
#	language/np3_ru_ru/dialogs_ru_ru.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/dialogs_zh_cn.rc
#	language/np3_zh_cn/menu_zh_cn.rc
#	language/np3_zh_cn/resource.h
#	language/np3_zh_cn/strings_zh_cn.rc
#	minipath/src/minipath.rc
#	np3encrypt/targetver.h
#	src/Dialogs.h

.editorconfig

@@ -0,0 +1,39 @@
+# EditorConfig is awesome: https://EditorConfig.org
+#
+# VisualStudio: https://docs.microsoft.com/en-us/visualstudio/ide/create-portable-custom-editor-options?view=vs-2017
+
+# top-most EditorConfig file
+root = true
+
+# Windows-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = crlf
+insert_final_newline = true
+trim_trailing_whitespace = false
+
+# Matches multiple files with brace expansion notation
+[*.{h,c,cpp,hpp,cxx}]
+# Set default charset
+charset = utf-8-bom
+# 2 space indentation
+indent_style = space
+indent_size = 2
+tab_width = 2
+
+[*.rc]
+charset = utf-8
+
+[language/**.h]
+charset = utf-8
+
+[minipath/language/**.h]
+charset = utf-8
+
+[scintilla/**.{h,c,cpp,hpp,cxx}]
+charset = utf-8
+# tab (w=4) indentation
+indent_style = tab
+indent_size = 4
+tab_width = 4
+

Version_PAPPS.cmd

@@ -1,6 +1,6 @@
 @echo off
 setlocal
-set _VERPATCH_=Dev_Test_1
+set _VERPATCH_=Dev_Test_2
 echo "%_VERPATCH_%" > .\np3portableapp\_buildname.txt
 Version -VerPatch "%_VERPATCH_%"
 endlocal

Versions/build.txt

@@ -1 +1 @@
-1436
+1437

language/common_res.h

@@ -194,7 +194,7 @@
 #define IDD_MUI_ENCODING                17030
 #define IDD_MUI_ALIGN                   17031
 #define IDD_MUI_CHOOSEFONT              17032
-
+#define IDD_MUI_CMDLINEHELP             17033
 
 #define IDC_COMMANDLINE                 18000
 #define IDC_SEARCHEXE                   18001
@@ -296,6 +296,7 @@
 #define IDC_TAB_INDENTS                 18097
 #define IDC_BACKTAB_INDENTS             18098
 #define IDC_WARN_INCONSISTENT_INDENTS   18099
+#define IDC_CMDLINEHELP                 18100
 
 #define CMD_ESCAPE                      20000
 #define CMD_SHIFTESC                    20001

language/np3_en_us/dialogs_en_us.rc

@@ -71,6 +71,19 @@ BEGIN
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,168
 END
 
+
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 280, 160
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Command Line Help"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ICON            IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20
+DEFPUSHBUTTON   "OK", IDOK, 220, 137, 55, 16
+//LTEXT           "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290
+EDITTEXT        IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER
+END
+
+
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Find Text"

language/np3_en_us/strings_en_us.rc

@@ -189,7 +189,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_TRANSL_AUTHOR       "(en-US) English(amer.) text by Flo Balmer et al."
-    IDS_MUI_CMDLINEHELP         "Command Line Help\n\nfile\tMust be the last argument,\n\tno quoted spaces by default.\n+\tAccept multiple file arguments (with quoted spaces).\n-\tAccept single file argument (without quoted spaces).\n…\tEncoding\n\t(/ansi, /unicode, /unicodebe, /utf8, /utf8sig).\n…\tLine ending mode (/crlf, /cr, /lf).\n/e\tFile source encoding.\n/g\tJump to specified position (/g -1 end of file).\n/m\tMatch specified text\n\t(/m- last, /mr regex, /mb backslash).\n/l\tAuto-reload modified files.\n/q\tForce creation of new files without prompt.\n/s\tSelect specified syntax scheme.\n/d\tSelect default text scheme.\n/h\tSelect Web Source Code scheme.\n/x\tSelect XML Document scheme.\n/c\tOpen new window and paste clipboard contents.\n/b\tOpen new paste board to collect clipboard entries.\n/n\tAlways open a new window (/ns single file instance).\n/r\tReuse window (/rs single file instance).\n/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\n/t\tSet window title.\n/i\tStart as tray icon.\n/o\tKeep window on top.\n/f\tSpecify ini-file (/f0 no ini-file).\n/u\tLaunch with elevated privileges.\n/v\tPrint file immediately and quit.\n/vd\tPrint file (open printer dialog).\n/z\tSkip next\n\t(usable for registry-based Notepad replacement)."
+    IDS_MUI_CMDLINEHELP         "Command Line Help\r\n\r\nfile\tMust be the last argument,\r\n\tno quoted spaces by default.\r\n+\tAccept multiple file arguments (with quoted spaces).\r\n-\tAccept single file argument (without quoted spaces).\r\n…\tEncoding\r\n\t(/ansi, /unicode, /unicodebe, /utf8, /utf8sig).\r\n…\tLine ending mode (/crlf, /cr, /lf).\r\n/e\tFile source encoding.\r\n/g\tJump to specified position (/g -1 end of file).\r\n/m\tMatch specified text\r\n\t(/m- last, /mr regex, /mb backslash).\r\n/l\tAuto-reload modified files.\r\n/q\tForce creation of new files without prompt.\r\n/s\tSelect specified syntax scheme.\r\n/d\tSelect default text scheme.\r\n/h\tSelect Web Source Code scheme.\r\n/x\tSelect XML Document scheme.\r\n/c\tOpen new window and paste clipboard contents.\r\n/b\tOpen new paste board to collect clipboard entries.\r\n/n\tAlways open a new window (/ns single file instance).\r\n/r\tReuse window (/rs single file instance).\r\n/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n/t\tSet window title.\r\n/i\tStart as tray icon.\r\n/o\tKeep window on top.\r\n/f\tSpecify ini-file (/f0 no ini-file).\r\n/u\tLaunch with elevated privileges.\r\n/v\tPrint file immediately and quit.\r\n/vd\tPrint file (open printer dialog).\r\n/z\tSkip next\r\n\t(usable for registry-based Notepad replacement)."
     IDS_MUI_EXAMPLE_TEXT        "The quick brown fox jumps over the lazy dog, 0123456789."
     IDS_MUI_ZERO_LEN_MATCH      "^ Zero-Length Match"
 END

minipath/License.txt

@@ -1,7 +1,7 @@
-MiniPath Copyright © 2008-2016 Rizonesoft, All rights reserved.
+MiniPath Copyright © 2008-2016 Rizonesoft, All rights reserved.
 https://rizonesoft.com
 
-metapath Copyright © 2004-2011 Florian Balmer
+metapath Copyright © 2004-2011 Florian Balmer
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

minipath/Readme.txt

@@ -1,4 +1,4 @@
-
+
 =======================================================================
 =                                                                     =
 =                                                                     =

minipath/metapath.txt

@@ -1,4 +1,4 @@
-
+
 =======================================================================
 =                                                                     =
 =                                                                     =

np3portableapp/_buildname.txt

@@ -1 +1 @@
-"Dev_Test_1" 
+"Dev_Test_2" 

res/Notepad3.exe.manifest.conf

@@ -3,8 +3,8 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.18.1108.1436"
+    version="5.18.1115.1437"
     type="win32"
   />
-  <description>Notepad3 Dev_Test_1</description>
+  <description>Notepad3 Dev_Test_2</description>
 </assembly>

src/ChooseFont/ChooseFont.h

@@ -1,4 +1,4 @@
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
+// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
 // ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
 // THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
 // PARTICULAR PURPOSE.

src/ChooseFont/FontEnumeration.cpp

@@ -1,4 +1,4 @@
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
+// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
 // ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
 // THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
 // PARTICULAR PURPOSE.

src/ChooseFont/FontEnumeration.h

@@ -1,4 +1,4 @@
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
+// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
 // ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
 // THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
 // PARTICULAR PURPOSE.

src/ChooseFont/GdiTextRenderer.cpp

@@ -1,4 +1,4 @@
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
+// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
 // ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
 // THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
 // PARTICULAR PURPOSE.

src/ChooseFont/GdiTextRenderer.h

@@ -1,4 +1,4 @@
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
+// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
 // ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
 // THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
 // PARTICULAR PURPOSE.

src/Dialogs.c

@@ -250,6 +250,7 @@ INT_PTR InfoBoxLng(int iType, LPCWSTR lpstrSetting, int uidMessage, ...)
 //
 //  DisplayCmdLineHelp()
 //
+#if 0
 void DisplayCmdLineHelp(HWND hwnd)
 {
   WCHAR szTitle[32] = { L'\0' };
@@ -276,7 +277,57 @@ void DisplayCmdLineHelp(HWND hwnd)
   MessageBoxIndirect(&mbp);
   //MsgBoxLng(MBINFO, IDS_MUI_CMDLINEHELP);
 }
+#else
 
+INT_PTR CALLBACK CmdLineHelpProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
+{
+  UNUSED(lParam);
+
+  switch (umsg) {
+  case WM_INITDIALOG:
+    {
+      WCHAR szTitle[80] = { L'\0' };
+      WCHAR szText[2048] = { L'\0' };
+      GetLngString(IDS_MUI_APPTITLE, szTitle, COUNTOF(szTitle));
+      GetLngString(IDS_MUI_CMDLINEHELP, szText, COUNTOF(szText));
+      SetWindowText(hwnd, szTitle);
+      SetDlgItemText(hwnd, IDC_CMDLINEHELP, szText);
+      //SendMessage(hwnd, WM_NEXTDLGCTL, (WPARAM)IDC_CMDLINEHELP, TRUE);
+    }
+    break;
+
+  case WM_COMMAND:
+    switch (LOWORD(wParam)) {
+    case IDOK:
+    case IDCANCEL:
+    case IDYES:
+    case IDNO:
+      EndDialog(hwnd, LOWORD(wParam));
+      break;
+    }
+    return true;
+
+  default:
+    break;
+  }
+  return false;
+}
+
+INT_PTR DisplayCmdLineHelp(HWND hwnd)
+{
+  return ThemedDialogBoxParam(Globals.hLngResContainer, MAKEINTRESOURCE(IDD_MUI_CMDLINEHELP), hwnd, CmdLineHelpProc, (LPARAM)L"");
+
+  //if (!hwnd) {
+  //  // text to std-out
+  //  //RedirectIOToConsole();
+  //  //fwprintf(stdout, L"\n!!! blahblub ???\n");
+  //  //fflush(stdout);
+  //  //SleepEx(5000,FALSE);
+  //}
+  //return(0);
+}
+
+#endif
 
 //=============================================================================
 //

src/Dialogs.h

@@ -19,7 +19,7 @@
 #include "TypeDefs.h"
 
 int  MsgBoxLng(int iType, UINT uIdMsg, ...);
-void DisplayCmdLineHelp(HWND hwnd);
+INT_PTR DisplayCmdLineHelp(HWND hwnd);
 bool GetDirectory(HWND hwndParent,int uiTitle,LPWSTR pszFolder,LPCWSTR pszBase,bool);
 INT_PTR CALLBACK AboutDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam);
 INT_PTR RunDlg(HWND hwnd,LPCWSTR lpstrDefault);

src/Helpers.h

@@ -354,6 +354,9 @@ bool GetDoAnimateMinimize(VOID);
 VOID MinimizeWndToTray(HWND hWnd);
 VOID RestoreWndFromTray(HWND hWnd);
 
+// console helper from Print.cpp
+//void RedirectIOToConsole();
+
 //==== StrCut methods ===================
 
 CHAR*  StrCutIA(CHAR* s,const CHAR* pattern);

src/Notepad3.rc

@@ -44,7 +44,6 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -68,15 +67,12 @@ IDB_PICK                BITMAP                  "Pick.bmp"
 IDB_ENCODING            BITMAP                  "Encoding.bmp"
 
 
-
-
-
 /////////////////////////////////////////////////////////////////////////////
 // English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
+#pragma code_page(65001)  // UTF-8
 
 /////////////////////////////////////////////////////////////////////////////
 //

src/Notepad3.ver

@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 *                                                                             *
 *                                                                             *
 * Notepad3                                                                    *

src/Print.cpp

@@ -592,5 +592,50 @@ static void EditPrintInit()
   }
 }
 
+#if 0
+#include <fcntl.h>
+#include <io.h>
+//#include <iostream>
+//#include <fstream>
+
+void RedirectIOToConsole()
+{
+  int hConHandle;
+  intptr_t lStdHandle;
+  CONSOLE_SCREEN_BUFFER_INFO coninfo;
+  FILE *fp;
+
+  // allocate a console for this app
+  AllocConsole();
+  // set the screen buffer to be big enough to let us scroll text
+  GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &coninfo);
+  coninfo.dwSize.Y = 500;
+  SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), coninfo.dwSize);
+
+  // redirect unbuffered STDOUT to the console
+  lStdHandle = (intptr_t)GetStdHandle(STD_OUTPUT_HANDLE);
+  hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+  fp = _fdopen(hConHandle, "w");
+  *stdout = *fp;
+  setvbuf(stdout, NULL, _IONBF, 0);
+
+  // redirect unbuffered STDIN to the console
+  lStdHandle = (intptr_t)GetStdHandle(STD_INPUT_HANDLE);
+  hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+  fp = _fdopen(hConHandle, "r");
+  *stdin = *fp;
+  setvbuf(stdin, NULL, _IONBF, 0);
+
+  // redirect unbuffered STDERR to the console
+  lStdHandle = (intptr_t)GetStdHandle(STD_ERROR_HANDLE);
+  hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+  fp = _fdopen(hConHandle, "w");
+  *stderr = *fp;
+  setvbuf(stderr, NULL, _IONBF, 0);
+
+  // make cout, wcout, cin, wcin, wcerr, cerr, wclog and clog point to console as well
+  std::ios::sync_with_stdio();
+}
+#endif
 
 // End of Print.cpp

src/VersionEx.h

@@ -6,8 +6,8 @@
 #define APPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 18
-#define VERSION_REV 1108
-#define VERSION_BUILD 1436
+#define VERSION_REV 1115
+#define VERSION_BUILD 1437
 #define SCINTILLA_VER 412
 #define ONIGMO_REGEX_VER 6.1.3
-#define VERSION_PATCH "Dev_Test_1"
+#define VERSION_PATCH "Dev_Test_2"