diff options
23 files changed, 248 insertions, 1390 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index a4e14d8ab21..ffbb8c43628 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2010-02-01 Karl Berry <karl@tug.org> + + * doc/web2c.texi (Output file location): mention that TEXMFOUTPUT + is also used for input. + 2010-01-31 Peter Breitenlohner <peb@mppmu.mpg.de> Moved luatexdir/zziplib/ to ../../libs/zziplib. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 1eaac0518d8..49deb6cee98 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -60,11 +60,12 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/ltmain.sh \ $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/alephdir/am/aleph.am \ - $(srcdir)/am/bootstrap.am $(srcdir)/am/cweb.am \ - $(srcdir)/am/texmf.am $(srcdir)/am/web.am $(srcdir)/c-auto.in \ - $(srcdir)/ctangleboot-sh.in $(srcdir)/etexdir/am/etex.am \ - $(srcdir)/libmd5/am/md5.am $(srcdir)/luatexdir/am/liblua51.am \ + $(srcdir)/Makefile.in $(srcdir)/README \ + $(srcdir)/alephdir/am/aleph.am $(srcdir)/am/bootstrap.am \ + $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/am/web.am \ + $(srcdir)/c-auto.in $(srcdir)/ctangleboot-sh.in \ + $(srcdir)/etexdir/am/etex.am $(srcdir)/libmd5/am/md5.am \ + $(srcdir)/luatexdir/am/liblua51.am \ $(srcdir)/luatexdir/am/libluatex.am \ $(srcdir)/luatexdir/am/luafontforge.am \ $(srcdir)/luatexdir/am/luamisc.am \ @@ -200,7 +201,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ - $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ @@ -213,7 +213,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = c-auto.h ff-config.h -CONFIG_CLEAN_FILES = web2c-sh tangle-sh ctangleboot-sh +CONFIG_CLEAN_FILES = CXXLD.sh web2c-sh tangle-sh ctangleboot-sh CONFIG_CLEAN_VPATH_FILES = ARFLAGS = cru libff_a_AR = $(AR) $(ARFLAGS) @@ -555,8 +555,8 @@ nodist_luatex_OBJECTS = $(am__objects_14) luatex-luatex-pool.$(OBJEXT) \ luatex_OBJECTS = $(nodist_luatex_OBJECTS) am__DEPENDENCIES_4 = libluatex.a libff.a libluamisc.a libluasocket.a \ liblua51.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) libmd5.a libmplib.a + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmd5.a \ + libmplib.a luatex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(luatex_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -908,6 +908,8 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CXXLD = @CXXLD@ +CXX_HACK_DEPS = @CXX_HACK_DEPS@ +CXX_HACK_LIBS = @CXX_HACK_LIBS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1010,9 +1012,6 @@ YFLAGS = @YFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ ZLIB_LIBS = @ZLIB_LIBS@ -ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@ -ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@ -ZZIPLIB_LIBS = @ZZIPLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -2191,6 +2190,8 @@ stamp-h2: $(top_srcdir)/luatexdir/luafontloader/ff-config.in $(top_builddir)/con distclean-hdr: -rm -f c-auto.h stamp-h1 ff-config.h stamp-h2 +CXXLD.sh: $(top_builddir)/config.status $(srcdir)/README + cd $(top_builddir) && $(SHELL) ./config.status $@ web2c-sh: $(top_builddir)/config.status $(srcdir)/web2c-sh.in cd $(top_builddir) && $(SHELL) ./config.status $@ tangle-sh: $(top_builddir)/config.status $(srcdir)/tangle-sh.in diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4 index 7fe1e663592..af019bf2d34 100644 --- a/Build/source/texk/web2c/aclocal.m4 +++ b/Build/source/texk/web2c/aclocal.m4 @@ -1121,7 +1121,6 @@ m4_include([../../m4/kpse-web2c.m4]) m4_include([../../m4/kpse-win32.m4]) m4_include([../../m4/kpse-xpdf-flags.m4]) m4_include([../../m4/kpse-zlib-flags.m4]) -m4_include([../../m4/kpse-zziplib-flags.m4]) m4_include([../../m4/libtool.m4]) m4_include([../../m4/ltoptions.m4]) m4_include([../../m4/ltsugar.m4]) diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 6c9ad7fa583..11ae823bf18 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -777,10 +777,6 @@ GRAPHITE_RULE GRAPHITE_DEPEND GRAPHITE_LIBS GRAPHITE_INCLUDES -ZZIPLIB_RULE -ZZIPLIB_DEPEND -ZZIPLIB_LIBS -ZZIPLIB_INCLUDES XPDF_RULE XPDF_DEPEND XPDF_LIBS @@ -863,6 +859,8 @@ MINGW32_TRUE WIN32_FALSE WIN32_TRUE KPSEWHICH +CXX_HACK_LIBS +CXX_HACK_DEPS CXXLD WARNING_OBJCXXFLAGS ac_ct_OBJCXX @@ -1040,7 +1038,6 @@ with_system_libpng with_libpng_includes with_libpng_libdir with_system_xpdf -with_system_zziplib with_system_graphite with_system_freetype2 with_system_teckit @@ -1759,8 +1756,6 @@ Optional Packages: libpng library installed in DIR --with-system-xpdf use installed poppler headers and library instead of xpdf (requires pkg-config) - --with-system-zziplib use installed zziplib headers and library (requires - pkg-config) --with-system-graphite use installed silgraphite headers and library (requires pkg-config) --with-system-freetype2 use installed freetype2 headers and library @@ -5169,13 +5164,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:5172: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5167: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5175: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5170: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5178: output\"" >&5) + (eval echo "\"\$as_me:5173: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6381,7 +6376,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6384 "configure"' > conftest.$ac_ext + echo '#line 6379 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8013,11 +8008,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:8016: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8011: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8020: \$? = $ac_status" >&5 + echo "$as_me:8015: \$? = $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. @@ -8352,11 +8347,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:8355: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8350: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8359: \$? = $ac_status" >&5 + echo "$as_me:8354: \$? = $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. @@ -8457,11 +8452,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:8460: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8455: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8464: \$? = $ac_status" >&5 + echo "$as_me:8459: \$? = $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 @@ -8512,11 +8507,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:8515: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8510: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8519: \$? = $ac_status" >&5 + echo "$as_me:8514: \$? = $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 @@ -10879,7 +10874,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10882 "configure" +#line 10877 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10975,7 +10970,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10978 "configure" +#line 10973 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14765,11 +14760,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:14768: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14763: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14772: \$? = $ac_status" >&5 + echo "$as_me:14767: \$? = $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. @@ -14864,11 +14859,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:14867: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14862: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14871: \$? = $ac_status" >&5 + echo "$as_me:14866: \$? = $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 @@ -14916,11 +14911,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:14919: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14914: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14923: \$? = $ac_status" >&5 + echo "$as_me:14918: \$? = $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 @@ -16230,18 +16225,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi if test "x$kpse_cv_cxx_hack" = xok; then CXXLD='$(top_builddir)/CXXLD.sh' + CXX_HACK_DEPS=$CXXLD + CXX_HACK_LIBS=$kpse_cv_cxx_flags cxxld_sh="#! ${CONFIG_SHELL-/bin/sh} # CXXLD.sh. Generated by configure. -set -- $CXX \"\$@\" $kpse_cv_cxx_flags +set -- $CXX \"\$@\" $CXX_HACK_LIBS echo \"\$0:\" \"\$@\" exec \"\$@\"" - ac_config_commands="$ac_config_commands CXXLD.sh" + ac_config_files="$ac_config_files CXXLD.sh:README" else CXXLD='$(CXX)' fi + + # Check whether --enable-libtool-hack was given. if test "${enable_libtool_hack+set}" = set; then : enableval=$enable_libtool_hack; @@ -20763,7 +20762,7 @@ if test "x$with_system_xpdf" = xyes; then POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" XPDF_LIBS=`$PKG_CONFIG poppler --libs` -elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then +elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then as_fn_error "did not find poppler-0.10 or better" "$LINENO" 5 fi else @@ -20782,35 +20781,7 @@ ${top_builddir}/../../libs/xpdf/xpdf/Stream.h: cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi -## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags - -# Check whether --with-system-zziplib was given. -if test "${with_system_zziplib+set}" = set; then : - withval=$with_system_zziplib; -fi -if test "x$with_system_zziplib" = xyes; then - if $PKG_CONFIG zziplib --atleast-version=0.12; then - ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags` - ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs` -elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then - as_fn_error "did not find zziplib-0.12 or better" "$LINENO" 5 -fi -else - ZZIPLIB_INCLUDES=`echo '-IBLD/libs/zziplib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZZIPLIB_LIBS=`echo 'BLD/libs/zziplib/libzzip.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZZIPLIB_DEPEND=`echo 'BLD/libs/zziplib/libzzip.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZZIPLIB_RULE='# Rebuild libzzip -$(ZZIPLIB_DEPEND): ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h - cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/zziplib/include/zzip/zzip.h: - cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - +KPSE_ZZIPLIB_FLAGS ## _KPSE_LIB_FLAGS: Setup graphite (-lgraphite) flags # Check whether --with-system-graphite was given. @@ -20821,7 +20792,7 @@ if test "x$with_system_graphite" = xyes; then if $PKG_CONFIG silgraphite --atleast-version=2.3; then GRAPHITE_INCLUDES="`$PKG_CONFIG silgraphite --cflags`" GRAPHITE_LIBS=`$PKG_CONFIG silgraphite --libs` -elif test "x$need_graphite:$with_system_graphite" = xyes:yes; then +elif test "x$need_graphite:$with_system_graphite" = 'xyes:yes'; then as_fn_error "did not find silgraphite 2.3 or better" "$LINENO" 5 fi else @@ -20942,7 +20913,7 @@ if test "x$with_system_freetype2" = xyes; then if $FT2_CONFIG --ftversion >/dev/null 2>&1; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` -elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +elif test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then as_fn_error "did not find freetype-config required for system freetype2 library" "$LINENO" 5 fi else @@ -22690,7 +22661,7 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "CXXLD.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS CXXLD.sh" ;; + "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:README" ;; "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;; "ff-config.h") CONFIG_HEADERS="$CONFIG_HEADERS ff-config.h:luatexdir/luafontloader/ff-config.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; @@ -24191,7 +24162,7 @@ if test "x$enable_libtool_hack" = xyes; then chmod +x "$ofile" fi ;; - "CXXLD.sh":C) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;; + "CXXLD.sh":F) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;; "c-auto.h":H) sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \ -e 's/^#define VERSION/#define WEB2C_VERSION/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h ;; "web2c-sh":F) chmod +x web2c-sh ;; diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index 069cea30a89..8f06ff91d05 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ - $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ @@ -129,6 +128,8 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CXXLD = @CXXLD@ +CXX_HACK_DEPS = @CXX_HACK_DEPS@ +CXX_HACK_LIBS = @CXX_HACK_LIBS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -231,9 +232,6 @@ YFLAGS = @YFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ ZLIB_LIBS = @ZLIB_LIBS@ -ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@ -ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@ -ZZIPLIB_LIBS = @ZZIPLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/Build/source/texk/web2c/doc/web2c.info b/Build/source/texk/web2c/doc/web2c.info index eb5eb64a55f..16fcecaceb6 100644 --- a/Build/source/texk/web2c/doc/web2c.info +++ b/Build/source/texk/web2c/doc/web2c.info @@ -1,4 +1,5 @@ -This is web2c.info, produced by makeinfo version 4.13 from web2c.texi. +This is ../../../../texk/web2c/doc/web2c.info, produced by makeinfo +version 4.13 from ../../../../texk/web2c/doc/web2c.texi. INFO-DIR-SECTION TeX START-INFO-DIR-ENTRY @@ -58,7 +59,7 @@ Web2c This document describes how to install and use the programs in the Web2c implementation of the TeX system, especially for Unix systems. It -corresponds to Web2c version 2009, released in July 2009. +corresponds to Web2c version 2009, released in February 2010. * Menu: @@ -82,7 +83,8 @@ File: web2c.info, Node: Introduction, Next: Installation, Prev: Top, Up: Top 1 Introduction ************** -This manual corresponds to version 2009 of Web2c, released in July 2009. +This manual corresponds to version 2009 of Web2c, released in February +2010. "Web2c" is the name of a TeX implementation, originally for Unix, but now also running under DOS, Amiga, and other operating systems. By @@ -625,6 +627,11 @@ not specified, the main programs (TeX, Metafont, MetaPost, and BibTeX) make an exception: if the config file value `TEXMFOUTPUT' is set (it is not by default), output files are written to the directory specified. + `TEXMFOUTPUT' is also checked for input files, as TeX often +generates files that need to be subsequently read; for input, no +suffixes (such as `.tex') are added by default, the input name is +simply checked as given. + File: web2c.info, Node: Three programs, Prev: Output file location, Up: Commonalities @@ -3657,7 +3664,7 @@ Index (line 16) * accented character: TCX files. (line 6) * accents, hyphenating words with: MLTeX. (line 6) -* acknowledgements: Introduction. (line 50) +* acknowledgements: Introduction. (line 51) * acm.bst: Basic BibTeX style files. (line 19) * Ada, WEB for: WEB. (line 13) @@ -3700,7 +3707,7 @@ Index * BDF and GF conversion: Font utilities available elsewhere. (line 15) * beginfig: mpost invocation. (line 37) -* Berry, Karl: Introduction. (line 40) +* Berry, Karl: Introduction. (line 41) * BIBINPUTS, search path for bib files: bibtex invocation. (line 18) * bibliographies, creating: BibTeX. (line 6) * bibliography: References. (line 6) @@ -3716,7 +3723,7 @@ Index * blank lines, in TCX files: TCX files. (line 67) * boxes, memory for: Runtime options. (line 20) * breakpoints, memory for: Runtime options. (line 20) -* Breitenlohner, Peter: Introduction. (line 8) +* Breitenlohner, Peter: Introduction. (line 9) * BSTINPUTS, search path for bst files: bibtex invocation. (line 18) * btex for MetaPost labels: mpost invocation. (line 50) * btxdoc.bib: bibtex invocation. (line 48) @@ -3785,7 +3792,7 @@ Index * cross-references, omitting: weave invocation. (line 22) * current directory, used for output: Output file location. (line 6) -* Curtis, Pavel: Introduction. (line 40) +* Curtis, Pavel: Introduction. (line 41) * CWEB: WEB. (line 13) * Cweb: WEB. (line 13) * date and time, in memory dumps: Hardware and memory dumps. @@ -3899,7 +3906,7 @@ Index * fraction routines: Compile-time options. (line 22) * Free Software Foundation documentation system: Formats. (line 47) -* freedom of Web2c: Introduction. (line 22) +* freedom of Web2c: Introduction. (line 23) * ftp.math.utah.edu: bibtex invocation. (line 54) * generating source specials: tex invocation. (line 136) * geometric designs: Metafont. (line 6) @@ -3936,12 +3943,12 @@ Index * headerbyte information: tftopl invocation. (line 96) * height, in pixels: pktype invocation. (line 62) * help, online: Common options. (line 11) -* Henry, Patrick: Introduction. (line 22) +* Henry, Patrick: Introduction. (line 23) * Herberts, Mathias: Online Metafont graphics. (line 20) * hex character codes, in TCX files: TCX files. (line 78) -* history: Introduction. (line 40) -* Hobby, John: Introduction. (line 8) +* history: Introduction. (line 41) +* Hobby, John: Introduction. (line 9) * horizontal escapement <1>: gftype invocation. (line 107) * horizontal escapement: pktype invocation. (line 57) * hp2627: Online Metafont graphics. @@ -3957,7 +3964,7 @@ Index * hyphenation and languages: Languages and hyphenation. (line 6) * hyphenation patterns, creating: patgen invocation. (line 6) -* ice cream: Introduction. (line 22) +* ice cream: Introduction. (line 23) * identifier case: tangle invocation. (line 35) * identifier collisions: tangle invocation. (line 46) * identifier length: tangle invocation. (line 27) @@ -3991,7 +3998,7 @@ Index * kerning table, in TFM files: tftopl invocation. (line 102) * keyboard character code, translating: TCX files. (line 102) * Knuth, Donald E. <1>: mft invocation. (line 58) -* Knuth, Donald E.: Introduction. (line 8) +* Knuth, Donald E.: Introduction. (line 9) * KPATHSEA_DEBUG: Common options. (line 60) * KRN property: tftopl invocation. (line 102) * label font: gftodvi invocation. (line 36) @@ -4005,7 +4012,7 @@ Index * left side bearing <1>: gftype invocation. (line 82) * left side bearing: pktype invocation. (line 66) * legalisms: Legalisms. (line 6) -* licensing terms: Introduction. (line 22) +* licensing terms: Introduction. (line 23) * LIG property: tftopl invocation. (line 102) * ligature table, in TFM files: tftopl invocation. (line 102) * LIGTABLE property: tftopl invocation. (line 102) @@ -4032,7 +4039,7 @@ Index * magnification: dvicopy invocation. (line 20) * main_memory: Runtime options. (line 15) * Make targets, additional: Additional targets. (line 6) -* Martin, Rick: Introduction. (line 50) +* Martin, Rick: Introduction. (line 51) * Mathematical Reviews: Formats. (line 39) * mathematical typesetting: TeX. (line 6) * mem file, determining: Determining the memory dump to use. @@ -4099,8 +4106,8 @@ Index * mode_setup: Modes. (line 15) * modes file needed for Metafont: Modes. (line 6) * modes.mf recommended modes file: Modes. (line 10) -* Morgan, Tim: Introduction. (line 40) -* Morris, Bob: Introduction. (line 50) +* Morgan, Tim: Introduction. (line 41) +* Morris, Bob: Introduction. (line 51) * MPEDIT: Editor invocation. (line 10) * mpgraph.ps: mpost invocation. (line 19) * mpman.ps: mpost invocation. (line 6) @@ -4227,7 +4234,7 @@ Index * pxtoch: Font utilities available elsewhere. (line 23) * Raichle, Bernd: MLTeX. (line 6) -* reading, additional: Introduction. (line 58) +* reading, additional: Introduction. (line 59) * readonly directory, running TeX in: Output file location. (line 15) * reallocation of arrays: Runtime options. (line 36) @@ -4244,7 +4251,7 @@ Index * restricted shell escapes: Shell escapes. (line 6) * right side bearing <1>: gftype invocation. (line 82) * right side bearing: pktype invocation. (line 66) -* Rokicki, Tomas: Introduction. (line 40) +* Rokicki, Tomas: Introduction. (line 41) * run length encoded bitmaps <1>: gftype invocation. (line 89) * run length encoded bitmaps: pktype invocation. (line 76) * runtime options: Runtime options. (line 6) @@ -4274,13 +4281,13 @@ Index * sockets: IPC and TeX. (line 6) * space-terminated filenames: \input filenames. (line 10) * Spiderweb: WEB. (line 13) -* Stallman, Richard: Introduction. (line 50) +* Stallman, Richard: Introduction. (line 51) * starting page <1>: dvitype invocation. (line 50) * starting page: dvicopy invocation. (line 28) * Steele Jr., Guy L.: Hardware and memory dumps. (line 34) * stopping at the first error: Common options. (line 41) -* strategy, overall: Introduction. (line 16) +* strategy, overall: Introduction. (line 17) * string numbers, displaying: pooltype invocation. (line 6) * string pool, writing: tangle invocation. (line 16) * string representation: pooltype invocation. (line 30) @@ -4327,7 +4334,7 @@ Index * TeX, input files found: tex invocation. (line 20) * TeX, invocation: tex invocation. (line 6) * TeX, Metafont, and MetaPost: Three programs. (line 6) -* TeX, Web2c implementation of: Introduction. (line 8) +* TeX, Web2c implementation of: Introduction. (line 9) * tex.fmt: Initial TeX. (line 15) * TEXBIB, search path for bib files: bibtex invocation. (line 18) * TEXEDIT: Editor invocation. (line 10) @@ -4336,6 +4343,8 @@ Index * texmf.cnf: Path searching. (line 6) * texmfmp.c: Online Metafont graphics. (line 80) +* TEXMFOUTPUT, used for reading: Output file location. + (line 24) * TEXMFOUTPUT, used if . unwritable: Output file location. (line 19) * texput: tex invocation. (line 35) @@ -4355,11 +4364,11 @@ Index (line 59) * torture tests: Triptrap. (line 6) * translation file for TeX, specifying: Common options. (line 96) -* translation from WEB to C: Introduction. (line 16) +* translation from WEB to C: Introduction. (line 17) * trap Make target: Additional targets. (line 41) * trap test: Triptrap. (line 6) * trapman.tex: Triptrap. (line 6) -* Trickey, Howard: Introduction. (line 40) +* Trickey, Howard: Introduction. (line 41) * trip Make target: Additional targets. (line 41) * trip test: Triptrap. (line 6) * tripman.tex: Triptrap. (line 6) @@ -4412,7 +4421,7 @@ Index * WEB programs, compiling: tangle invocation. (line 6) * WEB programs, typesetting: weave invocation. (line 6) * WEB2C, search path for TCX files: TCX files. (line 36) -* Weber, Olaf: Introduction. (line 40) +* Weber, Olaf: Introduction. (line 41) * webmac.tex: weave invocation. (line 22) * webman.tex: WEB. (line 13) * whitespace, in TCX files: TCX files. (line 69) @@ -4456,75 +4465,75 @@ Index Tag Table: -Node: Top2758 -Node: Introduction3752 -Node: Installation6924 -Node: configure options9088 -Node: Compile-time options11170 -Node: Additional targets12296 -Node: Triptrap13577 -Node: Runtime options15106 -Node: Commonalities16878 -Node: Option conventions17483 -Node: Common options18707 -Node: Path searching23219 -Node: Output file location24241 -Node: Three programs25281 -Node: Initial and virgin26040 -Node: Memory dumps27140 -Node: Creating memory dumps27607 -Node: Determining the memory dump to use28868 -Node: Hardware and memory dumps30492 -Node: Editor invocation32961 -Node: \input filenames33691 -Node: TeX36684 -Node: tex invocation37830 -Node: Initial TeX44800 -Node: Formats46289 -Node: Languages and hyphenation49228 -Node: MLTeX49658 -Node: \charsubdef51153 -Node: \tracingcharsubdef53479 -Node: TCX files54054 -Node: patgen invocation59478 -Node: Shell escapes60195 -Node: IPC and TeX63759 -Node: TeX extensions64329 -Node: Metafont65461 -Node: mf invocation66749 -Node: Initial Metafont70632 -Node: Modes72385 -Node: Online Metafont graphics74641 -Node: gftodvi invocation78056 -Node: mft invocation80878 -Node: MetaPost84933 -Node: mpost invocation85695 -Node: Initial MetaPost90603 -Node: dvitomp invocation92414 -Node: BibTeX93079 -Node: bibtex invocation93440 -Node: Basic BibTeX style files95765 -Node: WEB97107 -Node: tangle invocation98315 -Node: weave invocation100438 -Node: pooltype invocation101846 -Node: DVI utilities102976 -Node: dvicopy invocation103920 -Node: dvitype invocation105218 -Node: dvitype output example107573 -Node: Font utilities110624 -Node: Font file formats111804 -Node: gftopk invocation115103 -Node: pktogf invocation116307 -Node: pktype invocation117486 -Node: gftype invocation120321 -Node: tftopl invocation124837 -Node: pltotf invocation129471 -Node: vftovp invocation130536 -Node: vptovf invocation132820 -Node: Font utilities available elsewhere133874 -Node: Legalisms136282 -Node: References138453 -Node: Index142835 +Node: Top2812 +Node: Introduction3810 +Node: Installation6986 +Node: configure options9150 +Node: Compile-time options11232 +Node: Additional targets12358 +Node: Triptrap13639 +Node: Runtime options15168 +Node: Commonalities16940 +Node: Option conventions17545 +Node: Common options18769 +Node: Path searching23281 +Node: Output file location24303 +Node: Three programs25563 +Node: Initial and virgin26322 +Node: Memory dumps27422 +Node: Creating memory dumps27889 +Node: Determining the memory dump to use29150 +Node: Hardware and memory dumps30774 +Node: Editor invocation33243 +Node: \input filenames33973 +Node: TeX36966 +Node: tex invocation38112 +Node: Initial TeX45082 +Node: Formats46571 +Node: Languages and hyphenation49510 +Node: MLTeX49940 +Node: \charsubdef51435 +Node: \tracingcharsubdef53761 +Node: TCX files54336 +Node: patgen invocation59760 +Node: Shell escapes60477 +Node: IPC and TeX64041 +Node: TeX extensions64611 +Node: Metafont65743 +Node: mf invocation67031 +Node: Initial Metafont70914 +Node: Modes72667 +Node: Online Metafont graphics74923 +Node: gftodvi invocation78338 +Node: mft invocation81160 +Node: MetaPost85215 +Node: mpost invocation85977 +Node: Initial MetaPost90885 +Node: dvitomp invocation92696 +Node: BibTeX93361 +Node: bibtex invocation93722 +Node: Basic BibTeX style files96047 +Node: WEB97389 +Node: tangle invocation98597 +Node: weave invocation100720 +Node: pooltype invocation102128 +Node: DVI utilities103258 +Node: dvicopy invocation104202 +Node: dvitype invocation105500 +Node: dvitype output example107855 +Node: Font utilities110906 +Node: Font file formats112086 +Node: gftopk invocation115385 +Node: pktogf invocation116589 +Node: pktype invocation117768 +Node: gftype invocation120603 +Node: tftopl invocation125119 +Node: pltotf invocation129753 +Node: vftovp invocation130818 +Node: vptovf invocation133102 +Node: Font utilities available elsewhere134156 +Node: Legalisms136564 +Node: References138735 +Node: Index143117 End Tag Table diff --git a/Build/source/texk/web2c/doc/web2c.texi b/Build/source/texk/web2c/doc/web2c.texi index 85465ef5bca..d42b6853333 100644 --- a/Build/source/texk/web2c/doc/web2c.texi +++ b/Build/source/texk/web2c/doc/web2c.texi @@ -12,7 +12,7 @@ The latest version is available from ftp://ftp.tug.org/tex/texinfo.tex.} @end tex @set version 2009 -@set month-year July 2009 +@set month-year February 2010 @c Define new indices for commands in auxiliary files, filenames, and options. @defcodeindex cm @@ -503,6 +503,11 @@ Bib@TeX{}) make an exception: if the config file value @code{TEXMFOUTPUT} is set (it is not by default), output files are written to the directory specified. +@vindex TEXMFOUTPUT@r{, used for reading} +@code{TEXMFOUTPUT} is also checked for input files, as @TeX{} often +generates files that need to be subsequently read; for input, no +suffixes (such as @samp{.tex}) are added by default, the input name is +simply checked as given. @node Three programs @section Three programs: Metafont, MetaPost, and @TeX{} diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index bf3cfd722b9..ce94b027977 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,8 @@ +2010-02-01 Karl Berry <karl@tug.org> + + * openclose.c (open_input): do not try prepending TEXMFOUTPUT for + reading if the filename is absolute. + 2010-01-24 Peter Breitenlohner <peb@mppmu.mpg.de> * texmfmp.c (mk_shellcmdlist): Declare string param as const. diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index 4f473047db6..5baf0602ed5 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -60,7 +60,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ - $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ @@ -120,6 +119,8 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CXXLD = @CXXLD@ +CXX_HACK_DEPS = @CXX_HACK_DEPS@ +CXX_HACK_LIBS = @CXX_HACK_LIBS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -222,9 +223,6 @@ YFLAGS = @YFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ ZLIB_LIBS = @ZLIB_LIBS@ -ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@ -ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@ -ZZIPLIB_LIBS = @ZZIPLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/Build/source/texk/web2c/lib/openclose.c b/Build/source/texk/web2c/lib/openclose.c index e82b3215d6c..33b2ef985bc 100644 --- a/Build/source/texk/web2c/lib/openclose.c +++ b/Build/source/texk/web2c/lib/openclose.c @@ -121,24 +121,21 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode) free(fullnameoffile); fullnameoffile = NULL; - /* Handle -output-directory. - FIXME: We assume that it is OK to look here first. Possibly it - would be better to replace lookups in "." with lookups in the - output_directory followed by "." but to do this requires much more - invasive surgery in libkpathsea. */ - /* FIXME: This code assumes that the filename of the input file is - not an absolute filename. */ - if (output_directory) { - fname = concat3(output_directory, DIR_SEP_STRING, nameoffile + 1); - *f_ptr = fopen(fname, fopen_mode); + /* Look in -output-directory first, if the filename is not + absolute. This is because .aux and other such files will get + written to the output directory, and we have to be able to read + them from there. We only look for the name as-is. */ + if (output_directory && kpse_absolute_p (nameoffile+1, false)) { + fname = concat3 (output_directory, DIR_SEP_STRING, nameoffile + 1); + *f_ptr = fopen (fname, fopen_mode); if (*f_ptr) { - free(nameoffile); + free (nameoffile); namelength = strlen (fname); - nameoffile = (string)xmalloc (namelength + 2); + nameoffile = (string) xmalloc (namelength + 2); strcpy (nameoffile + 1, fname); fullnameoffile = fname; } else { - free(fname); + free (fname); } } diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog index f15e9469409..e456ca3ba0a 100644 --- a/Build/source/texk/web2c/man/ChangeLog +++ b/Build/source/texk/web2c/man/ChangeLog @@ -1,3 +1,14 @@ +2010-02-01 Karl Berry <karl@tug.org> + + * etex.man, + * aleph.man, + * bibtex.man, + * pdftex.man, + * tex.man: say a few more words about TEXMFOUTPUT. + * pdfetex.man: just refer to pdftex.man. + + * Makefile.am (EXTRA_DIST): rm pdftexman.m4. + 2009-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (man1_links): New list of symlinks within man1dir. @@ -68,6 +79,7 @@ AUTHORS for eTeX contributions. 2007-01-08 Martin Schröder <martin@pdftex.org> + * pdfetex.man, pdftex.man: Document -etex and -draftmode switches. * pdftosrc.man: New man page for pdftosrc diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am index dde3b31f85d..3043c69dcf0 100644 --- a/Build/source/texk/web2c/man/Makefile.am +++ b/Build/source/texk/web2c/man/Makefile.am @@ -104,7 +104,6 @@ EXTRA_DIST += \ amslatex.min \ initex.min \ lamstex.min \ - pdftexman.m4 \ slitex.min \ spell.add \ virtex.min diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index 4e28c01db44..e1bb8014623 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -74,7 +74,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ - $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ @@ -134,6 +133,8 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CXXLD = @CXXLD@ +CXX_HACK_DEPS = @CXX_HACK_DEPS@ +CXX_HACK_LIBS = @CXX_HACK_LIBS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -236,9 +237,6 @@ YFLAGS = @YFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ ZLIB_LIBS = @ZLIB_LIBS@ -ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@ -ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@ -ZZIPLIB_LIBS = @ZZIPLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -306,8 +304,8 @@ man_sources = $(bootstrap_man_sources) $(am__append_1) $(am__append_2) \ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_sources) tex.man \ mf.man mpost.man etex.man $(pdftex_man_sources) luatex.man \ $(otangle_man_sources) aleph.man $(misc_man_sources) \ - amslatex.min initex.min lamstex.min pdftexman.m4 slitex.min \ - spell.add virtex.min + amslatex.min initex.min lamstex.min slitex.min spell.add \ + virtex.min bootstrap_man_sources = cweb.man tangle.man # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 diff --git a/Build/source/texk/web2c/man/aleph.man b/Build/source/texk/web2c/man/aleph.man index cad9084f70c..1345102956a 100644 --- a/Build/source/texk/web2c/man/aleph.man +++ b/Build/source/texk/web2c/man/aleph.man @@ -1,4 +1,4 @@ -.TH ALEPH 1 "5 April 2009" "Web2C @VERSION@" +.TH ALEPH 1 "1 February 2010" "Web2C @VERSION@" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF M\s-2ETAFONT\s0 @@ -19,7 +19,7 @@ .if n .ds AY AmSLaTeX .\"===================================================================== .SH NAME -aleph \- extended unicode TeX +aleph \- extended Unicode TeX .SH SYNOPSIS .B aleph .RI [ options ] @@ -45,24 +45,13 @@ it is usually better to use the option instead. .PP Aleph is a version of the \*(TX program modified for multilingual -typesetting. It uses unicode, and has additional primitives for +typesetting. It uses Unicode, and has additional primitives for (among other things) bidirectional typesetting. .PP -The -.B inialeph -and -.B viraleph -commands are Aleph's analogues to the -.B initex -and -.B virtex -commands. In this installation, they are symlinks to the -.B aleph -executable. -.PP Aleph's command line options are similar to those of \*(TX. .PP -Aleph is experimental software. +Aleph is no longer being actively developed; see LuaTeX for current +activity. .\"===================================================================== .SH OPTIONS Run aleph --help to see the complete list of options; this is not @@ -204,7 +193,10 @@ Aleph attempts to create .I /tmp/paper.log (and .IR /tmp/paper.dvi , -if any output is produced.) +if any output is produced.) TEXMFOUTPUT is also checked for input +files, as \*(TX often generates files that need to be subsequently +read; for input, no suffixes (such as ``.tex'') are added by default, +the input name is simply checked as given. .TP TEXINPUTS Search path for @@ -212,11 +204,11 @@ Search path for and .I \eopenin files. -This should probably start with ``.'', so +This should start with ``.'', so that user files are found before system files. An empty path component will be replaced with the paths defined in the .I texmf.cnf -file. For example, set TEXINPUTS to ".:/home/usr/tex:" to prepend the +file. For example, set TEXINPUTS to ".:/home/user/tex:" to prepend the current direcory and ``/home/user/tex'' to the standard search path. .TP TEXEDIT diff --git a/Build/source/texk/web2c/man/bibtex.man b/Build/source/texk/web2c/man/bibtex.man index 94999d72cfa..f9f75c41290 100644 --- a/Build/source/texk/web2c/man/bibtex.man +++ b/Build/source/texk/web2c/man/bibtex.man @@ -1,4 +1,4 @@ -.TH BIBTEX 1 "8 January 2007" "bibtex 0.99c" "Web2C @VERSION@" +.TH BIBTEX 1 "1 February 2010" "bibtex 0.99c" "Web2C @VERSION@" .\"===================================================================== .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP .if n .ds TX TeX diff --git a/Build/source/texk/web2c/man/etex.man b/Build/source/texk/web2c/man/etex.man index 61fcdc2f3bf..651b2567e4b 100644 --- a/Build/source/texk/web2c/man/etex.man +++ b/Build/source/texk/web2c/man/etex.man @@ -1,4 +1,4 @@ -.TH ETEX 1 "22 March 2009" "pdftex 1.40" "Web2C @VERSION@" +.TH ETEX 1 "1 February 2010" "pdftex 1.40" "Web2C @VERSION@" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF M\s-2ETAFONT\s0 @@ -23,7 +23,7 @@ .if t .ds WB W\s-2EB\s0 .\"===================================================================== .SH NAME -etex, einitex, evirtex \- extended TeX +etex \- extended (plain) TeX .SH SYNOPSIS .B etex .RI [ options ] @@ -316,7 +316,10 @@ e-\*(TX attempts to create .I /tmp/paper.log (and .IR /tmp/paper.dvi , -if any output is produced.) +if any output is produced.) TEXMFOUTPUT is also checked for input +files, as \*(TX often generates files that need to be subsequently +read; for input, no suffixes (such as ``.tex'') are added by default, +the input name is simply checked as given. .TP TEXINPUTS Search path for @@ -324,11 +327,11 @@ Search path for and .I \eopenin files. -This should probably start with ``.'', so +This should start with ``.'', so that user files are found before system files. An empty path component will be replaced with the paths defined in the .I texmf.cnf -file. For example, set TEXINPUTS to ".:/home/usr/tex:" to prepend the +file. For example, set TEXINPUTS to ".:/home/user/tex:" to prepend the current direcory and ``/home/user/tex'' to the standard search path. .TP TEXFORMATS diff --git a/Build/source/texk/web2c/man/pdfetex.man b/Build/source/texk/web2c/man/pdfetex.man index 0f0579fd2e3..7aea1034fdf 100644 --- a/Build/source/texk/web2c/man/pdfetex.man +++ b/Build/source/texk/web2c/man/pdfetex.man @@ -1,4 +1,4 @@ -.TH PDFETEX 1 "8 January 2007" "pdftex 1.40" "Web2C @VERSION@" +.TH PDFETEX 1 "1 February 2010" "pdftex 1.40" "Web2C @VERSION@" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF M\s-2ETAFONT\s0 @@ -21,7 +21,7 @@ .if n .ds AY AmSLaTeX .\"===================================================================== .SH NAME -pdfetex, pdfeinitex, pdfevirtex \- PDF output from e-TeX +pdfetex \- PDF output from e-TeX .SH SYNOPSIS .B pdfetex .RI [ options ] @@ -29,471 +29,9 @@ pdfetex, pdfeinitex, pdfevirtex \- PDF output from e-TeX [ \fIfile\fR | \fB\e\fR \fIcommands\fR ] .\"===================================================================== .SH DESCRIPTION -Run the pdfe\*(TX typesetter on -.IR file , -usually creating -.IR file.pdf . -If the file argument has no extension, ".tex" will be appended to it. -Instead of a filename, a set of pdfe\*(TX commands can be given, the first -of which must start with a backslash. -With a -.BI & format -argument pdfe\*(TX uses a different set of precompiled commands, -contained in -.IR format.fmt ; -it is usually better to use the -.B -fmt -.I format -option instead. -.PP -pdfe\*(TX is a version of e-\*(TX that can create -.I PDF -files as well as -.I DVI -files. -.PP -In -.I DVI -mode, pdfe\*(TX can be used as a complete replacement of the e-\*(TX -engine. -.PP -The typical use of pdfe\*(TX is with a pregenerated formats for which -PDF output has been enabled. The -.B pdfetex -command uses the equivalent of the plain e-\*(TX format, and the -.B pdfelatex -command uses the equivalent of the e-\*(LX format. -To generate formats, use the -.B -ini -switch. -.PP -The -.B pdfeinitex -and -.B pdfevirtex -commands are pdfe\*(TX's analogues to the -.B einitex -and -.B evirtex -commands. In this installation, they are symbolic links to the -.B pdfetex -executable. These symbolic links may not exist at all. -.PP -In -.I PDF -mode, pdfe\*(TX can natively handle the -.IR PDF , -.IR JPG , -.IR JBIG2 , -and -.I PNG -graphics formats. pdfe\*(TX cannot include PostScript or Encapsulated -PostScript (EPS) graphics files; first convert them to PDF using -.BR epstopdf (1). -pdfe\*(TX's handling of its command-line arguments is similar to that of -of the other \*(TX programs in the -.I web2c -implementation. -.\"===================================================================== -.SH OPTIONS -This version of pdfe\*(TX understands the following command line options. -.TP -.B -draftmode -.rb -Sets \epdfdraftmode so pdf\*(TX doesn't write a PDF and doesn't read any -included images, thus speeding up execution. -.TP -.B -enc -.rb -Enable the enc\*(TX extensions. This option is only effective in -combination with -.TP -.B -etex -.rb -Enable the e-\*(TX extensions. This option is only effective in -combination with -.BR -ini . -See -.BR etex (1). -.TP -.BR -ini . -For documentation of the enc\*(TX extensions see -.BR http://www.olsak.net/enctex.html . -.B -file-line-error -.rb -Print error messages in the form -.I file:line:error -which is similar to the way many compilers format them. -.TP -.B -no-file-line-error -.rb -Disable printing error messages in the -.I file:line:error -style. -.TP -.B -file-line-error-style -.rb -This is the old name of the -.B -file-line-error -option. -.TP -.BI -fmt \ format -.rb -Use -.I format -as the name of the format to be used, instead of the name by which -pdfe\*(TX was called or a -.I %& -line. -.TP -.B -halt-on-error -.rb -Exit with an error code when an error is encountered during processing. -.TP -.B -help -.rb -Print help message and exit. -.TP -.B -ini -.rb -Start in -.I INI -mode, which is used to dump formats. The -.I INI -mode can be used for typesetting, but no format is preloaded, and -basic initializations like setting catcodes may be required. -.TP -.BI -interaction \ mode -.rb -Sets the interaction mode. The mode can be either -.IR batchmode , -.IR nonstopmode , -.IR scrollmode , -and -.IR errorstopmode . -The meaning of these modes is the same as that of the corresponding -\ecommands. -.TP -.B -ipc -.rb -Send DVI or PDF output to a socket as well as the usual output file. -Whether this option is available is the choice of the installer. -.TP -.B -ipc-start -.rb -As -.BR -ipc , -and starts the server at the other end as well. Whether this option -is available is the choice of the installer. -.TP -.BI -jobname \ name -.rb -Use -.I name -for the job name, instead of deriving it from the name of the input file. -.TP -.BI -kpathsea-debug \ bitmask -.rb -Sets path searching debugging flags according to the bitmask. See the -.I Kpathsea -manual for details. -.TP -.BI -mktex \ fmt -.rb -Enable -.RI mktex fmt , -where -.I fmt -must be either -.I tex -or -.IR tfm . -.TP -.B -mltex -.rb -Enable ML\*(TX extensions. Only effective in combination with -.BR -ini . -.TP -.BI -no-mktex \ fmt -.rb -Disable -.RI mktex fmt , -where -.I fmt -must be either -.I tex -or -.IR tfm . -.TP -.BI -output-comment \ string -.rb -In -.I DVI -mode, use -.I string -for the -.I DVI -file comment instead of the date. This option is ignored -in -.I PDF -mode. -.TP -.BI -output-directory \ directory -.rb Write output files in -.I directory -instead of the current directory. Look up input files in -.I directory -first, the along the normal search path. -.TP -.BI -output-format \ format -.rb -Set the output format mode, where -.I format -must be either -.I pdf -or -.IR dvi . -This also influences the set of graphics formats understood by pdfe\*(TX. -.TP -.B -parse-first-line -.rb -If the first line of the main input file begins with -.I %& -parse it to look for a dump name or a -.B -translate-file -option. -.TP -.B -no-parse-first-line -.rb -Disable parsing of the first line of the main input file. -.TP -.BI -progname \ name -.rb -Pretend to be program -.IR name . -This affects both the format used and the search paths. -.TP -.B -recorder -.rb -Enable the filename recorder. -This leaves a trace of the files opened for input and output -in a file with extension -.IR .fls . -.TP -.B -shell-escape -.rb -Enable the -.BI \ewrite18{ command } -construct. The -.I command -can be any shell command. This construct is normally -disallowed for security reasons. -.TP -.B -no-shell-escape -.rb -Disable the -.BI \ewrite18{ command } -construct, even if it is enabled in the -.I texmf.cnf -file. -.TP -.B -src-specials -.rb -In -.I DVI -mode, insert source specials into the -.I DVI -file. -This option is ignored in -.I PDF -mode. -.TP -.BI -src-specials \ where -.rb -In -.I DVI -mode, insert source specials in certain placed of the -.I DVI -file. -.I where -is a comma-separated value list: -.IR cr , -.IR display , -.IR hbox , -.IR math , -.IR par , -.IR parent , -or -.IR vbox . -This option is ignored in -.I PDF -mode. -.TP -.BI -translate-file \ tcxname -.rb -Use the -.I tcxname -translation table to set the mapping of input characters and -re-mapping of output characters. -.TP -.BI -default-translate-file \ tcxname -.rb -Like -.B -translate-file -except that a -.I %& -line can overrule this setting. -.TP -.B -version -.rb -Print version information and exit. -.\"===================================================================== -.SH ENVIRONMENT -See the Kpathsearch library documentation (the `Path specifications' -node) for precise details of how the environment variables are used. -The -.B kpsewhich -utility can be used to query the values of the variables. -.PP -One caveat: In most pdfe\*(TX formats, you cannot use ~ in a filename you -give directly to pdfe\*(TX, because ~ is an active character, and hence is -expanded, not taken as part of the filename. Other programs, such as -\*(MF, do not have this problem. -.PP -.TP -TEXMFOUTPUT -Normally, pdfe\*(TX puts its output files in the current directory. If -any output file cannot be opened there, it tries to open it in the -directory specified in the environment variable TEXMFOUTPUT. -There is no default value for that variable. For example, if you say -.I pdfetex paper -and the current directory is not writable, if TEXMFOUTPUT has -the value -.IR /tmp , -pdfe\*(TX attempts to create -.I /tmp/paper.log -(and -.IR /tmp/paper.pdf , -if any output is produced.) -.TP -TEXINPUTS -Search path for -.I \einput -and -.I \eopenin -files. -This should probably start with ``.'', so -that user files are found before system files. An empty path -component will be replaced with the paths defined in the -.I texmf.cnf -file. For example, set TEXINPUTS to ".:/home/usr/tex:" to prepend the -current directory and ``/home/user/tex'' to the standard search path. -.TP -TEXFORMATS -Search path for format files. -.TP -TEXPOOL -search path for -.B pdfetex -internal strings. -.TP -TEXEDIT -Command template for switching to editor. The default, usually -.BR vi , -is set when pdfe\*(TX is compiled. -.TP -TFMFONTS -Search path for font metric -.RI ( .tfm ) -files. -.\"===================================================================== -.SH FILES -The location of the files mentioned below varies from system to -system. Use the -.B kpsewhich -utility to find their locations. -.TP -.I pdfetex.pool -Text file containing pdfe\*(TX's internal strings. -.TP -.I pdftex.map -Filename mapping definitions. -.TP -.I *.tfm -Metric files for pdfe\*(TX's fonts. -.TP -.I *.fmt -Predigested pdfe\*(TX format (.\|fmt) files. -.br -.\"===================================================================== -.SH NOTES -Starting with version 1.40, pdf\*(TX incorporates the e-\*(TX -extensions, and pdfe\*(TX is just a copy of pdf\*(TX. See -.BR pdftex (1). -This manual page is not meant to be exhaustive. The complete -documentation for this version of pdfe\*(TX can be found in the -.IR "pdf\*(TX manual" -and the info manual -.IR "Web2C: A TeX implementation" . -.\"===================================================================== -.SH BUGS -This version of pdfe\*(TX implements a number of optional extensions. -In fact, many of these extensions conflict to a greater or lesser -extent with the definition of pdfe\*(TX. When such extensions are -enabled, the banner printed when pdfe\*(TX starts is changed to print -.B pdfeTeXk -instead of -.BR pdfeTeX . -.PP -This version of pdfe\*(TX fails to trap arithmetic overflow when -dimensions are added or subtracted. Cases where this occurs are rare, -but when it does the generated -.I DVI -file will be invalid. Whether a generated -.I PDF -file would be usable is unknown. -.\"===================================================================== -.SH AVAILABILITY -pdfe\*(TX is available for a large variety of machine architectures -and operation systems. -pdfe\*(TX is part of all major \*(TX distributions. -.P -Information on how to get pdfe\*(TX and related information -is available at the -.B http://www.pdftex.org -.IR "pdf\*(TX" -website. -.P -The following pdf\*(TX related mailing list is available: -.BR pdftex@tug.org . -This is a mailman list; -to subscribe send a message containing -.I subscribe -to -.BR pdftex-request@tug.org . -More about the list can be found at the -.B "http://tug.org/mailman/listinfo/pdftex" -.I mailing list -website. +pdfe\*(TX is another name for pdf\*(TX; they behave identically. +See pdftex(1) for all information. .\"===================================================================== .SH "SEE ALSO" -.BR etex (1), -.BR mf (1), .BR pdftex (1), -.BR tex (1). -.\"===================================================================== -.SH AUTHORS -The primary authors of pdfe\*(TX are Han The Thanh, Petr Sojka, -Jiri Zlatuska, and Peter Breitenlohner (e\*(TX). -.PP -\*(TX was designed by Donald E. Knuth, -who implemented it using his \*(WB system for Pascal programs. -It was ported to Unix at Stanford by Howard Trickey, and -at Cornell by Pavel Curtis. -The version now offered with the Unix \*(TX distribution is that -generated by the \*(WB to C system -.RB ( web2c ), -originally written by Tomas Rokicki and Tim Morgan. -.PP -The enc\*(TX extensions were written by Petr Olsak. -.\" vim: syntax=nroff +http://pdftex.org, http://tug.org/web2c. diff --git a/Build/source/texk/web2c/man/pdftex.man b/Build/source/texk/web2c/man/pdftex.man index 46a03ffed2f..f291eb58f06 100644 --- a/Build/source/texk/web2c/man/pdftex.man +++ b/Build/source/texk/web2c/man/pdftex.man @@ -1,4 +1,4 @@ -.TH PDFTEX 1 "8 January 2007" "pdftex 1.40" "Web2C @VERSION@" +.TH PDFTEX 1 "1 February 2010" "pdftex 1.40" "Web2C @VERSION@" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF M\s-2ETAFONT\s0 @@ -370,14 +370,17 @@ any output file cannot be opened there, it tries to open it in the directory specified in the environment variable TEXMFOUTPUT. There is no default value for that variable. For example, if you say .I pdftex paper -and the current directory is not writable, if TEXMFOUTPUT has +and the current directory is not writable and TEXMFOUTPUT has the value .IR /tmp , pdf\*(TX attempts to create .I /tmp/paper.log (and .IR /tmp/paper.pdf , -if any output is produced.) +if any output is produced.) TEXMFOUTPUT is also checked for input +files, as \*(TX often generates files that need to be subsequently +read; for input, no suffixes (such as ``.tex'') are added by default, +the input name is simply checked as given. .TP TEXINPUTS Search path for @@ -385,11 +388,11 @@ Search path for and .I \eopenin files. -This should probably start with ``.'', so +This should start with ``.'', so that user files are found before system files. An empty path component will be replaced with the paths defined in the .I texmf.cnf -file. For example, set TEXINPUTS to ".:/home/usr/tex:" to prepend the +file. For example, set TEXINPUTS to ".:/home/user/tex:" to prepend the current directory and ``/home/user/tex'' to the standard search path. .TP TEXFORMATS @@ -465,7 +468,7 @@ Information on how to get pdf\*(TX and related information is available at the .B http://www.pdftex.org .IR "pdf\*(TX" -website. +web site. .P The following pdfe\*(TX related mailing list is available: .BR pdftex@tug.org . @@ -474,10 +477,9 @@ to subscribe send a message containing .I subscribe to .BR pdftex-request@tug.org . -More about the list can be found at the -.B "http://tug.org/mailman/listinfo/pdftex" -.I mailing list -website. +A web interface and list archives can be found at the +.B "http://lists.tug.org/pdftex" +mailing list web site. .\"===================================================================== .SH "SEE ALSO" .BR epstopdf (1), @@ -485,8 +487,8 @@ website. .BR latex (1), .BR mptopdf (1), .BR tex (1), -.BR texexec (1), .BR mf (1). +http://tug.org/applications/pdftex, http://tug.org/web2c. .\"===================================================================== .SH AUTHORS The primary authors of pdf\*(TX are Han The Thanh, Petr Sojka, diff --git a/Build/source/texk/web2c/man/pdftexman.m4 b/Build/source/texk/web2c/man/pdftexman.m4 deleted file mode 100644 index c80e8a1c28e..00000000000 --- a/Build/source/texk/web2c/man/pdftexman.m4 +++ /dev/null @@ -1,671 +0,0 @@ -m4_divert(-1)m4_dnl -======================================================================= -$Id: //depot/Build/source.development/TeX/texk/web2c/man/pdftexman.m4#2 $ - -Common man page for pdftex and pdfetex, to be preprocessed by GNU m4: - -$ m4 -P -DOLD pdftexman.m4 > pdftex.man -$ m4 -P pdfetexman.m4 > pdfetex.man - -======================================================================= - -m4_define(`M_MANDATE', `23 March 2004') -m4_define(`M_WEB2CVERSION', `@VERSION@') - -m4_ifdef(`OLD', - ` - m4_define(`M_LTXPP', `\*(LX') - m4_define(`M_TEXPP', `\*(TX') - m4_define(`M_TEXP', `TeX') - m4_define(`M_TEX', `tex') - m4_define(`M_PDFTEX', `PDFTEX') - m4_define(`M_PDFENGINI', `pdfinitex') - m4_define(`M_PDFENGVIR', `pdfvirtex') - m4_define(`M_PDFENGPP', `pdf\*(TX') - m4_define(`M_PDFENGKP', `pdfTeXk') - m4_define(`M_PDFENGP', `pdfTeX') - m4_define(`M_PDFENG', `pdftex') - m4_define(`M_ENGINI', `initex') - m4_define(`M_ENGVIR', `virtex') - m4_define(`M_PDFLTX', `pdflatex') - m4_define(`M_FMT', `fmt') - ', ` - m4_define(`M_LTXPP', `e-\*(LX') - m4_define(`M_TEXPP', `e-\*(TX') - m4_define(`M_TEXP', `e-TeX') - m4_define(`M_TEX', `etex') - m4_define(`M_PDFTEX', `PDFETEX') - m4_define(`M_PDFENGINI', `pdfeinitex') - m4_define(`M_PDFENGVIR', `pdfevirtex') - m4_define(`M_PDFENGPP', `pdfe\*(TX') - m4_define(`M_PDFENGKP', `pdfeTeXk') - m4_define(`M_PDFENGP', `pdfeTeX') - m4_define(`M_PDFENG', `pdfetex') - m4_define(`M_ENGINI', `einitex') - m4_define(`M_ENGVIR', `evirtex') - m4_define(`M_PDFLTX', `pdfelatex') - m4_define(`M_FMT', `efmt') - ' -) -m4_divert`'m4_dnl -.TH M_PDFTEX 1 "M_MANDATE" "Web2C M_WEB2CVERSION" -.\"===================================================================== -.if n .ds MF Metafont -.if t .ds MF M\s-2ETAFONT\s0 -.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP -.if n .ds TX TeX -.if n .ds MF Metafont -.if t .ds MF M\s-2ETAFONT\s0 -.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP\" for troff -.el .ds OX TeX\" for nroff -.\" the same but obliqued -.\" BX definition must follow TX so BX can use TX -.if t .ds BX \fRB\s-2IB\s0\fP\*(TX -.if n .ds BX BibTeX -.\" LX definition must follow TX so LX can use TX -.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX -.if n .ds LX LaTeX -.if t .ds AX \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(TX -.if n .ds AX AmSTeX -.if t .ds AY \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(LX -.if n .ds AY AmSLaTeX -.\"===================================================================== - -.SH NAME -M_PDFENG \- Direct PDF or DVI output from M_TEXP -.\"===================================================================== - -.SH SYNTAX -.B M_PDFENG -[\fIoption\fR] ... [\fItexname\fR[\fI.tex\fR]] ... [\fIcommands\fR] -.br -.B M_PDFENG -[\fIoption\fR] ... \e\fIfirst-line\fR -.br -.B M_PDFENG -[\fIoption\fR] ... &\fI`'M_FMT args\fR -.br -.B M_PDFENG \-\-version -.br -.B M_PDFENG \-\-help -.\"===================================================================== - -.SH USAGE -Run M_PDFENGPP on -.IR texname , -usually creating -.I texname.pdf -or -.IR texname.dvi . -Any remaining -.I commands -are processed as M_PDFENGPP input, after -.I texname -is read. -.P -If the first line of -.I texname -is -.IR "%&M_FMT" , -where -.I M_FMT -is an existing format -.RI ( .M_FMT ) -file, and if parsing of the first line is enabled, use this format. -Else use -.IR "name.M_FMT" , -where -.I name -is the program invocation name, most commonly M_PDFENG. -.P -Alternatively, if the first non-option argument begins with a backslash -.IR \e , -interpret all non-option arguments as a line of M_PDFENGPP input. -.P -Alternatively, if the first non-option argument begins with an ampersand -.IR & , -the next word is taken as the format -.I M_FMT -to read, overriding all else. -Any remaining arguments -.I args -are processed as above. -.P -If no arguments or options are specified, prompt for input. -.P -M_PDFENGPP's handling of its command line arguments is similar to -that of the other \*(TX programs in the -.I WEB2C -implementation. -.P -Non-alphanumeric characters on the command line -might need quoting, depending on the shell used. -.\"===================================================================== - -.SH DESCRIPTION -This manual page is not meant to be exhaustive. -The complete documentation for this version of a \*(TX engine -can be found in the manual -.IR "The pdfTeX user manual" -and in the info file or manual -.IR "Web2C: A TeX implementation" . -.P -M_PDFENGPP is a version of M_TEXPP that can create -.I PDF -files as well as -.I DVI -files. -In -.I DVI -mode, -M_PDFENGPP can be used as complete replacement for the M_TEXPP engine. -The selection of -.I PDF -or -.I DVI -mode is done by the -.B --output-format -option or by setting the -.BI \epdfoutput -register. -.P -The typical use of M_PDFENGPP is with a pregenerated format -for which PDF output has been enabled. -The -.B M_PDFENG -command uses the equivalent of the plain M_TEXPP format, and the -.B M_PDFLTX -command uses the equivalent of the M_LTXPP format. -.P -M_PDFENGPP can also be used for generating format -.RI ( .M_FMT ) -files by call -.BR "M_PDFENG --ini" . -This gives the same functionality as the former -.B M_PDFENGINI -command, which is considered as deprecated. -.\" The -.\" .B M_PDFENGINI -.\" and -.\" .B M_PDFENGVIR -.\" commands are M_PDFENGPP's analogues to the -.\" .B M_ENGINI -.\" and -.\" .B M_ENGVIR -.\" commands. In this installation, they are symlinks to the -.\" .B M_PDFENG -.\" executable. -.P -In -.I PDF -mode, M_PDFENGPP can natively handle graphics input formats -.IR PNG , -.IR JPEG , -and -.IR PDF . -m4_ifdef(`OLD', `m4_dnl -.P -Nowadays M_PDFENGPP usually is just a link to the pdfe\*(TX program. -', `')m4_dnl -.\"===================================================================== - -.SH OPTIONS -This version of M_PDFENGPP understands the following command line options, -which can be also given starting with a single dash. -m4_dnl------------------------------------------------------------------ -.TP -.BI --default-translate-file \ tcxname -.rb -Use the default translation table from file -.IR tcxname . -This option does not override a setting given in a -.I %& -line. -The -.BI --translate-file -can overwrite this setting. -m4_dnl------------------------------------------------------------------ -.TP -m4_ifdef(`OLD', `', `m4_dnl -.BI --M_FMT \ M_FMT -.rb -Use -.I M_FMT -as the name of the format to be used, instead of the name by which -M_PDFENGPP was called or a -.I %& -line. -m4_dnl------------------------------------------------------------------ -.TP -')m4_dnl -.B --enc -.rb -Enable enc\*(TX extension by Petr Olsak, see the file -.IR "encdoc-e.pdf" . -m4_dnl------------------------------------------------------------------ -.TP -.B --file-line-error-style -.rb -Print error messages in the form -.I file:line:error -which is similar to the way many compilers format them. -m4_dnl------------------------------------------------------------------ -.TP -m4_ifdef(`OLD', `m4_dnl -.BI --M_FMT \ M_FMT -.rb -Use -.I M_FMT -as the name of the format to be used, instead of the name by which -M_PDFENGPP was called or a -.I %& -line. -m4_dnl------------------------------------------------------------------ -.TP -', `')m4_dnl -.B --help -.rb -Print help message with list of command line options and exit. -m4_dnl------------------------------------------------------------------ -.TP -.B --ini -.rb -Start in -.I INI -mode, for dumping a format M_FMT. -The -.I INI -mode can als be used for general typesetting. -As no format is preloaded, -basic initializations like setting catcodes might be required. -\." ; this is implicitly true if the program is called -\." as -\." .BR M_PDFENGINI . -m4_dnl------------------------------------------------------------------ -.TP -.BI --interaction \ mode -.rb -Sets the interaction mode. The mode can be either -.IR batchmode , -.IR nonstopmode , -.IR scrollmode , -and -.IR errorstopmode . -The meaning of these modes is the same as that of the corresponding -\ecommands. -m4_dnl------------------------------------------------------------------ -.TP -.B --ipc -.rb -In -.I DVI mode, -send -.I DVI -output to a socket as well as the usual output file. -Whether this option is available is the choice of the installer. -This option is ignored in -.I PDF -mode. -m4_dnl------------------------------------------------------------------ -.TP -.B --ipc-start -.rb -In -.DVI -mode, works as -.BR --ipc , -and starts the server at the other end as well. -Whether this option is available is the choice of the installer. -This option is ignored in -.I PDF -mode. -m4_dnl------------------------------------------------------------------ -.TP -.BI --jobname \ name -.rb -Use -.I name -for the job name, instead of deriving it from the name of the input file. -m4_dnl------------------------------------------------------------------ -.TP -.BI --kpathsea-debug \ bitmask -.rb -Sets path searching debugging flags according to the bitmask. See the -.I Kpathsea -manual for details. -m4_dnl------------------------------------------------------------------ -.TP -.BI --mktex \ fmt -.rb -Enable -.RI mktex fmt , -where -.I fmt -must be either -.I tex -or -.IR tfm . -m4_dnl------------------------------------------------------------------ -.TP -.BI --mltex -.rb -Enable MLTeX extensions such as -.IR \echarsubdef . -m4_dnl------------------------------------------------------------------ -.TP -.BI --no-mktex \ fmt -.rb -Disable -.RI mktex fmt , -where -.I fmt -must be either -.I tex -or -.IR tfm . -m4_dnl------------------------------------------------------------------ -.TP -.BI --output-comment \ string -.rb -In -.I DVI -mode, use -.I string -for the DVI file comment instead of the date. -This option is ignored in -.I PDF -mode. -m4_dnl------------------------------------------------------------------ -.TP -.BI --output-format \ format -.rb -Set output format mode, -where -.I format -must be either -.I pdf -or -.IR dvi . -This option can be overridden by setting the -.BI \epdfoutput -register. -The output format mode also influences the set of graphics formats -understood by M_PDFENGPP. -m4_dnl------------------------------------------------------------------ -.TP -.B --parse-first-line -.rb -If the first line of the main input file begins with -.IR %& , -parse it to look for a dump name or a -.B --translate-file -option. -m4_dnl------------------------------------------------------------------ -.TP -.BI --progname \ name -.rb -Pretend to be program -.IR name . -This affects both the format used and the search paths. -.TP -.B --recorder -.rb -Enable the filename recorder. -This leaves a trace of the files opened for input and output -in a file with extension -.IR .fls . -m4_dnl------------------------------------------------------------------ -.TP -.B --shell-escape -.rb -Enable the -.BI \ewrite18{ command } -construct. The -.I command -can be any shell command. -This construct is often disallowed for security reasons. -m4_dnl------------------------------------------------------------------ -.TP -.B --src-specials -.rb -In -.I DVI -mode, insert source specials into the -.I DVI -file. -This option is ignored in -.I PDF -mode. -m4_dnl------------------------------------------------------------------ -.TP -.BI --src-specials \ where -.rb -In -.I DVI -mode, insert source specials in certain placed of the -.I DVI -file. -.I where -is a comma-separated value list: -.IR cr , -.IR display , -.IR hbox , -.IR math , -.IR par , -.IR parent , -or -.IR vbox . -This option is ignored in -.I PDF -mode. -m4_dnl------------------------------------------------------------------ -.TP -.BI --translate-file \ tcxname -.rb -Use the translation table in file -.I tcxname -for mapping of input characters -and re-mapping of output characters. -This option overrides a setting given in a -.I %& -line. -m4_dnl------------------------------------------------------------------ -.TP -.B --version -.rb -Print version and copyright information and exit. -.\"===================================================================== - -.SH ENVIRONMENT -See the -.I Kpathsea library -documentation, section ```Path searching''' -for precise details of how the environment variables are used. -The -.B kpsewhich -utility can be used to query the values of the variables. -.P -One caveat: -In most M_PDFENGPP formats, you cannot use ~ in a filename -you give directly to M_PDFENGPP, because ~ is an active character, -and hence is expanded, not taken as part of the filename. -Other programs, such as \*(MF, do not have this problem. -.P -.TP -TEXMFOUTPUT -Normally, M_PDFENGPP puts its output files in the current directory. -If any output file cannot be opened there, it tries to open it in the -directory specified in the environment variable TEXMFOUTPUT. -There is no default value for that variable. For example, if you say -.I M_PDFENG paper -and the current directory is not writable, if TEXMFOUTPUT has -the value -.IR /tmp , -M_PDFENGPP attempts to create -.I /tmp/paper.log -(and -.IR /tmp/paper.pdf , -if any output is produced.) -.TP -TEXINPUTS -Search path for files read in by -.I \einput -and -.I \eopenin -commands, -as well as for graphics files. -This should probably start with ```.''', so -that user files are found before system files. An empty path -component will be replaced with the paths defined in the -.I texmf.cnf -file. For example, set TEXINPUTS to ".:/home/usr/tex:" to prepend the -current direcory and ```/home/user/tex''' to the standard search path. -.TP -TEXFORMATS -Search path for format -.RI ( .M_FMT ) -files. -.TP -TEXPOOL -Search path for string pool -.RI ( .pool ) -files. -.TP -ENCFONTS -Search path for font encoding -.RI ( .enc ) -files. -.TP -TEXFONTMAPS -Search path for font mapping -.RI ( .map ) -files. -.TP -TFMFONTS -Search path for font metric -.RI ( .tfm ) -files. -.TP -VFFONTS -Search path for virtual font -.RI ( .vf ) -files. -.TP -T1FONTS -Search path for Type 1 font files -.RI ( .pfa ) -and -.RI ( .pfb ")." -.TP -TTFONTS -Search path for True-Type font -.RI ( .ttf ) -files. -.TP -PKFONTS -Search path for pixel font -.RI ( .pk ) -files. -.TP -TEXEDIT -Command template for switching to editor. The default, usually -.BR vi , -is set when M_PDFENGPP is compiled. -.\"===================================================================== - -.SH FILES -The location of the files mentioned below varies from system to -system. Use the -.B kpsewhich -utility to find their locations. -.TP -.I texmf.cnf -Configuration file with default settings for M_PDFENGPP as well -as for other \*(TX and \*(MF related programs and utilities. -.TP -.I *.M_FMT -Predigested M_PDFENGPP format files. -.TP -.I *.pool -String pool files. -.TP -.I *.enc -Font encoding files. -.TP -.I *.map -Text files containing font mapping definitions -between TFM entries and font files. -The default file is -.IR pdftex.map . -.TP -.I *.tfm -Font metric files. -.TP -.I *.vf -Virtual font files. -.TP -.IR *.pfa , \ *.pfb -Type 1 font files (ASCII and binary format). -.TP -.I *.ttf -True-Type font files. -.TP -.I *.pk -Pixel font files. -.TP -.I *.tcx -Character translation table files. -.\"===================================================================== - -.SH BUGS -This version of M_PDFENGPP implements a number of optional extensions. -In fact, many of these extensions conflict to a greater or lesser -extent with the definition of M_PDFENGPP. When such extensions are -enabled, the banner printed when M_PDFENGPP starts is changed to print -.B M_PDFENGKP -instead of -.BR M_PDFENGP . -.P -This version of M_PDFENGPP fails to trap arithmetic overflow when -dimensions are added or subtracted. Cases where this occurs are rare, -but when it does the generated -.I DVI -file will be invalid. Whether a generated -.I PDF -file would be usable is unknown. -\." .P -.\"===================================================================== - -.SH AVAILABILITY -M_PDFENGPP is available for a large variety of machine architectures -and operation systems. -M_PDFENGPP is part of all major \*(TX distributions. -.P -Information on how to get M_PDFENGPP and related information -is available at the -.BI "http://www.pdftex.org" \ pdf\*(TX -website. -.P -The following M_PDFENGPP related mailing list is available: -.BR "pdftex@tug.org" . -This is a mailman list; -to subscribe, send a message with the subject -.I subscribe -to -.BR pdftex-request@tug.org . -More about the list can be found at the -.B "http://tug.org/mailman/listinfo/pdftex" -.I mailing list -website. -.\"===================================================================== - -.SH "SEE ALSO" -.BR tex (1), -m4_ifdef(`OLD',m4_dnl -`.BR mf (1).',m4_dnl -`.BR mf (1), -.BR etex (1).') -.\"===================================================================== - -.SH AUTHORS -The authors of M_PDFENGPP are Han The Thanh and the pdf\*(TX team. diff --git a/Build/source/texk/web2c/man/tex.man b/Build/source/texk/web2c/man/tex.man index 237bf83f8f4..c7e2776fff3 100644 --- a/Build/source/texk/web2c/man/tex.man +++ b/Build/source/texk/web2c/man/tex.man @@ -1,4 +1,4 @@ -.TH TEX 1 "6 December 2006" "Web2C @VERSION@" +.TH TEX 1 "1 February 2010" "Web2C @VERSION@" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF M\s-2ETAFONT\s0 @@ -424,7 +424,10 @@ the value .I /tmp/paper.log (and .IR /tmp/paper.dvi , -if any output is produced.) +if any output is produced.) TEXMFOUTPUT is also checked for input +files, as \*(TX often generates files that need to be subsequently +read; for input, no suffixes (such as ``.tex'') are added by default, +the input name is simply checked as given. .TP TEXINPUTS Search path for @@ -432,11 +435,11 @@ Search path for and .I \eopenin files. -This should probably start with ``.'', so +This probably start with ``.'', so that user files are found before system files. An empty path component will be replaced with the paths defined in the .I texmf.cnf -file. For example, set TEXINPUTS to ".:/home/usr/tex:" to prepend the +file. For example, set TEXINPUTS to ".:/home/user/tex:" to prepend the current directory and ``/home/user/tex'' to the standard search path. .TP TEXFORMATS diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 92a51ee79cd..bdc518ed6d9 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -63,7 +63,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ - $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ @@ -138,6 +137,8 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CXXLD = @CXXLD@ +CXX_HACK_DEPS = @CXX_HACK_DEPS@ +CXX_HACK_LIBS = @CXX_HACK_LIBS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -240,9 +241,6 @@ YFLAGS = @YFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ ZLIB_LIBS = @ZLIB_LIBS@ -ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@ -ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@ -ZZIPLIB_LIBS = @ZZIPLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index 23ae68789ae..1f1bcf6f7ed 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -65,7 +65,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ - $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ @@ -164,6 +163,8 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CXXLD = @CXXLD@ +CXX_HACK_DEPS = @CXX_HACK_DEPS@ +CXX_HACK_LIBS = @CXX_HACK_LIBS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -266,9 +267,6 @@ YFLAGS = @YFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ ZLIB_LIBS = @ZLIB_LIBS@ -ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@ -ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@ -ZZIPLIB_LIBS = @ZZIPLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in index 7baaacba326..18e5a4349c1 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -61,7 +61,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ - $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ @@ -125,6 +124,8 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CXXLD = @CXXLD@ +CXX_HACK_DEPS = @CXX_HACK_DEPS@ +CXX_HACK_LIBS = @CXX_HACK_LIBS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -227,9 +228,6 @@ YFLAGS = @YFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ ZLIB_LIBS = @ZLIB_LIBS@ -ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@ -ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@ -ZZIPLIB_LIBS = @ZZIPLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ |