summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-03-19 20:04:16 +0000
committerKarl Berry <karl@freefriends.org>2022-03-19 20:04:16 +0000
commit83cfbafbfd6bc896b6654ac005c8ed1f0125b838 (patch)
treedef8a0ad199a74d1584d33f03915773c4b56222c
parentca06ce88f61fcdd3ac3e0d448bc5eff174b12ff9 (diff)
texdoc (18mar22)
git-svn-id: svn://tug.org/texlive/trunk@62815 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl22
-rw-r--r--Master/texmf-dist/doc/man/man1/texdoc.12
-rw-r--r--Master/texmf-dist/doc/man/man1/texdoc.man1.pdfbin27009 -> 27010 bytes
-rw-r--r--Master/texmf-dist/doc/support/texdoc/NEWS4
-rw-r--r--Master/texmf-dist/doc/support/texdoc/texdoc.pdfbin84307 -> 84314 bytes
-rw-r--r--Master/texmf-dist/doc/support/texdoc/texdoc.tex2
-rwxr-xr-xMaster/texmf-dist/scripts/texdoc/texdoclib-const.tlu4
-rwxr-xr-xMaster/texmf-dist/scripts/texdoc/texdoclib-score.tlu4
8 files changed, 29 insertions, 9 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
index e84a6d2af7e..a86ecdf33da 100755
--- a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
+++ b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
@@ -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 run_external {cmd {mess ""}} {
}
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 @@ proc initialize {} {
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"} {
diff --git a/Master/texmf-dist/doc/man/man1/texdoc.1 b/Master/texmf-dist/doc/man/man1/texdoc.1
index c92bd7ccb20..e614721b832 100644
--- a/Master/texmf-dist/doc/man/man1/texdoc.1
+++ b/Master/texmf-dist/doc/man/man1/texdoc.1
@@ -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
diff --git a/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf b/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf
index d42365a321a..dfe06fb9730 100644
--- a/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/texdoc/NEWS b/Master/texmf-dist/doc/support/texdoc/NEWS
index 0c5b6b4e8ae..64cb2199a94 100644
--- a/Master/texmf-dist/doc/support/texdoc/NEWS
+++ b/Master/texmf-dist/doc/support/texdoc/NEWS
@@ -2,6 +2,10 @@ NEWS for texdoc
===============
(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
diff --git a/Master/texmf-dist/doc/support/texdoc/texdoc.pdf b/Master/texmf-dist/doc/support/texdoc/texdoc.pdf
index 8e6f1ecc7cc..5619830b780 100644
--- a/Master/texmf-dist/doc/support/texdoc/texdoc.pdf
+++ b/Master/texmf-dist/doc/support/texdoc/texdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/texdoc/texdoc.tex b/Master/texmf-dist/doc/support/texdoc/texdoc.tex
index 8346c80193d..689e6968775 100644
--- a/Master/texmf-dist/doc/support/texdoc/texdoc.tex
+++ b/Master/texmf-dist/doc/support/texdoc/texdoc.tex
@@ -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}
diff --git a/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu b/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu
index d6def02f747..50d7ba4ca81 100755
--- a/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu
+++ b/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu
@@ -22,8 +22,8 @@ end
-- 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
diff --git a/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu b/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu
index 5aca28ef73b..d609224cea2 100755
--- a/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu
+++ b/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu
@@ -211,8 +211,8 @@ local function set_score(df, original_kw)
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