texlive[62815] trunk: texdoc (18mar22)

[commits+karl at tug.org]

Revision: 62815
          http://tug.org/svn/texlive?view=revision&revision=62815
Author:   karl
Date:     2022-03-19 21:04:16 +0100 (Sat, 19 Mar 2022)
Log Message:
-----------
texdoc (18mar22)

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
    trunk/Master/texmf-dist/doc/man/man1/texdoc.1
    trunk/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf
    trunk/Master/texmf-dist/doc/support/texdoc/NEWS
    trunk/Master/texmf-dist/doc/support/texdoc/texdoc.pdf
    trunk/Master/texmf-dist/doc/support/texdoc/texdoc.tex
    trunk/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu
    trunk/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu

Modified: trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl	2022-03-19 20:03:50 UTC (rev 62814)
+++ trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl	2022-03-19 20:04:16 UTC (rev 62815)
@@ -1,10 +1,10 @@
 #!/bin/sh
 # next line ignored by wish but not by sh \
-TK_SILENCE_DEPRECATION=1 exec wish "$0" "$@"
+TK_SILENCE_DEPRECATION=1 exec wish "$0" -- "$@"
 # The above environment variable is set to suppress
 # a warning message under MacOS Catalina and Big Sur
 
-# Copyright 2017-2021 Siep Kroonenberg
+# Copyright 2017-2022 Siep Kroonenberg
 
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
@@ -2285,7 +2285,7 @@
 }
 
 proc about_cmd {} {
-  set msg "\u00a9 2017-2021 Siep Kroonenberg\n\n"
+  set msg "\u00a9 2017-2022 Siep Kroonenberg\n\n"
   append msg [__ "GUI interface for TeX Live Manager\nImplemented in Tcl/Tk"]
   tk_messageBox -message $msg
 }
@@ -3088,6 +3088,22 @@
   Are you sure you want to continue?" $::instroot]]
     if {$ans ne "yes"} {exit}
   }
+  # handle -h[elp] and -v[ersion parameters;
+  # do not pass these on to the upcoming tlmgr pipe
+  set i $::argc
+  while 1 {
+    incr i -1
+    if {$i<0} break
+    set s [lindex $::argv $i]
+    if {$s eq "-h" || $s eq "-help"} {
+      tk_messageBox -message [__ "See internal help"] \
+                   -icon info -type ok
+      set ::argv [lreplace $::argv $i $i]
+    } elseif {$s eq "-v" || $s eq "-version"} {
+      set ::argv [lreplace $::argv $i $i]
+    }
+  }
+  set ::argc [llength $::argv]
 
   start_tlmgr {*}$::argv
   if {$::tcl_platform(platform) eq "windows"} {

Modified: trunk/Master/texmf-dist/doc/man/man1/texdoc.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/texdoc.1	2022-03-19 20:03:50 UTC (rev 62814)
+++ trunk/Master/texmf-dist/doc/man/man1/texdoc.1	2022-03-19 20:04:16 UTC (rev 62815)
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "TEXDOC" "1" "March 2022" "Texdoc 3.4" "Texdoc manual"
+.TH "TEXDOC" "1" "March 2022" "Texdoc 3.4.1" "Texdoc manual"
 .
 .SH "NAME"
 \fBtexdoc\fR \- find & view documentation in TeX Live

Modified: trunk/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/support/texdoc/NEWS
===================================================================
--- trunk/Master/texmf-dist/doc/support/texdoc/NEWS	2022-03-19 20:03:50 UTC (rev 62814)
+++ trunk/Master/texmf-dist/doc/support/texdoc/NEWS	2022-03-19 20:04:16 UTC (rev 62815)
@@ -2,6 +2,10 @@
 ===============
 (This file public domain.)
 
+Version 3.4.1
+-------------
+- Bug fix: give locale bonus only if "lang" is set
+
 Version 3.4 (TeX Live 2022)
 ===========================
 - Make Data.tlpdb.lua reproducible

Modified: trunk/Master/texmf-dist/doc/support/texdoc/texdoc.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/support/texdoc/texdoc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/support/texdoc/texdoc.tex	2022-03-19 20:03:50 UTC (rev 62814)
+++ trunk/Master/texmf-dist/doc/support/texdoc/texdoc.tex	2022-03-19 20:04:16 UTC (rev 62815)
@@ -8,7 +8,7 @@
 \subtitle{Find \& view documentation in \TL}
 \pkgurl{https://tug.org/texdoc/}
 \author{Manuel Pégourié-Gonnard\and Takuto Asakura}
-\date{v3.4\quad \today}
+\date{v3.4.1\quad \today}
 
 \begin{document}
 

Modified: trunk/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu
===================================================================
--- trunk/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu	2022-03-19 20:03:50 UTC (rev 62814)
+++ trunk/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu	2022-03-19 20:04:16 UTC (rev 62815)
@@ -22,8 +22,8 @@
 -- progname and version
 fullname = kpse.find_file('texdoc/texdoclib', 'lua')
 progname = 'Texdoc'
-version = '3.4'
-release_date = '2022-03-03'
+version = '3.4.1'
+release_date = '2022-03-19'
 
 -- make sure to update setup_config_from_cl() accordingly
 -- and set a default value in setup_config_from_defaults() if relevant

Modified: trunk/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu
===================================================================
--- trunk/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu	2022-03-19 20:03:50 UTC (rev 62814)
+++ trunk/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu	2022-03-19 20:04:16 UTC (rev 62815)
@@ -211,8 +211,8 @@
     end
 
     -- bonus for locale
-    if not is_alias then
-        local config_lang = texdoc.config.get_value('lang')
+    local config_lang = texdoc.config.get_value('lang')
+    if not is_alias and config_lang ~= nil then
         local file_lang = df.lang
 
         if not file_lang then