summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-06-22 18:15:54 +0000
committerKarl Berry <karl@freefriends.org>2009-06-22 18:15:54 +0000
commit1a45ba09ca26bd4c2c2a4b24a84eeb1ffd46c41b (patch)
treef9919ed26cc67019f7141de2f59feb4d6ed9ba96 /Master
parente7345494aece5bf020d1f35da01813e6055363d7 (diff)
consistency fixes
git-svn-id: svn://tug.org/texlive/trunk@13887 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf/doc/man/man1/pdftexi2dvi.1184
-rw-r--r--Master/texmf/doc/man/man1/pdftexi2dvi.pdfbin10106 -> 0 bytes
-rw-r--r--Master/tlpkg/tlpsrc/fontname.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texdraw.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/wintools.win32.tlpsrc28
-rw-r--r--Master/tlpkg/tlpsrc/xindy.tlpsrc10
7 files changed, 26 insertions, 204 deletions
diff --git a/Master/texmf/doc/man/man1/pdftexi2dvi.1 b/Master/texmf/doc/man/man1/pdftexi2dvi.1
deleted file mode 100644
index 76d34b6e3da..00000000000
--- a/Master/texmf/doc/man/man1/pdftexi2dvi.1
+++ /dev/null
@@ -1,184 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-.TH TEXI2DVI "1" "April 2008" "texi2dvi 1.122" "User Commands"
-.SH NAME
-texi2dvi \- convert Texinfo documents to PDF
-.SH SYNOPSIS
-.B texi2dvi
-[\fIOPTION\fR]... \fIFILE\fR...
-.SH DESCRIPTION
-Run each Texinfo or (La)TeX FILE through TeX in turn until all
-cross\-references are resolved, building all indices. The directory
-containing each FILE is searched for included files. The suffix of FILE
-is used to determine its language ((La)TeX or Texinfo). To process
-(e)plain TeX files, set the environment variable LATEX=tex.
-.PP
-In order to make texi2dvi a drop\-in replacement of TeX/LaTeX in AUC\-TeX,
-the FILE may also be composed of the following simple TeX commands.
-.TP
-`\einput{FILE}'
-the actual file to compile
-.TP
-`\enonstopmode'
-same as \fB\-\-batch\fR
-.PP
-Makeinfo is used to perform Texinfo macro expansion before running TeX
-when needed.
-.SS "General options:"
-.TP
-\fB\-b\fR, \fB\-\-batch\fR
-no interaction
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-turn on shell debugging (set \fB\-x\fR)
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help and exit successfully
-.TP
-\fB\-o\fR, \fB\-\-output\fR=\fIOFILE\fR
-leave output in OFILE (implies \fB\-\-clean\fR);
-only one input FILE may be specified in this case
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-no output unless errors (implies \fB\-\-batch\fR)
-.TP
-\fB\-s\fR, \fB\-\-silent\fR
-same as \fB\-\-quiet\fR
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-display version information and exit successfully
-.TP
-\fB\-V\fR, \fB\-\-verbose\fR
-report on what is done
-.SS "TeX tuning:"
-.TP
-\-@
-use @input instead of \einput for preloaded Texinfo
-.TP
-\fB\-\-dvi\fR
-output a DVI file [default]
-.TP
-\fB\-e\fR, \fB\-E\fR, \fB\-\-expand\fR
-force macro expansion using makeinfo
-.TP
-\fB\-I\fR DIR
-search DIR for Texinfo files
-.TP
-\fB\-l\fR, \fB\-\-language\fR=\fILANG\fR
-specify the LANG of FILE (LaTeX or Texinfo)
-.TP
-\fB\-\-no\-line\-error\fR
-do not pass \fB\-\-file\-line\-error\fR to TeX
-.TP
-\fB\-p\fR, \fB\-\-pdf\fR
-use pdftex or pdflatex for processing
-.TP
-\fB\-r\fR, \fB\-\-recode\fR
-call recode before TeX to translate input
-.TP
-\fB\-\-recode\-from\fR=\fIENC\fR
-recode from ENC to the @documentencoding
-.TP
-\fB\-\-src\-specials\fR
-pass \fB\-\-src\-specials\fR to TeX
-.TP
-\fB\-t\fR, \fB\-\-command\fR=\fICMD\fR
-insert CMD in copy of input file
-.TP
-or \fB\-\-texinfo\fR=\fICMD\fR
-multiple values accumulate
-.TP
-\fB\-\-translate\-file\fR=\fIFILE\fR
-use given charset translation file for TeX
-.SS "Build modes:"
-.TP
-\fB\-\-build\fR=\fIMODE\fR
-specify the treatment of auxiliary files [local]
-.TP
-\fB\-\-tidy\fR
-same as \fB\-\-build\fR=\fItidy\fR
-.TP
-\fB\-c\fR, \fB\-\-clean\fR
-same as \fB\-\-build\fR=\fIclean\fR
-.TP
-\fB\-\-build\-dir\fR=\fIDIR\fR
-specify where the tidy compilation is performed;
-implies \fB\-\-tidy\fR;
-defaults to TEXI2DVI_BUILD_DIRECTORY [.]
-.TP
-\fB\-\-mostly\-clean\fR
-remove the auxiliary files and directories
-but not the output
-.PP
-The MODE specifies where the TeX compilation takes place, and, as a
-consequence, how auxiliary files are treated. The build mode
-can also be set using the environment variable TEXI2DVI_BUILD_MODE.
-.SS "Valid MODEs are:"
-.TP
-`local'
-compile in the current directory, leaving all the auxiliary
-files around. This is the traditional TeX use.
-.TP
-`tidy'
-compile in a local *.t2d directory, where the auxiliary files
-are left. Output files are copied back to the original file.
-.TP
-`clean'
-same as `tidy', but remove the auxiliary directory afterwards.
-Every compilation therefore requires the full cycle.
-.SS "Using the `tidy' mode brings several advantages:"
-.TP
-\-
-the current directory is not cluttered with plethora of temporary files.
-.TP
-\-
-clutter can be even reduced using \fB\-\-build\-dir\fR=\fIdir\fR: all the *.t2d
-directories are stored there.
-.TP
-\-
-clutter can be reduced to zero using, e.g., \fB\-\-build\-dir=\fR/tmp/$USER.t2d
-or \fB\-\-build\-dir=\fR$HOME/.t2d.
-.TP
-\-
-the output file is updated after every succesful TeX run, for
-sake of concurrent visualization of the output. In a `local' build
-the viewer stops during the whole TeX run.
-.TP
-\-
-if the compilation fails, the previous state of the output file
-is preserved.
-.TP
-\-
-PDF and DVI compilation are kept in separate subdirectories
-preventing any possibility of auxiliary file incompatibility.
-.PP
-On the other hand, because `tidy' compilation takes place in another
-directory, occasionally TeX won't be able to find some files (e.g., when
-using \egraphicspath): in that case use \fB\-I\fR to specify the additional
-directories to consider.
-.PP
-The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO,
-TEX (or PDFTEX), TEXINDEX, and THUMBPDF environment variables are used
-to run those commands, if they are set. Any CMD strings are added
-after @setfilename for Texinfo input, in the first line for LaTeX input.
-.SH "REPORTING BUGS"
-Email bug reports to <bug\-texinfo@gnu.org>,
-general questions and discussion to <help\-texinfo@gnu.org>.
-Texinfo home page: http://www.gnu.org/software/texinfo/
-.SH COPYRIGHT
-Copyright \(co 2008 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-.br
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-.SH "SEE ALSO"
-The full documentation for
-.B texi2dvi
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B texi2dvi
-programs are properly installed at your site, the command
-.IP
-.B info texi2dvi
-.PP
-should give you access to the complete manual.
diff --git a/Master/texmf/doc/man/man1/pdftexi2dvi.pdf b/Master/texmf/doc/man/man1/pdftexi2dvi.pdf
deleted file mode 100644
index 7829f17b49e..00000000000
--- a/Master/texmf/doc/man/man1/pdftexi2dvi.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/tlpkg/tlpsrc/fontname.tlpsrc b/Master/tlpkg/tlpsrc/fontname.tlpsrc
index e51f194ee44..60c86e9a038 100644
--- a/Master/tlpkg/tlpsrc/fontname.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fontname.tlpsrc
@@ -1 +1 @@
-docpattern f texmf/doc/info/fontname.info
+docpattern +f texmf/doc/info/fontname.info
diff --git a/Master/tlpkg/tlpsrc/texdraw.tlpsrc b/Master/tlpkg/tlpsrc/texdraw.tlpsrc
index 51d842a9114..1c4f6ab4fe4 100644
--- a/Master/tlpkg/tlpsrc/texdraw.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texdraw.tlpsrc
@@ -1 +1 @@
-docpattern f texmf/doc/info/texdraw.info
+docpattern +f texmf/doc/info/texdraw.info
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index cce247e8255..023010cb80b 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -34,8 +34,8 @@ binpattern f/i386-cygwin tlpkg/installer/xz/xz.i386-cygwin.exe
binpattern f/!i386-cygwin tlpkg/installer/xz/xzdec.${ARCH}
binpattern f/!i386-cygwin tlpkg/installer/xz/xz.${ARCH}
# we count on lots of platforms providing their own wget.
-binpattern f/!i386-solaris,i386-linux,mips-irix,sparc-linux,alpha-linux,\
-powerpc-linux,i386-freebsd,x86_64-linux \
+binpattern f/!i386-cygwin,i386-solaris,i386-linux,mips-irix,sparc-linux,\
+alpha-linux,powerpc-linux,i386-freebsd,x86_64-linux \
tlpkg/installer/wget/wget.${ARCH}
# former tlmgr stuff
runpattern f texmf/web2c/fmtutil-hdr.cnf
diff --git a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc b/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
index fcefbf6460f..448f66da283 100644
--- a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
@@ -1,26 +1,28 @@
category TLCore
-# original bin-winutils
+#
+# these are provided on Windows only, sources come from w32tex.
binpattern f bin/win32/aftopl.exe
+binpattern f bin/win32/bmp2png.exe
binpattern f bin/win32/bmeps.exe
binpattern f bin/win32/cjpeg.exe
binpattern f bin/win32/djpeg.exe
+binpattern f bin/win32/gunzip.exe
+binpattern f bin/win32/gzip.exe
binpattern f bin/win32/jbig2.exe
+binpattern f bin/win32/pdffonts.exe
+binpattern f bin/win32/pdfimages.exe
+binpattern f bin/win32/pdfinfo.exe
+binpattern f bin/win32/pdftops.exe
+binpattern f bin/win32/pdftotext.exe
+binpattern f bin/win32/png22pnm.exe
+binpattern f bin/win32/png2bmp.exe
binpattern f bin/win32/sam2p.exe
binpattern f bin/win32/texview.exe
+binpattern f bin/win32/tiff2png.exe
binpattern f bin/win32/todos.exe
binpattern f bin/win32/tomac.exe
binpattern f bin/win32/tounix.exe
binpattern f bin/win32/type1afm.exe
binpattern f bin/win32/unzip.exe
-# from bin-gzip.win32
-docpattern f texmf/doc/gzip/*
-binpattern f bin/win32/gunzip.exe
-binpattern f bin/win32/gzip.exe
-# from bin-tifftools.win32
-binpattern f bin/win32/tiff2png.exe
-# from bin-xpdf.win32
-binpattern f bin/win32/pdffonts.exe
-binpattern f bin/win32/pdfimages.exe
-binpattern f bin/win32/pdfinfo.exe
-binpattern f bin/win32/pdftops.exe
-binpattern f bin/win32/pdftotext.exe
+#
+docpattern d texmf/doc/gzip
diff --git a/Master/tlpkg/tlpsrc/xindy.tlpsrc b/Master/tlpkg/tlpsrc/xindy.tlpsrc
index 7fd968d6c37..ce11b72c1aa 100644
--- a/Master/tlpkg/tlpsrc/xindy.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xindy.tlpsrc
@@ -1,16 +1,20 @@
category TLCore
+#
runpattern d texmf/xindy
runpattern d texmf/scripts/xindy
#
binpattern f/!mips-irix bin/${ARCH}/texindy
binpattern f/!mips-irix bin/${ARCH}/tex2xindy
binpattern f/!mips-irix bin/${ARCH}/xindy
-binpattern f/!mips-irix bin/${ARCH}/xindy.run
+#
+# cygwin and windows have to use a different name for the clisp executable.
+binpattern f/!mips-irix,i386-cygwin bin/${ARCH}/xindy.run
+binpattern f/i386-cygwin,win32 bin/${ARCH}/xindy-lisp.exe
+#
+# darwin has to split the mem file by architecture.
binpattern f/!mips-irix,universal-darwin bin/${ARCH}/xindy.mem
-binpattern f/i386-cygwin bin/${ARCH}/xindy-lisp.exe
binpattern f/universal-darwin bin/universal-darwin/xindy-i386.mem
binpattern f/universal-darwin bin/universal-darwin/xindy-ppc.mem
-binpattern f bin/win32/xindy-lisp.exe
#
docpattern f texmf/doc/man/man1/*xindy.*
docpattern d texmf/doc/xindy