update from current build-install

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

16 files changed, 718 insertions, 25 deletions

diff --git a/Master/texmf/chktex/chktexrc b/Master/texmf/chktex/chktexrc
new file mode 100644
index 00000000000..d6f288a6690
--- /dev/null
+++ b/Master/texmf/chktex/chktexrc
@@ -0,0 +1,678 @@
+##
+##  ChkTeX, example resource file for ChkTeX.
+##  Copyright (C) 1995-96 Jens T. Berger Thielemann
+##
+##  This program is free software; you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation; either version 2 of the License, or
+##  (at your option) any later version.
+##
+##  This program is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with this program; if not, write to the Free Software
+##  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+##
+##  Contact the author at:
+##      Jens Berger
+##      Spektrumvn. 4
+##      N-0666 Oslo
+##      Norway
+##      E-mail: <jensthi@ifi.uio.no>
+##
+
+#####################################################################
+#
+# Note:   The  format  has  changed  slightly  (again).  The { ...  }
+# syntax does now mean case-sensitive comparing, while [ ...  ] means
+# case-insensitive   comparing  of  the  keywords.   Case-insensitive
+# comparing  of  the  keywords  is  only  supported  on  a few of the
+# keywords  (it's not meaningful in all contexts, and it slows ChkTeX
+# down).  Keywords supporting this are marked throughout the file.
+#
+# You  may  also reset a list by saying "KEYWORD = { ...  }"; it will
+# then be set equal to the contents of the list you specify.
+#
+# Comments  begin  with  `#', and continues for the rest of the line.
+# Blank lines plus leading and trailing spaces are of course ignored.
+#
+# The general format of this file is the following:
+#
+# KEYWORD { item item ...} [ item item ... ] /* Adds items */
+#
+# KEYWORD [ item item ...] { item item ... } /* Adds items */
+#
+# KEYWORD = item
+#
+# KEYWORD = { item item ... } /* Clears list before adding */
+#
+# KEYWORD = [ item item ... ] /* Clears list before adding */
+#
+# This  does  _not_  mean  that  you may alternate the forms; certain
+# keywords  demands  a  list, other a single value.  You thus have to
+# look at the examples of their use.
+#
+# Please  also  note  that if you specify a list-keyword twice, we'll
+# concatenate  the  lists.   If you you specify a item-keyword twice,
+# we'll kill the previous value.
+#
+# We  are  slightly  context-sensitive when detecting tokens like "}"
+# and "]"; they have to be preceded by a space.  This generally makes
+# life easier.
+#
+# Items  are separated by spaces.  Newlines are considered as spaces,
+# but  can't be escaped.  You may surround items with quotes (`"') to
+# easily put spaces into them.
+#
+# Escape sequences available:
+#
+#   Sequence        Resulting character
+#   !               A space (type `! ', not just a exclamation mark)
+#   !"              "
+#   !#              #
+#   !!              !
+#   !{              {
+#   !}              }
+#   ![              [
+#   !]              ]
+#   !=              =
+#   !b              Backspace
+#   !n              New line
+#   !r              Carriage return
+#   !t              Tab
+#   !f              Form feed
+#   !xNN            NN must be a hexadecimal number (00 - ff),
+#                   _both_ characters must be included.
+#   !dNNN           DDD must be a decimal number (000 - 255), all
+#                   three characters must be included. Unspecified
+#                   results if DDD > 255.
+#   !NNN            DDD must be a octal number (000 - 377), all
+#                   three characters must be included. Unspecified
+#                   results if DDD > 377.
+#
+# Minor  note:   As  you  can see, most of these escape sequences are
+# equal  to  those  in  C  (with  some extensions); however, we use !
+# instead of \ as escape character for obvious reasons.
+#
+#
+# Quick summary of keywords follows.  Keywords marked with a * accept
+# keywords accepting case-insensitive lists.
+#
+#   Abbrev*     - A list of abbreviations not automatically catched.
+#   CenterDots  - Commands/characters  which  should  have  \cdots in
+#                 between.
+#   CmdLine     - Default   commandline   options.    These  will  be
+#                 processed  before  the ones you give on the command
+#                 line.
+#   HyphDash   \
+#   NumDash     - No. of dashes allowed in different contexts.
+#   WordDash   /
+#   IJAccent    - Commands   which   puts   an  accent  _over_  their
+#                 argument.
+#   Italic      - Commands immediately turning on italic mode.
+#   ItalCmd     - Commands putting their argument into italic.
+#   Linker      - Commands  which should have a non-breaking space in
+#                 front.
+#   LowDots     - Commands/characters  which  should  have  \ldots in
+#                 between.
+#   MathEnvir   - Environments which turn on math mode.
+#   MathRoman   - Mathematical   operators   with  LaTeX  replacement
+#                 defined.
+#   NoCharNext  - Insists on that certain commands aren't followed by 
+#                 certain characters.
+#   NonItalic   - Commands immediately turning off italic mode.
+#   NotPreSpaced- Commands  which should not have a space in front of
+#                 them.
+#   Primitives  - Primitive TeX commands.
+#   PostLink    - Commands which generates a page reference.
+#   OutFormat   - Formats  to use for output.  See the -f & -v switch
+#                 in the main doc.
+#   QuoteStyle  - Either  "Traditional"  or "Logical".  See main doc,
+#                 warning 38.
+#   Silent      - These  commands  do not produce any textual output;
+#                 and are thus allowed to have a space after them.
+#   TabSize     - Tab size you are using.
+#   TeXInputs   - Paths to search \input and \include files for.
+#   UserWarn*   - These  strings  will be searched for throughout the
+#                 text.
+#   VerbEnvir   - Environments which contents should be ignored.
+#   VerbClear   - String we will overwrite unwanted data with.
+#   WipeArg     - Commands  (with  arguments) which should be ignored
+#                 in the checking.
+#
+
+
+#####################################################################
+#
+# Enter which type of  quote-style you are using here.  Currently, we
+# support the following styles:
+#
+#  Style        Example of use
+#  Traditional  "An example," he said, "would be great."
+#  Logical      "An example", he said, "would be great".
+#
+
+QuoteStyle = Logical
+
+#####################################################################
+#
+# Enter  here what interval you have between your tabs.  Only regular
+# intervals are supported.
+#
+
+TabSize = 8
+
+#####################################################################
+#
+# Here, you can put default commandline options; most users would for
+# instance like to put -v2 here.
+#
+
+CmdLine
+{
+
+}
+
+#####################################################################
+#
+# These  patterns  will  be  searched for through the text; no matter
+# whether   they   appear  as  normal  text,  commands  or  whatever.
+# Currently case-sensitive.
+#
+# I usually define a special command like this:
+#
+# \def\unknown{\large\bf??}
+#
+# which  I use whenever there is some information I don't have at the
+# moment of writing.  Thus, it makes sense to search for it.
+#
+# You should be able to develop your own uses for this.
+#
+
+UserWarn
+{
+
+    \unknown
+###
+#
+# Another example; one should write \chktex or Chk\TeX - never ChkTeX.
+#
+###
+
+    ChkTeX
+}
+[
+
+###
+#
+# You may put case-insensitive patterns here.
+#
+###
+
+]
+
+#####################################################################
+#
+# Here you can list the path of where ChkTeX should look for files it
+# \inputs.   The  // postfix is now supported; if you append a double
+# path-separator we'll recursively search that directory directories.
+# MS-DOS users must append \\ instead, e.g.  "C:\EMTEX\\".
+#
+# If you under either MS-DOS or UNIX wish to search an entire
+# partition or the complete directory tree, you must use *three*
+# slashes, e.g. "c:\\\" or "///". This may be considered to be a bug.
+#
+# By  default,  we'll  search the current directory (not recursively,
+# put  "//"  in the list for this); any paths specified below will be
+# searched in addition to this.
+#
+
+TeXInputs
+{
+
+}
+
+#####################################################################
+#
+# Here you may specify more outputformats for use with the -v option,
+# it simply indexes  into this list.  Remember to use ! instead of \,
+# though.
+#
+# For explanation of how % fields expand; look at ChkTeX.{dvi,ps}.
+#
+# We will by default select entry number _two_ in this list (we count
+# from 0), and -v without any parameter selects entry number _three_.
+#
+
+OutFormat
+{
+
+# -v0; silent mode
+%f%b%l%b%c%b%n%b%m!n
+
+# -v1; normal mode
+"%k %n in %f line %l: %m!n%r%s%t!n%u!n"
+
+# -v2; fancy mode
+"%k %n in %f line %l: %m!n%r%i%s%I%t!n!n"
+
+# -v3; lacheck mode
+"!"%f!", line %l: %m!n"
+
+# -v4; verbose lacheck mode
+"!"%f!", line %l: %m!n%r%s%t!n%u!n"
+
+# -v5; no line number, ease auto-test
+"%k %n in %f: %m!n%r%s%t!n%u!n"
+
+}
+
+
+
+#####################################################################
+#
+# These  commands  should be ignored when detecting whether a command
+# is ended by a space.
+#
+
+Silent
+{
+    \rm \em \bf \it \sl \sf \sc \tt \selectfont
+    \rmfamily \sffamily \ttfamily \mdseries \bfseries
+    \slshape \scshape \relax
+    \vskip \pagebreak \nopagebreak
+
+    \textrm \textem \textbf \textit \textsl \textsf \textsc \texttt
+
+    \clearpage \ddots \dotfill \flushbottom \fussy \indent \linebreak
+    \onecolumn \pagebreak \pushtabs \poptabs \scriptsize \sloppy
+    \twocolumn \vdots
+    \today \kill \newline \thicklines \thinlines
+
+    \columnsep \space \item \tiny \footnotesize \small \normalsize
+    \normal \large \Large \LARGE \huge \Huge \printindex
+
+    \newpage \listoffigures \listoftables \tableofcontents
+    \maketitle \makeindex
+
+    \hline \hrule \vrule
+
+    \centering
+
+    \bigskip \medskip \smallskip
+
+    \noindent \expandafter
+
+    \makeatletter \makeatother
+
+    \columnseprule
+
+    \textwidth \textheight \hsize \vsize
+
+    \if \fi
+
+    \csname \endcsname
+
+    \z@ \p@ \@warning \typeout
+
+    \dots \ldots \input \endinput \nextline \leavevmode \cdots
+-    \appendix \listfiles \and \quad
+    \vfill \vfil \hfill \hfil \topmargin \oddsidemargin
+    \frenchspacing \nonfrenchspacing
+    \begingroup \endgroup \par
+
+    \vrefwarning \upshape \headheight \headsep \hoffset \voffset
+    \cdot \qquad
+    \left \right
+}
+
+#####################################################################
+#
+# Here,  you  can  specify the length of various dashes.  We sort the
+# dash according to which type of characters that are on the left and
+# right of of it.  We are only conclusive if they are the same.
+#
+# We associate as follows:
+#
+#     Name        Type of character on each side
+#     HyphDash    Alphabetic (foo-bar)
+#     NumDash     Numeric (2--3)
+#     WordDash    Space (like this --- see?)
+#
+# Below you specify how many dashes which are legal in each case.  We
+# define 0 as an magic constant which always generates an error.  You
+# may specify more than one legal dash-length.
+#
+# Let's look at an example.  You use the following dash-syntax:
+#
+#     foo-bar
+#     2--3
+#     like this---see?
+#
+#
+# HYPHDASH { 1 3 }        # Either a hyphen, or inter-word
+# NUMDASH { 2 }           # Between words
+# WORDDASH { 0 }          # We never use this
+#
+
+HyphDash
+{
+    1 3
+}
+
+NumDash
+{
+    2
+}
+
+WordDash
+{
+    3
+}
+
+#####################################################################
+#
+# This  keyword  indicates commands  which argument isn't LaTeX code,
+# and which thus should be ignored.
+#
+# After the  command,  you  may place arguments  that  you  wish that
+# should be  wiped in the process;  use [] for optional arguments, {}
+# for required  ones and *  if the  command  supports  an alternative
+# variant. These should be separated from the command with a colon.
+#
+# For  instance,  if  you would like to wipe the \newcommand command,
+# you would declare it as \newcommand:*[][]{}
+#
+# These  commands may be "executed" before they're wiped, so you will
+# typically also wish to list filehandling commands and similar here.
+#
+
+WipeArg
+{
+    \label:{} \ref:{} \vref:{} \pageref:{} \index:{} \cite:[]{}
+    \input:{} \verbatiminput:[]{} \listinginput:[]{}{}
+    \verbatimtabinput:[]{} \include:{} \includeonly:{} 
+    \bibitem:[]{}
+}
+
+#####################################################################
+#
+# These  environments  contains  material  which  will  be typeset as
+# mathematics by LaTeX.  This turns on/off some warnings.
+#
+# We will automagically append a * to each keyword.
+#
+
+MathEnvir
+{
+    displaymath math eqnarray array equation
+    align alignat gather flalign multline
+}
+
+#####################################################################
+#
+# These  environments  contains  material  which  contents  should be
+# ignored.
+#
+# We will automagically append a * to each keyword.
+#
+
+VerbEnvir
+{
+    verbatim comment listing verbatimtab rawhtml errexam picture texdraw
+}
+
+#####################################################################
+#
+# ChkTeX  does  automagically  catch  most abbreviations; the ones we
+# need  to  list here, are those which are most likely to be followed
+# by a word with an upper-case letter (that is not the beginning of a
+# new sentence).
+#
+# The case-insensitive abbreviations are not really case-insensitive,
+# it seems to be more  practical to  only let  the first character be
+# case-insensitive, while the remaining are case-sensitive.
+#
+# To  speed  up the searching process somewhat, we require that these
+# end in a `.', this should not be a problem.
+#
+# Much  of  this  work (both the abbreviations below, and the regexps
+# necessary  to catch the remaining automatically) have been provided
+# by Russ Bubley, <russ@scs.leeds.ac.uk>.
+#
+
+
+Abbrev
+{
+# Ordinals
+1st. 2nd. 3rd. 4th.
+# Titles
+Mr. Mrs. Miss. Ms. Dr. Prof. St.
+
+#
+# Days
+# Mon. Tue. Wed. Thu. Fri. Sat. Sun.
+#
+# Months
+# Jan. Feb. Mar. Apr. May. Jun. Jul. Aug. Sep. Oct. Nov. Dec.
+#
+# Letters
+# Kt. Jr.
+#
+# Corporate
+# Co. Ltd.
+#
+# Addresses
+# Rd. Dr. St. Ave. Cres. Gdns. Sq. Circ. Terr. Pl. Arc. La. Clo. Ho. Est. Gn.
+#
+# Misc.
+# oe. pbab. ps. rsvp. Tx.
+}
+[
+###
+#
+# The first letter is case-insensitive in the abbrevs in this
+# list. Due to the nature of the checking algorithm used for
+# this, entries consisting of only one character will be
+# silently ignored.
+#
+##
+
+# Latin
+# cf. "et al." etc. qed. qv. viz.
+#
+# Corporate
+# inc. plc.
+#
+# Misc
+# fax. pcs. qty. tel. misc.
+]
+
+#####################################################################
+#
+# Commands which accent characters, meaning that \i or \j (\imath and
+# \jmath in mathmode) should be used instead of `i' and `j'
+#
+
+IJAccent
+{
+    \hat \check \breve \acute \grave \tilde \bar \vec \dot \ddot
+
+    \' \` \^ \" \~ \= \. \u \v \H \t
+
+###
+#
+# The  remaining  accent commands (\c,\d,\b) put their accent _under_
+# the  character,  not above, and should thus be used with normal i's
+# and j's.
+#
+###
+
+}
+
+#####################################################################
+#
+# Commands   which,  when  the  group  is  terminated,  needs  italic
+# correction.
+#
+
+Italic
+{
+    \it \em \sl
+    \itshape \slshape
+}
+
+#####################################################################
+#
+# Commands which makes the font non-italic.
+#
+
+NonItalic
+{
+    \bf \rm \sf \tt \sc
+    \upshape
+}
+
+#####################################################################
+#
+# Commands   which puts their argument into italic (and thus possibly
+# needs italic correction in the end).
+#
+# This is currently empty, since \textit, \textsl and \emph do that
+# automatically.
+#
+
+ItalCmd
+{
+}
+
+#####################################################################
+#
+# These  commands  all have in common that a pagebreak right in front
+# of  them  is  highly  undesirable; thus there should be no space in
+# front of them.
+#
+
+PostLink
+{
+    \index \label
+}
+
+#####################################################################
+#
+# These commands should not have a space in front of them for various
+# reasons.   I.e.   much  the  same as POSTLINK, but produces another
+# warning.
+#
+
+NotPreSpaced
+{
+    \footnote \footnotemark \/
+}
+
+#####################################################################
+#
+# The  commands  listed  here,  should be prepended with a `~', as in
+# "look  in  table~\ref{foo}", to avoid the references being split
+# across lines.
+#
+
+Linker
+{
+    \ref \vref \pageref \cite
+}
+
+#####################################################################
+#
+# Commands/characters  which  should  have  \cdots  in  between, e.g.
+# $1+2+3+\cdots+n$.
+#
+
+CenterDots
+{
+    = + - \cdot \div & \times \geq \leq < >
+}
+
+#####################################################################
+#
+# Commands/characters  which  should  have  \ldots  in  between, e.g.
+# $1,2,3,\ldots,n$.
+#
+
+LowDots
+{
+    . , ;
+}
+
+#####################################################################
+#
+# In maths mode, there are certain aliases for mathematical operators
+# like  sin, cos, etc.  Ignore the leading backslash in the commands,
+# and so forth.  You should list these below.
+#
+
+MathRoman
+{
+    log lg ln lim limsup liminf sin arcsin sinh cos arccos cosh tan
+    arctan tanh cot coth sec csc max min sup inf arg ker dim hom det
+    exp Pr gcd deg bmod pmod mod
+}
+
+#####################################################################
+#
+# These TeX commands have become unnecessary, as there are LaTeX cmds
+# that does the same. Purists should thus avoid these in their code.
+#
+# (These are a spell-corrected version of those lacheck uses).
+#
+
+Primitives
+{
+   \above \advance \catcode \chardef \closein \closeout \copy \count
+   \countdef \cr \crcr \csname \delcode \dimendef \dimen \divide
+   \expandafter \font \hskip \vskip \openout
+}
+
+#####################################################################
+#
+# Format: \command:characters
+#
+# We'll emit a warning if any of characters are found after the 
+# command.
+#
+
+NoCharNext 
+{
+   \left:{}$ \right:{}$
+}
+
+#####################################################################
+#
+# We're killing \verb@...@ commands and the arguments of the commands
+# listed above in WIPEARG by overwriting them with a string or a
+# single character.
+#
+# This  should  not contain an alphabetic character (in case the user
+# writes (\foo\verb@bar@), neither should it contain be one of LaTeX'
+# reserved  characters  (`#$%&~_^\{}'),  or any parenthesis character
+# ('()[]{}').   If  possible,  don't  use  a  punctuation  character,
+# either, or any spacing character.
+#
+# The  asterix is also unsuitable, as some commands behave in another
+# way  if  they  are  postpended with an asterix.  Which more or less
+# leaves  us  with  the  pipe.
+#
+# Please  note  that  this  may  also  be  a  _string_, which will be
+# repeated until the proper length is reached.
+#
+
+VerbClear = "|"
+
+#
+# All for now - have fun.
+#
+#####################################################################
+
diff --git a/Master/texmf/doc/chktex/ChkTeX.pdf b/Master/texmf/doc/chktex/ChkTeX.pdf
new file mode 100644
index 00000000000..a9cfb22f813
--- /dev/null
+++ b/Master/texmf/doc/chktex/ChkTeX.pdf
diff --git a/Master/texmf/doc/man/man1/Makefile b/Master/texmf/doc/man/man1/Makefile
index 349595c0157..2cc1c3391d4 100644
--- a/Master/texmf/doc/man/man1/Makefile
+++ b/Master/texmf/doc/man/man1/Makefile
@@ -30,6 +30,9 @@ man1/ctangle.man1.pdf: man1/ctangle.1 man1/cweb.1
 man1/cweave.man1.pdf: man1/cweave.1 man1/cweb.1
 	$(MKPDF)
 
+man1/dvigif.man1.pdf: man1/dvigif.1 man1/dvipng.1
+	$(MKPDF)
+
 man1/dvilj2p.man1.pdf: man1/dvilj2p.1 man1/dvilj.1
 	$(MKPDF)
 
@@ -57,6 +60,9 @@ man1/kpsepath.man1.pdf: man1/kpsepath.1 man1/kpsetool.1
 man1/kpsexpand.man1.pdf: man1/kpsexpand.1 man1/kpsetool.1
 	$(MKPDF)
 
+man1/lamed.man1.pdf: man1/lamed.1 man1/aleph.1
+	$(MKPDF)
+
 man1/mf-nowin.man1.pdf: man1/mf-nowin.1 man1/mf.1
 	$(MKPDF)
 
@@ -69,6 +75,9 @@ man1/odvicopy.man1.pdf: man1/odvicopy.1 man1/dvicopy.1
 man1/odvitype.man1.pdf: man1/odvitype.1 man1/dvitype.1
 	$(MKPDF)
 
+man1/otangle.man1.pdf: man1/otangle.1 man1/tangle.1
+	$(MKPDF)
+
 man1/pdflatex.man1.pdf: man1/pdflatex.1 man1/pdftex.1
 	$(MKPDF)
 
diff --git a/Master/texmf/doc/man/man1/dvigif.man1.pdf b/Master/texmf/doc/man/man1/dvigif.man1.pdf
new file mode 100644
index 00000000000..01b184ffd8a
--- /dev/null
+++ b/Master/texmf/doc/man/man1/dvigif.man1.pdf
diff --git a/Master/texmf/doc/man/man1/lamed.1 b/Master/texmf/doc/man/man1/lamed.1
new file mode 100644
index 00000000000..bda63f2adb8
--- /dev/null
+++ b/Master/texmf/doc/man/man1/lamed.1
@@ -0,0 +1 @@
+.so man1/aleph.1
diff --git a/Master/texmf/doc/man/man1/lamed.man1.pdf b/Master/texmf/doc/man/man1/lamed.man1.pdf
new file mode 100644
index 00000000000..85268c6acdd
--- /dev/null
+++ b/Master/texmf/doc/man/man1/lamed.man1.pdf
diff --git a/Master/texmf/doc/man/man1/otangle.1 b/Master/texmf/doc/man/man1/otangle.1
new file mode 100644
index 00000000000..6c242cba957
--- /dev/null
+++ b/Master/texmf/doc/man/man1/otangle.1
@@ -0,0 +1 @@
+.so man1/tangle.1
diff --git a/Master/texmf/doc/man/man1/otangle.man1.pdf b/Master/texmf/doc/man/man1/otangle.man1.pdf
new file mode 100644
index 00000000000..5a1a695f60a
--- /dev/null
+++ b/Master/texmf/doc/man/man1/otangle.man1.pdf
diff --git a/Master/texmf/texconfig/tcfmgr b/Master/texmf/texconfig/tcfmgr
index adb6046e9c1..252bbf87e22 100755
--- a/Master/texmf/texconfig/tcfmgr
+++ b/Master/texmf/texconfig/tcfmgr
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id: tcfmgr 16754 2010-01-17 01:14:28Z karl $
 
 # invoke the right shell:
 
@@ -50,7 +51,7 @@ setupMap()
   esac
 
   case $TFC_MAP in
-    "") abort "config file \`tcfmgr.map' (usually in \$TEXMFMAIN/texconfig) not found";;
+    "") abort "config file \`tcfmgr.map' (usually in \$TEXMFMAIN/texconfig) not found (ls-R missing?)";;
   esac
 
   if test ! -f "$TFC_MAP"; then
diff --git a/Master/texmf/web2c/mktex.opt b/Master/texmf/web2c/mktex.opt
index 58854e3f17e..bd5d0fbcc8f 100644
--- a/Master/texmf/web2c/mktex.opt
+++ b/Master/texmf/web2c/mktex.opt
@@ -1,8 +1,8 @@
 # mktex.opt -- common mktex* options, etc.
 # Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set.
 # 
-# te@dbs.uni-hannover.de and kb@mail.tug.org. Public domain.
-# $Id: mktex.opt,v 1.36 2005/01/21 19:17:01 olaf Exp $
+# Originally written by Thomas Esser.  Public domain.
+# $Id: mktex.opt 18383 2010-05-20 18:31:24Z karl $
  
 if test "x$1" = x--help || test "x$1" = x-help; then
   echo "$usage"
diff --git a/Master/texmf/web2c/mktexdir b/Master/texmf/web2c/mktexdir
index 5d378ad4778..e9c2100d879 100755
--- a/Master/texmf/web2c/mktexdir
+++ b/Master/texmf/web2c/mktexdir
@@ -1,12 +1,12 @@
 #!/bin/sh
-# mkinstalldirs --- make directory hierarchy (now mktexdir).
+# mkinstalldirs (now mktexdir) -- make directory hierarchy.
 # Author: Noah Friedman <friedman@prep.ai.mit.edu>, created: 1993-05-16.
 # Public domain.
 # 
-# Modified for sticky directory creation, --help, --version.
-# te@dbs.uni-hannover.de and kb@mail.tug.org.
+# Modified for sticky directory creation, --help, --version, more,
+# by Thomas Esser, Karl Berry, Olaf Weber, et al.
 
-version='$Id: mktexdir,v 1.17 2004/12/29 13:38:45 olaf Exp $'
+version='$Id: mktexdir 18383 2010-05-20 18:31:24Z karl $'
 usage="Usage: $0 DIRS...
   Create each DIR, including any missing leading directories."
 mt_max_args=$#
diff --git a/Master/texmf/web2c/mktexnam.opt b/Master/texmf/web2c/mktexnam.opt
index d4c518bc450..a9eb4e5c279 100644
--- a/Master/texmf/web2c/mktexnam.opt
+++ b/Master/texmf/web2c/mktexnam.opt
@@ -1,8 +1,9 @@
 # mktexnam.opt to determine various manipulations of the filenames.
 # Sourced from mktexnam.
 # 
-# te@dbs.uni-hannover.de and kb@mail.tug.org. Public domain.
-# $Id: mktexnam.opt,v 1.14 2004/12/28 20:58:18 olaf Exp $
+# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
+# Public domain.
+# $Id: mktexnam.opt 18383 2010-05-20 18:31:24Z karl $
 
 # Get 8.3 filenames like dpiNNN/NAME.pk.
 case "$MT_FEATURES" in
diff --git a/Master/texmf/web2c/mktexupd b/Master/texmf/web2c/mktexupd
index 317ec9eb8aa..1636e683f45 100755
--- a/Master/texmf/web2c/mktexupd
+++ b/Master/texmf/web2c/mktexupd
@@ -1,9 +1,11 @@
 #!/bin/sh
 # mktexupd -- update ls-R with a new entry.
 # 
-# te@dbs.uni-hannover.de and kb@mail.tug.org. Public domain.
+# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
+# Public domain.
+# $Id: mktexupd 18383 2010-05-20 18:31:24Z karl $
 
-version='$Id: mktexupd,v 1.20 2004/12/19 12:41:13 olaf Exp $'
+version='$Id: mktexupd 18383 2010-05-20 18:31:24Z karl $'
 usage="Usage: $0 DIR FILE.
   Update the ls-R file with an entry for FILE in DIR."
 mt_min_args=2
diff --git a/Master/texmf/xdvi/XDvi b/Master/texmf/xdvi/XDvi
index 31b83e76a34..3e0f4984e4c 100644
--- a/Master/texmf/xdvi/XDvi
+++ b/Master/texmf/xdvi/XDvi
@@ -26,6 +26,15 @@
 !!! This should be the best choice for modern displays with large color depth.
 *thorough: true
 
+!!! Add some useful translations for the mouse wheel (bug #1422928)
+*wheelTranslations:\
+Shift<Btn4Down>:left(.08)\n\
+Shift<Btn5Down>:right(.08)\n\
+Ctrl<Btn4Down>:set-shrink-factor(+)\n\
+Ctrl<Btn5Down>:set-shrink-factor(-)\n\
+<Btn4Down>:wheel(-.7)\n\
+<Btn5Down>:wheel(.7)
+
 !!!------------------------------------------------------------------------------
 !!!------------------------------ Motif toolbar ---------------------------------
 !!!------------------------------------------------------------------------------
@@ -76,18 +85,9 @@
 *textColumns: 50
 
 !!! make all text/entry fields white, for better contrasts:
-*file_text.background: white
-*searchbox_input.background: white
-*print_text.background: white
-*dvips_options_text.background: white
-*from_page.background: white
-*to_page.background: white
-*topics_list.background: white
-*help_text.background: white
-*FilterText.background: white
-*DirList.background: white
-*ItemsList.background: white
-*file.Text.background: white
+*XmDialogShell*XmTextField.background: white
+*XmDialogShell*XmText.background: white
+*XmDialogShell*XmList.background: white
 
 !!! adjust position of header in help window
 *help_window*right_form.topOffset: 10
diff --git a/Master/texmf/xdvi/pixmaps/toolbar.xpm b/Master/texmf/xdvi/pixmap/toolbar.xpm
index e752fef011e..a9dd124e668 100644
--- a/Master/texmf/xdvi/pixmaps/toolbar.xpm
+++ b/Master/texmf/xdvi/pixmap/toolbar.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * toolbar_xpm[] = {
+static const char * toolbar_xpm[] = {
 /* width height colors colordepth */
 " 378    18     16     1 0 0",
 " 	 s none c None",
diff --git a/Master/texmf/xdvi/pixmaps/toolbar2.xpm b/Master/texmf/xdvi/pixmap/toolbar2.xpm
index edacd450833..0245a01dac1 100644
--- a/Master/texmf/xdvi/pixmaps/toolbar2.xpm
+++ b/Master/texmf/xdvi/pixmap/toolbar2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * tools2_xpm[] = {
+static const char * tools2_xpm[] = {
 /* width height colors colordepth */
 " 378    18     15     1 0 0",
 " 	 m none c None",