summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-25 09:26:15 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-25 09:26:15 +0000
commitf0efc86956ea62704ab58dfc88d22d846bc85656 (patch)
tree1890e8d13435e06806164a2cb9645bda2b4ef886
parent1d7bfb5b2b02438ee1b815360ad6c84f8f3885cb (diff)
texk/dvipdfm-x: Drop '#ifdef XETEX' dependency in fontmap.[ch]
git-svn-id: svn://tug.org/texlive/trunk@36380 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog7
-rw-r--r--Build/source/texk/dvipdfm-x/fontmap.c4
-rw-r--r--Build/source/texk/dvipdfm-x/fontmap.h2
3 files changed, 8 insertions, 5 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index f7dbbb63e73..74ac35aaa50 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * fontmap.h (pdf_insert_native_fontmap_record): Declare also
+ without '#ifdef XETEX'.
+ * fontmap.c (pdf_insert_native_fontmap_record): Define also
+ without '#ifdef XETEX'; drop redundant test for path==NULL.
+
2015-02-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvi.c (dvi_locate_native_font): Avoid sprintf() buffer overrun.
diff --git a/Build/source/texk/dvipdfm-x/fontmap.c b/Build/source/texk/dvipdfm-x/fontmap.c
index d4210ad36d5..96d2b8e7848 100644
--- a/Build/source/texk/dvipdfm-x/fontmap.c
+++ b/Build/source/texk/dvipdfm-x/fontmap.c
@@ -1035,7 +1035,6 @@ pdf_load_fontmap_file (const char *filename, int mode)
return error;
}
-#ifdef XETEX
fontmap_rec *
pdf_insert_native_fontmap_record (const char *path, uint32_t index,
int layout_dir, int extend, int slant, int embolden)
@@ -1057,7 +1056,7 @@ pdf_insert_native_fontmap_record (const char *path, uint32_t index,
mrec->map_name = fontmap_key;
mrec->enc_name = mstrdup(layout_dir == 0 ? "Identity-H" : "Identity-V");
- mrec->font_name = (path != NULL) ? mstrdup(path) : NULL;
+ mrec->font_name = mstrdup(path);
mrec->opt.index = index;
if (layout_dir != 0)
mrec->opt.flags |= FONTMAP_OPT_VERT;
@@ -1077,7 +1076,6 @@ pdf_insert_native_fontmap_record (const char *path, uint32_t index,
return ret;
}
-#endif /* XETEX */
#if 0
/* tfm_name="dmjhira10", map_name="dmj@DNP@10", sfd_name="DNP"
diff --git a/Build/source/texk/dvipdfm-x/fontmap.h b/Build/source/texk/dvipdfm-x/fontmap.h
index a4cbbc06973..daad78b021d 100644
--- a/Build/source/texk/dvipdfm-x/fontmap.h
+++ b/Build/source/texk/dvipdfm-x/fontmap.h
@@ -93,9 +93,7 @@ extern fontmap_rec *pdf_lookup_fontmap_record (const char *kp);
extern int is_pdfm_mapline (const char *mline);
-#ifdef XETEX
extern fontmap_rec *pdf_insert_native_fontmap_record (const char *filename, uint32_t index,
int layout_dir, int extend, int slant, int embolden);
-#endif
#endif /* _FONTMAP_H_ */