summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-06-10 16:49:17 +0000
committerKarl Berry <karl@freefriends.org>2008-06-10 16:49:17 +0000
commit32fb792b18a81c4993e3ae6d24e999b4ab8c4432 (patch)
tree51ec07388cd3db1efab8d63905a168d9d59bcf1d /Master
parentf6b5fc56a4de1d5b386d21bdbf4655318685c680 (diff)
no pdf output for etex
git-svn-id: svn://tug.org/texlive/trunk@8658 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/tex/plain/config/etex.ini4
-rw-r--r--Master/texmf-dist/tex/plain/config/pdfetex.ini2
-rw-r--r--Master/texmf-dist/tex/plain/config/pdftex.ini6
-rw-r--r--Master/texmf/fmtutil/format.pdftex.cnf5
4 files changed, 8 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/plain/config/etex.ini b/Master/texmf-dist/tex/plain/config/etex.ini
new file mode 100644
index 00000000000..f8db7a942ef
--- /dev/null
+++ b/Master/texmf-dist/tex/plain/config/etex.ini
@@ -0,0 +1,4 @@
+% Thomas Esser, 1998. public domain.
+\input etex.src
+\dump
+\endinput
diff --git a/Master/texmf-dist/tex/plain/config/pdfetex.ini b/Master/texmf-dist/tex/plain/config/pdfetex.ini
index 56b3462bbf7..f88b7ac77b3 100644
--- a/Master/texmf-dist/tex/plain/config/pdfetex.ini
+++ b/Master/texmf-dist/tex/plain/config/pdfetex.ini
@@ -1,4 +1,6 @@
% Thomas Esser, 1998. public domain.
+% This is used for pdftex and pdfetex, which are now identical: both
+% with e-TeX extensions, both with pdf output.
\input pdftexconfig.tex
\input etex.src
\input pdftexmagfix.tex
diff --git a/Master/texmf-dist/tex/plain/config/pdftex.ini b/Master/texmf-dist/tex/plain/config/pdftex.ini
deleted file mode 100644
index bd788c28aed..00000000000
--- a/Master/texmf-dist/tex/plain/config/pdftex.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-% Thomas Esser, 1998. public domain.
-\input pdftexconfig.tex
-\input plain
-\input pdftexmagfix.tex
-\dump
-\endinput
diff --git a/Master/texmf/fmtutil/format.pdftex.cnf b/Master/texmf/fmtutil/format.pdftex.cnf
index 2cb6871ee41..8e95d445c08 100644
--- a/Master/texmf/fmtutil/format.pdftex.cnf
+++ b/Master/texmf/fmtutil/format.pdftex.cnf
@@ -1,7 +1,6 @@
# ------------------------------------------------------------------
# $Id$
-# We use pdfetex.ini for all formats now, since pdftex always includes
-# the e-TeX extensions, and so we may as well always read etex.src.
-etex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
+# The pdftex engine always includes the e-TeX extensions.
+etex pdftex language.def -translate-file=cp227.tcx *etex.ini
pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
pdftex pdftex - -translate-file=cp227.tcx *pdfetex.ini