pTeX fixes from Sadayuki Tanaka

git-svn-id: svn://tug.org/texlive/trunk@17890 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 111 insertions, 37 deletions

diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog
index 64841831195..7055f213b2b 100644
--- a/Build/source/texk/makejvf/ChangeLog
+++ b/Build/source/texk/makejvf/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* write.c (writevf): Initialize height.  From Sadayuki Tanaka
+	<s-tanaka@asciimw.jp>, 16 Apr 2010 16:30:22.
+
 2010-04-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* tool.c: #include "makejvf.h" for prototypes.
@@ -8,9 +13,6 @@
 	* makejvf.h, write.c: Change return type of vfclose() and
 	maketfm() from int to void.
 
-	*** FIXME ***
-	* write.c (writevf): height might be used uninitialized.
-
 2010-04-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile: Renamed => Makefile.orig.
diff --git a/Build/source/texk/makejvf/configure b/Build/source/texk/makejvf/configure
index 75c5c493985..39f7f689535 100755
--- a/Build/source/texk/makejvf/configure
+++ b/Build/source/texk/makejvf/configure
@@ -879,6 +879,9 @@ enable_compiler_warnings
 with_system_kpathsea
 with_kpathsea_includes
 with_kpathsea_libdir
+with_system_ptexenc
+with_ptexenc_includes
+with_ptexenc_libdir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1534,6 +1537,11 @@ Optional Packages:
                           kpathsea headers installed in DIR
   --with-kpathsea-libdir=DIR
                           kpathsea library installed in DIR
+  --with-system-ptexenc   use installed ptexenc headers and library
+  --with-ptexenc-includes=DIR
+                          ptexenc headers installed in DIR
+  --with-ptexenc-libdir=DIR
+                          ptexenc library installed in DIR
 
 Some influential environment variables:
   CC          C compiler command
@@ -4537,13 +4545,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4540: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4548: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4543: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4551: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4546: output\"" >&5)
+  (eval echo "\"\$as_me:4554: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5746,7 +5754,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5749 "configure"' > conftest.$ac_ext
+  echo '#line 5757 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7667,11 +7675,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7670: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7678: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7674: \$? = $ac_status" >&5
+   echo "$as_me:7682: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8006,11 +8014,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8009: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8017: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8013: \$? = $ac_status" >&5
+   echo "$as_me:8021: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8111,11 +8119,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8114: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8122: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8118: \$? = $ac_status" >&5
+   echo "$as_me:8126: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8166,11 +8174,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8169: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8177: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8173: \$? = $ac_status" >&5
+   echo "$as_me:8181: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10533,7 +10541,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10536 "configure"
+#line 10544 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10629,7 +10637,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10632 "configure"
+#line 10640 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13220,6 +13228,30 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
 fi
 
 ## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags
+
+# Check whether --with-system-ptexenc was given.
+if test "${with_system_ptexenc+set}" = set; then :
+  withval=$with_system_ptexenc;
+fi
+
+# Check whether --with-ptexenc-includes was given.
+if test "${with_ptexenc_includes+set}" = set; then :
+  withval=$with_ptexenc_includes;
+fi
+
+# Check whether --with-ptexenc-libdir was given.
+if test "${with_ptexenc_libdir+set}" = set; then :
+  withval=$with_ptexenc_libdir;
+fi
+if test "x$with_system_ptexenc" = xyes; then
+  if test "x$with_ptexenc_includes" != x && test "x$with_ptexenc_includes" != xyes; then
+  PTEXENC_INCLUDES="-I$with_ptexenc_includes"
+fi
+PTEXENC_LIBS="-lptexenc"
+if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; then
+  PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS"
+fi
+else
   PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \
     -e "s,SRC/,$kpse_SRC/,g" \
     -e "s,BLD/,$kpse_BLD/,g"`
@@ -13233,6 +13265,7 @@ $(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/pt
 	cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild
 ${top_builddir}/../ptexenc/ptexenc.h:
 	cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+fi
 
 
 ac_config_files="$ac_config_files Makefile"
diff --git a/Build/source/texk/makejvf/write.c b/Build/source/texk/makejvf/write.c
index bd10c4eb55c..0ef2617aa78 100644
--- a/Build/source/texk/makejvf/write.c
+++ b/Build/source/texk/makejvf/write.c
@@ -51,7 +51,7 @@ FILE *vfopen(char *name)
 
 void writevf(int code, FILE *fp)
 {
-	int cc,cc2,cc3,cc4,w,skip=0,skip2=0,height;
+	int cc,cc2,cc3,cc4,w,skip=0,skip2=0,height=1000;
 	char buf[256],buf2[256];
 
 	w = jfmread(code);
diff --git a/Build/source/texk/mendexk/ChangeLog.TL b/Build/source/texk/mendexk/ChangeLog.TL
index 7117d3223b0..64b913cfd80 100644
--- a/Build/source/texk/mendexk/ChangeLog.TL
+++ b/Build/source/texk/mendexk/ChangeLog.TL
@@ -1,6 +1,13 @@
 ChangeLog.TL: TeX Live (TL) changes for mendexk
 ===============================================
 
+2010-04-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* exvar.h, var.h (atama, page_compositor, page_precedence):
+	Change types from 'char' back to 'unsigned char' as they
+	originally were in exvar.h.  From Sadayuki Tanaka
+	<s-tanaka@asciimw.jp>, 16 Apr 2010 16:30:22.
+
 2010-04-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* pageread.c: #include "mendex.h" for prototype.
@@ -15,7 +22,6 @@ ChangeLog.TL: TeX Live (TL) changes for mendexk
 	* exvar.h (atama, page_compositor, page_precedence): Change type
 	from 'unsigned char' to 'char' as defined in var.h.
 
-	FIXME: Is this correct?
 	* convert.c (dicread): Add 'return 0' at end.
 
 	Avoid compiler warnings.
diff --git a/Build/source/texk/mendexk/configure b/Build/source/texk/mendexk/configure
index 62fff1d2279..71a873a311b 100755
--- a/Build/source/texk/mendexk/configure
+++ b/Build/source/texk/mendexk/configure
@@ -879,6 +879,9 @@ enable_compiler_warnings
 with_system_kpathsea
 with_kpathsea_includes
 with_kpathsea_libdir
+with_system_ptexenc
+with_ptexenc_includes
+with_ptexenc_libdir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1534,6 +1537,11 @@ Optional Packages:
                           kpathsea headers installed in DIR
   --with-kpathsea-libdir=DIR
                           kpathsea library installed in DIR
+  --with-system-ptexenc   use installed ptexenc headers and library
+  --with-ptexenc-includes=DIR
+                          ptexenc headers installed in DIR
+  --with-ptexenc-libdir=DIR
+                          ptexenc library installed in DIR
 
 Some influential environment variables:
   CC          C compiler command
@@ -4537,13 +4545,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4540: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4548: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4543: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4551: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4546: output\"" >&5)
+  (eval echo "\"\$as_me:4554: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5746,7 +5754,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5749 "configure"' > conftest.$ac_ext
+  echo '#line 5757 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7667,11 +7675,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7670: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7678: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7674: \$? = $ac_status" >&5
+   echo "$as_me:7682: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8006,11 +8014,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8009: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8017: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8013: \$? = $ac_status" >&5
+   echo "$as_me:8021: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8111,11 +8119,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8114: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8122: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8118: \$? = $ac_status" >&5
+   echo "$as_me:8126: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8166,11 +8174,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8169: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8177: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8173: \$? = $ac_status" >&5
+   echo "$as_me:8181: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10533,7 +10541,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10536 "configure"
+#line 10544 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10629,7 +10637,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10632 "configure"
+#line 10640 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13220,6 +13228,30 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
 fi
 
 ## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags
+
+# Check whether --with-system-ptexenc was given.
+if test "${with_system_ptexenc+set}" = set; then :
+  withval=$with_system_ptexenc;
+fi
+
+# Check whether --with-ptexenc-includes was given.
+if test "${with_ptexenc_includes+set}" = set; then :
+  withval=$with_ptexenc_includes;
+fi
+
+# Check whether --with-ptexenc-libdir was given.
+if test "${with_ptexenc_libdir+set}" = set; then :
+  withval=$with_ptexenc_libdir;
+fi
+if test "x$with_system_ptexenc" = xyes; then
+  if test "x$with_ptexenc_includes" != x && test "x$with_ptexenc_includes" != xyes; then
+  PTEXENC_INCLUDES="-I$with_ptexenc_includes"
+fi
+PTEXENC_LIBS="-lptexenc"
+if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; then
+  PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS"
+fi
+else
   PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \
     -e "s,SRC/,$kpse_SRC/,g" \
     -e "s,BLD/,$kpse_BLD/,g"`
@@ -13233,6 +13265,7 @@ $(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/pt
 	cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild
 ${top_builddir}/../ptexenc/ptexenc.h:
 	cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+fi
 
 
 ac_config_files="$ac_config_files Makefile"
diff --git a/Build/source/texk/mendexk/exvar.h b/Build/source/texk/mendexk/exvar.h
index a30a77220b4..7190a233c72 100644
--- a/Build/source/texk/mendexk/exvar.h
+++ b/Build/source/texk/mendexk/exvar.h
@@ -29,6 +29,6 @@ extern char symhead_positive[2048],symhead_negative[2048];
 extern char numhead_positive[2048],numhead_negative[2048];
 extern int symbol_flag;
 extern int letter_head;
-extern char atama[2048];
-extern char page_compositor[2048],page_precedence[2048];
+extern unsigned char atama[2048];
+extern unsigned char page_compositor[2048],page_precedence[2048];
 extern char character_order[2048];
diff --git a/Build/source/texk/mendexk/var.h b/Build/source/texk/mendexk/var.h
index 9565dd791d0..5b7fe8a7ddb 100644
--- a/Build/source/texk/mendexk/var.h
+++ b/Build/source/texk/mendexk/var.h
@@ -32,6 +32,6 @@ char symhead_positive[2048]={"Symbols"},symhead_negative[2048]={"symbols"};
 char numhead_positive[2048]={"Numbers"},numhead_negative[2048]={"numbers"};
 int symbol_flag=1;
 int letter_head=1;
-char atama[2048];
-char page_compositor[2048]={"-"},page_precedence[2048]={"rnaRA"};
+unsigned char atama[2048];
+unsigned char page_compositor[2048]={"-"},page_precedence[2048]={"rnaRA"};
 char character_order[2048]={"SNEJ"};