diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-21 22:53:49 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-21 22:53:49 +0000 |
commit | 22ea71d84d3cd13a2523c2ad951f22eff56ea91f (patch) | |
tree | c2a2c69a0ff61a8d55d468f6cf4a1b319bdecee8 | |
parent | ea5346c2be7f21aaa64e65600af6b7e61f9e2a78 (diff) |
texdoc (20feb20)
git-svn-id: svn://tug.org/texlive/trunk@53859 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texdoc/texdoc.tlu | 14 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 20 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/texdoc.1 | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/texdoc.man1.pdf | bin | 25514 -> 25515 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/texdoc/NEWS | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/texdoc/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/texdoc/texdoc.pdf | bin | 82654 -> 82654 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/texdoc/texdoc.tex | 2 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/texdoc/texdoc.tlu | 14 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu | 4 |
10 files changed, 40 insertions, 22 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texdoc/texdoc.tlu b/Build/source/texk/texlive/linked_scripts/texdoc/texdoc.tlu index bc2139435a3..e16f2e4eb1a 100755 --- a/Build/source/texk/texlive/linked_scripts/texdoc/texdoc.tlu +++ b/Build/source/texk/texlive/linked_scripts/texdoc/texdoc.tlu @@ -16,13 +16,15 @@ kpse.set_program_name(arg[-1], 'texdoc') -- get realpath of this file local function realpath(p) if os.type == 'unix' then - local h = io.popen(string.format("realpath '%s'", p)) - local r = h:read('*a') - h:close() - return r:gsub('\n$', '') - else - return '' + local e = os.execute('which realpath >/dev/null 2>&1') + if e == 0 then + local h = io.popen(string.format("realpath '%s'", p)) + local r = h:read('*a') + h:close() + return r:gsub('\n$', '') + end end + return '' end local file = realpath(arg[0]) diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 76113849bdc..c08ad2c3339 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 53820 2020-02-17 03:23:13Z preining $ +# $Id: tlmgr.pl 53842 2020-02-19 07:28:40Z preining $ # # Copyright 2008-2020 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 53820 $'; -my $datrev = '$Date: 2020-02-17 04:23:13 +0100 (Mon, 17 Feb 2020) $'; +my $svnrev = '$Revision: 53842 $'; +my $datrev = '$Date: 2020-02-19 08:28:40 +0100 (Wed, 19 Feb 2020) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -6900,8 +6900,10 @@ END_NO_CHECKSUMS } # from here on only in non-machine-readable mode and not silent info("$prg: package repositories\n"); + my $show_verification_page_link = 0; my $verstat = ""; if (!$remotetlpdb->virtual_get_tlpdb('main')->is_verified) { + $show_verification_page_link = 1; $verstat = ": "; $verstat .= $VerificationStatusDescription{$remotetlpdb->virtual_get_tlpdb('main')->verification_status}; } @@ -6912,14 +6914,22 @@ END_NO_CHECKSUMS if ($t ne 'main') { $verstat = ""; if (!$remotetlpdb->virtual_get_tlpdb($t)->is_verified) { + my $tlpdb_ver_stat = $remotetlpdb->virtual_get_tlpdb($t)->verification_status; $verstat = ": "; - $verstat .= $VerificationStatusDescription{$remotetlpdb->virtual_get_tlpdb($t)->verification_status}; + $verstat .= $VerificationStatusDescription{$tlpdb_ver_stat}; + # if the db is not verified *but* was signed, give the page link info + if ($tlpdb_ver_stat != $VS_UNSIGNED) { + $show_verification_page_link = 1; + } } info("\t$t = " . $repos{$t} . " (" . ($remotetlpdb->virtual_get_tlpdb($t)->is_verified ? "" : "not ") . "verified$verstat)\n"); } } + if ($show_verification_page_link) { + info("For more about verification, see https://texlive.info/verification.html.\n"); + } return 1; } @@ -9989,7 +9999,7 @@ This script and its documentation were written for the TeX Live distribution (L<https://tug.org/texlive>) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 53820 2020-02-17 03:23:13Z preining $ +$Id: tlmgr.pl 53842 2020-02-19 07:28:40Z preining $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Master/texmf-dist/doc/man/man1/texdoc.1 b/Master/texmf-dist/doc/man/man1/texdoc.1 index fb2b79f2ec5..2b51fbe793f 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" "February 2020" "Texdoc 3.2" "Texdoc manual" +.TH "TEXDOC" "1" "February 2020" "Texdoc 3.2.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 Binary files differindex cb13587285b..0fdea3191ae 100644 --- a/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf diff --git a/Master/texmf-dist/doc/support/texdoc/NEWS b/Master/texmf-dist/doc/support/texdoc/NEWS index aae48497e53..29fa3873d96 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.2.1 +------------- +- Bug fix: suspend a realpath not found error + Version 3.2 (TeX Live 2020) =========================== - Improved the scoring scheme to prioritize the latex tree than the latex-dev diff --git a/Master/texmf-dist/doc/support/texdoc/README.md b/Master/texmf-dist/doc/support/texdoc/README.md index b71ab747430..c36135750ab 100644 --- a/Master/texmf-dist/doc/support/texdoc/README.md +++ b/Master/texmf-dist/doc/support/texdoc/README.md @@ -1,4 +1,4 @@ -# Texdoc 3.2 (2020-02-02) +# Texdoc 3.2.1 (2020-02-20) [![Build Status](https://travis-ci.org/TeX-Live/texdoc.svg?branch=master)](https://travis-ci.org/TeX-Live/texdoc) [![Build status](https://ci.appveyor.com/api/projects/status/uq28ms7eba7ns6d3/branch/master?svg=true)](https://ci.appveyor.com/project/wtsnjp/texdoc/branch/master) diff --git a/Master/texmf-dist/doc/support/texdoc/texdoc.pdf b/Master/texmf-dist/doc/support/texdoc/texdoc.pdf Binary files differindex d414706520b..5462c218e69 100644 --- a/Master/texmf-dist/doc/support/texdoc/texdoc.pdf +++ b/Master/texmf-dist/doc/support/texdoc/texdoc.pdf diff --git a/Master/texmf-dist/doc/support/texdoc/texdoc.tex b/Master/texmf-dist/doc/support/texdoc/texdoc.tex index e1ab840ace1..7b9a2590089 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.2\quad \today} +\date{v3.2.1\quad \today} \begin{document} diff --git a/Master/texmf-dist/scripts/texdoc/texdoc.tlu b/Master/texmf-dist/scripts/texdoc/texdoc.tlu index bc2139435a3..e16f2e4eb1a 100755 --- a/Master/texmf-dist/scripts/texdoc/texdoc.tlu +++ b/Master/texmf-dist/scripts/texdoc/texdoc.tlu @@ -16,13 +16,15 @@ kpse.set_program_name(arg[-1], 'texdoc') -- get realpath of this file local function realpath(p) if os.type == 'unix' then - local h = io.popen(string.format("realpath '%s'", p)) - local r = h:read('*a') - h:close() - return r:gsub('\n$', '') - else - return '' + local e = os.execute('which realpath >/dev/null 2>&1') + if e == 0 then + local h = io.popen(string.format("realpath '%s'", p)) + local r = h:read('*a') + h:close() + return r:gsub('\n$', '') + end end + return '' end local file = realpath(arg[0]) diff --git a/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu b/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu index 9562122d38a..0bccb118a1c 100755 --- a/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu +++ b/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu @@ -21,8 +21,8 @@ end -- progname and version fullname = kpse.find_file('texdoc/texdoclib', 'lua') progname = 'Texdoc' -version = '3.2' -release_date = '2020-02-02' +version = '3.2.1' +release_date = '2020-02-20' -- make sure to update setup_config_from_cl() accordingly -- and set a default value in setup_config_from_defaults() if relevant |