better font name handling

kerning moved to FontHelper
This commit is contained in:
Jindra Petřík
2014-10-26 12:36:56 +01:00
parent bcfb4a1c01
commit 093d17a055
24 changed files with 683 additions and 245 deletions

View File

@@ -1906,13 +1906,12 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
if (textTag.setFormattedText(new MissingCharacterHandler() {
@Override
public boolean handle(FontTag font, char character) {
String fontName = font.getSwf().sourceFontFamiliesMap.get(font.getFontId());
String fontName = font.getSwf().sourceFontNamesMap.get(font.getFontId());
if (fontName == null) {
fontName = font.getFontName();
}
fontName = FontTag.findInstalledFontFamily(fontName);
Font f = new Font(fontName, font.getFontStyle(), 18);
if (!f.canDisplay(character)) {
}
Font f = FontTag.installedFontsByName.get(fontName);
if (f == null || !f.canDisplay(character)) {
View.showMessageDialog(null, translate("error.font.nocharacter").replace("%char%", "" + character), translate("error"), JOptionPane.ERROR_MESSAGE);
return false;
}