diff options
author | Karl Berry <karl@freefriends.org> | 2008-05-08 23:42:28 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-05-08 23:42:28 +0000 |
commit | 44074544b4e3fb4bf5f754768b102ed7d768aadf (patch) | |
tree | 9d46bef5afbc7e9564c230d3e6ea33dcdb40456d /Master | |
parent | 854bb6b3161ae0c46490db9be4d6c3b771e6a48c (diff) |
merge etex into pdftex, since that is the reality
git-svn-id: svn://tug.org/texlive/trunk@7961 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf/fmtutil/fmtutil-hdr.cnf | 2 | ||||
-rw-r--r-- | Master/texmf/fmtutil/format.etex.cnf | 1 | ||||
-rw-r--r-- | Master/texmf/fmtutil/format.pdftex.cnf | 5 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/bin-eplain.tlpsrc | 2 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/bin-etex.tlpsrc | 10 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/bin-latex.tlpsrc | 2 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc | 2 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc | 1 |
8 files changed, 8 insertions, 17 deletions
diff --git a/Master/texmf/fmtutil/fmtutil-hdr.cnf b/Master/texmf/fmtutil/fmtutil-hdr.cnf index 50197cb7408..060ebec0b75 100644 --- a/Master/texmf/fmtutil/fmtutil-hdr.cnf +++ b/Master/texmf/fmtutil/fmtutil-hdr.cnf @@ -11,7 +11,7 @@ # Some notes: # 1) tex and amstex just load hyphen.tex. No customization. -# You can have you own customized (via babel's hyphen.cfg) +# You can have your own customized (via babel's hyphen.cfg) # formats on top of plain by using "bplain.tex" instead of # plain.tex (see e.g. bplain.ini file for bplain format). # diff --git a/Master/texmf/fmtutil/format.etex.cnf b/Master/texmf/fmtutil/format.etex.cnf deleted file mode 100644 index 9f4424f4ba2..00000000000 --- a/Master/texmf/fmtutil/format.etex.cnf +++ /dev/null @@ -1 +0,0 @@ -etex pdftex language.def -translate-file=cp227.tcx *etex.ini diff --git a/Master/texmf/fmtutil/format.pdftex.cnf b/Master/texmf/fmtutil/format.pdftex.cnf index 49d63d0d13e..0d4eecfb6ae 100644 --- a/Master/texmf/fmtutil/format.pdftex.cnf +++ b/Master/texmf/fmtutil/format.pdftex.cnf @@ -1,2 +1,3 @@ -pdftex pdftex - -translate-file=cp227.tcx *pdftex.ini -pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini +etex pdftex language.def -translate-file=cp227.tcx *etex.ini +pdftex pdftex - -translate-file=cp227.tcx *pdftex.ini +pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini diff --git a/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc b/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc index 2b72d0d6380..0dacf3ff6ab 100644 --- a/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc +++ b/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc @@ -1,6 +1,6 @@ name bin-eplain category TLCore -depend bin-etex +depend bin-pdftex execute BuildFormat eplain runpattern f texmf/fmtutil/format.eplain.cnf docpattern f texmf/doc/info/eplain.info diff --git a/Master/tlpkg/tlpsrc/bin-etex.tlpsrc b/Master/tlpkg/tlpsrc/bin-etex.tlpsrc deleted file mode 100644 index e9976b93acd..00000000000 --- a/Master/tlpkg/tlpsrc/bin-etex.tlpsrc +++ /dev/null @@ -1,10 +0,0 @@ -name bin-etex -category TLCore -depend bin-kpathsea -execute BuildFormat etex -runpattern f texmf/fmtutil/format.etex.cnf -docpattern f texmf/doc/man/man1/etex.1 -docpattern f texmf/doc/man/man1/etex.1.html -binpattern f bin/${ARCH}/einitex -binpattern f bin/${ARCH}/etex -binpattern f bin/${ARCH}/evirtex diff --git a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc b/Master/tlpkg/tlpsrc/bin-latex.tlpsrc index b3356965c28..5d53ca254fc 100644 --- a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc +++ b/Master/tlpkg/tlpsrc/bin-latex.tlpsrc @@ -1,6 +1,6 @@ name bin-latex category TLCore -depend bin-etex +depend bin-pdftex execute BuildFormat latex runpattern f texmf/fmtutil/format.latex.cnf runpattern f texmf/tex/generic/config/preload.cfg diff --git a/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc b/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc index 2d9ea8a0173..6a4f9f231e5 100644 --- a/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc +++ b/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc @@ -7,6 +7,7 @@ runpattern f texmf/fonts/map/pdftex/updmap/* runpattern f texmf/tex/generic/config/pdftex*.tex runpattern f texmf/tex/generic/pdftex/* runpattern f texmf/web2c/pdftex.pool +docpattern f texmf/doc/man/man1/etex.1 docpattern f texmf/doc/man/man1/pdfetex.1 docpattern f texmf/doc/man/man1/pdfetex.1.html docpattern f texmf/doc/man/man1/pdflatex.1 @@ -20,6 +21,7 @@ docpattern f texmf/doc/pdftex/misc/* docpattern f texmf/doc/pdftex/pdftex-pdfkeys/* docpattern f texmf/doc/pdftex/thanh/* docpattern f texmf/doc/pdftex/thanh/ext/* +binpattern f bin/${ARCH}/etex binpattern f bin/${ARCH}/pdfetex binpattern f bin/${ARCH}/pdflatex binpattern f bin/${ARCH}/pdftex diff --git a/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc b/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc index 8a44c0b52f8..2df4e345524 100644 --- a/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc @@ -8,7 +8,6 @@ depend bin-dialog depend bin-dvipdfm depend bin-dvipdfmx depend bin-dvipsk -depend bin-etex depend bin-getnonfreefonts depend bin-gsftopk depend bin-kpathsea |