summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x/dvi.c
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-12-18 09:59:24 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-12-18 09:59:24 +0000
commitb22cb23cdeac4ab3438e64d1687205825d432f51 (patch)
tree3260ca585f4bcb83d4a1c3a7fb927db106ef927c /Build/source/texk/dvipdfm-x/dvi.c
parent92c0a963ad9468c08d01c2a487d8ae382925389c (diff)
dvipdfm-x: Merge libdpx by Clerk Ma at https://github.com/clerkma/ptex-ng
git-svn-id: svn://tug.org/texlive/trunk@42741 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/dvi.c')
-rw-r--r--Build/source/texk/dvipdfm-x/dvi.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c
index cea0ef0a3e5..47e2feb63b0 100644
--- a/Build/source/texk/dvipdfm-x/dvi.c
+++ b/Build/source/texk/dvipdfm-x/dvi.c
@@ -942,7 +942,11 @@ dvi_locate_font (const char *tfm_name, spt_t ptsize)
return cur_id;
}
+#if defined(LIBDPX)
+int
+#else
static int
+#endif /* LIBDPX */
dvi_locate_native_font (const char *filename, uint32_t index,
spt_t ptsize, int layout_dir, int extend, int slant, int embolden)
{
@@ -1302,10 +1306,10 @@ dvi_rule (int32_t width, int32_t height)
}
void
-dvi_dir (unsigned char dir)
+dvi_dirchg (unsigned char dir)
{
if (verbose)
- fprintf(stderr, " > dvi_dir %d\n", dir);
+ fprintf(stderr, " > dvi_dirchg %d\n", dir);
dvi_state.d = dir;
pdf_dev_set_dirmode(dvi_state.d); /* 0: horizontal, 1,3: vertical */
}
@@ -2528,3 +2532,6 @@ dvi_scan_specials (int page_no,
return;
}
+#if defined(LIBDPX)
+#include "dvi_ng.c"
+#endif /* LIBDPX */