diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
--- xdvik-22.84.14/texk/configure.in.pxdvi 2008-05-03 20:45:04.000000000 +0100
+++ xdvik-22.84.14/texk/configure.in 2008-10-12 01:55:37.000000000 +0100
@@ -52,7 +52,7 @@ fi
PKGS='
bibtex8 cjkutils detex devnag dtl dvi2tty dvidvi dviljk dvipdfm dvipsk gsftopk
lacheck makeindexk musixflx odvipsk ps2pkm seetexk tetex tex4htk
- texlive ttf2pk tth xdvik
+ texlive ttf2pk tth xdvik pxdvik
'
ESUBDIRS=
diff -up xdvik-22.84.14/texk/pxdvik/main.c.pxdvi xdvik-22.84.14/texk/pxdvik/main.c
--- xdvik-22.84.14/texk/pxdvik/main.c.pxdvi 2008-10-12 01:55:37.000000000 +0100
+++ xdvik-22.84.14/texk/pxdvik/main.c 2008-10-12 01:55:37.000000000 +0100
@@ -1177,7 +1177,7 @@ main(int argc, char **argv)
kpse_init_prog("XDVI", resource.pixels_per_inch, resource.mfmode, resource.alt_font);
- kpse_set_program_name(argv[0], "xdvi");
+ kpse_set_program_name(argv[0], "pxdvi");
if (globals.debug & DBG_EXPAND) {
diff -up xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi xdvik-22.84.14/texk/pxdvik/Makefile.in
--- xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi 2008-10-12 01:55:37.000000000 +0100
+++ xdvik-22.84.14/texk/pxdvik/Makefile.in 2008-10-12 01:57:46.000000000 +0100
@@ -10,6 +10,9 @@ ac_include ../make/cross.mk
all_subdirs = gui tests
+dvipsdir = $(texmf)/pdvips
+psheaderdir = $(dvipsdir)
+
CPP = @CPP@
# Make `#include <X11/...>' and `-lX...' work.
@@ -178,40 +181,41 @@ uninstall-exec:
install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/pxdvi/pixmaps
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/fonts/map/pxdvi
$(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext)
rm -f $(man1dir)/o$(manpage).$(manext)
ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext)
- $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi
- $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps
+ $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/pxdvi/XDvi
+ $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/pxdvi/pixmaps
if \
- grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
+ grep 'original xdvi.cfg --' $(texmf)/pxdvi/xdvi.cfg >/dev/null 2>&1 \
+ || test ! -r $(texmf)/pxdvi/xdvi.cfg; \
then \
- $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi/xdvi.cfg; \
+ $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/pxdvi/xdvi.cfg; \
else \
true; \
fi
- $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/xdvi/
+ $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/fonts/map/pxdvi/xdvi-ptex.map
if test ! -f $(PTEXMAP); then \
$(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(PTEXMAP); \
fi
uninstall-data:
rm -f $(man1dir)/$(manpage).$(manext) \
- $(texmf)/xdvi/pixmaps/toolbar.xpm $(texmf)/xdvi/pixmaps/toolbar2.xpm \
- $(texmf)/xdvi/XDvi
+ $(texmf)/pxdvi/pixmaps/toolbar.xpm $(texmf)/pxdvi/pixmaps/toolbar2.xpm \
+ $(texmf)/pxdvi/XDvi
if \
- head -n 1 $(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
+ head -n 1 $(texmf)/pxdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
+ || test ! -r $(texmf)/pxdvi/xdvi.cfg; \
then \
- rm -f $(texmf)/xdvi/xdvi.cfg; \
+ rm -f $(texmf)/pxdvi/xdvi.cfg; \
else \
true; \
fi
- rmdir $(texmf)/xdvi/pixmaps
+ rmdir $(texmf)/pxdvi/pixmaps
-distname = xdvik
+distname = pxdvik
program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \
MOTIF
version_files = xdvi.c
diff -up xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi xdvik-22.84.14/texk/pxdvik/texmf/XDvi
--- xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi 2008-10-12 01:55:37.000000000 +0100
+++ xdvik-22.84.14/texk/pxdvik/texmf/XDvi 2008-10-12 01:55:37.000000000 +0100
@@ -137,7 +137,7 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
!!!------------------------------------------------------------------------------
!!! note: when i18n'ed, *font and *fontSet should have same size of font
*international: true
-*inputMethod: kinput2
+*inputMethod: SCIM
*preeditType: OverTheSpot,OffTheSpot,Root
!!! note: xdviSelFile can not be i18n'ed (bug?)
xdviSelFile*international: false
diff -up xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi xdvik-22.84.14/texk/pxdvik/xdvi-sh.in
--- xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi 2007-10-18 17:28:55.000000000 +0100
+++ xdvik-22.84.14/texk/pxdvik/xdvi-sh.in 2008-10-12 01:55:37.000000000 +0100
@@ -35,7 +35,7 @@ case "$#:$1" in
NAMEOPT="-name $BASE_NAME";;
esac
-xdviappfile=`kpsewhich -progname=xdvi --format='other text files' XDvi`
+xdviappfile=`kpsewhich -progname=pxdvi --format='other text files' XDvi`
if test -n "$xdviappfile"; then
xdviappdir=`dirname "$xdviappfile"`
xdviapppath="${xdviappdir}/%l_%t/%N:${xdviappdir}/%N"
