diff options
author | Karl Berry <karl@freefriends.org> | 2016-04-05 22:50:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-04-05 22:50:13 +0000 |
commit | 52e905992c395638cf339bcd463c71b197fc03b9 (patch) | |
tree | 88970c53454646c3953c29970ee9c81762b0f019 /Build/source/texk/xdvik/dvi-draw.c | |
parent | b56b320b5e2515160073fa1b469514002688fe11 (diff) |
import xdvik-22.87.03
git-svn-id: svn://tug.org/texlive/trunk@40253 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvik/dvi-draw.c')
-rw-r--r-- | Build/source/texk/xdvik/dvi-draw.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Build/source/texk/xdvik/dvi-draw.c b/Build/source/texk/xdvik/dvi-draw.c index 4a9bbe88961..e062f5f591b 100644 --- a/Build/source/texk/xdvik/dvi-draw.c +++ b/Build/source/texk/xdvik/dvi-draw.c @@ -2943,7 +2943,12 @@ text_do_char(FILE *fp, struct scan_info *info, wide_ubyte ch) do_load_freetype_font(); #endif - if (currinf.set_char_p == load_n_set_char) { +#if FREETYPE + while (currinf.set_char_p == load_n_set_char) +#else + if (currinf.set_char_p == load_n_set_char) +#endif + { if (globals.ev.flags & EV_GE_NEWDOC) /* if abort */ return 0; if (!load_font(currinf.fontp @@ -3072,7 +3077,12 @@ geom_do_char(FILE *fp, struct scan_info *info, wide_ubyte ch) do_load_freetype_font(); #endif - if (currinf.set_char_p == load_n_set_char) { +#if FREETYPE + while (currinf.set_char_p == load_n_set_char) +#else + if (currinf.set_char_p == load_n_set_char) +#endif + { if (globals.ev.flags & EV_GE_NEWDOC) /* if abort */ return 0; if (!load_font(currinf.fontp @@ -3781,7 +3791,7 @@ src_spawn_editor(const struct src_parsed_special *parsed) argv = src_format_arguments(get_separated_list(resource.editor, " \t", True), expanded_filename, parsed->line, parsed->col); - fork_process(argv[0], False, NULL, NULL, NULL, argv); + fork_process(argv[0], False, NULL, NULL, NULL, 0, argv); free(expanded_filename); for (i = 0; argv[i] != NULL; i++) |