texlive[59283] trunk: texdoc (20may21)
commits+karl at tug.org
commits+karl at tug.org
Thu May 20 22:18:50 CEST 2021
Revision: 59283
http://tug.org/svn/texlive?view=revision&revision=59283
Author: karl
Date: 2021-05-20 22:18:50 +0200 (Thu, 20 May 2021)
Log Message:
-----------
texdoc (20may21)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
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/README.md
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
trunk/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu
trunk/Master/texmf-dist/texdoc/texdoc.cnf
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2021-05-20 20:18:30 UTC (rev 59282)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2021-05-20 20:18:50 UTC (rev 59283)
@@ -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 @@
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 @@
$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 @@
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
Modified: trunk/Master/texmf-dist/doc/man/man1/texdoc.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/texdoc.1 2021-05-20 20:18:30 UTC (rev 59282)
+++ trunk/Master/texmf-dist/doc/man/man1/texdoc.1 2021-05-20 20:18:50 UTC (rev 59283)
@@ -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
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 2021-05-20 20:18:30 UTC (rev 59282)
+++ trunk/Master/texmf-dist/doc/support/texdoc/NEWS 2021-05-20 20:18:50 UTC (rev 59283)
@@ -2,6 +2,13 @@
===============
(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
Modified: trunk/Master/texmf-dist/doc/support/texdoc/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/support/texdoc/README.md 2021-05-20 20:18:30 UTC (rev 59282)
+++ trunk/Master/texmf-dist/doc/support/texdoc/README.md 2021-05-20 20:18:50 UTC (rev 59283)
@@ -1,10 +1,8 @@
-# Texdoc 3.3 (2021-03-17)
+# Texdoc ― Find and view documentation in TeX Live
-[](https://travis-ci.org/TeX-Live/texdoc)
-[](https://ci.appveyor.com/project/wtsnjp/texdoc/branch/master)
+[](https://github.com/TeX-Live/texdoc/actions/workflows/ci.yml)
+[](https://www.ctan.org/pkg/texdoc)
-Texdoc is a command line program to find and view documentation in TeX Live.
-
## General Information
* Website: <https://www.tug.org/texdoc/>
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 2021-05-20 20:18:30 UTC (rev 59282)
+++ trunk/Master/texmf-dist/doc/support/texdoc/texdoc.tex 2021-05-20 20:18:50 UTC (rev 59283)
@@ -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 @@
\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 @@
|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 @@
\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 @@
\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}
Modified: trunk/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu
===================================================================
--- trunk/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu 2021-05-20 20:18:30 UTC (rev 59282)
+++ trunk/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu 2021-05-20 20:18:50 UTC (rev 59283)
@@ -22,8 +22,8 @@
-- 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
Modified: trunk/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu
===================================================================
--- trunk/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu 2021-05-20 20:18:30 UTC (rev 59282)
+++ trunk/Master/texmf-dist/scripts/texdoc/texdoclib-score.tlu 2021-05-20 20:18:50 UTC (rev 59283)
@@ -250,7 +250,7 @@
-- 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 @@
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
Modified: trunk/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu
===================================================================
--- trunk/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu 2021-05-20 20:18:30 UTC (rev 59282)
+++ trunk/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu 2021-05-20 20:18:50 UTC (rev 59283)
@@ -453,13 +453,21 @@
-- 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 @@
-- 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
Modified: trunk/Master/texmf-dist/texdoc/texdoc.cnf
===================================================================
--- trunk/Master/texmf-dist/texdoc/texdoc.cnf 2021-05-20 20:18:30 UTC (rev 59282)
+++ trunk/Master/texmf-dist/texdoc/texdoc.cnf 2021-05-20 20:18:50 UTC (rev 59283)
@@ -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(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-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
More information about the tex-live-commits
mailing list.