[Scummvm-git-logs] scummvm master -> ea7d0989139b1f8393d099a076fd66168b30a145
djsrv
dservilla at gmail.com
Mon Jul 12 22:56:03 UTC 2021
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ad79812cc6 GRAPHICS: MACGUI: Introduce font aliases
de929228c4 GRAPHICS: MACGUI: Add Japanese mode
6b02cb4820 DIRECTOR: Pass language to window manager
6621b6121d GRAPHICS: MACGUI: Fix ID at which Japanese fonts start
ea7d098913 GRAPHICS: MACGUI: Clean up comments
Commit: ad79812cc6ee729d7040a81e00917a71958bbb59
https://github.com/scummvm/scummvm/commit/ad79812cc6ee729d7040a81e00917a71958bbb59
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-12T18:02:56-04:00
Commit Message:
GRAPHICS: MACGUI: Introduce font aliases
Easy way of adding more font IDs and names for the same font.
Changed paths:
graphics/macgui/macfontmanager.cpp
graphics/macgui/macfontmanager.h
diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 60791be8b6..57b4bfd35e 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -38,48 +38,59 @@ static struct FontProto {
int id;
Common::Language lang;
Common::CodePage encoding;
- int fallbackId;
const char *name;
} defaultFonts[] = {
+ { 2, Common::UNK_LANG, Common::kMacRoman, "New York" },
+ { 3, Common::UNK_LANG, Common::kMacRoman, "Geneva" },
+ { 4, Common::UNK_LANG, Common::kMacRoman, "Monaco" },
+ { 5, Common::UNK_LANG, Common::kMacRoman, "Venice" },
+ { 6, Common::UNK_LANG, Common::kMacRoman, "London" },
+ { 7, Common::UNK_LANG, Common::kMacRoman, "Athens" },
+ { 8, Common::UNK_LANG, Common::kMacRoman, "San Francisco" },
+ { 9, Common::UNK_LANG, Common::kMacRoman, "Toronto" },
+ { 11, Common::UNK_LANG, Common::kMacRoman, "Cairo" },
+ { 12, Common::UNK_LANG, Common::kMacRoman, "Los Angeles" },
+ { 13, Common::UNK_LANG, Common::kMacRoman, "Zapf Dingbats" },
+ { 14, Common::UNK_LANG, Common::kMacRoman, "Bookman" },
+ { 15, Common::UNK_LANG, Common::kMacRoman, "Helvetica Narrow" },
+ { 16, Common::UNK_LANG, Common::kMacRoman, "Palatino" },
+ { 18, Common::UNK_LANG, Common::kMacRoman, "Zapf Chancery" },
+ { 20, Common::UNK_LANG, Common::kMacRoman, "Times" }, // 20
+ { 21, Common::UNK_LANG, Common::kMacRoman, "Helvetica" },
+ { 22, Common::UNK_LANG, Common::kMacRoman, "Courier" },
+ { 23, Common::UNK_LANG, Common::kMacRoman, "Symbol" },
+ { 24, Common::UNK_LANG, Common::kMacRoman, "Taliesin" }, // mobile?
+ { 33, Common::UNK_LANG, Common::kMacRoman, "Avant Garde" },
+ { 34, Common::UNK_LANG, Common::kMacRoman, "New Century Schoolbook" },
+ { 16383, Common::UNK_LANG, Common::kMacRoman, "Chicago" },
+
+ // Japanese (names are Shift JIS encoded)
+ { 16384, Common::JA_JPN, Common::kUtf8, "Osaka" },
+ { 16436, Common::JA_JPN, Common::kUtf8, "Osaka\x81\x7C\x93\x99\x95\x9D" }, // Osaka Mono
+
+ { -1, Common::UNK_LANG, Common::kCodePageInvalid, NULL }
+};
+
+static struct AliasProto {
+ int id;
+ int aliasForId;
+ const char *name;
+} defaultAliases[] = {
// Latin
- { 0, Common::UNK_LANG, Common::kMacRoman, -1, "Chicago" }, // system font
- { 1, Common::UNK_LANG, Common::kMacRoman, -1, "Geneva" }, // application font
- { 2, Common::UNK_LANG, Common::kMacRoman, -1, "New York" },
- { 3, Common::UNK_LANG, Common::kMacRoman, -1, "Geneva" },
- { 4, Common::UNK_LANG, Common::kMacRoman, -1, "Monaco" },
- { 5, Common::UNK_LANG, Common::kMacRoman, -1, "Venice" },
- { 6, Common::UNK_LANG, Common::kMacRoman, -1, "London" },
- { 7, Common::UNK_LANG, Common::kMacRoman, -1, "Athens" },
- { 8, Common::UNK_LANG, Common::kMacRoman, -1, "San Francisco" },
- { 9, Common::UNK_LANG, Common::kMacRoman, -1, "Toronto" },
- { 11, Common::UNK_LANG, Common::kMacRoman, -1, "Cairo" },
- { 12, Common::UNK_LANG, Common::kMacRoman, -1, "Los Angeles" },
- { 13, Common::UNK_LANG, Common::kMacRoman, -1, "Zapf Dingbats" },
- { 14, Common::UNK_LANG, Common::kMacRoman, -1, "Bookman" },
- { 15, Common::UNK_LANG, Common::kMacRoman, -1, "Helvetica Narrow" },
- { 16, Common::UNK_LANG, Common::kMacRoman, -1, "Palatino" },
- { 18, Common::UNK_LANG, Common::kMacRoman, -1, "Zapf Chancery" },
- { 20, Common::UNK_LANG, Common::kMacRoman, -1, "Times" }, // 20
- { 21, Common::UNK_LANG, Common::kMacRoman, -1, "Helvetica" },
- { 22, Common::UNK_LANG, Common::kMacRoman, -1, "Courier" },
- { 23, Common::UNK_LANG, Common::kMacRoman, -1, "Symbol" },
- { 24, Common::UNK_LANG, Common::kMacRoman, -1, "Taliesin" }, // mobile?
- { 33, Common::UNK_LANG, Common::kMacRoman, -1, "Avant Garde" },
- { 34, Common::UNK_LANG, Common::kMacRoman, -1, "New Century Schoolbook" },
+ { 0, 16383, "System" }, // system font - Chicago by default
+ { 1, 3, "Application" }, // application font - Geneva by default
// Japanese (names are Shift JIS encoded)
- { 16384, Common::JA_JPN, Common::kUtf8, -1, "Osaka" },
- { 16396, Common::JA_JPN, Common::kUtf8, 16384, "\x96\x7B\x96\xBE\x92\xA9\x81\x7C\x82\x6C" }, // Book Mincho - M
- { 16433, Common::JA_JPN, Common::kUtf8, 16436, "\x93\x99\x95\x9D\x83\x53\x83\x56\x83\x62\x83\x4E" }, // Mono Gothic
- { 16435, Common::JA_JPN, Common::kUtf8, 16436, "\x93\x99\x95\x9D\x96\xBE\x92\xA9" }, // Mono Ming
- { 16436, Common::JA_JPN, Common::kUtf8, -1, "Osaka\x81\x7C\x93\x99\x95\x9D" }, // Osaka Mono
- { 16436, Common::JA_JPN, Common::kUtf8, -1, "OsakaMono" }, // redundant entry is to register English name
- { 16640, Common::JA_JPN, Common::kUtf8, 16384, "\x92\x86\x83\x53\x83\x56\x83\x62\x83\x4E\x91\xCC" }, // Medium Gothic
- { 16641, Common::JA_JPN, Common::kUtf8, 16384, "\x8D\xD7\x96\xBE\x92\xA9\x91\xCC" }, // Ming
- { 16700, Common::JA_JPN, Common::kUtf8, 16384, "\x95\xBD\x90\xAC\x96\xBE\x92\xA9" }, // Heisi Mincho
- { 16701, Common::JA_JPN, Common::kUtf8, 16384, "\x95\xBD\x90\xAC\x8A\x70\x83\x53\x83\x56\x83\x62\x83\x4E" }, // Heisei Kaku Gothic
-
- { -1, Common::UNK_LANG, Common::kCodePageInvalid, -1, NULL }
+ { 16396, 16384, "\x96\x7B\x96\xBE\x92\xA9\x81\x7C\x82\x6C" }, // Book Mincho - M
+ { 16433, 16436, "\x93\x99\x95\x9D\x83\x53\x83\x56\x83\x62\x83\x4E" }, // Mono Gothic
+ { 16435, 16436, "\x93\x99\x95\x9D\x96\xBE\x92\xA9" }, // Mono Ming
+ { 16436, 16436, "OsakaMono" },
+ { 16640, 16384, "\x92\x86\x83\x53\x83\x56\x83\x62\x83\x4E\x91\xCC" }, // Medium Gothic
+ { 16641, 16384, "\x8D\xD7\x96\xBE\x92\xA9\x91\xCC" }, // Ming
+ { 16700, 16384, "\x95\xBD\x90\xAC\x96\xBE\x92\xA9" }, // Heisi Mincho
+ { 16701, 16384, "\x95\xBD\x90\xAC\x8A\x70\x83\x53\x83\x56\x83\x62\x83\x4E" }, // Heisei Kaku Gothic
+
+ { -1, -1, NULL }
};
static const char *const fontStyleSuffixes[] = {
@@ -121,7 +132,6 @@ MacFontManager::MacFontManager(uint32 mode) : _mode(mode) {
FontInfo *info = new FontInfo;
info->lang = font->lang;
info->encoding = font->encoding;
- info->fallbackId = font->fallbackId;
info->name = font->name;
_fontInfo[font->id] = info;
}
@@ -129,6 +139,17 @@ MacFontManager::MacFontManager(uint32 mode) : _mode(mode) {
_fontIds[font->name] = font->id;
}
}
+ for (AliasProto *alias = defaultAliases; alias->name; alias++) {
+ if (!_fontInfo.contains(alias->id)) {
+ FontInfo *info = new FontInfo;
+ info->aliasForId = alias->aliasForId;
+ info->name = alias->name;
+ _fontInfo[alias->id] = info;
+ }
+ if (!_fontIds.contains(alias->name)) {
+ _fontIds[alias->name] = alias->id;
+ }
+ }
if (_mode & MacGUIConstants::kWMModeForceBuiltinFonts) {
_builtInFonts = true;
@@ -373,9 +394,9 @@ const Font *MacFontManager::getFont(MacFont macFont) {
Common::String name;
const Font *font = 0;
- int fallbackId = getFontFallbackId(macFont.getId());
- if (fallbackId > -1) {
- macFont.setId(fallbackId);
+ int aliasForId = getFontAliasForId(macFont.getId());
+ if (aliasForId > -1) {
+ macFont.setId(aliasForId);
}
if (!_builtInFonts) {
@@ -537,6 +558,9 @@ Common::Language MacFontManager::getFontLanguage(uint16 id) {
warning("MacFontManager::getFontLanguage: No _fontInfo entry for font %d", id);
return Common::UNK_LANG;
}
+ if (_fontInfo[id]->aliasForId > -1) {
+ return getFontLanguage(_fontInfo[id]->aliasForId);
+ }
return _fontInfo[id]->lang;
}
@@ -545,22 +569,28 @@ Common::CodePage MacFontManager::getFontEncoding(uint16 id) {
warning("MacFontManager::getFontEncoding: No _fontInfo entry for font %d", id);
return Common::kCodePageInvalid;
}
+ if (_fontInfo[id]->aliasForId > -1) {
+ return getFontEncoding(_fontInfo[id]->aliasForId);
+ }
return _fontInfo[id]->encoding;
}
-int MacFontManager::getFontFallbackId(uint16 id) {
+int MacFontManager::getFontAliasForId(uint16 id) {
if (!_fontInfo.contains(id)) {
- warning("MacFontManager::getFontFallbackId: No _fontInfo entry for font %d", id);
+ warning("MacFontManager::getFontAliasForId: No _fontInfo entry for font %d", id);
return -1;
}
- return _fontInfo[id]->fallbackId;
+ return _fontInfo[id]->aliasForId;
}
Common::String MacFontManager::getFontName(uint16 id) {
if (!_fontInfo.contains(id)) {
- warning("MacFontManager::getFontFallbackId: No _fontInfo entry for font %d", id);
+ warning("MacFontManager::getFontAliasForId: No _fontInfo entry for font %d", id);
return "";
}
+ if (_fontInfo[id]->aliasForId > -1) {
+ return getFontName(_fontInfo[id]->aliasForId);
+ }
return _fontInfo[id]->name;
}
diff --git a/graphics/macgui/macfontmanager.h b/graphics/macgui/macfontmanager.h
index 577a1f56c1..8cb9faab8c 100644
--- a/graphics/macgui/macfontmanager.h
+++ b/graphics/macgui/macfontmanager.h
@@ -71,10 +71,10 @@ class Font;
struct FontInfo {
Common::Language lang;
Common::CodePage encoding;
- int fallbackId;
+ int aliasForId;
Common::String name;
- FontInfo() : lang(Common::UNK_LANG), encoding(Common::kCodePageInvalid), fallbackId(-1) {}
+ FontInfo() : lang(Common::UNK_LANG), encoding(Common::kCodePageInvalid), aliasForId(-1) {}
};
class MacFont {
@@ -145,7 +145,7 @@ public:
Common::Language getFontLanguage(uint16 id);
Common::CodePage getFontEncoding(uint16 id);
- int getFontFallbackId(uint16 id);
+ int getFontAliasForId(uint16 id);
Common::String getFontName(uint16 id);
void loadFonts(Common::SeekableReadStream *stream);
Commit: de929228c4ed9c82fb81748c8235e6a99acedaf7
https://github.com/scummvm/scummvm/commit/de929228c4ed9c82fb81748c8235e6a99acedaf7
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-12T18:02:56-04:00
Commit Message:
GRAPHICS: MACGUI: Add Japanese mode
Changed paths:
graphics/macgui/macfontmanager.cpp
graphics/macgui/macfontmanager.h
graphics/macgui/macwindowmanager.cpp
graphics/macgui/macwindowmanager.h
diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 57b4bfd35e..66a2f5cca5 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -71,15 +71,13 @@ static struct FontProto {
{ -1, Common::UNK_LANG, Common::kCodePageInvalid, NULL }
};
-static struct AliasProto {
+struct AliasProto {
int id;
int aliasForId;
const char *name;
-} defaultAliases[] = {
- // Latin
- { 0, 16383, "System" }, // system font - Chicago by default
- { 1, 3, "Application" }, // application font - Geneva by default
+};
+static AliasProto defaultAliases[] = {
// Japanese (names are Shift JIS encoded)
{ 16396, 16384, "\x96\x7B\x96\xBE\x92\xA9\x81\x7C\x82\x6C" }, // Book Mincho - M
{ 16433, 16436, "\x93\x99\x95\x9D\x83\x53\x83\x56\x83\x62\x83\x4E" }, // Mono Gothic
@@ -93,6 +91,18 @@ static struct AliasProto {
{ -1, -1, NULL }
};
+static AliasProto latinModeAliases[] = {
+ { 0, 16383, "System" }, // Chicago
+ { 1, 3, "Application" }, // Geneva
+ { -1, -1, NULL }
+};
+
+static AliasProto japaneseModeAliases[] = {
+ { 0, 16384, "System" }, // Osaka
+ { 1, 16384, "Application" }, // Osaka
+ { -1, -1, NULL }
+};
+
static const char *const fontStyleSuffixes[] = {
"",
"Bold",
@@ -126,7 +136,7 @@ Common::String cleanFontName(const Common::String fontname) {
return f;
}
-MacFontManager::MacFontManager(uint32 mode) : _mode(mode) {
+MacFontManager::MacFontManager(uint32 mode, Common::Language language) : _mode(mode), _language(language) {
for (FontProto *font = defaultFonts; font->name; font++) {
if (!_fontInfo.contains(font->id)) {
FontInfo *info = new FontInfo;
@@ -150,6 +160,7 @@ MacFontManager::MacFontManager(uint32 mode) : _mode(mode) {
_fontIds[alias->name] = alias->id;
}
}
+ setLocalizedFonts();
if (_mode & MacGUIConstants::kWMModeForceBuiltinFonts) {
_builtInFonts = true;
@@ -168,6 +179,26 @@ MacFontManager::~MacFontManager() {
delete it->_value;
}
+void MacFontManager::setLocalizedFonts() {
+ AliasProto *aliases = latinModeAliases;
+ if (_language == Common::JA_JPN) {
+ aliases = japaneseModeAliases;
+ loadJapaneseFonts();
+ }
+ for (AliasProto *alias = aliases; alias->name; alias++) {
+ if (_fontInfo.contains(alias->id)) {
+ // Overwrite the font info that's already registered in case
+ // we're switching languages or something.
+ delete _fontInfo[alias->id];
+ }
+ FontInfo *info = new FontInfo;
+ info->aliasForId = alias->aliasForId;
+ info->name = alias->name;
+ _fontInfo[alias->id] = info;
+ _fontIds[alias->name] = alias->id;
+ }
+}
+
void MacFontManager::loadFontsBDF() {
Common::Archive *dat;
diff --git a/graphics/macgui/macfontmanager.h b/graphics/macgui/macfontmanager.h
index 8cb9faab8c..dd959d0162 100644
--- a/graphics/macgui/macfontmanager.h
+++ b/graphics/macgui/macfontmanager.h
@@ -117,9 +117,11 @@ private:
class MacFontManager {
public:
- MacFontManager(uint32 mode);
+ MacFontManager(uint32 mode, Common::Language language);
~MacFontManager();
+ void setLocalizedFonts();
+
/**
* Accessor method to check the presence of built-in fonts.
* @return True if there are bult-in fonts.
@@ -178,6 +180,7 @@ private:
bool _builtInFonts;
bool _japaneseFontsLoaded;
uint32 _mode;
+ Common::Language _language;
Common::HashMap<Common::String, MacFont *> _fontRegistry;
Common::HashMap<int, FontInfo *> _fontInfo;
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 2a5fd4faef..83aae13419 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -155,7 +155,7 @@ static const byte macCursorCrossBar[] = {
static void menuTimerHandler(void *refCon);
-MacWindowManager::MacWindowManager(uint32 mode, MacPatterns *patterns) {
+MacWindowManager::MacWindowManager(uint32 mode, MacPatterns *patterns, Common::Language language) {
_screen = nullptr;
_screenCopy = nullptr;
_desktopBmp = nullptr;
@@ -169,6 +169,7 @@ MacWindowManager::MacWindowManager(uint32 mode, MacPatterns *patterns) {
_hoveredWidget = nullptr;
_mode = mode;
+ _language = language;
_menu = 0;
_menuDelay = 0;
@@ -210,7 +211,7 @@ MacWindowManager::MacWindowManager(uint32 mode, MacPatterns *patterns) {
memcpy(_palette, palette, _paletteSize * 3);
}
- _fontMan = new MacFontManager(mode);
+ _fontMan = new MacFontManager(mode, language);
_cursor = nullptr;
_cursorType = _tempType = kMacCursorArrow;
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index c8eb6ecaa0..dbace434cb 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -141,7 +141,7 @@ typedef void (* MacDrawPixPtr)(int, int, int, void *);
*/
class MacWindowManager {
public:
- MacWindowManager(uint32 mode = 0, MacPatterns *patterns = nullptr);
+ MacWindowManager(uint32 mode = 0, MacPatterns *patterns = nullptr, Common::Language language = Common::UNK_LANG);
~MacWindowManager();
MacDrawPixPtr getDrawPixel();
@@ -335,6 +335,7 @@ public:
public:
MacFontManager *_fontMan;
uint32 _mode;
+ Common::Language _language;
Common::Point _lastClickPos;
Common::Point _lastMousePos;
Commit: 6b02cb4820b426e9ea6cc584df5990999e49964c
https://github.com/scummvm/scummvm/commit/6b02cb4820b426e9ea6cc584df5990999e49964c
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-12T18:02:56-04:00
Commit Message:
DIRECTOR: Pass language to window manager
Changed paths:
engines/director/director.cpp
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 640be27f40..829378415d 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -155,7 +155,7 @@ Common::Error DirectorEngine::run() {
if (debugChannelSet(-1, kDebug32bpp))
wmMode |= Graphics::kWMMode32bpp;
- _wm = new Graphics::MacWindowManager(wmMode, &_director3QuickDrawPatterns);
+ _wm = new Graphics::MacWindowManager(wmMode, &_director3QuickDrawPatterns, getLanguage());
_wm->setEngine(this);
_pixelformat = _wm->_pixelformat;
Commit: 6621b6121d39ce1342ef6ca393ca988c1e56afdc
https://github.com/scummvm/scummvm/commit/6621b6121d39ce1342ef6ca393ca988c1e56afdc
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-12T18:02:56-04:00
Commit Message:
GRAPHICS: MACGUI: Fix ID at which Japanese fonts start
Changed paths:
graphics/macgui/macfontmanager.cpp
diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 66a2f5cca5..1197068854 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -542,7 +542,7 @@ int MacFontManager::registerFontName(Common::String name, int preferredId) {
FontInfo *info = new FontInfo;
info->name = name;
- if (preferredId >= 16000) {
+ if (preferredId >= 0x4000) {
info->lang = Common::JA_JPN;
info->encoding = Common::kWindows932; // default to Shift JIS
} else {
Commit: ea7d0989139b1f8393d099a076fd66168b30a145
https://github.com/scummvm/scummvm/commit/ea7d0989139b1f8393d099a076fd66168b30a145
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-12T18:02:56-04:00
Commit Message:
GRAPHICS: MACGUI: Clean up comments
Changed paths:
graphics/macgui/macfontmanager.cpp
diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 1197068854..bce16a9997 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -55,7 +55,7 @@ static struct FontProto {
{ 15, Common::UNK_LANG, Common::kMacRoman, "Helvetica Narrow" },
{ 16, Common::UNK_LANG, Common::kMacRoman, "Palatino" },
{ 18, Common::UNK_LANG, Common::kMacRoman, "Zapf Chancery" },
- { 20, Common::UNK_LANG, Common::kMacRoman, "Times" }, // 20
+ { 20, Common::UNK_LANG, Common::kMacRoman, "Times" },
{ 21, Common::UNK_LANG, Common::kMacRoman, "Helvetica" },
{ 22, Common::UNK_LANG, Common::kMacRoman, "Courier" },
{ 23, Common::UNK_LANG, Common::kMacRoman, "Symbol" },
@@ -78,14 +78,18 @@ struct AliasProto {
};
static AliasProto defaultAliases[] = {
- // Japanese (names are Shift JIS encoded)
+ // English names for Japanese fonts
+ { 16436, 16436, "OsakaMono" },
+
+ // Missing Japanese fonts
+ // These technically should be separate fonts, not just aliases for Osaka.
+ // However, we don't have a free source for these right now.
{ 16396, 16384, "\x96\x7B\x96\xBE\x92\xA9\x81\x7C\x82\x6C" }, // Book Mincho - M
{ 16433, 16436, "\x93\x99\x95\x9D\x83\x53\x83\x56\x83\x62\x83\x4E" }, // Mono Gothic
{ 16435, 16436, "\x93\x99\x95\x9D\x96\xBE\x92\xA9" }, // Mono Ming
- { 16436, 16436, "OsakaMono" },
{ 16640, 16384, "\x92\x86\x83\x53\x83\x56\x83\x62\x83\x4E\x91\xCC" }, // Medium Gothic
{ 16641, 16384, "\x8D\xD7\x96\xBE\x92\xA9\x91\xCC" }, // Ming
- { 16700, 16384, "\x95\xBD\x90\xAC\x96\xBE\x92\xA9" }, // Heisi Mincho
+ { 16700, 16384, "\x95\xBD\x90\xAC\x96\xBE\x92\xA9" }, // Heisei Mincho
{ 16701, 16384, "\x95\xBD\x90\xAC\x8A\x70\x83\x53\x83\x56\x83\x62\x83\x4E" }, // Heisei Kaku Gothic
{ -1, -1, NULL }
More information about the Scummvm-git-logs
mailing list