texdoc update

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

4 files changed, 29 insertions, 6 deletions

diff --git a/Master/texmf-dist/texdoc/texdoc.cnf b/Master/texmf-dist/texdoc/texdoc.cnf
index 1d1b6be1330..1f4c0970d75 100644
--- a/Master/texmf-dist/texdoc/texdoc.cnf
+++ b/Master/texmf-dist/texdoc/texdoc.cnf
@@ -194,6 +194,7 @@ adjscore(pgf) pgfmanual.pdf = +5
 
 alias live    = texlive-en
 alias texlive = texlive-en
+alias tex-live = texlive-en
 
 ## various stuff
 
@@ -335,6 +336,21 @@ alias    mp       = mpman
 alias(5) mp       = mpgraph
 alias(5) mp       = mpintro
 
+# latex3 and friends
+alias latex3    = ltx3info
+alias l3clist   = interface3
+alias l3token   = interface3
+alias l3prop    = interface3
+alias l3msg     = interface3
+alias l3file    = interface3
+alias l3skip    = interface3
+alias l3keys    = interface3
+alias l3fp      = interface3
+alias l3box     = interface3
+alias l3coffins = interface3
+alias l3color   = interface3
+alias l3luatex  = interface3
+
 # misc
 alias autofe        = ucs
 alias afoot         = arabtex-doc
@@ -362,13 +378,15 @@ alias dtk           = dtk/doc/beispiel.pdf
 alias musixtex      = musixdoc
 alias mychemistry   = mychemistry_en
 alias mychemistry-de = mychemistry_de
-alias cjk           = cjk.txt # FIXME: doesn't work
+alias cjk           = CJK.txt # FIXME: should be case insensitive
 alias ieee          = IEEEtran_HOWTO
 alias layouts       = layman
 alias plnfss        = plnfss.txt # XXX
 alias teubner       = teubner-doc
 alias xypic         = xyguide
 alias kvoptions-patch = kvoptions # XXX?
+alias cweb          = cwebman # XXX: is in 'cweb' dir, should win
+alias einfuehrung   = einfuehrung/README # tl should get "readme" tag
 
 ## a few easy patterns
 
@@ -400,7 +418,6 @@ alias lehman        = fontinstallationguide
 alias gnlogic       = gn-logic14
 alias kluwer        = kluwer/usrman
 alias lmfonts       = lm-info
-alias latex3        = ltx3info
 alias mathenv       = mdwtab
 alias montex        = mlsquick
 alias mltex         = mltex/mltex.txt
diff --git a/Master/texmf/doc/texdoc/News b/Master/texmf/doc/texdoc/News
index efbfabae589..6a021928550 100644
--- a/Master/texmf/doc/texdoc/News
+++ b/Master/texmf/doc/texdoc/News
@@ -1,4 +1,7 @@
-Version 0.82
+Fix -f output when TEXMFHOME contains a list of paths. Bug sort-of reported
+by Matthew Leingang, see http://tex.stackexchange.com/questions/42920/
+
+Version 0.83
 ------------
 
 Minor adjustments in the scoring system.
diff --git a/Master/texmf/doc/texdoc/texdoc.pdf b/Master/texmf/doc/texdoc/texdoc.pdf
index ecffb336c19..d82bc07849b 100644
--- a/Master/texmf/doc/texdoc/texdoc.pdf
+++ b/Master/texmf/doc/texdoc/texdoc.pdf
diff --git a/Master/texmf/scripts/texdoc/config.tlu b/Master/texmf/scripts/texdoc/config.tlu
index 48b061830c8..0c3640c71c1 100644
--- a/Master/texmf/scripts/texdoc/config.tlu
+++ b/Master/texmf/scripts/texdoc/config.tlu
@@ -291,9 +291,12 @@ function show_config_files (print_fun, verbose)
         print_fun(pref..file.status..'\t'..w32_path(file.path))
     end
     if verbose then
-        local texmfhome = kpse.var_value('TEXMFHOME')
-        print_fun('Recommended file for personal settings:')
-        print_fun(pref..texmfhome..'/texdoc/texdoc.cnf')
+        print_fun('Recommended file(s) for personal settings:')
+        local sep = (os.type == 'windows') and ';' or ':'
+        local texmfhomes = string.explode(kpse.var_value('TEXMFHOME'), sep)
+        for _, home in ipairs(texmfhomes) do
+            print_fun(pref..home..'/texdoc/texdoc.cnf')
+        end
     end
 end