web2c manpages

git-svn-id: svn://tug.org/texlive/trunk@17817 c570f23f-e606-0410-a88d-b1316a301751

36 files changed, 472 insertions, 301 deletions

diff --git a/Build/source/texk/web2c/am/cweb.am b/Build/source/texk/web2c/am/cweb.am
index 689c3cae47d..f7674eef57b 100644
--- a/Build/source/texk/web2c/am/cweb.am
+++ b/Build/source/texk/web2c/am/cweb.am
@@ -1,6 +1,6 @@
 ## texk/web2c/am/cweb.am: Makefile fragment for cweb programs (except ctangle).
 ##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 bin_PROGRAMS += ctie cweave tie
@@ -8,7 +8,8 @@ EXTRA_DIST += ctiedir tiedir
 
 nodist_ctie_SOURCES = ctie.c
 ctie_CFLAGS = $(WARNING_CFLAGS)
-nodist_man_MANS += ctiedir/ctie.1
+## We install man/ctie.man, not ctiedir/ctie.1
+## nodist_man_MANS += ctiedir/ctie.1
 ctie.c: ctangle$(EXEEXT) ctiedir/ctie.w ctiedir/ctie-k.ch
 	CWEBINPUTS=$(srcdir)/ctiedir $(ctangle) ctie.w ctie-k.ch
 DISTCLEANFILES += ctie.c
@@ -16,14 +17,15 @@ DISTCLEANFILES += ctie.c
 nodist_cweave_SOURCES = cweave.c cweb.c
 $(cweave_OBJECTS): cweb.h
 cweave_CFLAGS = $(WARNING_CFLAGS)
-cweave.c: ctangle$(EXEEXT) cwebdir/common.h cwebdir/cweave.w cwebdir/cweav-w2c.ch
+cweave.c: ctangle$(EXEEXT) cwebdir/common.h cwebdir/cweave.w cwebdir/prod.w cwebdir/cweav-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) cweave cweav-w2c
 DISTCLEANFILES += cweave.c
 
 nodist_tie_SOURCES = tie.c
 tie_CPPFLAGS = -DNOT_WEB2C
 tie_CFLAGS = $(WARNING_CFLAGS)
-nodist_man_MANS += tiedir/tie.1
+## We install man/tie.man, not tiedir/tie.1
+## nodist_man_MANS += tiedir/tie.1
 tie.c: ctangle$(EXEEXT) tiedir/tie.w tiedir/tie-w2c.ch
 	CWEBINPUTS=$(srcdir)/tiedir $(ctangle) tie.w tie-w2c.ch
 DISTCLEANFILES += tie.c
diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog
index 8348d7cf39c..8d4601b868b 100644
--- a/Build/source/texk/web2c/man/ChangeLog
+++ b/Build/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,19 @@
+2010-04-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ctie.man (new): Instead of ../ctiedir/ctie.1.
+	* tie.man (new): Instead of ../tiedir/tie.1.
+	* Makefile.am (bootstrap_man_sources): Add the new files.
+
+2010-04-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* bibtex.man, cweb.man, dvicopy.man, dvitomp.man, dvitype.man,
+	gftodvi.man, gftopk.man, gftype.man, mft.man, ofm2opl.man,
+	opl2ofm.man, ovf2ovp.man, ovp2ovf.man, patgen.man, pdftosrc.man,
+	pktogf.man, pktype.man, pltotf.man, tangle.man, tftopl.man,
+	ttf2afm.man, vftovp.man, vptovf.man, weave.man:
+	Uniform manpage formatting: bold for literals, italic for
+	variable items, roman for meta items.  Adapt to facts.
+
 2010-03-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* bibtex.man: Version 0.99d.
diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am
index 3043c69dcf0..36557772652 100644
--- a/Build/source/texk/web2c/man/Makefile.am
+++ b/Build/source/texk/web2c/man/Makefile.am
@@ -1,11 +1,11 @@
 ## Makefile.am for the TeX Live subdirectory texk/web2c/man/
 ##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 man_sources = $(bootstrap_man_sources)
 EXTRA_DIST = $(bootstrap_man_sources)
-bootstrap_man_sources = cweb.man tangle.man
+bootstrap_man_sources = ctie.man cweb.man tangle.man tie.man
 
 # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
 man1_links = cweb:ctangle cweb:cweave
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 8c8de39905c..826939216fd 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -191,7 +191,6 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_DLLOADERS = @LT_DLLOADERS@
 LT_DLPREOPEN = @LT_DLPREOPEN@
-LUATANGLE = @LUATANGLE@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -320,7 +319,7 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_sources) tex.man \
 	$(otangle_man_sources) aleph.man $(misc_man_sources) \
 	amslatex.min initex.min lamstex.min slitex.min spell.add \
 	virtex.min
-bootstrap_man_sources = cweb.man tangle.man
+bootstrap_man_sources = ctie.man cweb.man tangle.man tie.man
 
 # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
 man1_links = cweb:ctangle cweb:cweave $(am__append_4) $(am__append_8) \
diff --git a/Build/source/texk/web2c/man/bibtex.man b/Build/source/texk/web2c/man/bibtex.man
index 9636c633f28..f7c75507ec7 100644
--- a/Build/source/texk/web2c/man/bibtex.man
+++ b/Build/source/texk/web2c/man/bibtex.man
@@ -16,15 +16,9 @@
 bibtex \- make a bibliography for (La)TeX
 .SH SYNOPSIS
 .B bibtex
-[
-.BI -min-crossrefs =number
-]
-[
-.B -terse
-]
-[
-.I auxname
-]
+.RB [ \-min-crossrefs=\fInumber\fP ]
+.RB [ \-terse ]
+.IR auxname [ \fB.aux\fP ]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -33,51 +27,47 @@ or manual
 .IR "Web2C: A TeX implementation" .
 .PP
 \*(BX reads the top-level auxiliary
-.RI ( .aux )
-file that was output during the running of
+.RB ( .aux )
+file
+.I auxname
+that was output during the running of
 .BR latex (1)
 or
 .BR tex (1)
 and creates a bibliography
-.RI ( .bbl )
+.RB ( .bbl )
 file that will be incorporated into the document on subsequent runs of
-\*(LX or \*(TX.  The
-.I auxname
-on the command line must be given without the
-.I .aux
-extension.  If you don't give the
-.IR auxname ,
-the program prompts you for it.
+\*(LX or \*(TX.
 .PP
 \*(BX looks up, in bibliographic database
-.RI ( .bib )
+.RB ( .bib )
 files specified by the \\bibliography command,
 the entries specified by the \\cite and \\nocite commands
 in the \*(LX or \*(TX source file.
 It formats the information from those entries
 according to instructions in a bibliography style
-.RI ( .bst )
+.RB ( .bst )
 file (specified by the \\bibliographystyle command,
 and it outputs the results to the
-.I .bbl
+.B .bbl
 file.
 .PP
 The \*(LX manual
 explains what a \*(LX source file must contain to work with \*(BX.
 Appendix B of the manual describes the format of the
-.I .bib
+.B .bib
 files. The `\*(BXing' document describes extensions and details of
 this format, and it gives other useful hints for using \*(BX.
 .\"=====================================================================
 .SH OPTIONS
 The
-.B -min-crossrefs
+.B \-min-crossrefs
 option defines the minimum number of
 .B crossref
 required for automatic inclusion of the crossref'd entry on the citation
 list; the default is two. 
 With the
-.B -terse
+.B \-terse
 option, \*(BX operates silently.  Without it, a banner and progress
 reports are printed on
 .IR stdout .
@@ -86,10 +76,10 @@ reports are printed on
 .SH ENVIRONMENT
 \*(BX searches the directories in the
 path defined by the BSTINPUTS environment variable for
-.I .bst
+.B .bst
 files. If BSTINPUTS is not set, it uses the system default.
 For
-.I .bib
+.B .bib
 files, it uses the BIBINPUTS environment variable if that is set,
 otherwise the default.
 See
@@ -101,7 +91,7 @@ TEXMFOUTPUT is set, \*(BX attempts to put its output
 files in it, if they cannot be put in the current directory.  Again, see
 .BR tex (1).
 No special searching is done for the
-.I .aux
+.B .aux
 file.
 .\"=====================================================================
 .SH FILES
@@ -127,7 +117,7 @@ template file and documentation for the standard styles
 All those files should be available somewhere on your system.
 .PP
 The host math.utah.edu has a vast collection of
-.I .bib
+.B .bib
 files available for anonymous ftp, including references for all the
 standard \*(TX books and a complete bibliography for TUGboat.
 .\"=====================================================================
diff --git a/Build/source/texk/web2c/man/ctie.man b/Build/source/texk/web2c/man/ctie.man
new file mode 100644
index 00000000000..cfa64ddd51f
--- /dev/null
+++ b/Build/source/texk/web2c/man/ctie.man
@@ -0,0 +1,59 @@
+.TH CTIE 1 "7 April 2010" "Web2C @VERSION@"
+.\"=====================================================================
+.SH NAME
+ctie \- merge or apply CWEB change files
+.\"=====================================================================
+.SH SYNOPSIS
+.B ctie
+.BR \-c | \-m
+.I outputfile masterfile
+.IR changefile .\|.\|.
+.\"=====================================================================
+.SH DESCRIPTION
+The
+.B ctie
+program is used to process multiple change files used with the CWEB
+system for literate programming.  The CWEB programs allow one to apply
+patches to a source file (the
+.IR masterfile )
+by means of a single change file.
+.B ctie
+can be used to either merge up to 32 change files into a single one or
+to apply the changes to the
+.I masterfile
+in order to create a new master file.  Output of either the new change
+file or the patched master file goes into
+.IR outputfile .
+Any include files (indicated using the CWEB
+.B @i
+command) are fully expanded during
+.B ctie
+processing, which means that the change files are able to modify the
+contents of any included files.
+.SH OPTIONS
+.TP
+.B \-c
+Create a single change file from the given
+.IR changefile s.
+.TP
+.B \-m
+Create a new master file by applying the given
+.IR changefile s.
+.\"=====================================================================
+.SH ENVIRONMENT
+The environment variable CWEBINPUTS is used to search for the input files,
+or the system default if CWEBINPUTS is not set.  See
+.BR tex (1)
+for the details of the searching.
+.\"=====================================================================
+.SH "SEE ALSO"
+.BR cweb (1),
+.IR ctiedoc.tex ,
+.BR tie (1),
+.BR web (1).
+.\"=====================================================================
+.SH "AUTHOR"
+Julian Gilbey, jdg@debian.org.  The original TIE program was by Klaus
+Guntermann, TH Darmstadt, Institut f. Theoretische Informatik.  The
+TIE man page was by Joachim Schnitter, TH Darmstadt, Phys. Chemie I,
+and was modified for CTIE by Julian Gilbey.
diff --git a/Build/source/texk/web2c/man/cweb.man b/Build/source/texk/web2c/man/cweb.man
index 0e0cbf5b382..948aec7efa8 100644
--- a/Build/source/texk/web2c/man/cweb.man
+++ b/Build/source/texk/web2c/man/cweb.man
@@ -1,35 +1,35 @@
-.TH CWEB 1 "19 December 2004" "Web2C @VERSION@"
-.
+.TH CWEB 1 "7 April 2010" "Web2C @VERSION@"
+.\"=====================================================================
 .SH NAME
 ctangle, cweave \- translate CWEB to C and/or TeX
-.
+.\"=====================================================================
 .SH SYNOPSIS
 .na
 .B ctangle
-[
-.B \-bhp
-] [
-.B +s
-] webfile[.w] [changefile[.ch]] [outputfile[.c]]
+.RB [ \-bhp ]
+.RB [ +s ]
+.IR webfile [ \fB.w\fP ]
+.RI [ changefile [ \fB.ch\fP ]
+.RI [ outputfile [ \fB.c\fP ]]]
 .br
 .B cweave
-[
-.B \-befhpx
-] [
-.B +s
-] webfile[.w] [changefile[.ch]] [outputfile[.tex]]
+.RB [ \-befhpx ]
+.RB [ +s ]
+.IR webfile [ \fB.w\fP ]
+.RI [ changefile [ \fB.ch\fP ]
+.RI [ outputfile [ \fB.tex\fP ]]]
 .ad
-.
+.\"=====================================================================
 .SH DESCRIPTION
 The
-.I ctangle
+.B ctangle
 program converts a CWEB
 source document into a C\ program that may be compiled in the usual way.
 The output file includes #line specifications so that debugging can be
 done in terms of the CWEB source file.
 .PP
 The
-.I cweave
+.B cweave
 program converts the same CWEB file into a TeX file that may be
 formatted and printed in the usual way.
 It takes appropriate care of typographic details like page
@@ -43,18 +43,28 @@ describing the program in as much detail as the writer may desire.
 The user of CWEB ought to be familiar with TeX as well as\ C.
 .PP
 The command line should have one, two, or three names on it.
-The first is taken as the CWEB file (and .w is added if there is no
-extension).
-If that file cannot be opened, the extension .web is tried instead.
-(But .w is recommended, since .web usually implies Pascal.)
-If there is a second name, it is a change file (and .ch is added if there is
-no extension).
+The first is taken as the CWEB file (and
+.B .w
+is added if there is no extension).
+If that file cannot be opened, the extension
+.B .web
+is tried instead. (But
+.B .w
+is recommended, since
+.B .web
+usually implies Pascal.)
+If there is a second name, it is a change file (and
+.B .ch
+is added if there is no extension).
 The change file overrides parts of the WEB file,
 as described in the documentation.
 If there is a third name, it overrides
 the default name of the output file, which is ordinarily the same as
 the name of the input file (but on the current directory) with the
-extension .c or .tex.
+extension
+.B .c
+or
+.BR .tex .
 .PP
 Options in the command line may be either turned off with\ \-
 (if they are on by default) or turned on with\ + (if they are off by
@@ -74,7 +84,9 @@ The
 .B \-p
 option suppresses progress reports (starred module numbers) as the processing
 takes place.
-If you say -bhp, you get nothing but error messages.
+If you say
+.BR \-bhp ,
+you get nothing but error messages.
 .PP
 The
 .B +s
@@ -82,7 +94,7 @@ option prints statistics about memory usage at the end of a run
 (assuming that the programs have been compiled with the -DSTAT switch).
 .PP
 There are three other options applicable to
-.I cweave
+.B cweave
 only:
 .B \-f
 means do not force a newline after every statement in the formatted output.
@@ -90,14 +102,20 @@ means do not force a newline after every statement in the formatted output.
 inhibits the enclosure of C\ material formatted by
 .I cweave
 in brackets
-\ePB{...}.
+\ePB{.\|.\|.}.
 Such brackets are normally inserted so that special hooks
 can be used by
 .I cweb-latex
 and similar programs.
 .B \-x
 means omit the index and table of contents.
-.
+.\"=====================================================================
+.SH ENVIRONMENT
+The environment variable CWEBINPUTS is used to search for the input files,
+or the system default if CWEBINPUTS is not set.  See
+.BR tex (1)
+for the details of the searching.
+.\"=====================================================================
 .SH FILES
 The location of the files mentioned below varies from system to
 system.  Use the
@@ -109,21 +127,22 @@ TeX macros used by cweave output.
 .TP
 .I cwebman.tex
 The user manual.
-.
+.\"=====================================================================
 .SH "SEE ALSO"
 .TP
 .I Literate Programming
-by D. E. Knuth
+by D. E. Knuth.
 .TP
 .I Weaving a Program
-by Wayne Sewell
+by Wayne Sewell.
 .TP
 .I The CWEB System of Structured Documentation
 by Donald E. Knuth and Silvio Levy (hardcopy version of cwebman.tex
-and the source code listings)
-.TP
-tex(1), cc(1)
-.
+and the source code listings).
+.PP
+.BR tex (1),
+.BR cc (1).
+.\"=====================================================================
 .SH AUTHORS
 Don Knuth wrote WEB for TeX and Pascal.
 Silvio Levy designed and developed CWEB
diff --git a/Build/source/texk/web2c/man/dvicopy.man b/Build/source/texk/web2c/man/dvicopy.man
index bca57924070..1d4424d1b62 100644
--- a/Build/source/texk/web2c/man/dvicopy.man
+++ b/Build/source/texk/web2c/man/dvicopy.man
@@ -1,10 +1,16 @@
 .TH DVICOPY 1 TeX "24 January 1999" "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
+.\"=====================================================================
 .SH NAME
-dvicopy \- produce modified copy of DVI file
+dvicopy, odvicopy \- produce modified copy of DVI file
 .SH SYNOPSIS
 .B dvicopy
 .RI [ options ]
-.RI [ infile\  [ outfile ]]
+.RI [ infile [ \fB.dvi\fP ]
+.RI [ outfile [ \fB.dvi\fP ]]]
+.\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
 documentation for this version of \*(TX can be found in the info file
@@ -18,5 +24,29 @@ fonts even if your DVI processor does not support them, by passing the
 documents through
 .B dvicopy
 first.
+.\"=====================================================================
+.SH OPTIONS
+.TP
+.BI \-magnification= NUMBER
+Override existing magnification with
+.IR NUMBER .
+.PP
+.TP
+.BI \-max-pages= NUMBER
+Process
+.I NUMBER
+pages; default one million.
+.PP
+.TP
+.BI \-page-start= PAGE-SPEC
+Start at
+.IR PAGE-SPEC ,
+for example `2' or `5.*.-2'.
+.\"=====================================================================
 .SH "SEE ALSO"
-dviselect(1)
+.BR dviselect (1),
+.BR dvitype (1).
+.\"=====================================================================
+.SH AUTHORS
+Peter Breitenlohner wrote the program.  Klaus Guntermann originally ported
+it to Unix.
diff --git a/Build/source/texk/web2c/man/dvitomp.man b/Build/source/texk/web2c/man/dvitomp.man
index f1c9c9a5432..2dc3a90b95f 100644
--- a/Build/source/texk/web2c/man/dvitomp.man
+++ b/Build/source/texk/web2c/man/dvitomp.man
@@ -4,18 +4,19 @@
 dvitomp \- convert a TeX DVI file to a MetaPost MPXFILE
 .SH SYNOPSIS
 .B dvitomp
-.RI [ options ]
-.IR dvifile [.dvi]
-.RI [ mpxfile [.mpx]]
+.RI [ OPTIONS ]
+.IR dvifile [ \fB.dvi\fP ]
+.RI [ mpxfile [ \fB.mpx\fP ]]
 .PP
 .B mpost 
 .B --dvitomp
-.IR dvifile [.dvi]
-.RI [ mpxfile [.mpx]]
+.IR dvifile [ \fB.dvi\fP ]
+.RI [ mpxfile [ \fB.mpx\fP ]]
 .SH DESCRIPTION
 \fBdvitomp\fP translates the given \fIdvifile\fP to a MetaPost
 MPXFILE.  The default \fImpxfile\fP is the basename of \fIdvifile\fP
-extended with ".mpx".
+extended with
+.BR .mpx .
 .SH OPTIONS
 .IP \fB-help\fP
 write usage summary and exit.
diff --git a/Build/source/texk/web2c/man/dvitype.man b/Build/source/texk/web2c/man/dvitype.man
index cc93be28eea..80edd9ade5f 100644
--- a/Build/source/texk/web2c/man/dvitype.man
+++ b/Build/source/texk/web2c/man/dvitype.man
@@ -13,10 +13,10 @@
 .if n .ds LX LaTeX
 .\"=====================================================================
 .SH NAME
-dvitype \- translate a dvi file for humans
+dvitype, odvitype \- translate a dvi file for humans
 .SH SYNOPSIS
 .B dvitype
-.I dvi_name[.dvi]
+.IR dvi_name [ \fB.dvi\fP ]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -43,12 +43,44 @@ magnification and resolution of the ``output device'' may be
 changed; and so on. All options are specified with an on-line dialog.
 .PP
 The
-.I .dvi
+.B .dvi
 extension is supplied if omitted from 
 .IR dvi_name .
 The output goes to
 .IR stdout .
 .\"=====================================================================
+.SH OPTIONS
+.TP
+.BI \-dpi= REAL
+Set resolution to
+.I REAL
+pixels per inch; default 300.0.
+.PP
+.TP
+.BI \-magnification= NUMBER
+Override existing magnification with
+.IR NUMBER .
+.PP
+.TP
+.BI \-max-pages= NUMBER
+Process
+.I NUMBER
+pages; default one million.
+.PP
+.TP
+.BI \-output-level= NUMBER
+Verbosity level, from 0 to 4; default 4.
+.PP
+.TP
+.BI \-page-start= PAGE-SPEC
+Start at
+.IR PAGE-SPEC ,
+for example `2' or `5.*.-2'.
+.PP
+.TP
+.B \-show-opcodes
+Show numeric opcodes (in decimal).
+.\"=====================================================================
 .SH ENVIRONMENT
 The environment variable TEXFONTS is used to search for the TFM files
 used in the DVI file.  See
@@ -61,12 +93,8 @@ If TEXFONTS is not set, it uses the system default.
 .BR pktype (1).
 .br
 Donald E. Knuth,
-.IR \*(OXware .
+.IR "\*(OXware" .
 .\"=====================================================================
-.SH BUGS
-The interactive dialog should be replaced by command-line options, as
-with 
-.BR gftype .
 .SH AUTHORS
 Donald E. Knuth wrote the program.  It was published as part of the
 .I \*(OXware
diff --git a/Build/source/texk/web2c/man/gftodvi.man b/Build/source/texk/web2c/man/gftodvi.man
index 3bdcbd643c3..5dd8234e0e0 100644
--- a/Build/source/texk/web2c/man/gftodvi.man
+++ b/Build/source/texk/web2c/man/gftodvi.man
@@ -18,15 +18,9 @@
 gftodvi \- make proof sheets from generic font files
 .SH SYNOPSIS
 .B gftodvi
-[
-.BI \-overflow-label-offset =real
-]
-[
-.B \-verbose
-]
-[
+.RB [ \-overflow-label-offset=\fIreal\fP ]
+.RB [ \-verbose ]
 .I gf_file_name
-]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -98,15 +92,14 @@ a font for lines with slope 1/6 at the resolution of an Imagen printer).
 .PP
 The
 .I gf_file_name
-on the command line must be complete. (The program prompts
-you for it if you don't give it.)  Because
+on the command line must be complete.  Because
 the resolution is part of the extension, it would not make
 sense to append a default extension as is done with \*(TX or
 DVI-reading software. The output file name uses the same
 root as the
 .I gf
 file, with the
-.I dvi
+.B .dvi
 extension added. For example, the input file
 .I cmr10.2602gf
 would become
diff --git a/Build/source/texk/web2c/man/gftopk.man b/Build/source/texk/web2c/man/gftopk.man
index 4ac55f79b67..0af5af98eae 100644
--- a/Build/source/texk/web2c/man/gftopk.man
+++ b/Build/source/texk/web2c/man/gftopk.man
@@ -18,13 +18,9 @@
 gftopk \- convert generic font files to packed font files
 .SH SYNOPSIS
 .B gftopk
-[
-.B \-v
-]
+.RB [ \-v ]
 .I gf_file_name
-[
-.I pk_file_name
-]
+.RI [ pk_file_name ]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -56,9 +52,9 @@ defaults to the same (stripped) name as
 .IR gf_file_name ,
 and it is placed in the current
 working directory with the
-.I pk
+.B pk
 suffix replacing
-.IR gf .
+.BR gf .
 For example, the input file
 .I cmr10.300gf
 would become
diff --git a/Build/source/texk/web2c/man/gftype.man b/Build/source/texk/web2c/man/gftype.man
index f88c5c08ebc..351607c6186 100644
--- a/Build/source/texk/web2c/man/gftype.man
+++ b/Build/source/texk/web2c/man/gftype.man
@@ -18,16 +18,10 @@
 gftype \- translate a generic font file for humans to read
 .SH SYNOPSIS
 .B gftype
-[
-.B \-i
-]
-[
-.B \-m
-]
+.RB [ \-i ]
+.RB [ \-m ]
 .I gf_file_name
-[
-.I output_file_name
-]
+.RI [ output_file_name ]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
diff --git a/Build/source/texk/web2c/man/mft.man b/Build/source/texk/web2c/man/mft.man
index cedecd79630..39b0f4c1c72 100644
--- a/Build/source/texk/web2c/man/mft.man
+++ b/Build/source/texk/web2c/man/mft.man
@@ -1,5 +1,7 @@
 .TH MFT 1 "14 December 1993" "Web2C @VERSION@"
 .\"=====================================================================
+.if n .ds MP MetaPost
+.if t .ds MP MetaPost
 .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
@@ -15,28 +17,11 @@
 .if n .ds LX LaTeX
 .\"=====================================================================
 .SH NAME
-mft \- translate Metafont code to TeX code for prettyprinting
+mft \- translate Metafont or MetaPost code to TeX code for prettyprinting
 .SH SYNOPSIS
 .B mft
-.I mf_file_name[.mf]
-[
-[
-.B \-c
-]
-or
-[
-.I change_file_name[.ch]
-]
-]
-[
-[
-.B \-s
-]
-or
-[
-.I style_file_name[.mft]
-]
-]
+.RI [ OPTIONS ]
+.BR \fImf_file_name\fP [ .mf | .mp ]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -46,57 +31,72 @@ or manual
 .PP
 The
 .B mft
-program creates a \*(TX file from a \*(MF program.
+program creates a \*(TX file from a \*(MF or \*(MP program.
 It takes appropriate care of typographic details like page
 layout and the use of indentation, italics, boldface, etc., as illustrated
 in the book
 .IR "Computer Modern Typefaces" .
-Special conventions in \*(MF comments allow you to control things that
+Special conventions in \*(MF and \*(MP comments allow you to control things that
 would not otherwise come out right; section 1 of the MFT source program
 in the
 .I \*(MFware
 report explains these rules.
 .PP
-The command line has one required file name and two optional file names.
-The required
-one is a \*(MF source file; there is also an optional change file
-(which works just as the change files to
+The
+.B mft
+program uses an optional change file (which works just as the change files to
 .BR tangle (1)
 and
 .BR weave (1)
 do)
-and an optional style file (which is prepended to everything).
+and one or several style files (which are prepended to everything).
+If no style file is specified, the style file
+.B plain.mft
+for \*(MF (or
+.B mplain.mft
+for \*(MP) is automatically used.
 .PP
-A file name that doesn't contain a dot is always given an extension,
-either
-.I .mf
-(\*(MF) or
-.I .ch
-(change) or
-.I .mft
-(style). If no style file is specified, the style file
-.I plain.mft
-is automatically used. The
-.I change_file_name
-is not searched for using any paths. The
-.I .mf
-file is searched for using the MFINPUTS environment variable if you
-have set it, or else the system default.  The style file is searched
-for using the TEXINPUTS environment variable.  See
-.BR tex (1)
-for the details of the searching.
+The
+.IR mf_file_name ,
+optional
+.IR change_file_name ,
+and
+.I style_file_name
+files are searched for using the MFINPUTS (for \*(MF) or MPINPUTS (for
+\*(MP) and MFTINPUTS environment variables if you have set them, or else the
+corresponding system defaults.
 .PP
 The output \*(TX file name is formed by using
-.I .tex
+.B .tex
 in place of the extension of
 .IR mf_file_name .
 .\"=====================================================================
 .SH OPTIONS
-Specify command-line options
-.B \-c
-to suppress the reading of a change file, and
-.B \-s
-to suppress the reading of a style file.
+.TP
+.BI \-change= change_file_name \fR[\fP.ch\fR]\fP
+Apply the change file
+.I change_file_name
+to
+.IR mf_file_name .
+.PP
+.TP
+.B \-metapost
+Assume
+.I mf_file_name
+is a \*(MP source file (this is the default if
+.I mf_file_name
+has the extension
+.BR .mp ).
+.PP
+.TP
+.BI \-style= style_file_name \fR[\fP.mft\fR]\fP
+Use the style file
+.I style_file_name
+insted of
+.B plain.mft
+(or
+.BR mplain.mft );
+this option can be given more than once.
 .\"=====================================================================
 .SH FILES
 .TP
@@ -105,8 +105,8 @@ to suppress the reading of a style file.
 .B mft
 output.
 .TP
-.I plain.mft
-Default style file.
+.IR plain.mft ", " mplain.mft
+Default style files.
 .TP
 .I cmbase.mft
 Style file for Computer Modern.
diff --git a/Build/source/texk/web2c/man/ofm2opl.man b/Build/source/texk/web2c/man/ofm2opl.man
index adc4de3ec3c..5eb363d8ecc 100644
--- a/Build/source/texk/web2c/man/ofm2opl.man
+++ b/Build/source/texk/web2c/man/ofm2opl.man
@@ -1,13 +1,14 @@
 .TH "ofm2opl" "1" "September 2000" "Omega" "Omega" 
 .PP 
 .SH "NAME" 
-ofm2opl \- convert Omega and TeX font-metric files to
-property-list files
+ofm2opl \- convert Omega and TeX font-metric files to property-list files
 .PP 
 .SH "SYNOPSIS" 
 .PP 
-\fBofm2opl\fP [ \fIOPTION\fP\&.\&.\&. ] \fIOFMNAME\fP[\&.ofm] [
-\fIOPLFILE\fP[\&.opl] ]
+.B ofm2opl
+.RI [ OPTIONS ]
+.IR OFMNAME [ \fB.ofm\fP ]
+.RI [ OPLFILE [ \fB.opl\fP ]]
 .PP 
 .SH "DESCRIPTION" 
 .PP 
diff --git a/Build/source/texk/web2c/man/opl2ofm.man b/Build/source/texk/web2c/man/opl2ofm.man
index 425ff8e0adc..8aa00d8c104 100644
--- a/Build/source/texk/web2c/man/opl2ofm.man
+++ b/Build/source/texk/web2c/man/opl2ofm.man
@@ -1,13 +1,14 @@
 .TH "opl2ofm" "1" "September 2000" "Omega" "Omega" 
 .PP 
 .SH "NAME" 
-opl2ofm \- convert Omega and TeX property-list files to
-font-metric files
+opl2ofm \- convert Omega and TeX property-list files to font-metric files
 .PP 
 .SH "SYNOPSIS" 
 .PP 
-\fBopl2ofm\fP [ \fIOPTION\fP\&.\&.\&. ] \fIOPLFILE\fP[\&.opl] [
-\fIOFMFILE\fP[\&.ofm] ]
+.B opl2ofm
+.RI [ OPTIONS ]
+.IR OPLFILE [ \fB.opl\fP ]
+.RI [ OFMFILE [ \fB.ofm\fP ]]
 .PP 
 .SH "DESCRIPTION" 
 .PP 
diff --git a/Build/source/texk/web2c/man/ovf2ovp.man b/Build/source/texk/web2c/man/ovf2ovp.man
index 86fbbb56dd9..ae60d5588e0 100644
--- a/Build/source/texk/web2c/man/ovf2ovp.man
+++ b/Build/source/texk/web2c/man/ovf2ovp.man
@@ -1,13 +1,15 @@
 .TH "ovf2ovp" "1" "September 2000" "Omega" "Omega" 
 .PP 
 .SH "NAME" 
-ovf2ovp \- convert a virtual font file and its associated
-font metric file into property-list format
+ovf2ovp \- convert a virtual font file and its associated font metric file into property-list format
 .PP 
 .SH "SYNOPSIS" 
 .PP 
-\fBovf2ovp\fP [ \fIOPTION\fP\&.\&.\&. ] \fIOVFNAME\fP[\&.ovf] [ [
-\fIOFMNAME\fP[\&.ofm] ] [ \fIOVPFILE\fP[\&.ovp] ] ]
+.B ovf2ovp
+.RI [ OPTIONS ]
+.IR OVFNAME [ \fB.ovf\fP ]
+.RI [ OFMNAME [ \fB.ofm\fP ]
+.RI [ OVPFILE [ \fB.ovp\fP ]]]
 .PP 
 .SH "DESCRIPTION" 
 .PP 
diff --git a/Build/source/texk/web2c/man/ovp2ovf.man b/Build/source/texk/web2c/man/ovp2ovf.man
index 2793db27eda..558837e40f9 100644
--- a/Build/source/texk/web2c/man/ovp2ovf.man
+++ b/Build/source/texk/web2c/man/ovp2ovf.man
@@ -1,13 +1,14 @@
 .TH "ovp2ovf" "1" "September 2000" "Omega" "Omega" 
 .PP 
 .SH "NAME" 
-ovp2ovf \- convert a virtual property-list file into a
-virtual font file and its associated font metric file
+ovp2ovf \- convert a virtual property-list file into a virtual font file and its associated font metric file
 .PP 
 .SH "SYNOPSIS" 
-.PP 
-\fBovp2ovf\fP [ \fIOPTION\fP\&.\&.\&. ] \fIOVPFILE\fP[\&.ovp] [ [
-\fIOVFFILE\fP[\&.ovf] ] [ \fIOFMFILE\fP[\&.ofm] ] ]
+.B ovp2ovf
+.RI [ OPTIONS ]
+.IR OVPFILE [ \fB.ovp\fP ]
+.RI [ OVFFILE [ \fB.ovf\fP ]
+.RI [ OFMFILE [ \fB.ofm\fP ]]]
 .PP 
 .SH "DESCRIPTION" 
 .PP 
diff --git a/Build/source/texk/web2c/man/patgen.man b/Build/source/texk/web2c/man/patgen.man
index f8e6332b01d..c8cdc12a975 100644
--- a/Build/source/texk/web2c/man/patgen.man
+++ b/Build/source/texk/web2c/man/patgen.man
@@ -1,4 +1,4 @@
-.TH PATGEN 1 "25 November 2007" "Web2C @VERSION@"
+.TH PATGEN 1 "7 April 2010" "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
@@ -102,10 +102,10 @@ control sequences.  For instance, this is not a valid pattern file:
 
 % this is a pattern file read by TeX.
 \\patterns{%
- ...
+ .\|.\|.
 }
 .fi
-It can only contain the actual patterns, i.e., the `...'.
+It can only contain the actual patterns, i.e., the `.\|.\|.'.
 .TP
 .B Translate file
 A translate file starts with a line containing the values of
@@ -125,16 +125,16 @@ another delimiter.
 If the translate file is empty, the values
 .IR left_hyphen_min "=2, " right_hyphen_min "=3,"
 and the 26 lower case letters
-.IR a ... z
+.BR a .\|.\|. z
 with their upper case representations
-.IR A ... Z
+.BR A .\|.\|. Z
 are assumed.
 .TP
 .B Terminal input
 After reading the
 .I translate_file
 and any previously-generated patterns from
-.IR pattern_file,
+.IR pattern_file ,
 .I patgen
 requests input from the user's terminal.
 
diff --git a/Build/source/texk/web2c/man/pdftosrc.man b/Build/source/texk/web2c/man/pdftosrc.man
index 1a4e1332053..847f912e5f3 100644
--- a/Build/source/texk/web2c/man/pdftosrc.man
+++ b/Build/source/texk/web2c/man/pdftosrc.man
@@ -9,9 +9,7 @@ pdftosrc \- extract source file or stream from PDF file
 .SH SYNOPSIS
 .B pdftosrc
 .I PDF-file
-.R [
-.I stream-object-number
-.R ]
+.RI [ stream-object-number ]
 .SH DESCRIPTION
 If only
 .I PDF-file
@@ -41,9 +39,9 @@ from the
 and writes it to a file named
 .IR PDF-file . stream-object-number
 with the ending
-.I .pdf
+.B .pdf
 or
-.I .PDF
+.B .PDF
 stripped from the original
 .I PDF-file
 name.
@@ -57,7 +55,7 @@ then
 .B pdftosrc
 decompresses the XRef stream from the PDF file and writes it
 in human-readable PDF cross-reference table format to a file named
-.IR PDF-file .xref
+.IB PDF-file .xref
 (these XRef streams can not be extracted just by giving their object number).
 
 In any case
diff --git a/Build/source/texk/web2c/man/pktogf.man b/Build/source/texk/web2c/man/pktogf.man
index 808ec870af6..20d19affe79 100644
--- a/Build/source/texk/web2c/man/pktogf.man
+++ b/Build/source/texk/web2c/man/pktogf.man
@@ -18,13 +18,9 @@
 pktogf \- convert packed font files to generic font files
 .SH SYNOPSIS
 .B pktogf
-[
-.B \-v
-]
+.RB [ \-v ]
 .I pk_file_name
-[
-.I gf_file_name
-]
+.RI [ gf_file_name ]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -57,9 +53,9 @@ defaults to the same (stripped) name as
 .IR pk_file_name ,
 and it is placed in the current
 working directory with the
-.I gf
+.B gf
 suffix replacing
-.IR pk .
+.BR pk .
 For example, the input file
 .I io.300pk
 would become
diff --git a/Build/source/texk/web2c/man/pktype.man b/Build/source/texk/web2c/man/pktype.man
index 9cb3508e79f..32c36960e56 100644
--- a/Build/source/texk/web2c/man/pktype.man
+++ b/Build/source/texk/web2c/man/pktype.man
@@ -19,9 +19,7 @@ pktype \- verify and translate a packed font bitmap file to plain text
 .SH SYNOPSIS
 .B pktype
 .I pk_file
-[
-.I output_file
-]
+.RI [ output_file ]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
diff --git a/Build/source/texk/web2c/man/pltotf.man b/Build/source/texk/web2c/man/pltotf.man
index 60a3b703cb1..0b4da6c06a2 100644
--- a/Build/source/texk/web2c/man/pltotf.man
+++ b/Build/source/texk/web2c/man/pltotf.man
@@ -20,11 +20,9 @@
 pltotf \- convert property list files to TeX font metric (tfm) format
 .SH SYNOPSIS
 .B pltotf
-[
-.B \-verbose
-]
-.I pl_file_name
-.I tfm_file_name
+.RB [ \-verbose ]
+.IR pl_file_name [ \fB.pl\fP ]
+.RI [ tfm_file_name [ \fB.tfm\fP ]]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -34,16 +32,28 @@ or manual
 .PP
 The
 .B pltotf
-program translates a (human-oriented) \*(WB property list file to a
+program translates a (human-oriented) property list file to a
 (program-oriented) \*(TX font metric file. Thus, after editing the property
 list file, a TFM file can be generated for use with, for example,
 .BR tex (1).
 .PP
-Both the
+The
+.I pl_file_name
+is extended with
+.B .pl
+if it lacks a suffix. No path searching is done.
+.PP
+If no
+.I tfm_file_name
+is given, the basename of
 .I pl_file_name
-and the
+with suffix
+.B .tfm
+is used; otherwise
 .I tfm_file_name
-must be complete; no adding of default extensions or path searching is done.
+is extended with
+.B .tfm
+if it lacks a suffix.
 .\"=====================================================================
 .SH OPTIONS
 Without the
diff --git a/Build/source/texk/web2c/man/tangle.man b/Build/source/texk/web2c/man/tangle.man
index 4cf40586f8d..6202a777e09 100644
--- a/Build/source/texk/web2c/man/tangle.man
+++ b/Build/source/texk/web2c/man/tangle.man
@@ -1,4 +1,4 @@
-.TH TANGLE 1 "20 October 2002" "Web2C @VERSION@"
+.TH TANGLE 1 "7 April 2010" "Web2C @VERSION@"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
@@ -20,13 +20,9 @@
 tangle \- translate WEB to Pascal
 .SH SYNOPSIS
 .B tangle
-[
-.RI options
-]
-.I webfile[.web]
-[
-.I changefile[.ch]
-]
+.RI [ options ]
+.IR webfile [ \fB.web\fP ]
+.RI [ changefile [ \fB.ch\fP ]]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -54,20 +50,20 @@ to be written in small easily-understood modules.
 .PP
 The command line should have either one or two names on it.
 The first is taken as the \*(WB file (and
-.I .web
+.B .web
 is added if there is no
 extension).
 If there is another name, it is a change file (and
-.I .ch
+.B .ch
 is added if there is
 no extension).  The change file overrides parts of the \*(WB file,
 as described in the \*(WB system documentation.
 .PP
 The output files are a Pascal file and a string pool file,
 whose names are formed by adding
-.I .p
+.B .p
 and
-.I .pool
+.B .pool
 respectively to the root of the \*(WB file name.
 .\"=====================================================================
 .SH "OPTIONS"
@@ -127,6 +123,12 @@ original
 .rb
 Print version information and exit.
 .\"=====================================================================
+.SH ENVIRONMENT
+The environment variable WEBINPUTS is used to search for the input files,
+or the system default if WEBINPUTS is not set.  See
+.BR tex (1)
+for the details of the searching.
+.\"=====================================================================
 .SH "SEE ALSO"
 .BR pc (1),
 .BR pxp (1)
diff --git a/Build/source/texk/web2c/man/tftopl.man b/Build/source/texk/web2c/man/tftopl.man
index ffd5690df13..1fc9bc122ee 100644
--- a/Build/source/texk/web2c/man/tftopl.man
+++ b/Build/source/texk/web2c/man/tftopl.man
@@ -18,16 +18,9 @@
 tftopl \- convert TeX font metric (tfm) files to property lists
 .SH SYNOPSIS
 .B tftopl
-[
-.BI \-charcode-format =format
-]
-[
-.B \-verbose
-]
-.I tfm_name[.tfm]
-[
-.I pl_name[.pl]
-]
+.RI [ OPTIONS ]
+.IR tfm_name [ \fB.tfm\fP ]
+.RI [ pl_name [ \fB.pl\fP ]]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -47,17 +40,15 @@ no error messages are given, the input file is correct.
 The
 .I pl_name
 is extended with
-.I .pl
+.B .pl
 if it lacks a suffix.
 If
 .I pl_name
 is not given, standard output is used. Likewise, 
 .I tfm_name
 is extended with
-.I .tfm
-if it lacks a suffix.  Also, path searching is done for the
-.I .tfm
-file
+.B .tfm
+if it lacks a suffix.  Also, path searching is done for the TFM file
 using the environment variable TEXFONTS.  If that is not set, 
 .B tftopl
 uses the system default.
@@ -67,10 +58,10 @@ See
 for the details of the searching.
 .\"=====================================================================
 .SH OPTIONS
+.TP
+.BI \-charcode-format= format
 The argument
 .I format
-to
-.B \-charcode-format
 specifies how character codes are output in the PL file.  By
 default, only letters and digits are output using the
 .B C
@@ -90,9 +81,9 @@ is
 .BR octal ,
 all character codes are output in octal.
 .PP
-Without the
+.TP
 .B \-verbose
-option,
+Without this option,
 .B tftopl
 operates silently.  With it, a banner and progress report are printed on
 .IR stdout .
diff --git a/Build/source/texk/web2c/man/tie.man b/Build/source/texk/web2c/man/tie.man
new file mode 100644
index 00000000000..06541756265
--- /dev/null
+++ b/Build/source/texk/web2c/man/tie.man
@@ -0,0 +1,52 @@
+.TH TIE 1 "7 April 2010" "Web2C @VERSION@"
+.\"=====================================================================
+.SH NAME
+tie \- merge or apply WEB change files
+.\"=====================================================================
+.SH SYNOPSIS
+.B tie
+.BR \-c | \-m
+.I outputfile masterfile
+.IR changefile .\|.\|.
+.\"=====================================================================
+.SH DESCRIPTION
+The
+.B tie
+program is used to process multiple change files used with the WEB
+system for literate programming.  The WEB programs allow to apply
+patches to a source file (the
+.IR masterfile )
+by means of a number of change files (often only a single change file
+is allowed).
+.B Tie
+can be used to either merge up to 32 change files into a single one
+or to apply the changes to the
+.I masterfile
+in order to create a new one.  Output of either the new change file or
+the patched master file goes into
+.IR outputfile .
+.\"=====================================================================
+.SH OPTIONS
+.TP
+.B \-c
+Create a single change file from the given
+.IR changefile s.
+.TP
+.B \-m
+Create a new master file by applying the given
+.IR changefile s.
+.\"=====================================================================
+.SH ENVIRONMENT
+The environment variable WEBINPUTS is used to search for the input files,
+or the system default if WEBINPUTS is not set.  See
+.BR tex (1)
+for the details of the searching.
+.\"=====================================================================
+.SH "SEE ALSO"
+.BR web (1),
+.BR ctie (1),
+.BR cweb (1).
+.\"=====================================================================
+.SH "AUTHOR"
+Klaus Guntermann, TH Darmstadt, Institut f. Theoretische Informatik.  Man page
+by Joachim Schnitter, TH Darmstadt, Phys. Chemie I.
diff --git a/Build/source/texk/web2c/man/ttf2afm.man b/Build/source/texk/web2c/man/ttf2afm.man
index 7cf15df3ab0..5c5d059ae54 100644
--- a/Build/source/texk/web2c/man/ttf2afm.man
+++ b/Build/source/texk/web2c/man/ttf2afm.man
@@ -4,8 +4,9 @@
 ttf2afm \- utility to generate AFM files for TrueType fonts
 .PP 
 .SH "SYNOPSIS" 
-.PP 
-\fBttf2afm\fP [ \fIOPTION\fP\&.\&.\&. ]  \fIFONTFILE\fP
+.B ttf2afm
+.RI [ OPTIONS ]
+.I FONTFILE
 .PP 
 .SH "DESCRIPTION" 
 .PP 
diff --git a/Build/source/texk/web2c/man/vftovp.man b/Build/source/texk/web2c/man/vftovp.man
index 22d45bb2653..00b94e68694 100644
--- a/Build/source/texk/web2c/man/vftovp.man
+++ b/Build/source/texk/web2c/man/vftovp.man
@@ -16,17 +16,10 @@
 vftovp \- convert virtual font (vf) files to virtual property lists (vpl)
 .SH SYNOPSIS
 .B vftovp
-[
-.BI \-charcode-format =format
-]
-[
-.B \-verbose
-]
-.I vf_name[.vf]
-.I tfm_name[.tfm]
-[
-.I vpl_name[.vpl]
-]
+.RI [ OPTIONS ]
+.IR vf_name [ \fB.vf\fP ]
+.RI [ tfm_name [ \fB.tfm\fP ]
+.RI [ vpl_name [ \fB.vpl\fP ]]]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -45,10 +38,10 @@ if no error messages are given, the input files are correct.
 The filenames are extended with the appropriate extension if necessary.
 .\"=====================================================================
 .SH OPTIONS
+.TP
+.BI \-charcode-format= format
 The argument
 .I format
-to
-.B \-charcode-format
 specifies how character codes are output in the VPL file.  By
 default, only letters and digits are output using the
 .B C
@@ -68,9 +61,9 @@ is
 .BR octal ,
 all character codes are output in octal.
 .PP
-Without the
+.TP
 .B \-verbose
-option,
+Without this option,
 .B vftovp
 operates silently.  With it, a banner and progress report are printed on
 .IR stdout .
diff --git a/Build/source/texk/web2c/man/vptovf.man b/Build/source/texk/web2c/man/vptovf.man
index fbba8245e06..eaf9e203661 100644
--- a/Build/source/texk/web2c/man/vptovf.man
+++ b/Build/source/texk/web2c/man/vptovf.man
@@ -16,12 +16,10 @@
 vptovf \- convert virtual property lists to virtual font metrics
 .SH SYNOPSIS
 .B vptovf
-[
-.B \-verbose
-]
-.I vpl_name[.vpl]
-.I vfm_name[.vf]
-.I tfm_name[.tfm]
+.RB [ \-verbose ]
+.IR vpl_name [ \fB.vpl\fP ]
+.RI [ vfm_name [ \fB.vf\fP ]
+.RI [ tfm_name [ \fB.tfm\fP ]]]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -41,10 +39,10 @@ sequence of low-level typesetting operations,
 can also be created in this way.
 .PP
 All three filenames,
-.I vpl_name,
-.I vf_name,
+.IR vpl_name ,
+.IR vf_name ,
 and
-.I tfm_name,
+.IR tfm_name ,
 are extended with the appropriate suffix, if they lack one.
 .\"=====================================================================
 .SH OPTIONS
diff --git a/Build/source/texk/web2c/man/weave.man b/Build/source/texk/web2c/man/weave.man
index b87cb84ff45..905e45a91a1 100644
--- a/Build/source/texk/web2c/man/weave.man
+++ b/Build/source/texk/web2c/man/weave.man
@@ -1,4 +1,4 @@
-.TH WEAVE 1 "4 May 1993" "Web2C @VERSION@"
+.TH WEAVE 1 "7 April 2010" "Web2C @VERSION@"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
@@ -20,13 +20,9 @@
 weave \- translate WEB to TeX
 .SH SYNOPSIS
 .B weave
-[
-.B \-x
-]
-.I webfile[.web]
-[
-.I changefile[.ch]
-]
+.RB [ \-x ]
+.IR webfile [ \fB.web\fP ]
+.RI [ changefile [ \fB.ch\fP ]]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -53,7 +49,7 @@ however, unless some macros in
 are redefined.)
 .PP
 The output \*(TX file name is formed by adding
-.I .tex
+.B .tex
 to the root of the \*(WB file name.
 .PP
 There are several macros
@@ -65,6 +61,12 @@ And, to cause output of only changed modules, one can say
 \\let\\maybe=\\iffalse (usually as the first change in the
 change file).
 .\"=====================================================================
+.SH ENVIRONMENT
+The environment variable WEBINPUTS is used to search for the input files,
+or the system default if WEBINPUTS is not set.  See
+.BR tex (1)
+for the details of the searching.
+.\"=====================================================================
 .SH FILES
 .TP \w'@@'u+2n
 .I $TEXMFMAIN/tex/plain/base/webmac.tex
diff --git a/Build/source/texk/web2c/otps/ChangeLog b/Build/source/texk/web2c/otps/ChangeLog
index bfb66e5f0b7..a9c8bb57d51 100644
--- a/Build/source/texk/web2c/otps/ChangeLog
+++ b/Build/source/texk/web2c/otps/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* mkocp.man, mkofm.man, otp2ocp.man, outocp.man:
+	Uniform manpage formatting: bold for literals, italic for
+	variable items, roman for meta items.
+
 2009-10-24  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* mkocp.man, mkofm.man, otp2ocp.man, outocp.man: New files
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 2bc6b3b9a2d..ac9e89cd737 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -221,7 +221,6 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_DLLOADERS = @LT_DLLOADERS@
 LT_DLPREOPEN = @LT_DLPREOPEN@
-LUATANGLE = @LUATANGLE@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
diff --git a/Build/source/texk/web2c/otps/mkocp.man b/Build/source/texk/web2c/otps/mkocp.man
index c35c967225e..74a90dc6581 100644
--- a/Build/source/texk/web2c/otps/mkocp.man
+++ b/Build/source/texk/web2c/otps/mkocp.man
@@ -2,11 +2,9 @@
 .PP 
 .SH "NAME" 
 mkocp \- frontend to \fBotp2ocp\fP(1)
-.PP 
 .SH "SYNOPSIS" 
-.PP 
-\fBmkocp\fP \fIOTPFILE\fP
-.PP 
+.B mkocp
+.I OTPFILE
 .SH "DESCRIPTION" 
 .PP 
 \fBmkocp\fP is used to create or recreate Omega Compiled Process files
diff --git a/Build/source/texk/web2c/otps/mkofm.man b/Build/source/texk/web2c/otps/mkofm.man
index 9c38a4301a6..f676d0e22f0 100644
--- a/Build/source/texk/web2c/otps/mkofm.man
+++ b/Build/source/texk/web2c/otps/mkofm.man
@@ -2,11 +2,9 @@
 .PP 
 .SH "NAME" 
 mkofm \- front end to \fBmktextfm\fP(1)
-.PP 
 .SH "SYNOPSIS" 
-.PP 
-\fBmkofm\fP \fIARGS\fP
-.PP 
+.B mkofm
+.I ARGS
 .SH "DESCRIPTION" 
 .PP 
 \fBmkofm\fP takes all \fIARGS\fP and passes them to
diff --git a/Build/source/texk/web2c/otps/otp2ocp.man b/Build/source/texk/web2c/otps/otp2ocp.man
index c111acc49d3..fcb4d0ad117 100644
--- a/Build/source/texk/web2c/otps/otp2ocp.man
+++ b/Build/source/texk/web2c/otps/otp2ocp.man
@@ -3,11 +3,10 @@
 .SH "NAME" 
 otp2ocp \- convert Omega Translation Process files to Omega
 Compiled Process files
-.PP 
 .SH "SYNOPSIS" 
-.PP 
-\fBotp2ocp\fP \fIOTPFILE\fP[\&.otp] [ \fIOCPFILE\fP[\&.ocp] ]
-.PP 
+.B otp2ocp
+.IR OTPFILE [ \fB.otp\fP ]
+.RI [ OCPFILE [ \fB.ocp\fP ]]
 .SH "DESCRIPTION" 
 .PP 
 \fBotp2ocp\fP is used to create or recreate Omega Compiled Process
diff --git a/Build/source/texk/web2c/otps/outocp.man b/Build/source/texk/web2c/otps/outocp.man
index ee803d9be67..9f41f3ba967 100644
--- a/Build/source/texk/web2c/otps/outocp.man
+++ b/Build/source/texk/web2c/otps/outocp.man
@@ -2,11 +2,9 @@
 .PP 
 .SH "NAME" 
 outocp \- debug an OCP file
-.PP 
 .SH "SYNOPSIS" 
-.PP 
-\fBoutocp\fP \fIOCPFILE\fP[\&.ocp]
-.PP 
+.B outocp
+.IR OCPFILE [ \fB.ocp\fP ]
 .SH "DESCRIPTION" 
 .PP 
 \fBoutocp\fP is used for debugging Omega Compiled Translation Process