texdoc.cnf update

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

6 files changed, 30 insertions, 14 deletions

diff --git a/Master/texmf-dist/texdoc/texdoc.cnf b/Master/texmf-dist/texdoc/texdoc.cnf
index 9f7ce3390a4..beeab226cbd 100644
--- a/Master/texmf-dist/texdoc/texdoc.cnf
+++ b/Master/texmf-dist/texdoc/texdoc.cnf
@@ -214,17 +214,20 @@ alias lshort-es                   = lshort-spanish/lshort-a4 # spanish
 alias e-tex-ref  = etex_man
 alias etex-ref   = etex_man
 alias pdftex-ref = pdftex-a
+#alias xetex-ref  = XeTeX-reference # OK
 alias luatex-ref = luatexref-t
 
 # by default, <engine> = <engine>-ref (duplicated: no alias cascading)
 alias e-tex      = etex_man
 alias etex       = etex_man
-alias xetex      = XeTeX-reference
+alias pdftex     = pdftex-a
+#alias xetex      = XeTeX-reference # OK
 alias luatex     = luatexref-t
 
+alias e-tex-man  = etex.man1
 alias etex-man   = etex.man1
 alias pdftex-man = pdftex.man1
-#alias xetex-man = xetex.man1 # XXX
+#alias xetex-man = xetex.man1 # missing
 alias luatex-man = luatex.man1
 
 alias luatex-pkg = oberdiek/luatex.pdf
@@ -233,8 +236,8 @@ alias luatex-pkg = oberdiek/luatex.pdf
 alias article   = classes
 alias book      = classes
 alias report    = classes
-#alias ltxguide  = XXX
-#alias minimal   = XXX
+#alias ltxguide  = ? # missing
+#alias minimal   = ? # missing
 adjscore(minimal) europecv = -1000 # false positive
 
 # latex/basic packages, sorted by dtx
@@ -290,11 +293,15 @@ alias amslatex2   = technote
 alias amsmath     = amsldoc
 alias amsrefs     = amsrdoc
 alias amsthm      = amsthdoc
+alias amsart      = instr-l
+alias amsbook     = instr-l
+alias amscls      = instr-l
+alias amsproc     = instr-l
 alias amsart-dev  = amsclass
 alias amsbook-dev = amsclass
 alias amscls-dev  = amsclass
-alias amsmath-dev = amsmath
 alias amsproc-dev = amsclass
+alias amsmath-dev = amsmath
 
 # koma-script
 alias koma           = scrguien
@@ -331,7 +338,6 @@ alias(5) mp       = mpintro
 # misc
 alias autofe        = ucs
 alias afoot         = arabtex-doc
-alias asymptote     = asymptote # not mentioned in the catalogue currently
 alias arabicfont    = bezos
 alias bibtex        = btxdoc
 alias(5) cmsuper    = cm-super/FAQ
@@ -346,7 +352,6 @@ alias iso           = isoman
 alias lettrine      = lettrine # to hide context/third/lettrine-doc.pdf
 alias nonfloat-de   = nonfloat
 alias nonfloat      = nonfloat-en
-alias pstricks      = pstricks-doc
 alias xstring-fr    = xstring_doc_fr
 alias arabic        = arabi/user_guide
 alias 3parttable    = threeparttable
@@ -357,7 +362,12 @@ alias dtk           = dtk/doc/beispiel.pdf
 alias musixtex      = musixdoc
 alias mychemistry   = mychemistry_en
 alias mychemistry-de = mychemistry_de
-alias layout        = layout # in order to win over pst-layout (catalogue)
+alias cjk           = cjk.txt # FIXME: doesn't work
+alias ieee          = IEEEtran_HOWTO
+alias layouts       = layman
+alias plnfss        = plnfss.txt # XXX
+alias teubner       = teubner-doc
+alias xypic         = xyguide
 
 ## a few easy patterns
 
@@ -383,12 +393,10 @@ alias arydshln      = arydshln-man
 alias cv            = curve/curve
 alias datenumber-de = datenumber/docgerman
 alias labels(1)     = envlab/elguide
-alias euro          = eurosamp
 alias expressg      = expeg
 alias flcards       = flashcards
 alias lehman        = fontinstallationguide
 alias gnlogic       = gn-logic14
-alias index         = ind
 alias kluwer        = kluwer/usrman
 alias lmfonts       = lm-info
 alias latex3        = ltx3info
@@ -402,7 +410,6 @@ alias otibet        = otibet/unidoc
 alias pbdiagram     = pb-manual
 alias tikz          = pgfmanual
 alias apmgraph      = pmgraph
-alias ppower4       = ppower4/report
 alias preprint      = preprint/00readme.txt
 alias dutch         = rapdoc
 alias startex       = startex/base/guide
diff --git a/Master/texmf/doc/texdoc/News b/Master/texmf/doc/texdoc/News
index 1f97ece217e..efbfabae589 100644
--- a/Master/texmf/doc/texdoc/News
+++ b/Master/texmf/doc/texdoc/News
@@ -1,17 +1,23 @@
 Version 0.82
 ------------
 
+Minor adjustments in the scoring system.
+
+Version 0.82
+------------
+
 Fixes to the default viewer/destkop environment detection:
 - try gvfs-open with Gnome
 - always try xdg-open first (usually more up-to-date)
 Thanks to Axel E. Retif for informing me that newer versions of Ubuntu don't
 ship gnome-open by default any more.
 
-Version 0.81
-------------
+Version 0.81 (TeX Live 2011)
+============================
 
 Allow configuration files to be found in all TEXMF trees.
-The default one should now be installed in TEXMFDIST.
+The default one should now be installed in TEXMFDIST (in upstream TeX Live) or
+in a tree search after TEXMFLOCAL (in downstream distros).
 
 Delay default viewer detection, see:
 http://tug.org/pipermail/tex-live/2011-May/029150.html
diff --git a/Master/texmf/doc/texdoc/texdoc.pdf b/Master/texmf/doc/texdoc/texdoc.pdf
index 794f0ca3690..ecffb336c19 100644
--- a/Master/texmf/doc/texdoc/texdoc.pdf
+++ b/Master/texmf/doc/texdoc/texdoc.pdf
diff --git a/Master/texmf/doc/texdoc/texdoc.tex b/Master/texmf/doc/texdoc/texdoc.tex
index 4d05cde786a..ec275df3334 100644
--- a/Master/texmf/doc/texdoc/texdoc.tex
+++ b/Master/texmf/doc/texdoc/texdoc.tex
@@ -34,6 +34,7 @@
 
 \usepackage[british]{babel}
 \usepackage[bookmarks=true]{hyperref}
+\usepackage{bookmark}
 \hypersetup{%
   bookmarksnumbered=true, bookmarksopen=true, bookmarksopenlevel=2,
   pdftitle=texdoc: find and view documentation in TeX Live,
diff --git a/Master/texmf/scripts/texdoc/config.tlu b/Master/texmf/scripts/texdoc/config.tlu
index 3fde04d69b7..48b061830c8 100644
--- a/Master/texmf/scripts/texdoc/config.tlu
+++ b/Master/texmf/scripts/texdoc/config.tlu
@@ -510,4 +510,5 @@ return {
     setup_config_and_alias = setup_config_and_alias,
     get_default_viewers    = get_default_viewers,
     show_config_files      = show_config_files,
+    read_config_file       = read_config_file,
 }
diff --git a/Master/texmf/scripts/texdoc/texdoclib.tlu b/Master/texmf/scripts/texdoc/texdoclib.tlu
index 54311ae4de8..ccaad778d93 100644
--- a/Master/texmf/scripts/texdoc/texdoclib.tlu
+++ b/Master/texmf/scripts/texdoc/texdoclib.tlu
@@ -78,6 +78,7 @@ texdoc_do('view')
 
 return {
     setup_config_and_alias = setup_config_and_alias,
+    read_config_file       = read_config_file,
     init_databases         = init_databases,
     print_usage            = print_usage,
     get_doclist            = get_doclist,