texlive/texlive-2007-pxdvi.patch
2007-12-02 08:03:19 +00:00

150 lines
5.7 KiB
Diff

--- texlive-2007/texk/configure.in.pxdvi 2007-02-22 11:12:57.000000000 +0900
+++ texlive-2007/texk/configure.in 2007-02-22 11:16:07.000000000 +0900
@@ -76,6 +76,7 @@
tth
xdv2pdf
xdvik
+ pxdvik
xdvipdfmx
'
--- texlive-2007/texk/pxdvik/vfontmap.c.pxdvi 2007-02-22 11:12:58.000000000 +0900
+++ texlive-2007/texk/pxdvik/vfontmap.c 2007-02-22 11:12:58.000000000 +0900
@@ -8,7 +8,7 @@
#include "vfontmap.h"
#include "kpathsea/tex-file.h"
#ifndef DEFAULT_FONTMAP
-#define DEFAULT_FONTMAP "/usr/local/share/texmf/xdvi/vfontmap"
+#define DEFAULT_FONTMAP "/usr/share/texmf/pxdvi/vfontmap"
#endif
#ifdef KANJI
#if defined(USE_ZEIT) && defined(USE_VFONTMAP)
--- texlive-2007/texk/pxdvik/withenable.ac.pxdvi 2007-02-22 11:12:58.000000000 +0900
+++ texlive-2007/texk/pxdvik/withenable.ac 2007-02-22 11:12:58.000000000 +0900
@@ -83,9 +83,9 @@
fi],
AC_DEFINE(A4))
-VFONTMAP='$(texmf)/xdvi/vfontmap'
+VFONTMAP='$(texmf)/pxdvi/vfontmap'
AC_ARG_WITH(vfontmap,
-[ --with-vfontmap=FILE Use FILE as default vfontmap (default ${texmf}/xdvi/vfontmap)],
+[ --with-vfontmap=FILE Use FILE as default vfontmap (default ${texmf}/pxdvi/vfontmap)],
[VFONTMAP="$withval"])
AC_SUBST(VFONTMAP)
--- texlive-2007/texk/pxdvik/xdvi-config.h.pxdvi 2007-02-22 11:12:58.000000000 +0900
+++ texlive-2007/texk/pxdvik/xdvi-config.h 2007-02-22 11:12:58.000000000 +0900
@@ -35,7 +35,7 @@
#define DEFAULT_FONTCONF ""
#define USE_VFONTMAP
#ifndef DEFAULT_FONTMAP
-#define DEFAULT_FONTMAP "/usr/local/share/texmf/xdvi/vfontmap"
+#define DEFAULT_FONTMAP "/usr/share/texmf/pxdvi/vfontmap"
#endif /* DEFAULT_FONTMAP */
#define NTTZEIT
#endif /* KANJI */
--- texlive-2007/texk/pxdvik/texmf/XDvi.pxdvi 2007-02-22 11:12:58.000000000 +0900
+++ texlive-2007/texk/pxdvik/texmf/XDvi 2007-02-22 11:12:58.000000000 +0900
@@ -137,7 +137,7 @@
!!!------------------------------------------------------------------------------
!!! 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
--- texlive-2007/texk/pxdvik/Makefile.in.pxdvi 2007-02-22 11:12:57.000000000 +0900
+++ texlive-2007/texk/pxdvik/Makefile.in 2007-02-22 11:12:58.000000000 +0900
@@ -11,6 +11,9 @@
all_subdirs = gui
+dvipsdir = $(texmf)/pdvips
+psheaderdir = $(dvipsdir)
+
CPP = @CPP@
# Make `#include <X11/...>' and `-lX...' work.
@@ -140,8 +143,8 @@
rm -f $(scriptdir)/o@wrapper_script@
ln -s @wrapper_script@ $(scriptdir)/o@wrapper_script@
### fix wrong CVS permissions for shell script
- $(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/xdvizilla
- chmod +x $(scriptdir)/xdvizilla
+ $(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/pxdvizilla
+ chmod +x $(scriptdir)/pxdvizilla
uninstall-exec:
for p in @final_exec_name@; do rm -f $(bindir)/$$p; done
@@ -149,42 +152,42 @@
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
$(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)/xdvizilla.1 $(man1dir)/xdvizilla.$(manext)
- $(INSTALL_DATA) $(srcdir)/vfontmap.sample $(texmf)/xdvi/
+ $(INSTALL_DATA) $(srcdir)/vfontmap.sample $(texmf)/pxdvi/
if test ! -f $(VFONTMAP); then \
$(INSTALL_DATA) $(srcdir)/vfontmap.sample $(VFONTMAP); \
fi
uninstall-data:
rm -f $(man1dir)/$(manpage).$(manext) $(man1dir)/xdvizilla.$(manext) \
- $(scriptdir)/xdvizilla \
- $(texmf)/xdvi/pixmaps/toolbar.xpm $(texmf)/xdvi/pixmaps/toolbar2.xpm \
- $(texmf)/xdvi/XDvi
+ $(scriptdir)/pxdvizilla \
+ $(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
--- texlive-2007/texk/pxdvik/xdvi-sh.in.pxdvi 2006-01-18 06:41:51.000000000 +0900
+++ texlive-2007/texk/pxdvik/xdvi-sh.in 2007-02-22 11:12:58.000000000 +0900
@@ -28,7 +28,7 @@
NAMEOPT='-name xdvi';;
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"