texdoc 0.82 (fixes viewer guessing code)

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

7 files changed, 22 insertions, 7 deletions

diff --git a/Master/texmf-dist/texdoc/texdoc.cnf b/Master/texmf-dist/texdoc/texdoc.cnf
index f4f33462b04..ff1a17e85a9 100644
--- a/Master/texmf-dist/texdoc/texdoc.cnf
+++ b/Master/texmf-dist/texdoc/texdoc.cnf
@@ -206,7 +206,7 @@ alias lshort-de                   = l2kurz                 # german
 alias lshort-pl                   = lshort-polish/lshort2e # polish
 alias lshort-pt                   = pt-lshort              # portuguese
 alias lshort-sk                   = slshorte               # slovak
-alias lshort-es                   = lshort-spanish/lshort  # spanish
+alias lshort-es                   = lshort-spanish/lshort-a4 # spanish
 
 # *TeX engines reference manuals, man pages and related
 alias e-tex-ref  = etex_man
@@ -349,13 +349,13 @@ alias xstring-fr    = xstring_doc_fr
 alias arabic        = arabi/user_guide
 alias 3parttable    = threeparttable
 alias croatian      = babel
-alias letterspace   = microtype
 alias mls           = montex
 alias vrbexin       = verbasef
 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)
 
 ## a few easy patterns
 
diff --git a/Master/texmf/doc/man/man1/texdoc.1 b/Master/texmf/doc/man/man1/texdoc.1
index 23715f0249a..4ef927c2e1a 100644
--- a/Master/texmf/doc/man/man1/texdoc.1
+++ b/Master/texmf/doc/man/man1/texdoc.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH TEXDOC "1" "June 2011" "texdoc 0.81" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
+.TH TEXDOC "1" "October 2011" "texdoc 0.82" "User Commands"
 .SH NAME
 texdoc \- find & view documentation in TeX Live
 .SH SYNOPSIS
diff --git a/Master/texmf/doc/man/man1/texdoc.man1.pdf b/Master/texmf/doc/man/man1/texdoc.man1.pdf
index 803a0b12583..62c4cdd80ed 100644
--- a/Master/texmf/doc/man/man1/texdoc.man1.pdf
+++ b/Master/texmf/doc/man/man1/texdoc.man1.pdf
diff --git a/Master/texmf/doc/texdoc/News b/Master/texmf/doc/texdoc/News
index 75e9ffbb4c2..1f97ece217e 100644
--- a/Master/texmf/doc/texdoc/News
+++ b/Master/texmf/doc/texdoc/News
@@ -1,3 +1,12 @@
+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
 ------------
 
diff --git a/Master/texmf/doc/texdoc/texdoc.pdf b/Master/texmf/doc/texdoc/texdoc.pdf
index 4b0335da850..794f0ca3690 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 7681425e9bb..3fde04d69b7 100644
--- a/Master/texmf/scripts/texdoc/config.tlu
+++ b/Master/texmf/scripts/texdoc/config.tlu
@@ -329,13 +329,18 @@ function is_in_path(name)
 end
 end
 
--- guess a viewer from a list: 
+-- guess a viewer from a list:
+-- - xdg-open from freedesktop if available
 -- - try detecting desktop environments
 -- - or return the first element of "list" whose name is found in path
 -- - or nil
 -- caches results of desktop environment detection
 do local de_viewer
 function guess_viewer(cmds)
+    -- try the freedesktop method
+    if is_in_path('xdg-open') then
+        return '(xdg-open %s) &'
+    end
     -- try desktop environment
     if not de_viewer then de_viewer = desktop_environment_viewer() end
     if de_viewer then return de_viewer end
@@ -357,7 +362,8 @@ function desktop_environment_viewer()
         return '(kfmclient exec %s) &'              -- kde < 4
     end
     if os.getenv('GNOME_DESKTOP_SESSION_ID') then   -- gnome
-        return '(gnome-open %s) &'
+        if is_in_path('gvfs-open') then return '(gvfs-open %s) &' end
+        if is_in_path('gnome-open') then return '(gnome-open %s) &' end
     end
     if not is_in_path('xprop') then return end
     local xprop_fh = io.popen('xprop -root _DT_SAVE_MODE 2>/dev/null')
diff --git a/Master/texmf/scripts/texdoc/constants.tlu b/Master/texmf/scripts/texdoc/constants.tlu
index 0a24aded4bd..8ff2e96d686 100644
--- a/Master/texmf/scripts/texdoc/constants.tlu
+++ b/Master/texmf/scripts/texdoc/constants.tlu
@@ -14,7 +14,7 @@ setfenv(1, constants)
 -- progname and version
 fullname    = kpse.find_file('texdoc/texdoclib', 'lua')
 progname    = 'texdoc'
-version     = '0.81'
+version     = '0.82'
 
 -- make sure to update setup_config_from_cl() accordingly
 -- and set a default value in setup_config_from_defaults() if relevant