Texdoc 0.66 addressing various problems.

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

1 files changed, 31 insertions, 18 deletions

diff --git a/Master/texmf/scripts/texdoc/constants.tlu b/Master/texmf/scripts/texdoc/constants.tlu
index a23d28ec6b0..e7023815cf0 100644
--- a/Master/texmf/scripts/texdoc/constants.tlu
+++ b/Master/texmf/scripts/texdoc/constants.tlu
@@ -15,31 +15,40 @@ load_env(L, {
 -- progname and version
 fullname    = arg[0]
 progname    = 'texdoc'
-version     = '0.65'
+version     = '0.66'
 
 -- make sure to update setup_config_from_cl() accordingly
 -- and set a default value in setup_config_from_defaults() if relevant
 usage_msg = [[
-texdoc tries to find appropriate TeX documentation for the specified NAME(s).
-With no NAME, it can print configuration information (-f, --files);
-the usual --help and --version options are also accepted.
-Usage: texdoc [OPTIONS]... [NAME]...
-  -f, --files           Print the name of the config files being used.
-  -w, --view            Use view mode: start a viewer.
+Usage: texdoc [OPTION]... [NAME]...
+
+Try to find appropriate TeX documentation for the specified NAME(s).
+The default (view mode) is to display the documentation.
+
+With no NAME, print information about texdoc (--help, --version, --files).
+
+  -h, --help            Print this help message.
+  -V, --version         Print the version number.
+  -f, --files           Print the list of configuration files used.
+
+  -w, --view            Use view mode: start a viewer. (default)
   -m, --mixed           Use mixed mode (view or list).
   -l, --list            Use list mode: show a list of results.
   -s, --showall         Use showall mode: show also "bad" results.
-  -r, --regex           Use regex mode. (Deprecated.)
-  -e, --extensions=L    Set ext_list=L. (Deprecated.)
-  -a, --alias           Use the alias table.
+  -M, --machine         Machine-readable output (list or showall modes).
+
+  -a, --alias           Use the alias table. (default)
   -A, --noalias         Don't use the alias table.
-  -i, --interact        Use interactive menus.
+
+  -i, --interact        Use interactive menus. (default)
   -I, --nointeract      Use plain lists, no interaction required.
-  -v, --verbosity=N     Set verbosity level to N.
-  -d, --debug[=list]    Activate debug for selected items (default all).
-  -M, --machine         Use a more machine-friendly output format.
+
+  -q, --quiet           Suppress warnings and most error messages.
+  -v, --verbose         Print additional information (eg, viewer command).
+  -d, --debug[=list]    Print debug info for selected items (default: all).
+
 Environment: PAGER, BROWSER, PDFVIEWER, PSVIEWER, DVIVIEWER.
-Files: <texmf>/texdoc/texdoc.cnf files, see the -f option.
+Files: <texmf>/texdoc/texdoc.cnf, see output of the --files option.
 Homepage: http://tug.org/texdoc/
 Manual: displayed by `texdoc texdoc'.]]
 
@@ -73,6 +82,13 @@ err_priority = {
     warning = 2,
     info    = 3,
 }
+min_verbosity='0'
+max_verbosity='3'
+def_verbosity='2'
+
+exit_ok = 0
+--exit_error = 1 -- apparently hard-coded in Lua
+exit_usage = 2
 
 known_debugs = {
     version = {},
@@ -80,9 +96,6 @@ known_debugs = {
     config  = {'files'},
     view    = {},
     texdocs = {},
-    filesea = {},
-    lsrsea  = {},
-    kpse    = {'texdocs', 'filesea', 'lsrsea'},
     score   = {},
 }