Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

ZRColaCompile: Evaluate Unicode Combining against Times New Roman font

Browse Source 
The ZRCola font doesn't stack multiple Unicode Combining characters
properly.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2021-04-09 13:11:24 +02:00
parent dbf3354a1a
commit 4995ea5a08
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ZRColaCompile/main.cpp
View File

@ -520,17 +520,30 @@ int _tmain(int argc, _TCHAR *argv[])
com_obj<ADORecordset> rs2; com_obj<ADORecordset> rs2;
if (src.SelectPUACharacters(rs2)) { if (src.SelectPUACharacters(rs2)) {
// Parse characters and build translations. // Parse characters and build translations.
static const LOGFONT lf_zrcola = { static const LOGFONT
-FONT_MATCH_HEIGHT/2, 0, lf_zrcola = {
0, 0, -FONT_MATCH_HEIGHT/2, 0,
FW_NORMAL, 0, 0,
FALSE, FALSE, FALSE, FW_NORMAL,
ANSI_CHARSET, FALSE, FALSE, FALSE,
OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, ANSI_CHARSET,
DEFAULT_PITCH | FF_DONTCARE, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
TEXT("ZRCola") DEFAULT_PITCH | FF_DONTCARE,
}; TEXT("ZRCola")
gdi_handle<HFONT> fnt_zrcola(::CreateFontIndirect(&lf_zrcola)); },
lf_times = {
-FONT_MATCH_HEIGHT/2, 0,
0, 0,
FW_NORMAL,
FALSE, FALSE, FALSE,
ANSI_CHARSET,
OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
DEFAULT_PITCH | FF_DONTCARE,
TEXT("Times New Roman")
};
gdi_handle<HFONT>
fnt_zrcola(::CreateFontIndirect(&lf_zrcola)),
fnt_times (::CreateFontIndirect(&lf_times ));
gdi_handle<HBRUSH> brush_bg(::CreateSolidBrush(RGB(0x00, 0x00, 0x00))); gdi_handle<HBRUSH> brush_bg(::CreateSolidBrush(RGB(0x00, 0x00, 0x00)));
gdi_handle<HBITMAP> gdi_handle<HBITMAP>
bmp_orig(::CreateBitmap(FONT_MATCH_WIDTH, FONT_MATCH_HEIGHT, 1, 1, NULL)), bmp_orig(::CreateBitmap(FONT_MATCH_WIDTH, FONT_MATCH_HEIGHT, 1, 1, NULL)),
@ -554,8 +567,8 @@ int _tmain(int argc, _TCHAR *argv[])
SetTextAlign(dc_pre , TA_BASELINE | TA_CENTER | TA_NOUPDATECP); SetTextAlign(dc_pre , TA_BASELINE | TA_CENTER | TA_NOUPDATECP);
dc_selector dc_selector
selector_font_orig(dc_orig, fnt_zrcola), selector_font_orig(dc_orig, fnt_zrcola),
selector_font_comb(dc_comb, fnt_zrcola), selector_font_comb(dc_comb, fnt_times ),
selector_font_pre (dc_pre , fnt_zrcola); selector_font_pre (dc_pre , fnt_times );
struct { struct {
BITMAPINFOHEADER bmiHeader; BITMAPINFOHEADER bmiHeader;
RGBQUAD bmiColors[2]; RGBQUAD bmiColors[2];

BIN
output/data/ZRCola.zrcdb
View File

Binary file not shown.