autoupdate

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

3 files changed, 150 insertions, 56 deletions

diff --git a/Master/texmf-dist/ls-R b/Master/texmf-dist/ls-R
index 11a4b6098f0..f31f98c3445 100644
--- a/Master/texmf-dist/ls-R
+++ b/Master/texmf-dist/ls-R
@@ -6421,6 +6421,7 @@ boolexpr
 bosisio
 boxhandler
 bpchem
+bracketkey
 braille
 breakurl
 brushscr
@@ -6882,6 +6883,7 @@ macqassign
 mafr
 magyar
 mailing
+mailmerge
 makebarcode
 makebox
 makecell
@@ -8553,6 +8555,10 @@ boxhandler.pdf
 ./doc/latex/bpchem:
 bpchem.pdf
 
+./doc/latex/bracketkey:
+Malva.tex
+README
+
 ./doc/latex/braille:
 README.braille
 braille.html
@@ -14071,6 +14077,10 @@ magyar.ldf
 mailing.pdf
 manifest.txt
 
+./doc/latex/mailmerge:
+README
+mailmerge.pdf
+
 ./doc/latex/makebarcode:
 License.txt
 README
@@ -14238,6 +14248,7 @@ pazotest.pdf
 
 ./doc/latex/mattens:
 MTsample.pdf
+MTsample_src.zip
 README
 mattens.pdf
 
@@ -21010,6 +21021,7 @@ pkfix
 pkfix-helper
 purifyeps
 texcount
+texdiff
 texdraw
 texloganalyser
 
@@ -21348,6 +21360,9 @@ TeXcount.pdf
 TeXcount.tex
 macros.tex
 
+./doc/support/texdiff:
+README
+
 ./doc/support/texdraw:
 getopt.c
 getopt.h
@@ -64857,6 +64872,7 @@ splitindex
 svn-multi
 tex4ht
 texcount
+texdiff
 texdirflatten
 texloganalyser
 thumbpdf
@@ -65158,6 +65174,9 @@ mk4ht.pl
 ./scripts/texcount:
 texcount.pl
 
+./scripts/texdiff:
+texdiff
+
 ./scripts/texdirflatten:
 texdirflatten
 
@@ -66794,6 +66813,7 @@ lps
 ltxindex
 ltxnew
 mailing
+mailmerge
 makebox
 makecell
 makecmds
@@ -69432,6 +69452,10 @@ ltxnew.ins
 mailing.dtx
 mailing.ins
 
+./source/latex/mailmerge:
+mailmerge.dtx
+mailmerge.ins
+
 ./source/latex/makebox:
 Makefile
 makebox.dtx
@@ -75555,6 +75579,7 @@ bophook
 bosisio
 boxhandler
 bpchem
+bracketkey
 braille
 breakurl
 brushscr
@@ -76043,6 +76068,7 @@ ly1
 macqassign
 mafr
 mailing
+mailmerge
 makebarcode
 makebox
 makecell
@@ -78067,6 +78093,9 @@ boxhandler.sty
 ./tex/latex/bpchem:
 bpchem.sty
 
+./tex/latex/bracketkey:
+bracketkey.sty
+
 ./tex/latex/braille:
 braille.sty
 
@@ -81805,6 +81834,9 @@ mafr.sty
 ./tex/latex/mailing:
 mailing.sty
 
+./tex/latex/mailmerge:
+mailmerge.sty
+
 ./tex/latex/makebarcode:
 makebarcode.sty
 
diff --git a/Master/texmf/ls-R b/Master/texmf/ls-R
index f73bdfbf15d..3ee6a6a8ac7 100644
--- a/Master/texmf/ls-R
+++ b/Master/texmf/ls-R
@@ -885,6 +885,7 @@ texconfig-sys.1
 texconfig-sys.pdf
 texconfig.1
 texconfig.pdf
+texdiff.1
 texdirflatten.1
 texdirflatten.pdf
 texdoc.1
@@ -1005,6 +1006,7 @@ Makefile
 cs-tex-live.sty
 csquote.sty
 ec-lmr10-19.png
+install-lnx-main.png
 install-w32-main.png
 live4ht.cfg
 psview.png
@@ -1016,15 +1018,14 @@ texlive-cz.pdf
 texlive-cz.tex
 tlmgr-config.png
 tlmgr-gui.png
+wizard-w32.png
 
 ./doc/texlive/texlive-de:
 Makefile
 install-w32-main.png
-live4ht.cfg
 lmsy10-40.png
 psview.png
 stdcoll.png
-tex-live.css
 texlive-de.css
 texlive-de.html
 texlive-de.pdf
diff --git a/Master/tlpkg/texlive.tlpdb b/Master/tlpkg/texlive.tlpdb
index 0e64311cdc3..55fbe531ebc 100644
--- a/Master/tlpkg/texlive.tlpdb
+++ b/Master/tlpkg/texlive.tlpdb
@@ -18,11 +18,11 @@ depend container_format/xz
 depend container_split_doc_files/1
 depend container_split_src_files/1
 depend release/2009
-depend revision/15458
+depend revision/15476
 
 name 00texlive.image
 category TLCore
-revision 15446
+revision 15464
 shortdesc TeX Live files only in the source repository and DVD image
 longdesc This package collects some files which are not caught by any of
 longdesc the other TL packages. Its purpose is to make the file coverage
@@ -13922,6 +13922,22 @@ catalogue-date 2008-08-17 01:00:50 +0200
 catalogue-license lppl
 catalogue-version 0.5
 
+name bracketkey
+category Package
+revision 15476
+shortdesc Produce bracketed identification keys.
+longdesc The package provides an environment bracketkey for use when
+longdesc producing lists of species.
+docfiles size=2
+ texmf-dist/doc/latex/bracketkey/Malva.tex
+ texmf-dist/doc/latex/bracketkey/README details="Readme, including usage details"
+runfiles size=1
+ texmf-dist/tex/latex/bracketkey/bracketkey.sty
+catalogue-ctan /macros/latex/contrib/bracketkey
+catalogue-date 2009-09-26 09:29:25 +0200
+catalogue-license lppl1.3
+catalogue-version 1.0
+
 name braille
 category Package
 revision 13293
@@ -19257,7 +19273,7 @@ catalogue-version 0
 
 name cleveref
 category Package
-revision 14804
+revision 15470
 shortdesc Automatic cross-reference formatting.
 longdesc The package enhances LaTeX's cross-referencing features,
 longdesc allowing the format of references to be determined
@@ -19268,13 +19284,13 @@ longdesc limited). The package also offers a means of referencing a list
 longdesc of references, each formatted according to its type. In such
 longdesc lists, it can collapse sequences of numerically-consecutive
 longdesc labels to a reference range.
-docfiles size=94
+docfiles size=97
  texmf-dist/doc/latex/cleveref/README details="Readme"
  texmf-dist/doc/latex/cleveref/cleveref.pdf details="Package documentation"
-srcfiles size=68
+srcfiles size=72
  texmf-dist/source/latex/cleveref/cleveref.dtx
  texmf-dist/source/latex/cleveref/cleveref.ins
-runfiles size=37
+runfiles size=40
  texmf-dist/tex/latex/cleveref/cleveref.sty
 catalogue-ctan /macros/latex/contrib/cleveref
 catalogue-date 2009-08-21 16:03:16 +0200
@@ -22636,7 +22652,7 @@ depend collection-latex
 
 name collection-binextra
 category Collection
-revision 15093
+revision 15464
 shortdesc TeX auxiliary programs
 longdesc Various useful, but non-essential, support programs. Includes
 longdesc programs and macros for DVI file manipulation, literate
@@ -22646,43 +22662,44 @@ depend a2ping
 depend asymptote
 depend bibtex8
 depend ctie
+depend cweb
 depend detex
 depend dtl
 depend dvi2tty
+depend dviasm
 depend dvicopy
 depend dvidvi
 depend dviljk
 depend dvipng
 depend dvipos
 depend findhyph
-depend getnonfreefonts
-depend lacheck
-depend listings-ext
-depend patgen
-depend pdftools
-depend seetexk
-depend texdoc
-depend texware
-depend tie
-depend tpic2pdftex
-depend web
-depend cweb
-depend dviasm
 depend fragmaster
+depend getnonfreefonts
 depend hyphenex
+depend lacheck
 depend latex2man
 depend latexmk
+depend listings-ext
 depend mkind-english
 depend mkjobtexmf
+depend patgen
 depend pdfcrop
+depend pdftools
 depend pkfix
 depend pkfix-helper
 depend purifyeps
+depend seetexk
 depend synctex
 depend texcount
-depend texworks
+depend texdiff
 depend texdirflatten
+depend texdoc
 depend texloganalyser
+depend texware
+depend texworks
+depend tie
+depend tpic2pdftex
+depend web
 depend xindy
 
 name collection-context
@@ -23728,7 +23745,7 @@ depend collection-latex
 
 name collection-latexextra
 category Collection
-revision 15457
+revision 15476
 shortdesc LaTeX supplementary packages
 longdesc A large collection of add-on packages for LaTeX.
 depend AkkTeX
@@ -23775,6 +23792,7 @@ depend booklet
 depend boolexpr
 depend bophook
 depend boxhandler
+depend bracketkey
 depend breakurl
 depend bullcntr
 depend bussproofs
@@ -24030,6 +24048,7 @@ depend ltxdockit
 depend ltxindex
 depend ltxnew
 depend mailing
+depend mailmerge
 depend makebarcode
 depend makebox
 depend makecell
@@ -33904,7 +33923,7 @@ binfiles arch=x86_64-linux size=26
 
 name dvips
 category Package
-revision 14549
+revision 15465
 shortdesc A DVI to PostScript driver.
 longdesc This package has been withdrawn from CTAN. The current sources
 longdesc of dvips may be found in the distribution of dvipsk which forms
@@ -39717,7 +39736,7 @@ docfiles size=59
 runfiles size=7
  texmf-dist/tex/latex/fancybox/fancybox.sty
 catalogue-ctan /macros/latex/contrib/fancybox
-catalogue-date 2007-12-07 18:12:40 +0100
+catalogue-date 2009-09-26 09:33:53 +0200
 catalogue-license lppl
 catalogue-version 1.3
 
@@ -39888,7 +39907,7 @@ runfiles size=18
  texmf-dist/tex/latex/fancyvrb/hbaw.sty
  texmf-dist/tex/latex/fancyvrb/hcolor.sty
 catalogue-ctan /macros/latex/contrib/fancyvrb
-catalogue-date 2008-05-13 15:35:52 +0200
+catalogue-date 2009-09-26 09:33:53 +0200
 catalogue-license artistic2
 catalogue-version 2.7a
 
@@ -40871,7 +40890,7 @@ binfiles arch=universal-darwin size=1
 
 name fig4latex.win32
 category Package
-revision 14758
+revision 15469
 shortdesc win32 files of fig4latex
 binfiles arch=win32 size=1
  bin/win32/fig4latex.exe
@@ -41090,7 +41109,7 @@ binfiles arch=universal-darwin size=1
 
 name findhyph.win32
 category Package
-revision 14758
+revision 15469
 shortdesc win32 files of findhyph
 binfiles arch=win32 size=1
  bin/win32/findhyph.exe
@@ -41357,7 +41376,7 @@ srcfiles size=11
 runfiles size=2
  texmf-dist/tex/latex/float/float.sty
 catalogue-ctan /macros/latex/contrib/float
-catalogue-date 2006-12-05 13:18:07 +0100
+catalogue-date 2009-09-26 09:33:53 +0200
 catalogue-license lppl
 catalogue-version 1.3d
 
@@ -41966,7 +41985,7 @@ runfiles size=254
  texmf-dist/tex/fontinst/smblmtx/unsetnum.mtx
  texmf-dist/tex/latex/fontinst/fontdoc.sty
 catalogue-ctan /fonts/utilities/fontinst
-catalogue-date 2009-08-24 13:51:44 +0200
+catalogue-date 2009-09-26 11:43:36 +0200
 catalogue-license lppl
 catalogue-version 1.933
 
@@ -42141,7 +42160,7 @@ runfiles size=377
  texmf-dist/fonts/map/fontname/width.map
  texmf-dist/fonts/map/fontname/yandy.map
 catalogue-ctan /info/fontname
-catalogue-date 2009-09-16 08:55:57 +0200
+catalogue-date 2009-09-26 11:43:36 +0200
 catalogue-license gpl
 
 name fontools
@@ -42617,7 +42636,7 @@ srcfiles size=23
 runfiles size=7
  texmf-dist/tex/latex/footbib/footbib.sty
 catalogue-ctan /macros/latex/contrib/footbib
-catalogue-date 2007-01-04 08:48:45 +0100
+catalogue-date 2009-09-26 11:43:36 +0200
 catalogue-license lppl
 catalogue-version 2.0.4
 
@@ -42684,7 +42703,7 @@ srcfiles size=1
 runfiles size=5
  texmf-dist/tex/latex/footnpag/footnpag.sty
 catalogue-ctan /macros/latex/contrib/footnpag
-catalogue-date 2007-01-05 21:30:32 +0100
+catalogue-date 2009-09-26 11:43:36 +0200
 catalogue-license gpl
 
 name forarray
@@ -43127,8 +43146,8 @@ name fp
 category Package
 revision 13293
 shortdesc Fixed point arithmetic.
-longdesc Provides an extensive collection of arithmetic operations for
-longdesc fixed point real numbers of high precision.
+longdesc An extensive collection of arithmetic operations for fixed
+longdesc point real numbers of high precision.
 docfiles size=6
  texmf-dist/doc/latex/fp/README
  texmf-dist/doc/latex/fp/fp.tex
@@ -43148,7 +43167,7 @@ runfiles size=37
  texmf-dist/tex/latex/fp/lfp.sty
  texmf-dist/tex/plain/fp/fp.tex
 catalogue-ctan /macros/latex/contrib/fp
-catalogue-date 2006-12-18 23:50:36 +0100
+catalogue-date 2009-09-26 11:43:36 +0200
 catalogue-license lppl
 
 name fpl
@@ -44357,7 +44376,7 @@ srcfiles size=35
 runfiles size=9
  texmf-dist/tex/latex/geometry/geometry.sty
 catalogue-ctan /macros/latex/contrib/geometry
-catalogue-date 2008-12-23 17:41:56 +0100
+catalogue-date 2009-09-26 12:32:55 +0200
 catalogue-license lppl
 catalogue-version 4.2
 
@@ -44381,7 +44400,7 @@ runfiles size=14
  texmf-dist/tex/generic/german/german.sty
  texmf-dist/tex/generic/german/ngerman.sty
 catalogue-ctan /language/german
-catalogue-date 2007-01-04 14:33:27 +0100
+catalogue-date 2009-09-26 12:32:55 +0200
 catalogue-license lppl
 catalogue-version 2.5e
 
@@ -49048,7 +49067,7 @@ catalogue-version 4.0
 
 name ifluatex
 category Package
-revision 15438
+revision 15474
 shortdesc Provides the \ifluatex switch.
 longdesc This package looks for LuaTeX regardless of its mode and
 longdesc provides the switch \ifluatex. It works with plain-TeX or
@@ -62439,7 +62458,7 @@ catalogue-version 0.93
 
 name luamplib
 category Package
-revision 13901
+revision 15471
 shortdesc Use LuaTeX's built-in MetaPost interpreter.
 longdesc The package enables the user to directly incorporate MetaPost
 longdesc diagrams into a document, using LuaTeX's built-in MetaPost
@@ -62461,7 +62480,7 @@ catalogue-version 1.01
 
 name luaotfload
 category Package
-revision 15216
+revision 15472
 shortdesc ConTeXt OTF loading system for Plain and LaTeX.
 longdesc The package adopts the TrueType/OpenType Font loader code
 longdesc provided in ConTeXt, and adapts it to use in Plain TeX and
@@ -62676,7 +62695,7 @@ binfiles arch=x86_64-linux size=1358
 
 name luatextra
 category Package
-revision 13902
+revision 15473
 shortdesc Additional macros for Plain TeX and LaTeX in LuaTeX.
 longdesc The bundle provides: - General lua language functionality
 longdesc (package luaextra) provided by the LuaTeX team (and imported,
@@ -62916,6 +62935,29 @@ catalogue-ctan /macros/latex/contrib/mailing
 catalogue-date 2006-12-28 00:57:12 +0100
 catalogue-license lppl
 
+name mailmerge
+category Package
+revision 15475
+shortdesc Repeating text field substitution.
+longdesc The package mailmerge provides an interface to produce text
+longdesc from a template, where fields are replaced by actual data, as
+longdesc in a database. The package may be used to produce several
+longdesc letters from a template, certificates or other such documents.
+longdesc It allows access to the entry number, number of entries and so
+longdesc on.
+docfiles size=27
+ texmf-dist/doc/latex/mailmerge/README details="Readme"
+ texmf-dist/doc/latex/mailmerge/mailmerge.pdf details="Package documentation"
+srcfiles size=4
+ texmf-dist/source/latex/mailmerge/mailmerge.dtx
+ texmf-dist/source/latex/mailmerge/mailmerge.ins
+runfiles size=1
+ texmf-dist/tex/latex/mailmerge/mailmerge.sty
+catalogue-ctan /macros/latex/contrib/mailmerge
+catalogue-date 2009-09-25 13:47:14 +0200
+catalogue-license lppl1.2
+catalogue-version 1.0
+
 name makebarcode
 category Package
 revision 13530
@@ -64673,9 +64715,10 @@ catalogue-version 0.16
 
 name mattens
 category Package
-revision 15445
-docfiles size=150
+revision 15463
+docfiles size=161
  texmf-dist/doc/latex/mattens/MTsample.pdf
+ texmf-dist/doc/latex/mattens/MTsample_src.zip
  texmf-dist/doc/latex/mattens/README
  texmf-dist/doc/latex/mattens/mattens.pdf
 srcfiles size=16
@@ -71244,8 +71287,8 @@ catalogue-version 1.38
 
 name oberdiek
 category Package
-revision 15438
-docfiles size=6614
+revision 15474
+docfiles size=6618
  texmf-dist/doc/latex/oberdiek/accsupp-example1.tex
  texmf-dist/doc/latex/oberdiek/accsupp-example2.tex
  texmf-dist/doc/latex/oberdiek/accsupp.pdf
@@ -71496,7 +71539,7 @@ docfiles size=6614
  texmf-dist/doc/latex/oberdiek/zref-example-lastpage.tex
  texmf-dist/doc/latex/oberdiek/zref-example.tex
  texmf-dist/doc/latex/oberdiek/zref.pdf
-srcfiles size=872
+srcfiles size=873
  texmf-dist/source/latex/oberdiek/accsupp.dtx
  texmf-dist/source/latex/oberdiek/aliascnt.dtx
  texmf-dist/source/latex/oberdiek/alphalph.dtx
@@ -71577,7 +71620,7 @@ srcfiles size=872
  texmf-dist/source/latex/oberdiek/twoopt.dtx
  texmf-dist/source/latex/oberdiek/uniquecounter.dtx
  texmf-dist/source/latex/oberdiek/zref.dtx
-runfiles size=490
+runfiles size=491
  texmf-dist/scripts/oberdiek/luacolor.lua
  texmf-dist/scripts/oberdiek/magicnum.lua
  texmf-dist/scripts/oberdiek/oberdiek.luacolor.lua
@@ -94628,6 +94671,24 @@ shortdesc x86_64-linux files of texcount
 binfiles arch=x86_64-linux size=1
  bin/x86_64-linux/texcount
 
+name texdiff
+category Package
+revision 15464
+shortdesc Compare documents and produce tagged merge.
+longdesc Two files are compared and a new TeX file is output. When the
+longdesc output file is processed with (La)TeX it marks new changes with
+longdesc blue and old text with red with a strike-through line.
+longdesc Furthermore, passages with changes are marked at the margin
+longdesc with grey bars by the LaTeX changebar package.
+docfiles size=1
+ texmf-dist/doc/support/texdiff/README details="Readme"
+runfiles size=5
+ texmf-dist/scripts/texdiff/texdiff
+catalogue-ctan /support/texdiff
+catalogue-date 2009-09-26 09:29:25 +0200
+catalogue-license artistic
+catalogue-version 0.4
+
 name texdirflatten
 category Package
 revision 15207
@@ -94978,14 +95039,15 @@ docfiles size=65
 
 name texlive-cz
 category TLCore
-revision 14013
+revision 15466
 postaction shortcut type=menu name="TeX Live Manual (cz) (PDF)"              cmd=TEXDIR/texmf/doc/texlive/texlive-cz/texlive-cz.pdf 
 postaction shortcut type=menu name="TeX Live Manual (cz) (HTML)"              cmd=TEXDIR/texmf/doc/texlive/texlive-cz/texlive-cz.html 
-docfiles size=369
+docfiles size=434
  texmf/doc/texlive/texlive-cz/Makefile
  texmf/doc/texlive/texlive-cz/cs-tex-live.sty
  texmf/doc/texlive/texlive-cz/csquote.sty
  texmf/doc/texlive/texlive-cz/ec-lmr10-19.png
+ texmf/doc/texlive/texlive-cz/install-lnx-main.png
  texmf/doc/texlive/texlive-cz/install-w32-main.png
  texmf/doc/texlive/texlive-cz/live4ht.cfg
  texmf/doc/texlive/texlive-cz/psview.png
@@ -94997,20 +95059,19 @@ docfiles size=369
  texmf/doc/texlive/texlive-cz/texlive-cz.tex
  texmf/doc/texlive/texlive-cz/tlmgr-config.png
  texmf/doc/texlive/texlive-cz/tlmgr-gui.png
+ texmf/doc/texlive/texlive-cz/wizard-w32.png
 
 name texlive-de
 category TLCore
-revision 14054
+revision 15468
 postaction shortcut type=menu name="TeX Live Manual (de) (PDF)" 	cmd=TEXDIR/texmf/doc/texlive/texlive-de/texlive-de.pdf
 postaction shortcut type=menu name="TeX Live Manual (de) (HTML)" 	cmd=TEXDIR/texmf/doc/texlive/texlive-de/texlive-de.html
-docfiles size=390
+docfiles size=434
  texmf/doc/texlive/texlive-de/Makefile
  texmf/doc/texlive/texlive-de/install-w32-main.png
- texmf/doc/texlive/texlive-de/live4ht.cfg
  texmf/doc/texlive/texlive-de/lmsy10-40.png
  texmf/doc/texlive/texlive-de/psview.png
  texmf/doc/texlive/texlive-de/stdcoll.png
- texmf/doc/texlive/texlive-de/tex-live.css
  texmf/doc/texlive/texlive-de/texlive-de.css
  texmf/doc/texlive/texlive-de/texlive-de.html
  texmf/doc/texlive/texlive-de/texlive-de.pdf
@@ -95255,7 +95316,7 @@ docfiles size=254
 
 name texlive.infra
 category TLCore
-revision 15454
+revision 15460
 shortdesc basic TeX Live infrastructure
 longdesc This package contains the files needed to get the TeX Live
 longdesc tools (notably tlmgr) running: perl modules, xz binaries, plus