diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-31 14:59:37 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-31 14:59:37 +0000 |
commit | b678d04ea42f842fb31a05faef08613423b12b14 (patch) | |
tree | 4361487e47b2e65d6a2dd47a8cbacf9b30f6b8b4 /Build/source/texk/xdvik/mime.c | |
parent | 6d5dd95b5e099dd28dae2c52de1e9f470d5e55e5 (diff) |
imported xdvik-22.84.15
git-svn-id: svn://tug.org/texlive/trunk@12586 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvik/mime.c')
-rw-r--r-- | Build/source/texk/xdvik/mime.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/Build/source/texk/xdvik/mime.c b/Build/source/texk/xdvik/mime.c index 60655f8a6eb..c0ee011bf05 100644 --- a/Build/source/texk/xdvik/mime.c +++ b/Build/source/texk/xdvik/mime.c @@ -135,13 +135,13 @@ struct mailcap_map { }; static struct mailcap_map default_mailcap[] = { - {"audio/*", "showaudio %s", NULL, False, False}, - {"image/*", "xv %s", NULL, False, False}, - {"video/mpeg", "mpeg_play %s", NULL, False, False}, - {"application/pdf", "acroread %s", NULL, False, False}, - {"text/html", "netscape-raise -remote 'openURL(%s,new-window)'", NULL, False, False}, - {"application/postscript", "ghostview %s", NULL, False, False}, - {"application/x-dvi", "xdvi %s", NULL, False, False}, + {"audio/*", "showaudio %s", NULL, False, "%s"}, + {"image/*", "xv %s", NULL, False, "%s"}, + {"video/mpeg", "mpeg_play %s", NULL, False, "%s"}, + {"application/pdf", "acroread %s", NULL, False, "%s"}, + {"text/html", "netscape-raise -remote 'openURL(%s,new-window)'", NULL, False, "%s"}, + {"application/postscript", "ghostview %s", NULL, False, "%s"}, + {"application/x-dvi", "xdvi %s", NULL, False, "%s"}, }; static struct mime_map *m_mimemap = NULL; @@ -543,10 +543,18 @@ figure_viewer(const char *content_type, const char **format_string, Boolean *nee { int i; - /* special case so that xdvizilla isn't used, which would be - too dangerous since xdvizilla tries to unlink the DVI file by default. + /* Hardwire xdvi for this MIME type so that xdvizilla isn't used, + which would be too dangerous since xdvizilla tries to unlink + the DVI file by default. There might be other DVI viewers, but + since the user invoking this from xdvi anyway ... + FIXME: A better way would be to always copy the original file, like e.g. Acroread does it; see comment in launch_program(), hypertex.c. + + Furthermore, xdvizilla has been retired in the meantime. + */ + /* FIXME: why do we actually need format_string - why not sprintf() + directly into the target? */ if (strcmp(content_type, "application/x-dvi") == 0) { *format_string = "%s"; |