Issue #389 Selecting font face while characters import

Issue #701 Importing from TTF file
Improved Font panel / Font embed dialog
Reloading installed fonts for other than windows systems
Removed xito Table Layout, using Oracle Table Layout instead
This commit is contained in:
Jindra Petřík
2014-10-25 20:58:32 +02:00
parent 1985ccb594
commit 8fd683d019
25 changed files with 665 additions and 4835 deletions
@@ -1954,7 +1954,7 @@ public class XFLConverter {
}
int fontStyle = font.getFontStyle();
String installedFont;
if ((installedFont = FontTag.isFontInstalled(fontName)) != null) {
if ((installedFont = FontTag.isFontFamilyInstalled(fontName)) != null) {
fontName = new Font(installedFont, fontStyle, 10).getPSName();
}
String embedRanges = "";
@@ -2458,7 +2458,7 @@ public class XFLConverter {
fontStyle = font.getFontStyle();
}
String installedFont;
if ((installedFont = FontTag.isFontInstalled(fontName)) != null) {
if ((installedFont = FontTag.isFontFamilyInstalled(fontName)) != null) {
psFontName = new Font(installedFont, fontStyle, 10).getPSName();
} else {
psFontName = fontName;
@@ -2616,7 +2616,7 @@ public class XFLConverter {
size = det.fontHeight;
fontFace = fontName;
String installedFont = null;
if ((installedFont = FontTag.isFontInstalled(fontName)) != null) {
if ((installedFont = FontTag.isFontFamilyInstalled(fontName)) != null) {
fontName = installedFont;
fontFace = new Font(installedFont, (italic ? Font.ITALIC : 0) | (bold ? Font.BOLD : 0) | (!italic && !bold ? Font.PLAIN : 0), size < 0 ? 10 : size).getPSName();
}
@@ -3355,7 +3355,7 @@ public class XFLConverter {
fontName = ft.getFontName();
}
String installedFont;
if ((installedFont = FontTag.isFontInstalled(fontName)) != null) {
if ((installedFont = FontTag.isFontFamilyInstalled(fontName)) != null) {
fontFace = new Font(installedFont, (italic ? Font.ITALIC : 0) | (bold ? Font.BOLD : 0) | (!italic && !bold ? Font.PLAIN : 0), size < 0 ? 10 : size).getPSName();
} else {
fontFace = fontName;