diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp index ebcf270eb47..63b7f13f389 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp +++ b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp @@ -124,14 +124,18 @@ XeTeXFontMgr::findFont(const char* name, char* variant, double ptSize) if (f != nameToFamily.end()) { // look for a family member with the "regular" bit set in OS/2 + int regFonts = 0; for (i = f->second->styles->begin(); i != f->second->styles->end(); ++i) if (i->second->isReg) { - font = i->second; - break; + if (regFonts == 0) + font = i->second; + ++regFonts; } - - if (font == NULL) { - // try for style "Regular", "Plain", or "Normal" + + // families with Ornament or similar fonts may flag those as Regular, + // which confuses the search above... so try some known names + if (font == NULL || regFonts > 1) { + // try for style "Regular", "Plain", "Normal", "Roman" i = f->second->styles->find("Regular"); if (i != f->second->styles->end()) font = i->second; @@ -143,6 +147,11 @@ XeTeXFontMgr::findFont(const char* name, char* variant, double ptSize) i = f->second->styles->find("Normal"); if (i != f->second->styles->end()) font = i->second; + else { + i = f->second->styles->find("Roman"); + if (i != f->second->styles->end()) + font = i->second; + } } } } |