summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2012-09-06 12:31:14 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2012-09-06 12:31:14 +0000
commit3d35ef1512ddbbb3536ee7da4a32d0b4e741f9b7 (patch)
tree20eaa8e5bbcadbe2d0a7636c44352fb121bb18d0
parent1d9631c13b2d3c1b328fd37f7a3c8a1c33fe38eb (diff)
Tidy up code
git-svn-id: svn://tug.org/texlive/trunk@27607 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/xdvipdfmx/src/fontmap.c25
1 files changed, 3 insertions, 22 deletions
diff --git a/Build/source/texk/xdvipdfmx/src/fontmap.c b/Build/source/texk/xdvipdfmx/src/fontmap.c
index f78b8370694..da236ac947d 100644
--- a/Build/source/texk/xdvipdfmx/src/fontmap.c
+++ b/Build/source/texk/xdvipdfmx/src/fontmap.c
@@ -1057,7 +1057,6 @@ pdf_load_fontmap_file (const char *filename, int mode)
}
#ifdef XETEX
-
static int
pdf_insert_native_fontmap_record (const char *name, const char *path, int index, FT_Face face,
int layout_dir, int extend, int slant, int embolden)
@@ -1162,8 +1161,6 @@ pdf_load_native_font (const char *ps_name,
static int sInitialized = 0;
int error = -1;
-#ifdef XETEX_MAC
-
if (!sInitialized) {
if (FT_Init_FreeType(&ftLib) != 0) {
WARN("FreeType initialization failed.");
@@ -1177,6 +1174,7 @@ pdf_load_native_font (const char *ps_name,
error = pdf_load_native_font_from_path(ps_name, layout_dir, extend, slant, embolden);
}
else {
+#ifdef XETEX_MAC
CFStringRef theName = CFStringCreateWithCStringNoCopy(kCFAllocatorDefault,
ps_name, kCFStringEncodingASCII, kCFAllocatorNull);
ATSFontRef fontRef = ATSFontFindFromPostScriptName(theName, kATSOptionFlagsDefault);
@@ -1205,31 +1203,14 @@ pdf_load_native_font (const char *ps_name,
if (atsName != NULL)
CFRelease(atsName);
}
- }
-
#else
-
- if (!sInitialized) {
- if (FT_Init_FreeType(&ftLib) != 0) {
- WARN("FreeType initialization failed.");
- return error;
- }
- FT_Library_Version(ftLib, &ft_major, &ft_minor, &ft_patch);
- sInitialized = 1;
- }
-
- if (ps_name[0] == '[') {
- error = pdf_load_native_font_from_path(ps_name, layout_dir, extend, slant, embolden);
- }
- else {
ERROR("Loading fonts by font name is not supported.");
+#endif /* XETEX_MAC */
}
-#endif
-
return error;
}
-#endif
+#endif /* XETEX */
#if 0
/* tfm_name="dmjhira10", map_name="dmj@DNP@10", sfd_name="DNP"