summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-11 17:53:34 +0000
committerKarl Berry <karl@freefriends.org>2010-03-11 17:53:34 +0000
commit27ab5bdb172cdca81625807019df6d38e6124094 (patch)
tree6a784c019f63f0466a9ef993a8f87b0cb949e1a1 /Build/source/texk
parent9ace6b0c25ac0b471098c1f8708cf01b21109cd4 (diff)
better mktexfmt parsing; regularize text at end of help messages
git-svn-id: svn://tug.org/texlive/trunk@17423 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/tetex/ChangeLog10
-rwxr-xr-xBuild/source/texk/tetex/fmtutil37
-rwxr-xr-xBuild/source/texk/tetex/texconfig7
-rwxr-xr-xBuild/source/texk/tetex/texlinks6
-rwxr-xr-xBuild/source/texk/tetex/updmap3
5 files changed, 43 insertions, 20 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index 8f7948c66f6..f7d9557bd7b 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-11 Karl Berry <karl@tug.org>
+
+ * updmap,
+ * texlinks,
+ * texconfig (version): use svn id.
+ (help): regularize info at end of msg.
+
+ * fmtutil (help): describe mktexfmt operation.
+ (main): give more error message in mktexfmt mode.
+
2010-01-17 Karl Berry <karl@tug.org>
* updmap,
diff --git a/Build/source/texk/tetex/fmtutil b/Build/source/texk/tetex/fmtutil
index 4c9b8f2eebe..c29237e3fb3 100755
--- a/Build/source/texk/tetex/fmtutil
+++ b/Build/source/texk/tetex/fmtutil
@@ -86,10 +86,21 @@ help()
cat <<eof
$version
Usage: fmtutil [OPTION]... CMD [ARG]...
+Usage: mktexfmt FMT.fmt|BASE.base|MEM.mem|FMTNAME
Rebuild and manage TeX formats (and Metafont bases and MetaPost mems).
-Valid options:
+If the command name ends in mktexfmt, only one format can be created.
+The only options supported are --help and --version, and the command
+line must consist of either a format name, with its extension, or a
+plain name that is passed as the argument to --byfmt (see below). The
+full name of the generated file (if any) is written to stdout, and
+nothing else.
+
+If not operating in mktexfmt mode, the command line can be more general,
+and multiple formats can be generated, as follows.
+
+Valid options for fmtutil:
--cnffile FILE
--fmtdir DIRECTORY
--no-engine-subdir don't use engine-specific subdir of the fmtdir
@@ -98,7 +109,7 @@ Valid options:
--dolinks (not implemented, just for compatibility)
--force (not implemented, just for compatibility)
-Valid commands:
+Valid commands for fmtutil:
--all recreate all format files
--missing create all missing format files
--refresh recreate only existing format files
@@ -118,7 +129,8 @@ Valid commands:
The config file is named fmtutil.cnf, and
running kpsewhich fmtutil.cnf should show the active file.
-Report bugs to <tex-k@tug.org>.
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
eof
cleanup 0
}
@@ -401,18 +413,15 @@ main()
mktexfmtMode=true
fullfmt=$1; shift
case $fullfmt in
+ ""|--help) help ;;
+ --version) version ;;
+ --*) abort "unknown option $fullfmt, try --help" ;;
*.fmt|*.mem|*.base)
- set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}; shift
- ;;
- *.*)
- abort "unknown format type: $fullfmt"
- ;;
- "")
- help
- ;;
- *)
- set x --byfmt $fullfmt; shift
- ;;
+ set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
+ shift
+ ;;
+ *.*) abort "unknown format type: $fullfmt" ;;
+ *) set x --byfmt $fullfmt; shift ;;
esac
;;
esac
diff --git a/Build/source/texk/tetex/texconfig b/Build/source/texk/tetex/texconfig
index fe0927136e0..f37b30b1283 100755
--- a/Build/source/texk/tetex/texconfig
+++ b/Build/source/texk/tetex/texconfig
@@ -25,7 +25,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
progname=texconfig
# the version string
-version=20080708.1050
+version='$Id$'
envVars="
AFMFONTS BIBINPUTS BSTINPUTS CMAPFONTS CWEBINPUTS ENCFONTS GFFONTS
@@ -586,8 +586,9 @@ Get more help with:
$progname pdftex
$progname xdvi
-See http://tug.org/texlive/ for other documentation, etc.
-Report bugs to <tex-k@tug.org>."
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+"
case $1 in
# texconfig conf
diff --git a/Build/source/texk/tetex/texlinks b/Build/source/texk/tetex/texlinks
index db16bb45aa0..686ac4ea92a 100755
--- a/Build/source/texk/tetex/texlinks
+++ b/Build/source/texk/tetex/texlinks
@@ -39,7 +39,7 @@ export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-version=20090623.0228
+version='$Id$
progname=texlinks
cnf=fmtutil.cnf # name of the config file
@@ -65,7 +65,9 @@ operate. If no directories are specified and --multiplatform is
likewise not specified, the directory of this script itself is used.
With --multiplatform, all child dirs of an upper-level bin/ dir are used.
-Report bugs to tex-k@tug.org.'
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+'
###############################################################################
# abort(errmsg)
diff --git a/Build/source/texk/tetex/updmap b/Build/source/texk/tetex/updmap
index dad49741f05..573a381ac98 100755
--- a/Build/source/texk/tetex/updmap
+++ b/Build/source/texk/tetex/updmap
@@ -161,7 +161,8 @@ written, run updmap -n.
For step-by-step instructions on making new fonts known to TeX, see
http://tug.org/fonts/fontinstall.html.
-Report bugs to <tex-k@tug.org>.
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
eof
(exit 0); exit
}