From ab8ef38b0c853b44e42cd6ef0c9f08a5a8834915 Mon Sep 17 00:00:00 2001
From: XProger <xproger@list.ru>
Date: Sat, 30 Mar 2019 17:35:51 +0300
Subject: [PATCH] fix japanese glyphs

---
 src/lang/glyph_ja.bmp     | Bin 14910 -> 14910 bytes
 src/lang/glyph_ja.h       |   6 +++---
 src/lang/ja.h             |   2 +-
 src/tools/glyphs/main.cpp | Bin 22808 -> 22818 bytes
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lang/glyph_ja.bmp b/src/lang/glyph_ja.bmp
index 83b5e58e94de9ee3f794eb816d5a16f9a1b25109..775762c93fd16e8810bf02e6bd410456a8d58cba 100644
GIT binary patch
delta 43
ecmdm2vae)<!^VVrmI@3=fDy=Mf%8Eu0R{ln$OV=F

delta 18
acmdm2vae)<!(<mTiOB(G92*_(Spon}Uk8H#

diff --git a/src/lang/glyph_ja.h b/src/lang/glyph_ja.h
index de8c298..f9754c2 100644
--- a/src/lang/glyph_ja.h
+++ b/src/lang/glyph_ja.h
@@ -7,8 +7,6 @@ static unsigned char GLYPH_JA[] = {
 	0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xd0, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x01, 0x00, 0x10, 0x8c, 0x0c, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 
 	0x00, 0x80, 0x10, 0x84, 0x42, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -934,7 +932,9 @@ static unsigned char GLYPH_JA[] = {
 	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 0x00, 0x40, 0x07, 0x80, 
 	0x00, 0x00, 0x03, 0xf0, 0x00, 0x00, 0x10, 0x00, 0x04, 0xc0, 0x04, 0x00, 0x11, 0x22, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x07, 0xe0, 0x04, 0x00, 
-	0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x10, 0x00, 0x04, 0x00, 0x04, 0x00, 0x11, 0xfe, 
+	0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x10, 0x00, 0x04, 0x00, 0x04, 0x00, 0x11, 0xfe, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 
 };
 
 #endif
diff --git a/src/lang/ja.h b/src/lang/ja.h
index 9932fbd..1fff489 100644
--- a/src/lang/ja.h
+++ b/src/lang/ja.h
@@ -280,7 +280,7 @@ const char *STR_JA[] = { "日本語"
 #endif
 
 #define JA_GLYPH_COUNT 452
-#define JA_GLYPH_BASE 1
+#define JA_GLYPH_BASE 0
 const uint8 JA_GLYPH_WIDTH[] = {
     16, 16, 15, 14, 6, 10, 16, 15, 16, 6, 16, 16, 15, 16, 15, 16, 
     15, 15, 15, 16, 16, 14, 15, 15, 15, 15, 16, 16, 17, 14, 17, 14, 
diff --git a/src/tools/glyphs/main.cpp b/src/tools/glyphs/main.cpp
index a917fb091871c3864b55071fe7bda67f5ffa4cb3..389405a52978a5a0eee12a327b8a7616a0ce50a9 100644
GIT binary patch
delta 84
zcmbQSiE+^;#tmCMCQEShO}=2vrdiBT!cfGJ%#h1az@Wk4!{Er^$KcKo&)~`6!l1*T
oz@Wt71r$?a(42hHOm*@ncZtdC7&#^{kl>iS&t7P=o988d0L2^@?f?J)

delta 80
zcmZ3qiE+jz#tmCMCW}N!DCaVyGL$eBF=R3%GZZseF(@#oGNeGs7=}CsB?g_zz8<Q)
bIzX`!hFk_c5INb`Pjd1yCxOi&p6B=hGFub3