summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl17
-rw-r--r--Master/texmf-dist/doc/man/man1/texdoc.12
-rw-r--r--Master/texmf-dist/doc/man/man1/texdoc.man1.pdfbin25241 -> 26938 bytes
-rw-r--r--Master/texmf-dist/doc/support/texdoc/NEWS7
-rw-r--r--Master/texmf-dist/doc/support/texdoc/README.md8
-rw-r--r--Master/texmf-dist/doc/support/texdoc/texdoc.pdfbin84291 -> 84310 bytes
-rw-r--r--Master/texmf-dist/doc/support/texdoc/texdoc.tex10
-rwxr-xr-xMaster/texmf-dist/scripts/texdoc/texdoclib-const.tlu4
-rwxr-xr-xMaster/texmf-dist/scripts/texdoc/texdoclib-score.tlu6
-rwxr-xr-xMaster/texmf-dist/scripts/texdoc/texdoclib-search.tlu19
-rw-r--r--Master/texmf-dist/texdoc/texdoc.cnf4
11 files changed, 49 insertions, 28 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 7e0d5995ffb..7e935f9cc05 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 59208 2021-05-15 17:45:58Z karl $
+# $Id: tlmgr.pl 59273 2021-05-19 23:02:14Z preining $
#
# Copyright 2008-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 59208 $';
-my $datrev = '$Date: 2021-05-15 19:45:58 +0200 (Sat, 15 May 2021) $';
+my $svnrev = '$Revision: 59273 $';
+my $datrev = '$Date: 2021-05-20 01:02:14 +0200 (Thu, 20 May 2021) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -398,6 +398,11 @@ sub main {
GetOptions(\%opts, keys(%optarg)) or pod2usage(2);
+ # load the config file and set the config options
+ # load it BEFORE starting downloads as we set persistent-downloads there!
+ load_config_file();
+
+
$::debug_translation = 0;
$::debug_translation = 1 if $opts{"debug-translation"};
@@ -669,10 +674,6 @@ for the full story.\n";
$loadmediasrcerror = "Cannot load TeX Live database from ";
- # load the config file and set the config options
- # load it BEFORE starting downloads as we set persistent-downloads there!
- load_config_file();
-
# in system mode verify that the selected action is allowed
if (!$opts{"usermode"} && $config{'allowed-actions'}) {
if (!TeXLive::TLUtils::member($action, @{$config{'allowed-actions'}})) {
@@ -10224,7 +10225,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 59208 2021-05-15 17:45:58Z karl $
+$Id: tlmgr.pl 59273 2021-05-19 23:02:14Z 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 f9ac765b5ba..63ee8e31e57 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 2021" "Texdoc 3.3" "Texdoc manual"
+.TH "TEXDOC" "1" "May 2021" "Texdoc 3.3.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 b05f4fe9008..2673605a3ea 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 837202862d7..c08e6c862da 100644
--- a/Master/texmf-dist/doc/support/texdoc/NEWS
+++ b/Master/texmf-dist/doc/support/texdoc/NEWS
@@ -2,6 +2,13 @@ NEWS for texdoc
===============
(This file public domain.)
+Version 3.3.1
+-------------
+- Support non-ascii username on Windows (patch by A. Kakuto)
+- Better support for multiple doc trees
+- Alias adjustments
+- Documentation tweaks
+
Version 3.3 (TeX Live 2021)
===========================
- Show all possible config files for -vf
diff --git a/Master/texmf-dist/doc/support/texdoc/README.md b/Master/texmf-dist/doc/support/texdoc/README.md
index f6d92f540dc..02150ce4703 100644
--- a/Master/texmf-dist/doc/support/texdoc/README.md
+++ b/Master/texmf-dist/doc/support/texdoc/README.md
@@ -1,9 +1,7 @@
-# Texdoc 3.3 (2021-03-17)
+# Texdoc ― Find and view documentation in TeX Live
-[![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)
-
-Texdoc is a command line program to find and view documentation in TeX Live.
+[![CI](https://github.com/TeX-Live/texdoc/actions/workflows/ci.yml/badge.svg)](https://github.com/TeX-Live/texdoc/actions/workflows/ci.yml)
+[![CTAN](https://img.shields.io/ctan/v/texdoc?color=FC02FF&label=CTAN&style=flat)](https://www.ctan.org/pkg/texdoc)
## General Information
diff --git a/Master/texmf-dist/doc/support/texdoc/texdoc.pdf b/Master/texmf-dist/doc/support/texdoc/texdoc.pdf
index 4e0c35a2452..b5e9b6bcc3e 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 79a8ab6c644..528eda18987 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.3\quad \today}
+\date{v3.3.1\quad \today}
\begin{document}
@@ -165,7 +165,7 @@ application it knows. See Section~\ref{sec:modes}.
\begin{clopt}{\sopt{l}, \lopt{list}}
Set \ci{mode} to |list|. Texdoc will show the lists of all relevant documents
it found and ask you which to open. When used with the \lopt{nointeract}
-option, Texdoc will just show the lists of documents and exist successfully.
+option, Texdoc will just show the lists of documents and exit successfully.
\end{clopt}
\begin{clopt}{\sopt{m}, \lopt{mixed}}
@@ -468,7 +468,7 @@ configuration item \ci{ext\_list}. By default, files with extensions |pdf|,
|html|, |htm|, |txt|, |dat|, |md|, |ps|, and |dvi| and files without extension
are recognized as documents.
-During the scoring process, the configuration item |badext_list| is also used:
+During the scoring process, the configuration item \ci{badext\_list} is also used:
files with a ``bad'' extension appearing in this list will get a lesser score.
In the practical filenames, things which are not actually extensions can follow
@@ -607,7 +607,7 @@ a malus of |1| on their heuristic score if it was previously positive.
\begin{confitem}{basename\_list}
{\meta{list}}[default: \code{readme, 00readme}]
-Set the list of ``known'' base names to |«list»|. Files with those base names
+Set the list of ``known'' basenames to |«list»|. Files with those basenames
are selected regardless of their extension. If the extension is unknown, the
text viewer will be used to view the file.
\end{confitem}
@@ -615,7 +615,7 @@ text viewer will be used to view the file.
\begin{confitem}{badbasename\_list}
{\meta{list}}[default: \code{readme, 00readme}]
-Set the list of ``bad'' base names to |«list»|. Files with those names get a
+Set the list of ``bad'' basenames to |«list»|. Files with those names get a
malus of |1| on their heuristic score if it was previously positive.
\end{confitem}
diff --git a/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu b/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu
index aef88a06237..7da64d394bb 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.3'
-release_date = '2021-03-17'
+version = '3.3.1'
+release_date = '2021-05-20'
-- 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 fdc2ef3467f..01c3818e375 100755
--- a/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu
+++ b/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu
@@ -250,7 +250,7 @@ end
-- compare two docfile's: (see texdoclib-search.tlu for structure)
-- 1. by score
-- 2. then by extensions (ordered as in ext_list),
--- 3. then lexicographically by fullpath.
+-- 3. then lexicographically by normname.
-- 4. then by tree.
-- return true if a is better than b
local function docfile_order(a, b)
@@ -258,8 +258,8 @@ local function docfile_order(a, b)
elseif a.score < b.score then return false
elseif a.ext_pos < b.ext_pos then return true
elseif a.ext_pos > b.ext_pos then return false
- elseif a.realpath < b.realpath then return true
- elseif a.realpath > b.realpath then return false
+ elseif a.normname < b.normname then return true
+ elseif a.normname > b.normname then return false
else return (a.tree > b.tree)
end
end
diff --git a/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu b/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu
index 8718dc83fff..af04a2a3eec 100755
--- a/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu
+++ b/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu
@@ -453,13 +453,21 @@ end
-- make sure a given directory exists, or return nil plus an error string
local function mkdir_p(dir)
- if lfs.isdir(dir) then return true end
+ if os.type == 'windows' and chgstrcp then
+ if lfs.isdir(chgstrcp.syscptoutf8(dir)) then return true end
+ else
+ if lfs.isdir(dir) then return true end
+ end
local parent = texdoc.util.path_parent(dir)
if parent then
local ok, msg = mkdir_p(parent)
if not ok then return nil, msg end
end
- return lfs.mkdir(dir)
+ if os.type == 'windows' and chgstrcp then
+ return lfs.mkdir(chgstrcp.syscptoutf8(dir))
+ else
+ return lfs.mkdir(dir)
+ end
end
local print_out_tlpinfo, get_doclist_tlpdb
@@ -538,7 +546,12 @@ end
-- print out data from tlpdb in dofile()-able form
print_out_tlpinfo = function(filename)
- local fh = assert(io.open(filename, 'w'))
+ local fh
+ if os.type == 'windows' and chgstrcp then
+ fh = assert(io.open(chgstrcp.syscptoutf8(filename), 'w'))
+ else
+ fh = assert(io.open(filename, 'w'))
+ end
local function printf(s, ...) fh:write(string.format(s, ...)) end
-- s_meta
diff --git a/Master/texmf-dist/texdoc/texdoc.cnf b/Master/texmf-dist/texdoc/texdoc.cnf
index d1b228e0701..b5ad9ecbdbc 100644
--- a/Master/texmf-dist/texdoc/texdoc.cnf
+++ b/Master/texmf-dist/texdoc/texdoc.cnf
@@ -88,7 +88,7 @@
# Built-in defaults (for reference):
#
-# fuzzy_level = 5
+# fuzzy_level = 3
# Known suffixes for documentation
suffix_list = doc, -doc, _doc, .doc, /doc, manual, /manual, -manual, userguide, /user_guide, -guide, -user, -man, notes, -info, ref
@@ -452,6 +452,7 @@ alias elsarticle = elsdoc
alias(0.1) fontinst = fontinstallationguide
alias hyperref-dev = hyperref.pdf
alias iso = isoman
+alias knuth-pdf = knuth-pdf/index.pdf
alias kvoptions-patch = kvoptions # XXX?
alias layouts = layman
alias lettrine = lettrine # to hide context/third/lettrine-doc.pdf
@@ -470,6 +471,7 @@ alias nonumonpart = nonumonpart-en
alias nonumonpart-fr = nonumonpart-fr
alias pkfix-helper = pkfix-helper.man1.pdf
alias plnfss = plnfss.txt # XXX
+alias symbols = symbols-a4
alias teubner = teubner-doc
alias vntex = vntex # should win over vntex-man in general
alias vntex-vi = vntex-man