From 0f0cfd47b08b0656c66083d33d37b8e02559b3b2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Mar 2021 21:23:29 +0000 Subject: texdoc (17mar21) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58527 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/man/man1/texdoc.1 | 4 ++-- Master/texmf-dist/doc/man/man1/texdoc.man1.pdf | Bin 25260 -> 25241 bytes Master/texmf-dist/doc/support/texdoc/NEWS | 7 +++++++ Master/texmf-dist/doc/support/texdoc/README.md | 4 ++-- Master/texmf-dist/doc/support/texdoc/texdoc.pdf | Bin 82978 -> 84291 bytes Master/texmf-dist/doc/support/texdoc/texdoc.tex | 10 +++++----- .../texmf-dist/scripts/texdoc/texdoclib-config.tlu | 13 ++++++------- .../texmf-dist/scripts/texdoc/texdoclib-const.tlu | 10 +++++++--- .../texmf-dist/scripts/texdoc/texdoclib-search.tlu | 5 ++--- Master/texmf-dist/scripts/texdoc/texdoclib-view.tlu | 14 ++++++-------- Master/texmf-dist/scripts/texdoc/texdoclib.tlu | 2 +- Master/texmf-dist/texdoc/texdoc.cnf | 4 +++- 12 files changed, 41 insertions(+), 32 deletions(-) diff --git a/Master/texmf-dist/doc/man/man1/texdoc.1 b/Master/texmf-dist/doc/man/man1/texdoc.1 index 87e84c387ad..f9ac765b5ba 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" "September 2020" "Texdoc 3.2.2" "Texdoc manual" +.TH "TEXDOC" "1" "March 2021" "Texdoc 3.3" "Texdoc manual" . .SH "NAME" \fBtexdoc\fR \- find & view documentation in TeX Live @@ -156,7 +156,7 @@ Texdoc home page: \fIhttp://tug\.org/texdoc/\fR Source: \fIhttps://github\.com/TeX\-Live/texdoc\fR . .SH "COPYRIGHT" -Copyright 2008\-2020 Manuel Pe\'gourie\'\-Gonnard, Takuto Asakura, the TeX Live Team\. +Copyright 2008\-2021 Manuel Pe\'gourie\'\-Gonnard, Takuto Asakura, the TeX Live Team\. . .br License: GNU GPL version 3 or later \fIhttp://gnu\.org/licenses/gpl\.html\fR\. diff --git a/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf b/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf index 7e7b6711eb4..e5638bd478e 100644 Binary files a/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf and b/Master/texmf-dist/doc/man/man1/texdoc.man1.pdf differ diff --git a/Master/texmf-dist/doc/support/texdoc/NEWS b/Master/texmf-dist/doc/support/texdoc/NEWS index 86e77628c11..837202862d7 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 (TeX Live 2021) +=========================== +- Show all possible config files for -vf +- Show diagnostic message of DISPLAY only if viewer failed +- Alias adjustments +- Documentation tweaks + Version 3.2.2 ------------- - Several aliases are added diff --git a/Master/texmf-dist/doc/support/texdoc/README.md b/Master/texmf-dist/doc/support/texdoc/README.md index 45805a7b8ad..f6d92f540dc 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.2 (2020-09-16) +# Texdoc 3.3 (2021-03-17) [![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) @@ -106,7 +106,7 @@ More specific information, such as the TODO list of this project and some inform ## Copyright and License -Copyright 2008-2020 Manuel Pégourié-Gonnard, Takuto Asakura, the TeX Live Team. +Copyright 2008-2021 Manuel Pégourié-Gonnard, Takuto Asakura, the TeX Live Team. This package is distributed under the terms of the GNU General Public License as published by the Free Software Foundation, either [version 3](./COPYING) of the License, or (at your option) any later version. diff --git a/Master/texmf-dist/doc/support/texdoc/texdoc.pdf b/Master/texmf-dist/doc/support/texdoc/texdoc.pdf index 2922130cda5..4e0c35a2452 100644 Binary files a/Master/texmf-dist/doc/support/texdoc/texdoc.pdf and b/Master/texmf-dist/doc/support/texdoc/texdoc.pdf differ diff --git a/Master/texmf-dist/doc/support/texdoc/texdoc.tex b/Master/texmf-dist/doc/support/texdoc/texdoc.tex index c3607b4d61b..79a8ab6c644 100644 --- a/Master/texmf-dist/doc/support/texdoc/texdoc.tex +++ b/Master/texmf-dist/doc/support/texdoc/texdoc.tex @@ -1,6 +1,6 @@ %#!xelatex % Texdoc user manual -% Copyright 2008-2020 Manuel Pégourié-Gonnard and Takuto Asakura +% Copyright 2008-2021 Manuel Pégourié-Gonnard and Takuto Asakura % distributed under the terms of GPL v3 or later \documentclass{texdoc-doc} @@ -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.2\quad \today} +\date{v3.3\quad \today} \begin{document} @@ -281,7 +281,7 @@ Inside each directory, three files are recognized, in this order: \begin{enumerate} \item |texdoc-«platform».cnf| where |«platform»| is the name of the current platform (defined as the name of the directories where the {\TL} - binaries are located, for example |x86-64-linux|). This may be useful when + binaries are located, for example |x86_64-linux|). This may be useful when an installation is shared across machines with different architectures needing different settings, for example for viewers. Their use is not recommended in any other situation. @@ -499,7 +499,7 @@ Other objects such as aliases cannot be found by the fuzzy search.} to the input |«keyword»|. The results of the fuzzy search are shown in an info message, which can be seen by using the command-line option |-v|. -The default allowance of Levenshtein distance is |5|. You can change this +The default allowance of Levenshtein distance is |3|. You can change this allowance by using the configuration item \ci{fuzzy\_level}. Results of fuzzy search could be different among executions if multiple package names have the same Levenshtein distance to the input. @@ -731,7 +731,7 @@ Texdoc within a {\TL}-based {\TeX} distribution which does not ship \label{sec:licence} The current version of Texdoc program and its documentation are copyright -2008--2020 Manuel Pégourié-Gonnard, Takuto Asakura, the {\TL} Team. +2008--2021 Manuel Pégourié-Gonnard, Takuto Asakura, the {\TL} Team. They are free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/Master/texmf-dist/scripts/texdoc/texdoclib-config.tlu b/Master/texmf-dist/scripts/texdoc/texdoclib-config.tlu index d4f993d4495..2fc0c99cdf0 100755 --- a/Master/texmf-dist/scripts/texdoc/texdoclib-config.tlu +++ b/Master/texmf-dist/scripts/texdoc/texdoclib-config.tlu @@ -274,15 +274,15 @@ local function get_config_files() } -- get dirs - local sep = (os.type == 'windows') and ';' or ':' - local texmf_texdoc = kpse.expand_path('$TEXMF/texdoc') - local dirs = texmf_texdoc:explode(sep) + local kpse_texmf = kpse.expand_var('$TEXMF') + local texmfs = kpse.expand_braces(kpse_texmf):explode(C.kpse_sep) -- merge them local ret = {} - for _, dir in ipairs(dirs) do + for _, dir in ipairs(texmfs) do + local path = dir:gsub('^!!', '') for _, name in ipairs(names) do - local pathname = dir .. '/' .. name + local pathname = path .. '/texdoc/' .. name table.insert(ret, pathname) end end @@ -344,9 +344,8 @@ function M.show_config_files(is_action) -- show the recommendation (only for the "files" action) if is_action then print_func('Recommended file(s) for personal settings:') - local sep = (os.type == 'windows') and ';' or ':' -- here TEXMFHOMEs do not have to exist, and thus use kpse.var_value - local texmfhomes = string.explode(kpse.var_value('TEXMFHOME'), sep) + local texmfhomes = kpse.var_value('TEXMFHOME'):explode(C.kpse_sep) for _, home in ipairs(texmfhomes) do print_func(indent .. w32_path(home .. '/texdoc/texdoc.cnf')) end diff --git a/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu b/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu index a1907c75c45..aef88a06237 100755 --- a/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu +++ b/Master/texmf-dist/scripts/texdoc/texdoclib-const.tlu @@ -5,6 +5,7 @@ -- use an empty environment that will become texdoc_env.C (see EOF) local constants = {} local kpse = kpse or require 'kpse' +local os = os or require 'os' local setfenv = setfenv local texdoc_env @@ -21,8 +22,8 @@ end -- progname and version fullname = kpse.find_file('texdoc/texdoclib', 'lua') progname = 'Texdoc' -version = '3.2.2' -release_date = '2020-09-16' +version = '3.3' +release_date = '2021-03-17' -- make sure to update setup_config_from_cl() accordingly -- and set a default value in setup_config_from_defaults() if relevant @@ -63,7 +64,7 @@ Repository: Please email bugs to .]] copyright_msg = [[ -Copyright 2008-2020 Manuel Pégourié-Gonnard, Takuto Asakura, the TeX Live Team. +Copyright 2008-2021 Manuel Pégourié-Gonnard, Takuto Asakura, the TeX Live Team. License GPLv3+: GNU GPL version 3 or later . This is free software: you are free to change and redistribute it.]] @@ -133,6 +134,9 @@ data_tlpdb_name = 'texdoc/Data.tlpdb.lua' place_holder = '%%s' -- used for viewer commands +-- kpse path separator +kpse_sep = (os.type == 'windows') and ';' or ':' + -- END constants -- get our previous environment back diff --git a/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu b/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu index 0340fa63ba1..8718dc83fff 100755 --- a/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu +++ b/Master/texmf-dist/scripts/texdoc/texdoclib-search.tlu @@ -280,7 +280,7 @@ local function scan_db(patlist, code, lsr_db) end end ---------------------- manage TEXDOCS trees à la kpse ---------------------- +--------------------- manage TEXDOCS trees of the kpse ---------------------- -- build a db from a ls-R file local function init_lsr_db(root, shift) @@ -371,11 +371,10 @@ init_texdocs_database = function() end doc_roots = {} - local sep = (os.type == 'windows') and ';' or ':' local kpse_texdocs = kpse.expand_var('$TEXDOCS') -- expand the path and turn it into a lua list - local raw_doc_roots = kpse.expand_braces(kpse_texdocs):explode(sep) + local raw_doc_roots = kpse.expand_braces(kpse_texdocs):explode(C.kpse_sep) local max = #raw_doc_roots + 1 for j, dir in ipairs(raw_doc_roots) do diff --git a/Master/texmf-dist/scripts/texdoc/texdoclib-view.tlu b/Master/texmf-dist/scripts/texdoc/texdoclib-view.tlu index 126ca576869..49148ea976b 100755 --- a/Master/texmf-dist/scripts/texdoc/texdoclib-view.tlu +++ b/Master/texmf-dist/scripts/texdoc/texdoclib-view.tlu @@ -32,14 +32,6 @@ local function try_viewing(view_command, viewer_replacement) view_command = view_command .. ' ' .. viewer_replacement end - -- try to catch problems with missing DISPLAY on Unix - if os.type == 'unix' and not (os.name == 'macosx') - and os.getenv('DISPLAY') == nil then - err_print('warning', - 'DISPLAY is not set; your viewer will likely have problems.') - err_print('warning', - 'Try --list to list results instead of displaying them.') - end err_print('info', 'View command: ' .. view_command) -- See long comment below this function for the LC_CTYPE story. @@ -55,6 +47,12 @@ local function try_viewing(view_command, viewer_replacement) -- the big casino: run the external command. if os.execute(view_command) > 0 then err_print('error', 'Failed to execute: ' .. view_command) + -- try to catch problems with missing DISPLAY on Unix + if os.type == 'unix' and not (os.name == 'macosx') + and os.getenv('DISPLAY') == nil then + err_print('error', + 'Maybe your viewer failed because DISPLAY is not set.') + end os.exit(C.exit_error) end diff --git a/Master/texmf-dist/scripts/texdoc/texdoclib.tlu b/Master/texmf-dist/scripts/texdoc/texdoclib.tlu index 7c93fba54cf..f7d4f06055e 100644 --- a/Master/texmf-dist/scripts/texdoc/texdoclib.tlu +++ b/Master/texmf-dist/scripts/texdoc/texdoclib.tlu @@ -1,7 +1,7 @@ -- texdoclib.tlu: the texdoc library --[[ -Copyright 2008-2020 Manuel Pégourié-Gonnard, Takuto Asakura, the TeX Live Team. +Copyright 2008-2021 Manuel Pégourié-Gonnard, Takuto Asakura, the TeX Live Team. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/Master/texmf-dist/texdoc/texdoc.cnf b/Master/texmf-dist/texdoc/texdoc.cnf index ae998a0c45a..d1b228e0701 100644 --- a/Master/texmf-dist/texdoc/texdoc.cnf +++ b/Master/texmf-dist/texdoc/texdoc.cnf @@ -450,7 +450,6 @@ alias dtk = dtk/doc/beispiel.pdf alias einfuehrung = einfuehrung/README # tl should get "readme" tag alias elsarticle = elsdoc alias(0.1) fontinst = fontinstallationguide -alias hyperref = hyperref/manual.pdf alias hyperref-dev = hyperref.pdf alias iso = isoman alias kvoptions-patch = kvoptions # XXX? @@ -460,6 +459,9 @@ alias llmk = light-latex-make/llmk alias(2) llmk = light-latex-make/README alias mls = montex alias musixtex = musixdoc +alias newcm = newcomputermodern/README +alias(5) newcm = newcomputermodern/newcomputermodern-sample.pdf +alias(5) newcm = newcomputermodern/newcm-unimath-symbols.pdf alias newtxtext = newtxdoc alias newtxmath = newtxdoc alias nonfloat = nonfloat-en -- cgit v1.2.3