From c3b4471e847c09c37a8d2587bdd0e88aaee1b124 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 17 Sep 2020 03:03:01 +0000 Subject: CTAN sync 202009170303 --- support/texdoc/script/texdoclib-config.tlu | 9 +++++---- support/texdoc/script/texdoclib-const.tlu | 4 ++-- support/texdoc/script/texdoclib-search.tlu | 2 +- support/texdoc/script/texdoclib-util.tlu | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) (limited to 'support/texdoc/script') diff --git a/support/texdoc/script/texdoclib-config.tlu b/support/texdoc/script/texdoclib-config.tlu index 4eb660873f..d4f993d449 100644 --- a/support/texdoc/script/texdoclib-config.tlu +++ b/support/texdoc/script/texdoclib-config.tlu @@ -345,7 +345,8 @@ function M.show_config_files(is_action) if is_action then print_func('Recommended file(s) for personal settings:') local sep = (os.type == 'windows') and ';' or ':' - local texmfhomes = string.explode(kpse.expand_path('$TEXMFHOME'), sep) + -- here TEXMFHOMEs do not have to exist, and thus use kpse.var_value + local texmfhomes = string.explode(kpse.var_value('TEXMFHOME'), sep) for _, home in ipairs(texmfhomes) do print_func(indent .. w32_path(home .. '/texdoc/texdoc.cnf')) end @@ -536,15 +537,15 @@ local function setup_config_from_defaults() mode = 'view', interact_switch = 'true', machine_switch = 'false', - ext_list = 'pdf, htm, html, txt, md, ps, dvi, ', + ext_list = 'pdf, htm, html, txt, dat, md, ps, dvi, ', basename_list = 'readme, 00readme', - badext_list = 'txt, ', + badext_list = 'txt, dat, ', badbasename_list = 'readme, 00readme', suffix_list = '', verbosity_level = C.def_verbosity, debug_list = '', max_lines = '20', - fuzzy_level = '5', + fuzzy_level = '3', } -- zip-related options set_config_ls { diff --git a/support/texdoc/script/texdoclib-const.tlu b/support/texdoc/script/texdoclib-const.tlu index 0bccb118a1..a1907c75c4 100644 --- a/support/texdoc/script/texdoclib-const.tlu +++ b/support/texdoc/script/texdoclib-const.tlu @@ -21,8 +21,8 @@ end -- progname and version fullname = kpse.find_file('texdoc/texdoclib', 'lua') progname = 'Texdoc' -version = '3.2.1' -release_date = '2020-02-20' +version = '3.2.2' +release_date = '2020-09-16' -- make sure to update setup_config_from_cl() accordingly -- and set a default value in setup_config_from_defaults() if relevant diff --git a/support/texdoc/script/texdoclib-search.tlu b/support/texdoc/script/texdoclib-search.tlu index addb59a01f..0340fa63ba 100644 --- a/support/texdoc/script/texdoclib-search.tlu +++ b/support/texdoc/script/texdoclib-search.tlu @@ -442,7 +442,7 @@ end ------------------------------- use tlpdb -------------------------------- --- tlpdb mean TeX Live Package DataBase and tlp means TeX Live Package +-- tlpdb means TeX Live Package DataBase and tlp means TeX Live Package -- return true if cache exists and is newer than original, false otherwise local function good_cache(cache, ori) diff --git a/support/texdoc/script/texdoclib-util.tlu b/support/texdoc/script/texdoclib-util.tlu index d14a212a12..81627c823e 100644 --- a/support/texdoc/script/texdoclib-util.tlu +++ b/support/texdoc/script/texdoclib-util.tlu @@ -12,12 +12,12 @@ local texdoc = { local M = {} local C = texdoc.const --- change '/' to '\' on windows +-- lowercase and change '/' to '\' on windows for display -- Note: Internal representation of files always use forward slashes. -- This function should be called only before displaying a path. if os.type == 'windows' then function M.w32_path(path) - return (string.gsub(path, '/', '\\')) + return (string.gsub(string.lower(path), '/', '\\')) end else function M.w32_path(path) -- cgit v1.2.3