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 1 Packages Projects Releases Wiki Activity

Merge pull request #1166 from RaiKoHoff/Dev_RC

Browse Source 
Remove Compact Encoding Detection (CED)
This commit is contained in:
Rainer Kottenhoff 2019-05-03 16:24:22 +02:00 committed by GitHub
commit 7ed8ec4644
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 62 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Notepad3.ini
View File

Binary file not shown.

2
Versions/build.txt
View File

@ -1 +1 @@
1688
1689

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.503.1688"
version="5.19.503.1689"
type="win32"
/>
<description>Notepad3 RC</description>

98
src/EncodingDetection.cpp
View File

@ -30,6 +30,7 @@
#define STRSAFE_NO_CB_FUNCTIONS
#define STRSAFE_NO_DEPRECATE // don't allow deprecated functions
#include <strsafe.h>
#include <math.h>
//~#include <future> // async detection
@ -51,8 +52,8 @@ extern "C" {
static char chEncodingInfo[MAX_PATH] = { '\0' };
static WCHAR wchEncodingInfo[MAX_PATH] = { L'\0' };
static void _SetEncodingTitleInfo(const char* encodingUCD, cpi_enc_t encUCD, float ucd_confidence,
const char* encodingCED, cpi_enc_t encCED, float ced_confidence);
static void _SetEncodingTitleInfo(const char* encodingUCD, cpi_enc_t encUCD, float ucd_confidence);
//~,const char* encodingCED, cpi_enc_t encCED, float ced_confidence);
extern "C" const char* Encoding_GetTitleInfoA() { return chEncodingInfo; }
extern "C" const WCHAR* Encoding_GetTitleInfoW() { return wchEncodingInfo; }
@ -570,6 +571,7 @@ constexpr cpi_enc_t _MapStdEncodingString2CPI(const char* encStrg, float* pConfi
// ============================================================================
#if FALSE
// ============================================================================
// CED (Compact Encoding Detector)
// ============================================================================
@ -617,7 +619,7 @@ cpi_enc_t AnalyzeText_CED
return cpiEncoding;
}
// ============================================================================
#endif
// ============================================================================
@ -681,7 +683,8 @@ extern "C" cpi_enc_t Encoding_AnalyzeText
{
if (len == 0)
{
_SetEncodingTitleInfo("", CPI_NONE, 0.0f, "", CPI_NONE, 0.0f);
//~_SetEncodingTitleInfo("", CPI_NONE, 0.0f, "", CPI_NONE, 0.0f);
_SetEncodingTitleInfo("", CPI_NONE, 0.0f);
*confidence_io = 0.0f;
return CPI_NONE;
}
@ -692,9 +695,9 @@ extern "C" cpi_enc_t Encoding_AnalyzeText
char encodingStrg_UCD[MAX_ENC_STRG_LEN] = { '\0' };
cpi_enc_t cpiEncoding_UCD = CPI_NONE;
float ced_cnf = 0.0f;
char encodingStrg_CED[MAX_ENC_STRG_LEN] = { '\0' };
cpi_enc_t cpiEncoding_CED = CPI_NONE;
//~float ced_cnf = 0.0f;
//~char encodingStrg_CED[MAX_ENC_STRG_LEN] = { '\0' };
//~cpi_enc_t cpiEncoding_CED = CPI_NONE;
#if FALSE
size_t const largeFile = static_cast<size_t>(Settings2.FileLoadWarningMB) * 1024LL * 1024LL;
@ -720,29 +723,29 @@ extern "C" cpi_enc_t Encoding_AnalyzeText
#else
// no need to run analyzers asynchrony, cause they analyze only the first KB of large files ...
cpiEncoding_CED = AnalyzeText_CED(text, len, encodingHint, &ced_cnf, encodingStrg_CED, MAX_ENC_STRG_LEN);
if (ced_cnf < 1.0f)
{
//~cpiEncoding_CED = AnalyzeText_CED(text, len, encodingHint, &ced_cnf, encodingStrg_CED, MAX_ENC_STRG_LEN);
//~if (ced_cnf < 1.0f)
//~{
cpiEncoding_UCD = AnalyzeText_UCHARDET(text, len, encodingHint, &ucd_cnf, encodingStrg_UCD, MAX_ENC_STRG_LEN);
}
else {
cpiEncoding_UCD = CPI_NONE;
ucd_cnf = 1.0f;
}
//~}
//~else {
//~ cpiEncoding_UCD = CPI_NONE;
//~ ucd_cnf = 1.0f;
//~}
#endif
float confidence = 0.0f;
float const ucd_confidence = ucd_cnf;
float const ced_confidence = ced_cnf;
//~float const ced_confidence = ced_cnf;
UINT const codePage_UCD = Encoding_GetCodePage(cpiEncoding_UCD);
UINT const codePage_CED = Encoding_GetCodePage(cpiEncoding_CED);
//~UINT const codePage_CED = Encoding_GetCodePage(cpiEncoding_CED);
if (Flags.bDevDebugMode)
{
_SetEncodingTitleInfo(encodingStrg_UCD, cpiEncoding_UCD, ucd_confidence,
encodingStrg_CED, cpiEncoding_CED, ced_confidence);
_SetEncodingTitleInfo(encodingStrg_UCD, cpiEncoding_UCD, ucd_confidence);
//~encodingStrg_CED, cpiEncoding_CED, ced_confidence);
}
// --- re-mapping UCD ----
@ -767,7 +770,7 @@ extern "C" cpi_enc_t Encoding_AnalyzeText
}
// --- re-mapping CED ----
/* ~~~
switch (codePage_CED)
{
case 20936: // Map old GB2312 -> GBK
@ -781,13 +784,16 @@ extern "C" cpi_enc_t Encoding_AnalyzeText
default:
break;
}
~~~ */
// --------------------------------------------------------------------------
// vote for encoding prognosis based on confidence levels or reliability
// --------------------------------------------------------------------------
cpi_enc_t iAnalyzedEncoding = CPI_NONE;
cpi_enc_t iAnalyzedEncoding = cpiEncoding_UCD;
confidence = ucd_confidence;
/* ~~~
if ((cpiEncoding_UCD == cpiEncoding_CED) && !Encoding_IsNONE(cpiEncoding_UCD))
{
iAnalyzedEncoding = cpiEncoding_UCD;
@ -816,6 +822,7 @@ extern "C" cpi_enc_t Encoding_AnalyzeText
}
}
}
~~~ */
*confidence_io = confidence;
return iAnalyzedEncoding;
@ -828,8 +835,8 @@ extern "C" cpi_enc_t Encoding_AnalyzeText
//
// _SetEncodingTitleInfo()
//
static void _SetEncodingTitleInfo(const char* encodingUCD, cpi_enc_t encUCD, float ucd_confidence,
const char* encodingCED, cpi_enc_t encCED, float ced_confidence)
static void _SetEncodingTitleInfo(const char* encodingUCD, cpi_enc_t encUCD, float ucd_confidence)
//~,const char* encodingCED, cpi_enc_t encCED, float ced_confidence)
{
char tmpBuf[128] = { '\0' };
@ -842,30 +849,33 @@ static void _SetEncodingTitleInfo(const char* encodingUCD, cpi_enc_t encUCD, flo
const char* ukn = (!encodingUCD || (encodingUCD[0] == '\0')) ? "<unknown>" : encodingUCD;
StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), (encUCD == CPI_ASCII_7BIT) ? "ASCII" : ukn);
}
StringCchPrintfA(tmpBuf, 128, "' Conf=%.0f%%", ucd_confidence * 100.0f);
float const ucd_conf_perc = ucd_confidence * 100.0f;
StringCchPrintfA(tmpBuf, 128, "' Conf=%.0f%%", ucd_conf_perc);
StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), tmpBuf);
StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), " || CED='");
if (encCED >= 0)
{
//WideCharToMultiByte(CP_UTF7, 0, Encoding_GetLabel(encCED), -1, chEncodingLabel, ARRAYSIZE(chEncodingLabel), 0, 0);
StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), encodingCED);
}
else {
StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), (encCED == CPI_ASCII_7BIT) ? "ASCII" : "<unknown>");
}
if ((encCED >= 0) || (encCED == CPI_ASCII_7BIT)) {
bool const ced_reliable = (ced_confidence >= Settings2.ReliableCEDConfidenceMapping);
bool const ced_not_reliable = (ced_confidence <= Settings2.UnReliableCEDConfidenceMapping);
StringCchPrintfA(tmpBuf, 128, "' Conf=%.0f%% [%s])", ced_confidence * 100.0f,
ced_reliable ? "reliable" : (ced_not_reliable ? "NOT reliable" : "???"));
StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), tmpBuf);
}
else {
StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), "'");
}
//~StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), " || CED='");
//~if (encCED >= 0)
//~{
//~ //WideCharToMultiByte(CP_UTF7, 0, Encoding_GetLabel(encCED), -1, chEncodingLabel, ARRAYSIZE(chEncodingLabel), 0, 0);
//~ StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), encodingCED);
//~}
//~else {
//~ StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), (encCED == CPI_ASCII_7BIT) ? "ASCII" : "<unknown>");
//~}
//~if ((encCED >= 0) || (encCED == CPI_ASCII_7BIT)) {
//~ bool const ced_reliable = (ced_confidence >= Settings2.ReliableCEDConfidenceMapping);
//~ bool const ced_not_reliable = (ced_confidence <= Settings2.UnReliableCEDConfidenceMapping);
//~ StringCchPrintfA(tmpBuf, 128, "' Conf=%.0f%% [%s])", ced_confidence * 100.0f,
//~ ced_reliable ? "reliable" : (ced_not_reliable ? "NOT reliable" : "???"));
//~ StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), tmpBuf);
//~}
//~else {
//~ StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), "'");
//~}
StringCchPrintfA(tmpBuf, 128, (int)lroundf(ucd_conf_perc) >= Settings2.AnalyzeReliableConfidenceLevel ? " (reliable)" : " (NOT reliable)");
StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), tmpBuf);
MultiByteToWideChar(CP_UTF7, 0, chEncodingInfo, -1, wchEncodingInfo, ARRAYSIZE(wchEncodingInfo));
}

5
src/Notepad3.c
View File

@ -7006,11 +7006,12 @@ void LoadSettings()
Settings2.CurrentLineVerticalSlop = clampi(IniSectionGetInt(pIniSection, L"CurrentLineVerticalSlop", Defaults2.CurrentLineVerticalSlop), 0, 25);
int const iARCLdef = 51;
int const iARCLdef = 67;
Defaults2.AnalyzeReliableConfidenceLevel = (float)iARCLdef / 100.0f;
int const iARCLset = clampi(IniSectionGetInt(pIniSection, L"AnalyzeReliableConfidenceLevel", iARCLdef), 0, 100);
Settings2.AnalyzeReliableConfidenceLevel = (float)iARCLset / 100.0f;
/* ~~~
int const iRCEDCMdef = 85;
Defaults2.ReliableCEDConfidenceMapping = (float)iRCEDCMdef / 100.0f;
int const iRCEDCMset = clampi(IniSectionGetInt(pIniSection, L"ReliableCEDConfidenceMapping", iRCEDCMdef), 0, 100);
@ -7020,7 +7021,7 @@ void LoadSettings()
Defaults2.UnReliableCEDConfidenceMapping = (float)iURCEDCMdef / 100.0f;
int const iURCEDCMset = clampi(IniSectionGetInt(pIniSection, L"UnReliableCEDConfidenceMapping", iURCEDCMdef), 0, iRCEDCMset);
Settings2.UnReliableCEDConfidenceMapping = (float)iURCEDCMset / 100.0f;
~~~ */
Defaults2.AdministrationTool[0] = L'\0';
IniSectionGetString(pIniSection, L"AdministrationTool.exe", Defaults2.AdministrationTool,

19
src/Notepad3.vcxproj
View File

@ -364,10 +364,6 @@
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\ced\ced\compact_enc_det\compact_enc_det.cc" />
<ClCompile Include="..\ced\ced\compact_enc_det\compact_enc_det_hint_code.cc" />
<ClCompile Include="..\ced\ced\util\encodings\encodings.cc" />
<ClCompile Include="..\ced\ced\util\languages\languages.cc" />
<ClCompile Include="..\crypto\crypto.c" />
<ClCompile Include="..\crypto\rijndael-alg-fst.c" />
<ClCompile Include="..\crypto\rijndael-api-fst.c" />
@ -493,21 +489,6 @@
<ClCompile Include="Styles.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det.h" />
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_generated_tables.h" />
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_generated_tables2.h" />
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_hint_code.h" />
<ClInclude Include="..\ced\ced\util\basictypes.h" />
<ClInclude Include="..\ced\ced\util\case_insensitive_hash.h" />
<ClInclude Include="..\ced\ced\util\commandlineflags.h" />
<ClInclude Include="..\ced\ced\util\encodings\encodings.h" />
<ClInclude Include="..\ced\ced\util\encodings\encodings.pb.h" />
<ClInclude Include="..\ced\ced\util\languages\languages.h" />
<ClInclude Include="..\ced\ced\util\languages\languages.pb.h" />
<ClInclude Include="..\ced\ced\util\logging.h" />
<ClInclude Include="..\ced\ced\util\port.h" />
<ClInclude Include="..\ced\ced\util\string_util.h" />
<ClInclude Include="..\ced\ced\util\varsetter.h" />
<ClInclude Include="..\crypto\crypto.h" />
<ClInclude Include="..\crypto\rijndael-alg-fst.h" />
<ClInclude Include="..\crypto\rijndael-api-fst.h" />

72
src/Notepad3.vcxproj.filters
View File

@ -25,21 +25,6 @@
<Filter Include="Source Files\ChooseFont">
<UniqueIdentifier>{a6270a0b-5c38-4e68-b38c-5795ccb57302}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\CED">
<UniqueIdentifier>{91d2fb70-4067-4692-b746-9a02db63f461}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\CED\compact_enc_det">
<UniqueIdentifier>{8d78b8ca-ff0f-46cb-8da2-83c4bde259b9}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\CED\util">
<UniqueIdentifier>{dbeb3dd1-1f65-45ec-a526-dc0e84e4c350}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\CED\util\encodings">
<UniqueIdentifier>{1d7878c8-36e3-4bae-91d9-fda61101aa81}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\CED\util\languages">
<UniqueIdentifier>{fd5165c7-e622-408b-95f0-666d494aa8f1}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\tinyexpr">
<UniqueIdentifier>{1de8e161-7393-4043-be9d-7bd2d0cb02df}</UniqueIdentifier>
</Filter>
@ -93,18 +78,6 @@
<ClCompile Include="Encoding.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\ced\ced\util\languages\languages.cc">
<Filter>Source Files\CED\util\languages</Filter>
</ClCompile>
<ClCompile Include="..\ced\ced\util\encodings\encodings.cc">
<Filter>Source Files\CED\util\encodings</Filter>
</ClCompile>
<ClCompile Include="..\ced\ced\compact_enc_det\compact_enc_det.cc">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClCompile>
<ClCompile Include="..\ced\ced\compact_enc_det\compact_enc_det_hint_code.cc">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClCompile>
<ClCompile Include="..\tinyexpr\tinyexpr.c">
<Filter>Source Files\tinyexpr</Filter>
</ClCompile>
@ -473,51 +446,6 @@
<ClInclude Include="Encoding.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\basictypes.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\case_insensitive_hash.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\commandlineflags.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\logging.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\port.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\string_util.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\varsetter.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\languages\languages.h">
<Filter>Source Files\CED\util\languages</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\languages\languages.pb.h">
<Filter>Source Files\CED\util\languages</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\encodings\encodings.h">
<Filter>Source Files\CED\util\encodings</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\encodings\encodings.pb.h">
<Filter>Source Files\CED\util\encodings</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det.h">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_generated_tables.h">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_generated_tables2.h">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_hint_code.h">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClInclude>
<ClInclude Include="..\language\common_res.h">
<Filter>Header Files</Filter>
</ClInclude>

19
src/Notepad3DLL.vcxproj
View File

@ -364,10 +364,6 @@
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\ced\ced\compact_enc_det\compact_enc_det.cc" />
<ClCompile Include="..\ced\ced\compact_enc_det\compact_enc_det_hint_code.cc" />
<ClCompile Include="..\ced\ced\util\encodings\encodings.cc" />
<ClCompile Include="..\ced\ced\util\languages\languages.cc" />
<ClCompile Include="..\crypto\crypto.c" />
<ClCompile Include="..\crypto\rijndael-alg-fst.c" />
<ClCompile Include="..\crypto\rijndael-api-fst.c" />
@ -493,21 +489,6 @@
<ClCompile Include="Styles.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det.h" />
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_generated_tables.h" />
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_generated_tables2.h" />
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_hint_code.h" />
<ClInclude Include="..\ced\ced\util\basictypes.h" />
<ClInclude Include="..\ced\ced\util\case_insensitive_hash.h" />
<ClInclude Include="..\ced\ced\util\commandlineflags.h" />
<ClInclude Include="..\ced\ced\util\encodings\encodings.h" />
<ClInclude Include="..\ced\ced\util\encodings\encodings.pb.h" />
<ClInclude Include="..\ced\ced\util\languages\languages.h" />
<ClInclude Include="..\ced\ced\util\languages\languages.pb.h" />
<ClInclude Include="..\ced\ced\util\logging.h" />
<ClInclude Include="..\ced\ced\util\port.h" />
<ClInclude Include="..\ced\ced\util\string_util.h" />
<ClInclude Include="..\ced\ced\util\varsetter.h" />
<ClInclude Include="..\crypto\crypto.h" />
<ClInclude Include="..\crypto\rijndael-alg-fst.h" />
<ClInclude Include="..\crypto\rijndael-api-fst.h" />

72
src/Notepad3DLL.vcxproj.filters
View File

@ -25,21 +25,6 @@
<Filter Include="Source Files\ChooseFont">
<UniqueIdentifier>{a6270a0b-5c38-4e68-b38c-5795ccb57302}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\CED">
<UniqueIdentifier>{91d2fb70-4067-4692-b746-9a02db63f461}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\CED\compact_enc_det">
<UniqueIdentifier>{8d78b8ca-ff0f-46cb-8da2-83c4bde259b9}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\CED\util">
<UniqueIdentifier>{dbeb3dd1-1f65-45ec-a526-dc0e84e4c350}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\CED\util\encodings">
<UniqueIdentifier>{1d7878c8-36e3-4bae-91d9-fda61101aa81}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\CED\util\languages">
<UniqueIdentifier>{fd5165c7-e622-408b-95f0-666d494aa8f1}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\tinyexpr">
<UniqueIdentifier>{1de8e161-7393-4043-be9d-7bd2d0cb02df}</UniqueIdentifier>
</Filter>
@ -93,18 +78,6 @@
<ClCompile Include="Encoding.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\ced\ced\util\languages\languages.cc">
<Filter>Source Files\CED\util\languages</Filter>
</ClCompile>
<ClCompile Include="..\ced\ced\util\encodings\encodings.cc">
<Filter>Source Files\CED\util\encodings</Filter>
</ClCompile>
<ClCompile Include="..\ced\ced\compact_enc_det\compact_enc_det.cc">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClCompile>
<ClCompile Include="..\ced\ced\compact_enc_det\compact_enc_det_hint_code.cc">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClCompile>
<ClCompile Include="..\tinyexpr\tinyexpr.c">
<Filter>Source Files\tinyexpr</Filter>
</ClCompile>
@ -473,51 +446,6 @@
<ClInclude Include="Encoding.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\basictypes.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\case_insensitive_hash.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\commandlineflags.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\logging.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\port.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\string_util.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\varsetter.h">
<Filter>Source Files\CED\util</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\languages\languages.h">
<Filter>Source Files\CED\util\languages</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\languages\languages.pb.h">
<Filter>Source Files\CED\util\languages</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\encodings\encodings.h">
<Filter>Source Files\CED\util\encodings</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\util\encodings\encodings.pb.h">
<Filter>Source Files\CED\util\encodings</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det.h">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_generated_tables.h">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_generated_tables2.h">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClInclude>
<ClInclude Include="..\ced\ced\compact_enc_det\compact_enc_det_hint_code.h">
<Filter>Source Files\CED\compact_enc_det</Filter>
</ClInclude>
<ClInclude Include="..\language\common_res.h">
<Filter>Header Files</Filter>
</ClInclude>

4
src/TypeDefs.h
View File

@ -471,8 +471,8 @@ typedef struct _settings2_t
int CurrentLineVerticalSlop;
float AnalyzeReliableConfidenceLevel;
float ReliableCEDConfidenceMapping; // = 0.85f;
float UnReliableCEDConfidenceMapping; //= 0.20f;
//~float ReliableCEDConfidenceMapping; // = 0.85f;
//~float UnReliableCEDConfidenceMapping; //= 0.20f;
WCHAR PreferredLanguageLocaleName[LOCALE_NAME_MAX_LENGTH+1];
WCHAR DefaultExtension[64];

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 503
#define VERSION_BUILD 1688
#define VERSION_BUILD 1689
#define SCINTILLA_VER 415
#define ONIGMO_REGEX_VER 6.2.0
#define VERSION_PATCH RC