[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
rpms/tetex/FC-5 tetex-3.0-xdvi-22.84.10.patch, NONE, 1.1 xdvi-22.84.10-j1.33.patch, NONE, 1.1 tetex-3.0-pxdvi.patch, 1.3, 1.4 tetex.spec, 1.88, 1.89 xdvik-22.84.10-j1.31_for_tetex.patch, 1.1, NONE
- From: fedora-cvs-commits redhat com
- To: fedora-cvs-commits redhat com
- Subject: rpms/tetex/FC-5 tetex-3.0-xdvi-22.84.10.patch, NONE, 1.1 xdvi-22.84.10-j1.33.patch, NONE, 1.1 tetex-3.0-pxdvi.patch, 1.3, 1.4 tetex.spec, 1.88, 1.89 xdvik-22.84.10-j1.31_for_tetex.patch, 1.1, NONE
- Date: Sun, 3 Sep 2006 06:36:24 -0400
Author: jnovy
Update of /cvs/dist/rpms/tetex/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17636
Modified Files:
tetex-3.0-pxdvi.patch tetex.spec
Added Files:
tetex-3.0-xdvi-22.84.10.patch xdvi-22.84.10-j1.33.patch
Removed Files:
xdvik-22.84.10-j1.31_for_tetex.patch
Log Message:
* Sun Sep 3 2006 Jindrich Novy <jnovy redhat com> 3.0-29.fc5
- remove BuildPreReq: openmotif-devel, build agaist Xaw3d
- sync pxdvi patch
- add xdvi-22.84.10 patch
- use %%{?dist}
* Fri Sep 1 2006 MATSUURA Takanori <t-matsuu estyle ne jp> 3.0-28.1.fc5
- fix platex2e_inputs macro
- fix dupulicated entry of %%{_datadir}/texmf/(p)xdvi/XDvi
- announce update pxdvi to 22.84.10-j1.33
tetex-3.0-xdvi-22.84.10.patch:
CHANGES | 16 +
INSTALL | 132 ------------
aclocal.m4 | 2
configure.in | 15 -
depend.mk | 580 ++++++++++++++++++++++-------------------------------
dvi-draw.c | 26 ++
encodings.c | 36 +--
events.c | 2
gui/depend.mk | 624 ++++++++++++++++++++++++++--------------------------------
gui/mag.c | 1
stamp-auto.in | 2
version.h | 2
withenable.ac | 46 ++--
xdvi.c | 9
14 files changed, 621 insertions(+), 872 deletions(-)
--- NEW FILE tetex-3.0-xdvi-22.84.10.patch ---
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/CHANGES xdvik-22.84.10/texk/xdvik/CHANGES
--- tetex-src-3.0/texk/xdvik/CHANGES 2004-12-03 08:40:37.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/CHANGES 2005-04-29 05:52:33.000000000 +0900
@@ -9,6 +9,22 @@
may contain undetected bugs. Such versions shouldn't be used
by distributors.
+ * 22.84.10 (2005/04/28):
+ + Fixed zero termination bug in t1lib version number check (t1lib.ac).
+ + Render an empty character instead of terminating with failed assertion
+ if T1lib doesn't return a usable glyph (e.g. at very small
+ \magnification factors; #1184087).
+ + Made gs_timeout in psgs.c a resource instead of #define it.
+ + Make file opening work with file descriptors too, as used in
+ Debian's Perl wrapper for xdvi (#1165497).
+
+ * 22.84.9 (teTeX-3.0):
+ + Applied Patch by Nobuyuki Tsuchimura (#1116871) to remove
+ code duplication in encodings.c.
+ + Changed --with-x-toolkit configure option to --with-xdvi-x-toolkit
+ for better interoperability with Metafont.
+ + Added a missing #if HAVE_X11_XMU_XMU_H in gui/selection.c.
+
* 22.84.8 (2004/12/02):
+ Made text selection mode and ruler mode work correctly with
LessTif and Motif 1.2.4 (bugfix for #997073). Special thanks
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/INSTALL xdvik-22.84.10/texk/xdvik/INSTALL
--- tetex-src-3.0/texk/xdvik/INSTALL 2004-06-27 01:31:47.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/INSTALL 1970-01-01 09:00:00.000000000 +0900
@@ -1,132 +0,0 @@
-
-Compiling and Installing Xdvik
-==============================
-
-Xdvik is the kpathsea-enhanced version of xdvi. The program
-invocation name is still `xdvi' for compatibility reasons.
-
-Please submit bug reports, suggestions etc. to the sourceforge
-xdvik project page:
-
- http://sourceforge.net/projects/xdvi/
-
-
-Note for users of older versions of teTeX (<= teTeX-1.0):
-=========================================================
-
- Please consult the README file in the texk/xdvik/texmf-alt/
- directory of the source distribution.
-
-
-Note for users of non-teTeX installations:
-==========================================
-
- Please consult the files texk/xdvik/texmf-alt/README and
- texk/xdvik/README.t1fonts for information on how to configure
- xdvik for direct Type1 font rendering.
-
-
-1. Required Software
-
- - X11R5 or newer and the Xt libraries
-
- and one of:
-
- - Xaw (Athena widgets)
-
- - Motif >= 1.2 or newer
- LessTif has a few bugs and restrictions that will result in limited
- functionality (see the file texk/xdvik/LESSTIF-BUGS for details).
- For best results, use OpenMotif 2.x.
-
- You need both the headers and the runtime libraries to compile and run
- xdvik (note that some Linux distributors put the headers into separate
- `X development' pacakges).
-
-2. Configuring:
-
- In the top-level directory (the directory in which this INSTALL
- file is located), invoke:
-
- ./configure
-
- You can also specify a toolkit via the --with-x-toolkit option
- (the default is to check if Motif is available and use it if it is):
-
- ./configure --with-x-toolkit=xaw [other-options]
-
- will compile with Xaw (Athena widgets) instead. You can set
- the search paths for Motif header/library files with the
- --with-motif-include and --with-motif-libdir options.
-
- If configure gives you errors about the main texmf tree not being
- found, specify its directory via the `--datadir' option.
- On a standard teTeX system, use the output of the command:
-
- kpsewhich --expand-path='$TEXMFMAIN'
-
- *without* the `texmf' component as value for `--datadir'
- (/usr/share or /usr/local/teTeX/share are possible values).
-
- For all configuration options available, see the output of:
- ./configure --help
-
-
-
-3. Compiling:
-
- In the top-level directory, invoke:
-
- make
-
- This should compile the executable texk/xdvik/xdvi-TOOLKIT.bin,
- where TOOLKIT is the value of the `--with-x-toolkit' specified
- in the configure step, e.g. `xaw' or `motif' (the default).
-
- If you set the environment variable XDVIINPUTS to the path
- containing the files xdvi.cfg and ps2pk.map, you should be
- able to test xdvi without actually installing it.
-
-
-
-4. Installation:
-
- Usually, the binary xdvi-TOOLKIT.bin is invoked by a shell wrapper
- `xdvi' which sets XDVIINPUTS and some other variables, like the X
- search path.
-
- If you only want to upgrade an existing version of xdvik, it should
- be sufficient to copy xdvi-TOOLKIT.bin into a directory in your PATH
- and check that the shell wrapper invokes the correct toolkit version.
- (You may also want to update the man page from xdvi.1). These files
- are located in the texk/xdvik subdirectory.
-
- To install a new version from scratch, invoke:
-
- make install
-
- in the top-level directory to install all executable and data files.
- This will not install the files in the texk/kpathsea subdirectory,
- which is not required if you already have a working TeX installation
- (and actually could overwrite your existing setup). If you don't have
- kpathsea installed yet, you'll need to install it manually; basically
- by doing `cd texk/kpathsea; make install'. Please see the file
- texk/kpathsea/INSTALL for more information.
-
-
-
-5. Setup:
-
- Make sure that the XDVIINPUTS variable (set in the system-wide
- texmf.cnf file or in the environment, e.g. in your .profile)
- contains the path to the directory DATADIR/texmf/xdvi, and
- to the file ps2pk.map (usually in DATADIR/texmf/dvips);
- e.g. by setting:
-
- export XDVIINPUTS='.;$TEXMF/{xdvi,dvips}//'
-
- If xdvik is still generating PK versions of fonts that you think
- you have Type1 versions of, please consult texk/xdvik/README.t1fonts
- for more information on how to configure xdvik correctly for Type1
- fonts.
-
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/aclocal.m4 xdvik-22.84.10/texk/xdvik/aclocal.m4
--- tetex-src-3.0/texk/xdvik/aclocal.m4 2005-01-20 17:52:59.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/aclocal.m4 2005-01-19 18:43:52.000000000 +0900
@@ -856,7 +856,7 @@
dnl ### Check for Xaw version
AC_DEFUN(XDVI_OLD_XAW,[
-if test "${with_x_toolkit}XXX" = XXX || test "${with_x_toolkit}" = xaw; then
+if test "${with_xdvi_x_toolkit}" = xaw; then
AC_MSG_CHECKING(for Xaw library)
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/configure.in xdvik-22.84.10/texk/xdvik/configure.in
--- tetex-src-3.0/texk/xdvik/configure.in 2005-01-24 08:42:17.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/configure.in 2004-12-08 08:31:06.000000000 +0900
@@ -83,7 +83,7 @@
dnl For the bitmap size. -- I think this is in XDVI_C_BITMAP_TYPE now -janl
dnl AC_CHECK_SIZEOF(long)
-sinclude(xt.ac)
+sinclude(../kpathsea/xt.ac)
sinclude(withenable.ac)
sinclude(../../libs/t1lib/withenable.ac)
sinclude(../../libs/t1lib/t1lib.ac)
@@ -142,25 +142,22 @@
Specify the location of Motif libraries],
motif_libdir="$withval")
-if test "x$with_xdvi_x_toolkit" = xno; then
- AC_MSG_WARN([xdvi needs at least the Xaw toolkit - ignoring the 'notool' option])
- AC_DEFINE(XAW)
- prog_extension="xaw"
- x_tool_libs="-lXaw"
-elif test "x$with_xdvi_x_toolkit" = xxaw3d; then
+if test "x$with_xdvi_x_toolkit" = xxaw3d; then
prog_extension="xaw3d"
x_tool_libs="-lXaw3d"
[...1763 lines suppressed...]
- xm_menu.h menu.h xaw_menu.h xm_prefsP.h xm_prefs.h xm_prefs_helpers.h
+ $(kpathsea_srcdir)/tex-file.h \
+ ../events.h ../string-utils.h message-window.h \
+ xm_menu.h menu.h xaw_menu.h xm_prefsP.h xm_prefs.h xm_prefs_helpers.h
xm_prefs_page.o: xm_prefs_page.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
- ../xdvi-config.h ../xdvi-debug.h ../xdvi.h ../version.h \
- $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
- $(kpathsea_srcdir)/c-std.h \
- $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
+ ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
+ $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
+ $(kpathsea_srcdir)/c-unistd.h \
+ $(kpathsea_srcdir)/systypes.h \
$(kpathsea_srcdir)/c-memstr.h \
$(kpathsea_srcdir)/c-errno.h \
$(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h \
$(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
$(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
- $(kpathsea_srcdir)/c-pathmx.h \
$(kpathsea_srcdir)/c-dir.h \
- $(kpathsea_srcdir)/c-vararg.h \
- ../x_util.h xm_colorsel.h topic-window.h ../version.h ../util.h \
+ $(kpathsea_srcdir)/c-vararg.h ../x_util.h \
+ xm_colorsel.h topic-window.h ../util.h \
$(kpathsea_srcdir)/c-stat.h \
$(kpathsea_srcdir)/hash.h \
- $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/c-vararg.h \
- ../events.h \
- ../events.h statusline.h xm_prefsP.h xm_prefs_page.h ../my-snprintf.h
+ $(kpathsea_srcdir)/tex-file.h \
+ ../events.h statusline.h xm_prefsP.h \
+ xm_prefs_page.h ../my-snprintf.h
xm_prefs_scroll.o: xm_prefs_scroll.c ../xdvi-config.h ../c-auto.h \
- ../xdvi.h ../xdvi-config.h ../xdvi-debug.h ../xdvi.h ../version.h \
- $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
- $(kpathsea_srcdir)/c-std.h \
- $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
+ ../xdvi.h ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
+ $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
+ $(kpathsea_srcdir)/c-unistd.h \
+ $(kpathsea_srcdir)/systypes.h \
$(kpathsea_srcdir)/c-memstr.h \
$(kpathsea_srcdir)/c-errno.h \
$(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h \
$(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
$(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
- $(kpathsea_srcdir)/c-pathmx.h \
$(kpathsea_srcdir)/c-dir.h \
- $(kpathsea_srcdir)/c-vararg.h \
- ../x_util.h xm_colorsel.h topic-window.h ../version.h ../util.h \
+ $(kpathsea_srcdir)/c-vararg.h ../x_util.h \
+ xm_colorsel.h topic-window.h ../util.h \
$(kpathsea_srcdir)/c-stat.h \
$(kpathsea_srcdir)/hash.h \
- $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/c-vararg.h \
- ../events.h \
- ../events.h ../dvi-init.h statusline.h xm_prefsP.h xm_prefs_scroll.h \
- ../my-snprintf.h
+ $(kpathsea_srcdir)/tex-file.h \
+ ../events.h ../dvi-init.h statusline.h \
+ xm_prefsP.h xm_prefs_scroll.h ../my-snprintf.h
xm_toolbar.o: xm_toolbar.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
- ../xdvi-config.h ../xdvi-debug.h ../xdvi.h ../version.h \
- $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
- $(kpathsea_srcdir)/c-std.h \
- $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
+ ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
+ $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
+ $(kpathsea_srcdir)/c-unistd.h \
+ $(kpathsea_srcdir)/systypes.h \
$(kpathsea_srcdir)/c-memstr.h \
$(kpathsea_srcdir)/c-errno.h \
$(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h \
$(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
$(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
- $(kpathsea_srcdir)/c-pathmx.h \
$(kpathsea_srcdir)/c-dir.h \
- $(kpathsea_srcdir)/c-vararg.h \
- pagesel.h \
+ $(kpathsea_srcdir)/c-vararg.h pagesel.h \
help-window.h message-window.h $(kpathsea_srcdir)/tex-file.h \
- $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/expand.h statusline.h \
- ../dvi-init.h ../events.h ../dvi-draw.h xm_menu.h menu.h xaw_menu.h \
- xm_toolbar.h ../util.h $(kpathsea_srcdir)/c-stat.h \
+ $(kpathsea_srcdir)/expand.h statusline.h ../dvi-init.h ../events.h \
+ ../dvi-draw.h xm_menu.h menu.h xaw_menu.h xm_toolbar.h ../util.h \
+ $(kpathsea_srcdir)/c-stat.h \
$(kpathsea_srcdir)/hash.h \
- $(kpathsea_srcdir)/tex-file.h \
- ../events.h ../x_util.h Tip.h \
- ../c-openmx.h ../pixmaps/toolbar.xpm
+ ../x_util.h \
+ Tip.h ../c-openmx.h
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/gui/mag.c xdvik-22.84.10/texk/xdvik/gui/mag.c
--- tetex-src-3.0/texk/xdvik/gui/mag.c 2005-01-25 04:22:22.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/gui/mag.c 2005-01-25 18:04:14.000000000 +0900
@@ -34,6 +34,7 @@
/* one of the following should define OPEN_MAX: */
#include <limits.h>
#include "c-openmx.h"
+
#include "xdvi.h"
#ifdef MOTIF
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/stamp-auto.in xdvik-22.84.10/texk/xdvik/stamp-auto.in
--- tetex-src-3.0/texk/xdvik/stamp-auto.in 2005-01-30 16:46:32.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/stamp-auto.in 2004-03-09 11:24:34.000000000 +0900
@@ -1 +1 @@
-So Jan 30 08:46:32 CET 2005
+Tue Mar 9 01:16:23 GMT 2004
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/version.h xdvik-22.84.10/texk/xdvik/version.h
--- tetex-src-3.0/texk/xdvik/version.h 2005-01-17 03:39:50.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/version.h 2005-04-29 05:52:36.000000000 +0900
@@ -2,7 +2,7 @@
#ifndef VERSION_H_
#define VERSION_H_
-#define XDVI_VERSION "22.84.9"
+#define XDVI_VERSION "22.84.10"
#ifdef MOTIF
#define XDVI_GUI "(Motif toolkit)"
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/withenable.ac xdvik-22.84.10/texk/xdvik/withenable.ac
--- tetex-src-3.0/texk/xdvik/withenable.ac 2004-12-10 05:22:13.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/withenable.ac 2004-12-14 18:23:04.000000000 +0900
@@ -1,5 +1,28 @@
dnl withenable.ac: --with and --enable options.
+# Check for toolkit options. This used to be --with-x-toolkit, but was changed
+# to remove clashes with metafont which accepts different values.
+# We allow `yes' as synonym for the default toolkit, for easier communication
+# with ../kpathsea/xt.ac.
+AC_ARG_WITH(xdvi-x-toolkit,
+[ --with-xdvi-x-toolkit=KIT
+ Use toolkit KIT for xdvi (KIT=motif/xaw/xaw3d/neXtaw).
+ If no --with-xdvi-x-toolkit option is used, use Motif
+ if available, else Xaw.],
+[ case "${withval}" in
+ next | nextaw | neXtaw ) val=neXtaw ;;
+ xaw3d ) val=xaw3d ;;
+ x | xa | xaw ) val=xaw ;;
+ y | ye | yes ) val=yes ;;
+ m | mo | mot | moti | motif ) val=motif ;;
+ * )
+AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw.])
+ val=xaw;;
+ esac
+ with_xdvi_x_toolkit=$val
+])
+
+
# Check if the user wants to use Ghostscript, DPS or NeWS to
# display PostScript.
AC_ARG_WITH(ps,
@@ -124,26 +147,3 @@
fi])
AC_SUBST(LDT1LIB)
-
-dnl This defines --with-x implicitly (which is why we use that package
-dnl name below), so put it here, so it comes first in the --help output.
-dnl This reads best.
-
-dnl Remember to add AC_PATH_XTRA when actually using X.
-
-AC_ARG_WITH(xdvi-x-toolkit,
-[ --with-xdvi-x-toolkit=KIT
- Use toolkit KIT for xdvi (KIT=motif/xaw/xaw3d/neXtaw).
- If no --with-xdvi-x-toolkit option is used, use Motif
- if available, else Xaw.],
-[ case "${withval}" in
- next | nextaw | neXtaw ) val=neXtaw ;;
- xaw3d ) val=xaw3d ;;
- x | xa | xaw ) val=xaw ;;
- m | mo | mot | moti | motif ) val=motif ;;
- * )
-AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw.])
- val=xaw;;
- esac
- with_xdvi_x_toolkit=$val
-])
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/xdvi.c xdvik-22.84.10/texk/xdvik/xdvi.c
--- tetex-src-3.0/texk/xdvik/xdvi.c 2005-01-20 17:52:59.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/xdvi.c 2005-04-18 17:19:36.000000000 +0900
@@ -3964,8 +3964,13 @@
if (real_filename == NULL)
return NULL;
-
- ret = REALPATH(real_filename, canonical_path);
+
+ if ((ret = REALPATH(real_filename, canonical_path)) == NULL) {
+ /* REALPATH failed, use real_filename */
+ strncpy(canonical_path, real_filename, MAXPATHLEN);
+ canonical_path[MAXPATHLEN] = '\0';
+ ret = canonical_path;
+ }
free(real_filename);
/* check for correct DVI files */
xdvi-22.84.10-j1.33.patch:
CHANGES.xdvik-jp | 534 +++++++++++++
Makefile.in | 31
README.xdvik-jp | 66 +
READMEs/ChangeLog.xdvik20a-j1.1 | 132 +++
READMEs/ChangeLog.xdvik20c-j1.0 | 34
READMEs/ChangeLog.xdvik22.40b-j1.05 | 69 +
READMEs/ChangeLog.xdvik22.40y1-j1.21.html | 322 ++++++++
READMEs/HEADERS.DOC | 170 ++++
READMEs/InternalVars | 56 +
READMEs/README.jp+toc+hal2 | 57 +
READMEs/README.jp-patch | 778 +++++++++++++++++++
READMEs/README.markpage+toc+printdvi | 200 +++++
READMEs/README.markpage+toc+printdvi+paper | 583 ++++++++++++++
READMEs/README.miyu-beta6 | 239 ++++++
READMEs/README.ptex | 80 ++
READMEs/README.tasai-ussy | 312 +++++++
READMEs/README.vf2ft | 100 ++
READMEs/README.xdvik-22.15-j1.04.patch | 217 +++++
READMEs/README.xdvik-22.40b-j1.05.patch | 220 +++++
READMEs/README.xdvik-22.40y1-j1.21 | 239 ++++++
READMEs/README.xdvik18f-j1.0.patch | 103 ++
READMEs/README.xdvik18f-j1.1p5.patch | 322 ++++++++
READMEs/README.xdvik20a-j1.1.patch | 273 ++++++
READMEs/README.xdvik20c-j1.0+hal2+dvisel | 179 ++++
READMEs/README.xdvik20c-j1.0p1.patch | 43 +
c-auto.in | 3
chardef.h | 31
configure.in | 23
dnpzeit.c | 177 ++++
dvi-draw.c | 646 ++++++++++++++--
dvi-draw.h | 12
dvi-init.c | 93 ++
dvi-init.h | 31
dvi.h | 4
dvisel.c | 1
encodings.c | 79 ++
events.c | 1
font-open.c | 25
ft2vert.c | 383 +++++++++
ft2vert.h | 7
gui/help-window.c | 3
jfm.c | 99 ++
jfm.h | 47 +
jisx0208.c | 1140 +++++++++++++++++++++++++++++
jisx0208.h | 3
pk.c | 3
psgs.c | 23
special.c | 760 ++++++++++++++++++-
texmf/XDvi | 24
util.c | 32
util.h | 3
version.h | 5
vf2ft.c | 227 +++++
vf2ft.h | 8
vfontmap.c | 211 +++++
vfontmap.h | 27
vfontmap.sample | 113 ++
withenable.ac | 18
xdvi-config.h | 12
xdvi.c | 39
xdvi.h | 11
zeit.c | 151 +++
zeit.h | 16
63 files changed, 9734 insertions(+), 116 deletions(-)
--- NEW FILE xdvi-22.84.10-j1.33.patch ---
diff -N texk/xdvik/CHANGES.xdvik-jp
--- xdvik-22.84.10.orig/texk/xdvik/CHANGES.xdvik-jp 1 Jan 1970 00:00:00 -0000
+++ xdvik-22.84.10/texk/xdvik/CHANGES.xdvik-jp 8 Jun 2006 17:20:33 -0000 1.95
@@ -0,0 +1,534 @@
+2006-06-09 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * jisx0208.c (MAXJIS, jis2uni_table): Deleted category
+ 85--92 which is out of JIS X 0208.
+ * util.c, util.h, zeit.c, dnpzeit.c (order_reverse_bitmap):
+ Renamed from reverse_endian_bitmap(). In fact, this is not
+ endian problem.
+
+2006-05-17 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * configure.in, configure (freetype):
+ Added a message when freetype is found.
+
+ * font-open.c (font_open): Fixed memory leak.
+ We must check iskanjifont() first.
+
+2006-05-09 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * encodings.c (guess_encoding): Added support for
+ ENC_UNICODE_{H|V}.
+
+ * events.c (do_sigpoll): Cleared allocated memory
+ to avoid ill condition jump.
+ Upstreamed as Request ID 1484561.
+
+2006-05-04 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * dvi-draw.c (free_bitmap2): Removed free_bitmap2()
+ which leaks memory.
+ * dvi-init.c, dvi-init.h (free_bitmap2):
+ New function derived from delete_glyphs().
+ * ft2vert.c (ft2vert_init): Fixed memory leak.
+
+ * vfontmap.c, vfontmap.h (getdnpfont, isdnpfont):
+ Surround with #ifdef NTTZEIT.
+ * font-open.c (font_open): Added #ifdef NTTZEIT condition.
+
+2006-05-03 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * zeit.c, zeit.h, dnpzeit.c, util.c, util.h:
+ Moved adj_ZEIT_bitmap() in 'zeit.c' as
+ reverse_endian_bitmap() in 'util.c'.
+ * dnpzeit.c: K&R -> ANSI prototype. Removed 'register'.
+ (read_NTT_char, read_NTT_char): int -> wide_ubyte ch.
+
+ * ft2vert.c (print_offset, tag_to_string, hex_dump):
+ Surround debug part with #ifdef DEBUG .. #endif.
+
+2006-05-01 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * jfm.h, zeit.c, Makefile.in: Renamed 'jtfm.h' -> 'jfm.h'.
+ * jfm.c, zeit.c (read_jfm, read_jfm0): Moved from 'zeit.c'
+ to new file 'jfm.c'.
+ * jfm.h (read_jfm0): Removed definition of internal function.
+ * jfm.h, jfm.c (jfm): Changed member variable from fn[128] to
+ *fontname.
+ * version.h (JPVERSION): new version j1.33.
+
+2006-04-29 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * zeit.c (adj_ZEIT_bitmap): Makeing reverse_byte[]
+ by calculation instead of giving as data.
+
+2006-04-28 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * zeit.c, dnpzeit.c: Use memset() instead of bzero().
+ * zeit.c, zeit.h: Adjusted under DEBUGZEIT condition.
+ * vf2ft.c, encodings.c, dvi-draw.c, vfontmap.h:
+ Converted space -> tab.
+ * vf2ft.c, vf2ft.h, ft2vert.c: Adjusted #include headers.
+ * vfontmap.c, encodings.c: Adjusted #ifdef KANJI condition.
+ * jisx0208.c: Added #ifdef USE_ZEIT condition.
+ * dvi-draw.c: K&R -> ANSI prototype.
+ * Makefile.in: Modified dependency of headers.
+
+2006-04-27 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * vfontmap.c, vfontmap.h (first_ptr): Let 'first_ptr' private
+ variable.
+ * vfontmap.c, vfontmap.h, zeit.c, dnpzeit.c
+ (getkanjifont, getdnpfont): Renamed iskanjifont() to
+ getkanjifont() and changed its return value to the pointer of
+ structure 'vfontmap' instead of the index number.
+ Defined iskanjifont() as a macro using getkanjifont().
+ * zeit.c, zeit.h (open_ZEIT_font): Changed arg to pointer
+ instead of index number.
+
+2006-04-26 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * dvi-init.c, dvi-init.h, dnpzeit.c, encodings.c, font-open.c,
+ vfontmap.c, vfontmap.h, xdvi.c, Makefile.in (iskanjifont, isdnpfont):
+ Moved iskanjifont() and isdnpfont() from dvi-init.c to
+ vfontmap.c.
+ * ft2vert.h: Removed useless comment.
+ * ft2vert.c: Added '#ifdef USE_ZEIT' condition.
+ Converted space -> tab.
+
+2006-04-25 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * dvi-draw.c (oldmaxchar): Enlarged 'oldmaxchar' from ubyte
+ to wide_ubyte to save whole 'maxchar'.
+ This fixes a string search trouble for Japanese characters.
+ (upstreamed as Request ID 1475921)
+
+2006-04-19 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * jisx0208.c, jisx0208.h, Mailefile.in (jisx0208): New file derived
+ from "src/VF_Ftype.c" in VFlib2-2.25.6.
+ * vf2ft.c (UnicodeTbl, jis2uni): Removed jis2uni() which overlaps
+ in jisx0208.c.
+ * ft2vert.c (ft2vert_get_gid): Fixed typo in error message.
+
+2005-11-21 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * dvi-draw.c (bbox_scale_bitmap, rotate_bitmap,
+ reverse_rotate_bitmap): Reduced "#ifdef WORDS_BIGENDIAN .. #endif"
+ by using new macros EXTREME_LEFT_BIT, EXTREME_RIGHT_BIT,
+ and SHIFT_RIGHT().
+
+2005-11-19 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * vf2ft.c (VF_GetBitmap): Clean bitmap earlier.
+ * util.c, utl.h (clear_bitmap, fill_bitmap): new function
+ * zeit.c (read_ZEIT_index): Use fill_bitmap() instead of bbox().
+ * dvi-draw.c (reverse_rotate_bitmap, rotate_bitmap,
+ bbox_scale_bitmap): Use clear_bitmap().
+ (rotate_bitmap, reverse_rotate_bitmap): K&R -> ANSI prototype.
+
+2005-11-17 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * gui/help-window.c (default_help_general): Removed VF2FT macro.
+
+2005-11-16 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * zeit.c: Converted K&R -> ANSI prototype.
+ (adj_ZEIT_bitmap): Simplified using new macro MAKE32BIT().
+ * zeit.h, jtfm.h (read_jfm0): Moved prototype.
+ * dvi-init.h (TateCorrectionTable): Removed tate adjustment.
+
+ * zeit.h, zeit.c (adj_ZEIT_bitmap, get_ZEIT_font), dnpzeit.c
+ (get_NTT_font): Omitted adjustment of bitmap padding by using 'bw'
+ parameter of VF_GetBitmap().
+ * vf2ft.c (VF_GetBitmap): Clean destination bitmap.
+
+2005-11-15 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * zeit.c (USE_PXL, jis2ccode): Removed unused macro
+ since xdvik-22.40k-j1.04.
+ (get_ZEIT_font): Removed arg 'tate'.
+ * zeit.h, zeit.c, dnpzeit.c (adj_ZEIT_bitmap):
+ Omitted #if .. #endif using dummy macro.
+ * vf2ft.c (jis2cidv): Merged into is_jis_vertical().
+
+2005-11-14 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * README.xdvik-jp: Added announce that VFlib support was removed.
+ * configure, configure.in, withenable.ac: Removed
+ '--enable-freetype' option. It is now default.
+ * configure, configure.in: Added version check of FreeType.
+ 2.1.10 or latter is OK.
+ * dnpzeit.c, ft2vert.c, vf2ft.c, vfontmap.c, vfontmap.h, xdvi.c,
+ xdvi.h, zeit.c, c-auto.in, withenable.ac (VF2FT): Deleted macro.
+ * vfontmap.c (default_jfonts): Removed default_jfonts.
+ We can't know appropriate default Japanese font name.
+ * vfontmap.vflib, Makefile.in (install-data): Removed vfontmap.vflib.
+
+ * vfontmap.h, zeit.c (vfontmap): Removed member variable 'tate'.
+ * vfontmap.c (addfontmap): Removed arg variable 'tate'.
+ * zeit.c (read_ZEIT_char): Removed tate adjustment.
+ Omitted swapping bm->h and bm->w because of square metric.
+ (get_ZEIT_font): Removed code in case of (bm->h != bm->w).
+ (trim_side_blanks_in_ZEIT_bitmap): Removed.
+ (trim_tate_blanks_in_ZEIT_bitmap): Removed.
+ (get_ZEIT_font): Removed arg 'code2' which is same as 'code'.
+ * zeit.c, zeit.h (auto_shift): Removed.
+ * dvi-init.h (font): Removed member variable 'tate'.
+ * tategaki.c, Makefile.in (tategaki.o): Removed tategaki.c.
+
+2005-11-13 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * version.h (JPVERSION): new version j1.32
+ * dvi-init.c (iskanjifont): Don't ignore decimal part of tfm name.
+
+2005-11-08 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * README.xdvik-jp: Added web site URI.
+
+2005-11-07 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
+
+ * Makefile.in (install-data): Specify "vfontmap.sample" etc. by
+ full path to avoid error in case of 'configure' in other directory
+ as reported by Mr. Matsuyama.
+ http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/39125.html
+
+2005-10-31 Nobuyuki Tsuchimura <tutimura(a)nn.iij4u.or.jp>
[...10638 lines suppressed...]
+ ¤È¤¤¤¦Ìõ¤Ç¡¢DVISEL ¤ò define ¤¹¤ë¤È¡¢¾åµ dviselect µ¡Ç½¤òÆâÊñ¤·¡¢³°Éô
+¥¹¥¯¥ê¥×¥È(¥Ç¥Õ¥©¥ë¥È¤Ï /usr/local/bin/xdviprint¡£-xdviprint ¥ª¥×¥·¥ç¥ó¤ä
+.xdviPrint ¥ê¥½¡¼¥¹¤Ç¤âÊѹ¹²Ä)¤ËÀÚ¤ê½Ð¤·¤¿ DVI ¥Õ¥¡¥¤¥ë¤ò¥Ñ¥¤¥×¤ÇÅϤ¹¤è¤¦
+¤Ë¤Ê¤ê¤Þ¤¹¡£¥×¥ê¥ó¥¿Ì¾¤È»æ¤Î¥µ¥¤¥º¤Ï°ú¿ô¤ÇÅϤ·¤Þ¤¹¡£
+ ¥¹¥¯¥ê¥×¥È¦¤Ï DVI ¥Õ¥¡¥¤¥ë¤òɸ½àÆþÎϤ«¤éÆɤߤȤê°õºþ¤¹¤ë¥¹¥¯¥ê¥×¥È¤Ë
+¤·¤Þ¤¹¡£dvips ¤ò»È¤Ã¤¿¥µ¥ó¥×¥ë¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢¤½¤Î¤Þ¤Þ¤Ç¤â
+»È¤¨¤ë¤È¤Ï»×¤¤¤Þ¤¹¤¬¡¢¹¥¤¤ËÊÔ½¸¤·¤Æ²¼¤µ¤¤¡£:-)
+ DVISEL ¤ò define ¤¹¤ë¤È¡¢% ¥·¡¼¥±¥ó¥¹¤Î¥³¥Þ¥ó¥É»ØÄêÅù¤Ï¤Ç¤¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
+
+ ¤Ê¤ª¡¢PRINTDVI ¤Ç¤Ï¡¢landscape Åù¤Î¥ª¥×¥·¥ç¥ó¤Î°ã¤¤¤ò xdvipaper.dvips
+Åù¤ÎÊÑ´¹¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ¡¢xdvi ÆâÉô¤ÇÊÑ´¹¤·¤Æ¤¤¤Þ¤·¤¿¡£¤³¤ì¤â¡¢¤É¤Î¥×¥ê
+¥ó¥¿¥É¥é¥¤¥Ð¡¼¤ò»È¤¦¤«¤ò xdvi ÆâÉô¤ËËä¤á¹þ¤Þ¤Ê¤¤¤È¤¤¤¦Êý¿Ë¤«¤é¡¢xdvi
+ÆâÉô¤Ç¤Ï¤³¤ÎÊÑ´¹½èÍý¤ò¤·¤Þ¤»¤ó¡£¤³¤Î½èÍý¤Ï¥¹¥¯¥ê¥×¥È¦¤Ç¤¹¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
+¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë¥µ¥ó¥×¥ë¡¦¥¹¥¯¥ê¥×¥È¤Ç¤Ï¤³¤Î½èÍý¤ò¤·¤Æ¤Þ¤¹¤Î¤Ç¡¢½¾Íè¤Î
+PRINTDVI ¤ò»È¤Ã¤Æ¤¿»þ¤ÈƱ¤¸µ¡Ç½¤¬¼Â¸½¤Ç¤¤Æ¤ë¤È¤Ï»×¤¤¤Þ¤¹¤¬¡¢¥¹¥¯¥ê¥×¥È¤Î
+¤³¤ÎÉôʬ¤â¹¥¤¤Ë½ñ¤´¹¤¨¤Æ»È¤Ã¤Æ²¼¤µ¤¤¡£:-)
+
+ Êä¤Ǥ¹¤¬¡¢DVISEL µ¡Ç½¤Ï PRINTDVI ¥ë¡¼¥Á¥ó¤òÁ´ÉôÃÖ¤´¹¤¨¤¿¤â¤Î¤Ç¤Ï¤Ê¤¯¡¢
+¤½¤Î¤Û¤È¤ó¤É¤Ï PRINTDVI ¤Î¥ë¡¼¥Á¥ó¤ò»È¤Ã¤Æ¼Â¸½¤·¤Æ¤¤¤Þ¤¹¡£dviselect ¤Î¥½¡¼¥¹
+¤Ï»È¤ï¤º°ì¤«¤é½ñ¤Â¤·¤Þ¤·¤¿¡£
+
+ ¤Þ¤¿¡¢DVISEL µ¡Ç½¤¬½ÐÎϤ¹¤ëÀÚ¤ê½Ð¤·¤¿ DVI ¤È¡¢dviselect ¥³¥Þ¥ó¥É¤¬½ÐÎϤ¹¤ë
+DVI ¤ÏƱ¤¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£°ã¤¤¤Ï¡¢dviselect ¤Ç¤Ï¥Õ¥©¥ó¥ÈÈÖ¹æ¤Î¥ê¥Ê¥ó¥Ð¡¼
+¤ò¹Ô¤Ê¤Ã¤Æ¤ë¤Î¤Ë¡¢¤³¤Î DVISEL µ¡Ç½¤Ï¤½¤ì¤ò¹Ô¤Ê¤Ã¤Æ¤Ê¤¤ÅÀ¤Ç¤¹¡£
+ DVI ¥Õ¥¡¥¤¥ë¤Ç¤Ï¥Õ¥©¥ó¥ÈÈÖ¹æ 0¡Á63ÈÖ¤Þ¤Ç¤Ï 1¥Ð¥¤¥È¤Ç¥Õ¥©¥ó¥È¥Á¥§¥ó¥¸¤¬
+¤Ç¤¤ë¤¬¡¢64Èְʾå¤À¤È¥Õ¥©¥ó¥È¥Á¥§¥ó¥¸¤Ë 2¥Ð¥¤¥È¤«¤«¤ë¤È¤¤¤¦»ÅÍͤˤʤäÆ
+¤Þ¤¹¡£½¾¤Ã¤Æ¡¢¥ª¥ê¥¸¥Ê¥ë¤Î DVI ¥Õ¥¡¥¤¥ë¤Ç¤Ï¥Õ¥©¥ó¥È¤ò 65¼ïÎà°Ê¾å»È¤Ã¤Æ
+¤ë¤¬¡¢»ØÄê°õºþ¥Ú¡¼¥¸¤Ç¤Ï¹ç·× 64¼ïÎà°Ê²¼¤Î¥Õ¥©¥ó¥È¤·¤«»È¤ï¤ì¤Æ¤Ê¤¤¾ì¹ç¡¢
+dviselect ¤Ç¤Ï½ÐÎÏ DVI ¤Ç»È¤ï¤ì¤Æ¤Ê¤¤·çÈ֤Υե©¥ó¥ÈÈÖ¹æ¤òËä¤á¤ÆÁ´¤Æ
+1¥Ð¥¤¥È¤Î¥Õ¥©¥ó¥È¥Á¥§¥ó¥¸¤Ë¤·¤Æ¤·¤Þ¤¦»ö¤¬¤Ç¤¤Þ¤¹¤¬¡¢¤³¤Î DVISEL µ¡Ç½¤Ï
+¥ª¥ê¥¸¥Ê¥ë¤Î DVI ¥Õ¥¡¥¤¥ë¤Î¥Õ¥©¥ó¥ÈÈÖ¹æ¤ò¤½¤Î¤Þ¤Þ»È¤¤¤Þ¤¹¡£½¾¤Ã¤Æ¡¢
+dviselect ¤Î½ÐÎϤ¹¤ë DVI ¤è¤ê¥µ¥¤¥º¤¬Â礤¯¤Ê¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£
+
+ ¤â¤Ã¤È¤â¡¢»ä¤Ï 65¼ïÎà°Ê¾å¤â¤Î¥Õ¥©¥ó¥È¤ò»È¤Ã¤¿ TeX ¤Ê¤ó¤Æ¸«¤¿»ö¤Ê¤¤¤·¡¢
+¤É¤¦¤»°õºþ¤¹¤ë»þ¤Ë°ì»þŪ¤Ë»È¤Ã¤Æ¤¹¤°¾Ã¤¹ DVI ¤Î½ÐÎϤǿô¥Ð¥¤¥È¤òÀáÌó¤·¤Æ
+¤â¤·¤ç¤¦¤¬¤Ê¤¤¤Î¤Ç¡¢¥Õ¥©¥ó¥ÈÈÖ¹æ¤Î¥ê¥Ê¥ó¥Ð¡¼¤Ï¹Ô¤Ê¤ï¤Ê¤¤»ö¤Ë¤·¤Þ¤·¤¿¡£:-)
+DVI ¥Õ¥¡¥¤¥ëÃæ¤Ç»È¤ï¤ì¤Æ¤ë¥Õ¥©¥ó¥ÈÈֹ椬Èô¤ÓÈô¤Ó¤Ê¤Î¤ÏÌäÂꤢ¤ê¤Þ¤»¤ó¡£
+TeX ¼«ÂΤ½¤¦¤¤¤¦ DVI ¤òÅǤ¤Þ¤¹¡£:-)
+
+
+ 3) ¤½¤Î¾ (ÀÛºî̤ȯɽ)
+
+ 3.1) SMALL_PANEL ¤Î¿ôÃͤθ«Ä¾¤·
+
+ ²èÌ̤µ¤¤¥Î¡¼¥È¥Ñ¥½¥³¥óÅù¤Ç»È¤¦»þ¤Ë¤Ï SMALL_PANEL µ¡Ç½¤ÏÊØÍø¤Ç¤¹
+ ¤¬¡¢¾®¤µ¤¯¤¹¤ë¤¢¤Þ¤ê¥Ü¥¿¥ó¤È¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤¬½Å¤Ê¤Ã¤¿¤ê¤·¤Æ¤Æ³Ê¹¥°¤¤
+ ¤Ç¤¹¡£°ìÈÌ¤Ë SMALL_PANEL ¤ò»È¤¤¤¿¤¤¿Í¤Ï²èÌ̤νÄÊý¸þ¤Ë;͵¤¬¤Ê¤¤¤±¤É¡¢
+ ²£Êý¸þ¤Ë¤Ï¤Þ¤À;͵¤¬¤¢¤ë¤È»×¤ï¤ì¤Þ¤¹¡£¤Þ¤¿¡¢½ÄÊý¸þ¤Ë¾®¤µ²á¤®¤ë¾ì¹ç¤Ï
+ ¥¦¥£¥ó¥É¡¼¤ò¥ê¥µ¥¤¥º¤¹¤ì¤ÐºÑ¤ß¤Þ¤¹¤¬¡¢²£Êý¸þ¤Ï¥ê¥µ¥¤¥º¤·¤Æ¤â¥Ñ¥Í¥ëÉôʬ
+ ¤ÎÂ礤µ¤ÏÊѤï¤é¤Ê¤¤¤Î¤Ç¡¢²£Êý¸þ¤Ë¾®¤µ²á¤®¤Æ¸«¤Ë¤¯¤¤¤Î¤Ïľ¤·¤Ë¤¯¤¤¤Ç¤¹¡£
+ ¤È¤¤¤¦Ìõ¤Ç¡¢Á´ÂΤΥХé¥ó¥¹¤ò¸«Ä¾¤·¤Æ¤ß¤Þ¤·¤¿¡£
+
+ 3.2) ¡ÖXDvi*international: True¡×¤Ê¤ó¤Æ¡¢ÀßÄê¤ò¤¹¤ë¤È¡¢TOC ¤Ç¥Þ¥¦¥¹
+ ¿¿Ãæ¥Ü¥¿¥ó¤ò²¡¤·¤¿»þ¤Ë²¡¤·¤¿°ÌÃ֤Ȱ㤦°ÌÃÖ¤¬¥Þ¡¼¥¯¤µ¤ì¤Æ¤·¤Þ¤¦¡£
+ ¤Þ¤¿¡¢SELFILE »þ¤Ëʸ»ú²½¤±¤·¤¿¤ê¡¢É½¼¨¤¬¤º¤ì¤¿¤ê¤¹¤ë¡£
+
+ ¤³¤ó¤ÊÀßÄê¤Ë¤·¤Æ¤ë¿Í¤Ï¤¤¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó¤¬(^^;;)¡¢Athena Widget
+ ¤Ç i18n ¤Ë¤¹¤ë»þ¤Ë¤Ï XFontStruct ¤ò»È¤Ã¤Æ¤ëÉôʬ¤ÏÁ´Éô½ñ¤´¹¤¨¤Ê¤¤ã
+ ¡Ä¤È¤¤¤¦¤ä¤Ä¤Ç¤¹¡£:-)
+ °ì±þ¡¢X11R4 °ÊÁ°¤ò»È¤Ã¤Æ¤ë¿Í¤ò¹Í¤¨¤Æ(¤¤¤ë¤Î¤«? ^^;;)¡¢#ifdef ÉÕ¤¤Ç
+ Êѹ¹¤·¤Æ¤ª¤¤Þ¤·¤¿¡£:-) ¥Æ¥¹¥È¤Ï¤·¤Æ¤Þ¤»¤ó¡£X11R4 ¤Ê¤ó¤Æ̵¤¤(¾Ð)¡£
+
+ 3.3) ¥Þ¥Ë¥å¥¢¥ë¤Î¥ª¥×¥·¥ç¥óÀâÌÀÉôʬ¤ËÉÕ¤¤¤Æ
+
+ xdvi ¤Î man ¤Î¥ª¥×¥·¥ç¥óÉôʬ¤ÎÀâÌÀ¤Ï¥ª¥×¥·¥ç¥ó¤Î¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Ë
+ µ½Ò¤µ¤ì¤Æ¤ë¤È»×¤ï¤ì¤ë¤¬¡¢PRINTDVI ¤ÇÄɲ䵤줿¥ª¥×¥·¥ç¥ó¤Ï¸å¤í¤Ë
+ Äɲ䵤ì¤Æ¤Æ¡¢¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Ë¤Ê¤Ã¤Æ¤Ê¤¤¤Î¤Ç¡¢¥½¡¼¥È¤·Ä¾¤·¤¿¡£:-)
+
+
+¡û³Ð½ñ (´º¤¨¤Æ TODO ¤È¤Ï½ñ¤«¤Ê¤¤(¾Ð))
+
+ * ¤«¤Ä¤Æ¿§¡¹¤¢¤Ã¤¿ xdvi-17 ÍѥѥåÁ¤Î¤¦¤Á¡¢xdvik-20c ÍѥѥåÁ¤Ç¤Þ¤À¼è¤ê
+ ¹þ¤Þ¤ì¤Æ¤Ê¤¤µ¡Ç½¤È¤·¤Æ¤Ï¡¢xdvi-17jp.960209 ¤Ë¤¢¤Ã¤¿¡¢
+ 5. DVI ¥Õ¥¡¥¤¥ëÃæ¤Îʸ»úÎó¤Î¸¡º÷µ¡Ç½¡£
+ 6. -remote ¥ª¥×¥·¥ç¥ó¤ÎÄɲá£
+ ¤¬µó¤²¤é¤ì¤Þ¤¹¡£
+
+
+¡ûºÇ¸å¤Ë
+
+ Ãøºî¸¢¤Ï¤½¤ì¤¾¤ì¤Î¥Ñ¥Ã¥Á¤Îºî¼Ô¤Ë¤¢¤ê¤Þ¤¹¡£¾Ü¤·¤¯¤Ï READMEs/ ¥Ç¥£¥ì¥¯
+¥È¥ê°Ê²¼¤Î¥Õ¥¡¥¤¥ë·²¤Ê¤É¤ò¸«¤Æ²¼¤µ¤¤¡£
+
+/* Takeshi WATANABE <watanabe komadori planet sci kobe-u ac jp> */
diff -N texk/xdvik/READMEs/README.xdvik20c-j1.0p1.patch
--- xdvik-22.84.10.orig/texk/xdvik/READMEs/README.xdvik20c-j1.0p1.patch 1 Jan 1970 00:00:00 -0000
+++ xdvik-22.84.10/texk/xdvik/READMEs/README.xdvik20c-j1.0p1.patch 18 Aug 2003 01:39:46 -0000 1.1
@@ -0,0 +1,43 @@
+xdvik20c-j1.0p1.patch ¤Ë¤Ä¤¤¤Æ
+
+ ÃÞÇÈÂç³Ø ¼Ò²ñ¹©³Ø¸¦µæ²Ê
+ Ã汦 ¹ÀÆó (knakau sk tsukuba ac jp)
+
+ÍÑÅÓ¡§
+ ¤³¤Î¥Ñ¥Ã¥Á¤Ï¡¢xdvi (xdvik-20c) ¤¬ÆüËܸì¤òɽ¼¨¤Ç¤¤ë¤è¤¦¤ËÊѹ¹¤ò
+ ²Ã¤¨¤ë¥Ñ¥Ã¥Á¤Ç¤¹¡£(ASCII-pTeX, NTT-JTeX)
+
+¼Õ¼¡§
+ ¤³¤Î¥Ñ¥Ã¥Á¤Ï xdvi-20a-j1.1p15.patch ̵¤¯¤·¤Æ¤Ï¸ºß¤·¤Þ¤»¤ó¡£
+ ¤½¤ÎÀ½ºî¤Ë¤Ï¡¢»³²ì¡÷ÀéÍÕÂ礵¤ó¤ò½é¤á¤È¤¹¤ë¿¤¯¤ÎÊý¤¬·È¤ï¤Ã¤Æ
+ ¤ª¤é¤ì¤Þ¤¹¡£¤½¤ÎÅØÎϤ˴¶¼Õ¤·¤Ä¤Ä¡¢¤³¤Î¥Ñ¥Ã¥Á¤ò»È¤¤¤Þ¤·¤ç¤¦¡£
+
+½Ð½ê¡§
+ ¤³¤Î¥Ñ¥Ã¥Á¤Ï´ðËÜŪ¤Ë xdvik20a-j1.1p15.patch ¤ËÊѹ¹¤ò²Ã¤¨¡¢
+ xdvik-20c¤ËÂбþ¤µ¤»¤¿¤â¤Î¤Ç¤¹¡£¤½¤ÎºÝ¤Î¼ç¤ÊÊѹ¹ÅÀ¤Ï¡¢
+ °Ê²¼¤ÎÆóÅÀ¤Ç¤¹¡£
+
+ ¡ü xdvik-20¦¤Î¥Õ¥¡¥¤¥ë̾¤ÎÊѹ¹¤Ëȼ¤¦¥Ñ¥Ã¥ÁÆâÍƤÎÊѹ¹¡£
+ ¡ü xdvik-20¤ÎÆâÍÆÊѹ¹¤Ëȼ¤¦¥Ñ¥Ã¥ÁÅö¤Æ¾ò·ï¤ÎÊѹ¹¡£
+
+ xdvik20c-j1.0p1¤«¤é¡¢Æ⻳¡÷·Ä±þÂ礵¤ó¤Î¹×¸¥¤Ë¤è¤ê¡¢jisx0212
+ ¤ÎÊä½õ´Á»ú¤òÍøÍѤǤ¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£¤³¤ÎÍøÍѤˤĤ¤¤Æ¤Ï¡¢
+ ²¼µ¤Î¥Ú¡¼¥¸¤¬»²¹Í¤Ë¤·¤Æ²¼¤µ¤¤¡£
+ Ê¡°æ¡÷ÅìÂ礵¤ó http://www.tooyoo.l.u-tokyo.ac.jp/fkr/makejvf.html
+ Æ⻳¡÷·ÄÂ礵¤ó http://macptex.appi.keio.ac.jp/~uchiyama/gaiji.html
+
+¥¤¥ó¥¹¥È¡¼¥ë¡§
+ ¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ä¤¤¤Æ¤Ï¡¢linux, Digital UNIX¤Î¾ì¹ç¤Î
+ ¥¤¥ó¥¹¥È¡¼¥ë¼ê½ç¤Ë¤Ä¤¤¤Æ¡¢¾ÜºÙ¤ËµÏ¿¤·¤Æ¤ª¤¤Þ¤·¤¿¡£
+ ¾Ü¤·¤¯¤Ï¡¢²¼µ¤ÎURL¤ò¸æÍ÷¤¯¤À¤µ¤¤¡£
+ http://ecopolis.sk.tsukuba.ac.jp/~knakau/unix/
+
+ ¤Þ¤¿¡¢README.xdvik20a-j1.1.patch ¤Ë»³²ì¡÷ÀéÍÕÂ礵¤ó¤Ë¤è¤ë
+ ¾ÜºÙ¤Êµ½Ò¤¬¤¢¤ê¤Þ¤¹¡£¤½¤Á¤é¤âÊ»¤»¤Æ»²¹Í¤Ë¤·¤Æ²¼¤µ¤¤¡£
+
+Ãí°ÕÅÀ¡§
+ ¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÀßÄêÊѹ¹¤ò¹Ô¤¦¥Õ¥¡¥¤¥ë̾¤¬ 20a ¤«¤é 20c ¤Î´Ö¤Ç
+ Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤´Ãí°Õ²¼¤µ¤¤¡£
+
+ ¡ü Makefile (Êѹ¹Ìµ¤·)
+ ¡ü xdvi-config.h (°ÊÁ°¤Î config.h ¤ËÁêÅö)
diff -u -r1.1.1.5 -r1.5
--- xdvik-22.84.10.orig/texk/xdvik/gui/help-window.c 1 Jan 2005 07:53:34 -0000 1.1.1.5
+++ xdvik-22.84.10/texk/xdvik/gui/help-window.c 17 Nov 2005 04:28:09 -0000 1.5
@@ -309,6 +309,9 @@
#ifdef T1LIB
"- T1lib (direct rendering of PS fonts) enabled\n",
#endif
+#ifdef USE_ZEIT
+ "- FreeType (Kanji font rendering) enabled\n",
+#endif /* USE_ZEIT */
#if HAVE_ICONV_H
"- Iconv support compiled in\n",
#if USE_LANGINFO
diff -u -r1.1.1.7 -r1.3
--- xdvik-22.84.10.orig/texk/xdvik/texmf/XDvi 22 Apr 2004 02:36:40 -0000 1.1.1.7
+++ xdvik-22.84.10/texk/xdvik/texmf/XDvi 24 Feb 2005 15:24:00 -0000 1.3
@@ -125,7 +125,7 @@
!!!------------------------------------------------------------------------------
!!! background color and font:
*tipShell.background: cornsilk
-*tipShell.fontSet: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*
+*tipShell.fontSet: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*,-*-*-medium-r-*-*-12-*-*-*-*-*-*,
!!! time the mouse needs to stay on a button until tooltips pop up,
!!! in milliseconds; set to a negative value to disable:
@@ -133,11 +133,24 @@
!!!------------------------------------------------------------------------------
+!!!-------------------------------- Xaw i18n ------------------------------------
+!!!------------------------------------------------------------------------------
+!!! note: when i18n'ed, *font and *fontSet should have same size of font
+*international: true
+*inputMethod: kinput2
+*preeditType: OverTheSpot,OffTheSpot,Root
+!!! note: xdviSelFile can not be i18n'ed (bug?)
+xdviSelFile*international: false
+
+
+!!!------------------------------------------------------------------------------
!!!------------------------------ Fonts and colors ------------------------------
!!!------------------------------------------------------------------------------
-*font: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*
+*font: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*
+*fontSet: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*,-*-*-medium-r-*-*-12-*-*-*-*-*-*
!!! Use a smaller font for the statusline in the Xaw version:
-*statusline.font: -*-helvetica-medium-r-*-*-10-*-*-*-*-*-*
+*statusline.font: -*-helvetica-medium-r-*-*-10-*-*-*-*-*-*
+*statusline.fontSet: -*-helvetica-medium-r-*-*-10-*-*-*-*-*-*,-*-*-medium-r-*-*-10-*-*-*-*-*-*
!!! Motif fonts. Meaning of the tags is:
!!! NORMAL: Ordinary text, labels etc.
@@ -147,11 +160,11 @@
!!! TOPIC_HEADING: Heading for help text in help window
!!!
*fontList: \
--*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*=NORMAL,\
--*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*=UNMARKED,\
--*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*=MARKED,\
--*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*=TOPIC_LABEL,\
--*-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*=TOPIC_HEADING
+-*-*-medium-r-*-*-12-*-*-*-*-*-*-*:=NORMAL,\
+-*-*-medium-r-*-*-12-*-*-*-*-*-*-*:=UNMARKED,\
+-*-*-bold-r-*-*-12-*-*-*-*-*-*-*:=MARKED,\
+-*-*-bold-r-*-*-12-*-*-*-*-*-*-*:=TOPIC_LABEL,\
+-*-*-bold-r-*-*-14-*-*-*-*-*-*-*:=TOPIC_HEADING
!!! Color used for page border, image bounding boxes and the ruler in `Ruler mode'.
tetex-3.0-pxdvi.patch:
configure.in | 2 +-
pxdvik/Makefile.in | 37 ++++++++++++++++++++-----------------
pxdvik/texmf/XDvi | 2 +-
pxdvik/vfontmap.c | 2 +-
pxdvik/withenable.ac | 4 ++--
pxdvik/xdvi-config.h | 2 +-
pxdvik/xdvi-sh.in | 2 +-
7 files changed, 27 insertions(+), 24 deletions(-)
Index: tetex-3.0-pxdvi.patch
===================================================================
RCS file: /cvs/dist/rpms/tetex/FC-5/tetex-3.0-pxdvi.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tetex-3.0-pxdvi.patch 27 Apr 2006 12:44:16 -0000 1.3
+++ tetex-3.0-pxdvi.patch 3 Sep 2006 10:36:20 -0000 1.4
@@ -1,5 +1,5 @@
---- tetex-src-3.0/texk/configure.in.pxdvi 2005-07-28 18:37:21.000000000 +0900
-+++ tetex-src-3.0/texk/configure.in 2005-07-28 18:37:21.000000000 +0900
+--- tetex-src-3.0/texk/configure.in.pxdvi 2006-09-02 11:40:25.000000000 +0200
++++ tetex-src-3.0/texk/configure.in 2006-09-02 11:40:26.000000000 +0200
@@ -51,7 +51,7 @@
PKGS='
afm2pl bibtex8 cjkutils detex devnag dtl dvi2tty dvidvi dviljk dvipdfm
@@ -9,8 +9,55 @@
'
ESUBDIRS=
---- tetex-src-3.0/texk/pxdvik/Makefile.in.pxdvi 2006-04-12 12:28:18.000000000 +0900
-+++ tetex-src-3.0/texk/pxdvik/Makefile.in 2006-04-12 12:45:02.000000000 +0900
+--- tetex-src-3.0/texk/pxdvik/vfontmap.c.pxdvi 2006-09-02 11:40:26.000000000 +0200
++++ tetex-src-3.0/texk/pxdvik/vfontmap.c 2006-09-02 11:40:26.000000000 +0200
+@@ -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)
+--- tetex-src-3.0/texk/pxdvik/withenable.ac.pxdvi 2006-09-02 11:40:26.000000000 +0200
++++ tetex-src-3.0/texk/pxdvik/withenable.ac 2006-09-02 11:40:26.000000000 +0200
+@@ -106,9 +106,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)
+
+--- tetex-src-3.0/texk/pxdvik/xdvi-config.h.pxdvi 2006-09-02 11:40:26.000000000 +0200
++++ tetex-src-3.0/texk/pxdvik/xdvi-config.h 2006-09-02 11:40:26.000000000 +0200
+@@ -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 */
+--- tetex-src-3.0/texk/pxdvik/texmf/XDvi.pxdvi 2006-09-02 11:40:26.000000000 +0200
++++ tetex-src-3.0/texk/pxdvik/texmf/XDvi 2006-09-02 11:40:26.000000000 +0200
+@@ -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
+--- tetex-src-3.0/texk/pxdvik/Makefile.in.pxdvi 2006-09-02 11:40:26.000000000 +0200
++++ tetex-src-3.0/texk/pxdvik/Makefile.in 2006-09-02 13:58:07.000000000 +0200
@@ -11,6 +11,9 @@
all_subdirs = gui
@@ -21,7 +68,7 @@
CPP = @CPP@
# Make `#include <X11/...>' and `-lX...' work.
-@@ -138,8 +141,8 @@
+@@ -139,8 +142,8 @@
rm -f $(scriptdir)/o wrapper_script@
ln -s @wrapper_script@ $(scriptdir)/o wrapper_script@
### fix wrong CVS permissions for shell script
@@ -32,7 +79,7 @@
uninstall-exec:
for p in @final_exec_name@; do rm -f $(bindir)/$$p; done
-@@ -147,43 +150,43 @@
+@@ -148,42 +151,42 @@
install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
@@ -57,10 +104,8 @@
true; \
fi
$(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(man1dir)/xdvizilla.$(manext)
-- $(INSTALL_DATA) $(srcdir)/vfontmap.sample $(texmf)/xdvi/vfontmap.freetype
-- $(INSTALL_DATA) $(srcdir)/vfontmap.vflib $(texmf)/xdvi/vfontmap.vflib
-+ $(INSTALL_DATA) $(srcdir)/vfontmap.sample $(texmf)/pxdvi/vfontmap.freetype
-+ $(INSTALL_DATA) $(srcdir)/vfontmap.vflib $(texmf)/pxdvi/vfontmap.vflib
+- $(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
@@ -92,55 +137,8 @@
program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \
MOTIF
version_files = xdvi.c
---- tetex-src-3.0/texk/pxdvik/texmf/XDvi.orig 2006-04-18 11:22:17.000000000 +0900
-+++ tetex-src-3.0/texk/pxdvik/texmf/XDvi 2006-04-24 21:25:59.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
---- tetex-src-3.0/texk/pxdvik/vfontmap.c.pxdvi 2006-04-12 12:28:18.000000000 +0900
-+++ tetex-src-3.0/texk/pxdvik/vfontmap.c 2006-04-12 12:37:56.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 VF2FT
- #include "vf2ft.h"
---- tetex-src-3.0/texk/pxdvik/withenable.ac.pxdvi 2005-02-07 15:53:00.408907107 +0900
-+++ tetex-src-3.0/texk/pxdvik/withenable.ac 2005-02-07 15:53:00.619868731 +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)
-
---- tetex-src-3.0/texk/pxdvik/xdvi-config.h.pxdvi 2006-04-12 12:28:18.000000000 +0900
-+++ tetex-src-3.0/texk/pxdvik/xdvi-config.h 2006-04-12 12:28:18.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 */
---- tetex-src-3.0/texk/pxdvik/xdvi-sh.in.pxdvi 2004-03-23 04:26:25.000000000 +0900
-+++ tetex-src-3.0/texk/pxdvik/xdvi-sh.in 2005-07-28 18:38:49.000000000 +0900
+--- tetex-src-3.0/texk/pxdvik/xdvi-sh.in.pxdvi 2004-03-22 20:26:25.000000000 +0100
++++ tetex-src-3.0/texk/pxdvik/xdvi-sh.in 2006-09-02 11:40:26.000000000 +0200
@@ -28,7 +28,7 @@
NAMEOPT='-name xdvi';;
esac
Index: tetex.spec
===================================================================
RCS file: /cvs/dist/rpms/tetex/FC-5/tetex.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- tetex.spec 25 Jun 2006 04:58:17 -0000 1.88
+++ tetex.spec 3 Sep 2006 10:36:20 -0000 1.89
@@ -11,7 +11,7 @@
Summary: The TeX text formatting system.
Name: tetex
Version: 3.0
-Release: 20.FC5
+Release: 29%{?dist}
License: distributable
Group: Applications/Publishing
Requires: tmpwatch, dialog, ed
@@ -91,10 +91,12 @@
Patch100: dvipsk-jpatch-pdvips.patch
Patch101: tetex-3.0-reautoconf.patch
-# based on http://prdownloads.sourceforge.jp/xdvi/18122/xdvik-22.84.10-j1.31.patch.gz
-Patch102: xdvik-22.84.10-j1.31_for_tetex.patch
-Patch103: tetex-3.0-pxdvi.patch
-Patch104: tetex-3.0-jp-platex209.patch
+# pxdvi requires xdvi-22.84.10
+Patch102: tetex-3.0-xdvi-22.84.10.patch
+# prepare from http://sourceforge.jp/projects/xdvi/
+Patch103: xdvi-22.84.10-j1.33.patch
+Patch104: tetex-3.0-pxdvi.patch
+Patch105: tetex-3.0-jp-platex209.patch
URL: http://www.tug.org/teTeX/
BuildRoot: %{_tmppath}/%{name}-root
@@ -106,7 +108,7 @@
%endif
BuildPreReq: bison flex perl libpng-devel ncurses-devel zlib-devel
-BuildPreReq: freetype-devel openmotif-devel textutils gd-devel
+BuildPreReq: freetype-devel Xaw3d-devel textutils gd-devel
BuildPreReq: desktop-file-utils >= %{desktop_file_utils_version}
BuildPreReq: autoconf213
BuildPreReq: libX11-devel libXpm-devel libXext-devel libSM-devel
@@ -305,18 +307,20 @@
done
mkdir -p texmf/doc/ptex/ptex-texmf
for i in COPYRIGHT COPYRIGHT.jis Changes.txt README.txt ; do
- cp -a texmf/ptex-texmf/${i} texmf/doc/ptex/ptex-texmf/
+ iconv -f ISO-2022-JP -t UTF-8 texmf/ptex-texmf/${i} \
+ -o texmf/doc/ptex/ptex-texmf/${i}
done
rm -rf texmf/ptex-texmf
tar xfj %{SOURCE900} -C texk/web2c/
+perl -pi -e 's|/\{ptex/\{platex,generic,\},tex/\{latex,generic,\}\}|/{ptex/platex,{p,}tex/latex,{p,}tex/generic,{p,}tex}|g; s/\| uniq//g' texk/web2c/ptex-src-%{ptex_src_ver}/mkconf
mkdir texmf/doc/ptex/ptex-src
cp -a texk/web2c/ptex-src-%{ptex_src_ver}/COPYRIGHT texmf/doc/ptex/ptex-src/
# Convert Japanese documents to UTF-8
-iconv -f iso-2022-jp -t utf-8 \
+iconv -f ISO-2022-JP -t UTF-8 \
texk/web2c/ptex-src-%{ptex_src_ver}/COPYRIGHT.jis \
-o texmf/doc/ptex/ptex-src/COPYRIGHT-ja
for i in README.txt Changes.txt ; do
- iconv -f euc-jp -t utf-8 texk/web2c/ptex-src-%{ptex_src_ver}/${i} \
+ iconv -f EUC-JP -t UTF-8 texk/web2c/ptex-src-%{ptex_src_ver}/${i} \
-o texmf/doc/ptex/ptex-src/${i}
done
# Prepare platex209
@@ -325,7 +329,7 @@
\input plplain.tex \dump
EOF
pushd texk/web2c/ptex-src-%{ptex_src_ver}
-%patch104 -p1
+%patch105 -p1
popd
# set up Japanese dvips (separately, bug #46785)
@@ -333,7 +337,7 @@
tar xfj %{SOURCE910} -C pdvipsk
mkdir texmf/doc/pdvipsk
for i in ChangeLog.jpatch README.jpatch ; do
- cp -a pdvipsk/${i} texmf/doc/pdvipsk/
+ iconv -f EUC-JP -t UTF-8 pdvipsk/${i} -o texmf/doc/pdvipsk/${i}
done
cp -lR texk/dvipsk texk/pdvipsk
patch -d texk/pdvipsk -p1 < pdvipsk/dvipsk-%{pdvipsk_ver}.patch
@@ -343,31 +347,36 @@
mkdir texmf/fonts/map/pdvips
ln -s dvips.1 texk/pdvipsk/pdvips.1
+# Recreated configure script with autoconf 2.13 for libwww detection
+%patch101 -p1 -b .reautoconf
+
# set up Japanese xdvi
cp -a texk/xdvik texk/pxdvik
-# Recreated configure script with autoconf 2.13 for libwww detection
-%patch101 -p1
-
pushd texk/pxdvik
%patch102 -p3
+%patch103 -p3
mkdir -p $RPM_BUILD_DIR/%{name}-src-%{version}/texmf/doc/pxdvi/READMEs
# Convert documents to UTF-8
for i in CHANGES.xdvik-jp README.xdvik-jp READMEs/* ; do
- iconv -f euc-jp -t utf-8 ${i} \
+ iconv -f EUC-JP -t UTF-8 ${i} \
-o $RPM_BUILD_DIR/%{name}-src-%{version}/texmf/doc/pxdvi/${i}
done
popd
-%patch103 -p1 -b .pxdvi
+%patch104 -p1 -b .pxdvi
mv texk/pxdvik/vfontmap.sample texk/pxdvik/vfontmap.sample.orig
install -m 644 %{SOURCE913} texk/pxdvik/vfontmap.sample
# set up mendexk
tar xfj %{SOURCE950} -C texk
+pushd texk/mendexk%{mendexk_ver}
+mv mendex.1 mendex.1.eucjp
+iconv -f EUC-JP -t UTF-8 mendex.1.eucjp -o mendex.1
+popd
%endif
@@ -406,7 +415,7 @@
--disable-multiplatform \
--without-dialog --without-texinfo --without-texi2html \
--with-mf-x-toolkit=yes \
- --with-xdvi-x-toolkit=motif \
+ --with-xdvi-x-toolkit=xaw3d \
--datadir=%{_datadir} --enable-freetype
%if %{enable_japanese}
@@ -473,8 +482,6 @@
# mendexk install
pushd texk/mendexk%{mendexk_ver}
install -m 755 mendex ${RPM_BUILD_ROOT}%{_bindir}
-mv mendex.1 mendex.1.eucjp
-iconv -f EUC-JP -t UTF-8 mendex.1.eucjp -o mendex.1
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/ja/man1
install -m 644 mendex.1 ${RPM_BUILD_ROOT}%{_mandir}/ja/man1
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/texmf/doc/mendexk
@@ -569,7 +576,7 @@
sed -e "s,.*\.\(cnf\|cfg\)$,%config(noreplace) &," \
-e "s,.*ls-R$,%ghost &," \
-e "s,^/usr/share/texmf/p\?dvips/config/config\.\(generic\|pdf\|ps\|www\)$,%config(noreplace) &," \
- -e "s,^/usr/share/texmf/*xdvi/XDvi,%config(noreplace) &," \
+ -e "s,^/usr/share/texmf/p\?xdvi/XDvi,%config(noreplace) &," \
-e "s,^/usr/share/texmf/pxdvi/vfontmap,%config(noreplace) &," \
-e "s,^/usr/share/texmf/tex/generic/config/.*,%config(noreplace) &," \
-e "s,^.*/updmap$,%config(noreplace) &," \
@@ -638,7 +645,10 @@
echo "%config(noreplace) %{_datadir}/texmf/tex/generic/config/preload.cfg" >> filelist.fonts.tmp
echo "%config(noreplace) %{_datadir}/texmf/tex/lambda/base/omarab.cfg" >> filelist.fonts.tmp
echo "%config(noreplace) %{_datadir}/texmf/tex/lambda/base/omlgc.cfg" >> filelist.fonts.tmp
-echo "%config(noreplace) %{_datadir}/texmf/*xdvi/XDvi" >> filelist.fonts.tmp
+echo "%config(noreplace) %{_datadir}/texmf/xdvi/XDvi" >> filelist.fonts.tmp
+%if %{enable_japanese}
+echo "%config(noreplace) %{_datadir}/texmf/pxdvi/XDvi" >> filelist.fonts.tmp
+%endif
echo "%config(noreplace) %{_datadir}/texmf/web2c/updmap.cfg" >> filelist.fonts.tmp
echo "%{_datadir}/texmf/web2c/mf.pool" >> filelist.fonts.tmp
echo "%{_datadir}/texmf/web2c/mktex.opt" >> filelist.fonts.tmp
@@ -826,6 +836,17 @@
%defattr(-,root,root)
%changelog
+* Sun Sep 3 2006 Jindrich Novy <jnovy redhat com> 3.0-29.fc5
+- remove BuildPreReq: openmotif-devel, build agaist Xaw3d
+- sync pxdvi patch
+- add xdvi-22.84.10 patch
+- use %%{?dist}
+
+* Fri Sep 1 2006 MATSUURA Takanori <t-matsuu estyle ne jp> 3.0-28.1.fc5
+- fix platex2e_inputs macro
+- fix dupulicated entry of %%{_datadir}/texmf/(p)xdvi/XDvi
+- announce update pxdvi to 22.84.10-j1.33
+
* Sun Jun 25 2006 Jindrich Novy <jnovy redhat com> 3.0-20.FC5
- update epstopdf to 2.9, fixes bounding box and rotation
problems (#192763, #196027)
--- xdvik-22.84.10-j1.31_for_tetex.patch DELETED ---
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]