rtoss

Subversion Repositories:
Compare Path: Rev
With Path: Rev
/ @ 324  →  / @ 325
/GreenPad/editwing/ewCommon.h
@@ -176,6 +176,10 @@
}
void SetFont( const TCHAR* fnam, int fsiz, char fontCS )
{
SetFont( fnam,fsiz,fontCS,DEFAULT_QUALITY );
}
void SetFont( const TCHAR* fnam, int fsiz, char fontCS, int qual )
{
fontsize = fsiz;
font.lfWidth = 0;
font.lfEscapement = 0;
@@ -186,7 +190,7 @@
font.lfStrikeOut = FALSE;
font.lfOutPrecision = OUT_DEFAULT_PRECIS;
font.lfClipPrecision = CLIP_DEFAULT_PRECIS;
font.lfQuality = DEFAULT_QUALITY;
font.lfQuality = qual;
font.lfPitchAndFamily = VARIABLE_PITCH|FF_DONTCARE;
font.lfCharSet = fontCS;
 
/GreenPad/ConfigManager.cpp
@@ -444,6 +444,7 @@
dt->wrapType = ref->wrapType;
dt->showLN = ref->showLN;
dt->fontCS = ref->fontCS;
dt->fontQual = ref->fontQual;
}
else
{
@@ -461,6 +462,7 @@
dt->wrapType = -1;
dt->showLN = false;
dt->fontCS = DEFAULT_CHARSET;
dt->fontQual = DEFAULT_QUALITY;
dt->vc.SetFont( TEXT("FixedSys"), 14, dt->fontCS );
}
 
@@ -532,13 +534,16 @@
case 0x006C006E: // ln: LINE-NO
dt->showLN = (0!=GetInt(ptr));
break;
case 0x00660071: // fq: Font Quality
dt->fontQual = GetInt(ptr);
break;
}
}
 
if( !clfound )
dt->vc.color[LN] = dt->vc.color[TXT];
if( fontname.len()!=0 && fontsize!=0 )
dt->vc.SetFont( fontname.c_str(), fontsize, dt->fontCS );
dt->vc.SetFont( fontname.c_str(), fontsize, dt->fontCS, dt->fontQual );
}
}
 
/GreenPad/ConfigManager.h
@@ -153,6 +153,7 @@
int wrapWidth;
bool showLN;
char fontCS;
int fontQual;
};
typedef ki::olist<DocType> DtList;
 
/GreenPad/kilib/textfile.cpp
@@ -1372,6 +1372,19 @@
DetectEncodingInfo detectEnc[5];
lang->DetectInputCodepage(MLDETECTCP_DBCS, 0, (char *)(ptr), (INT *)(&siz), detectEnc, &detectEncCount); // 2 ugly C-cast here
 
# ifdef MLANG_DEBUG
TCHAR otmp[1024];
TCHAR stmp[64];
::wsprintf(otmp,TEXT("detectEncCount = %d\n"),detectEncCount);
 
for(int decCnt=0;decCnt<detectEncCount;decCnt++){
::wsprintf(stmp,TEXT("detectEnc[%d] = %d (Conf.: %d)\n"),detectEncCount, detectEnc[decCnt].nCodePage, detectEnc[decCnt].nConfidence);
::wsprintf(otmp,TEXT("%s%s\n"),otmp,stmp);
 
}
::MessageBox(NULL,otmp,TEXT("MLangDetect"),0);
# endif
 
// MLang fine tunes
if ( detectEncCount > 1 && detectEnc[0].nCodePage == 1252 ) // sometimes it gives multiple results with 1252 in the first
{
@@ -1413,6 +1426,7 @@
# endif
 
if (cs == 20127) cs = 0; // 20127 == ASCII, 0 = unknown
if (cs == 65000) cs = 0; // 65000 == UTF-7, let's disable misdetecting as UTF-7
 
if (lang)
lang->Release();
/GreenPad/kilib_vc71.vcproj
@@ -61,8 +61,10 @@
IgnoreAllDefaultLibraries="TRUE"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile=".\release/GreenPad.pdb"
GenerateMapFile="TRUE"
GenerateMapFile="FALSE"
MapFileName=".\OBJ/vc71/reluni/GreenPad.map"
MapExports="FALSE"
MapLines="FALSE"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -146,6 +148,10 @@
IgnoreAllDefaultLibraries="FALSE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\OBJ/GreenPad.pdb"
GenerateMapFile="TRUE"
MapFileName=".\OBJ/vc71/dbg/GreenPad.map"
MapExports="TRUE"
MapLines="TRUE"
SubSystem="2"/>
<Tool
Name="VCMIDLTool"
@@ -1093,17 +1099,17 @@
WholeProgramOptimization="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug Win32s|Win32">
Name="Release Win32s|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
EnableIntrinsicFunctions="FALSE"
WholeProgramOptimization="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Release Win32s|Win32">
Name="Debug Win32s|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
EnableIntrinsicFunctions="FALSE"
WholeProgramOptimization="FALSE"/>
</FileConfiguration>
@@ -1180,14 +1186,14 @@
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug Win32s|Win32">
Name="Release Win32s|Win32">
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="TRUE"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release Win32s|Win32">
Name="Debug Win32s|Win32">
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="TRUE"