texlive[44267] Master/texmf-dist/scripts/texdoc/config.tlu: allow :
commits+karl at tug.org
commits+karl at tug.org
Tue May 9 19:24:55 CEST 2017
Revision: 44267
http://tug.org/svn/texlive?view=revision&revision=44267
Author: karl
Date: 2017-05-09 19:24:55 +0200 (Tue, 09 May 2017)
Log Message:
-----------
allow : separated list in BROWSER, etc.; texdoc r3
Revision Links:
--------------
http://tug.org/svn/texlive?view=revision&revision=3
Modified Paths:
--------------
trunk/Master/texmf-dist/scripts/texdoc/config.tlu
Modified: trunk/Master/texmf-dist/scripts/texdoc/config.tlu
===================================================================
--- trunk/Master/texmf-dist/scripts/texdoc/config.tlu 2017-05-09 16:52:26 UTC (rev 44266)
+++ trunk/Master/texmf-dist/scripts/texdoc/config.tlu 2017-05-09 17:24:55 UTC (rev 44267)
@@ -189,18 +189,39 @@
end
end
end
+ local function set_config_elt_from_option_env(key, var)
+ if (os.type == "windows") then return end
+ local value = os.getenv(var)
+ if value then
+ for cmd in string.gmatch(value, '([^:]+)') do
+ if is_in_path(cmd) then
+ set_config_element(key, cmd, {src='env', name=var})
+ -- don't test other commands if we have found one
+ break
+ end
+ end
+ end
+ end
set_config_elt_from_vars('viewer_pdf',
- {"PDFVIEWER_texdoc", "TEXDOCVIEW_pdf", "TEXDOC_VIEWER_PDF", "PDFVIEWER"})
+ {"PDFVIEWER_texdoc", "TEXDOCVIEW_pdf", "TEXDOC_VIEWER_PDF"})
+ set_config_elt_from_option_env('viewer_pdf', "PDFVIEWER")
set_config_elt_from_vars('viewer_ps',
- {"PSVIEWER_texdoc", "TEXDOCVIEW_ps", "TEXDOC_VIEWER_PS", "PSVIEWER"})
+ {"PSVIEWER_texdoc", "TEXDOCVIEW_ps", "TEXDOC_VIEWER_PS"})
+ set_config_elt_from_option_env('viewer_ps', "PSVIEWER")
set_config_elt_from_vars('viewer_dvi',
- {"DVIVIEWER_texdoc", "TEXDOCVIEW_dvi", "TEXDOC_VIEWER_DVI", "DVIVIEWER"})
+ {"DVIVIEWER_texdoc", "TEXDOCVIEW_dvi", "TEXDOC_VIEWER_DVI"})
+ set_config_elt_from_option_env('viewer_dvi', "DVIVIEWER")
set_config_elt_from_vars('viewer_html',
- {"BROWSER_texdoc", "TEXDOCVIEW_html", "TEXDOC_VIEWER_HTML", "BROWSER"})
+ {"BROWSER_texdoc", "TEXDOCVIEW_html", "TEXDOC_VIEWER_HTML"})
+ set_config_elt_from_option_env('viewer_html', "BROWSER")
+ bla = config['viewer_html']
+ err_print('warning', 'NORBERT: viewer_html is now ' .. bla)
set_config_elt_from_vars('viewer_md',
- {"MDVIEWER_texdoc", "TEXDOCVIEW_md", "TEXDOC_VIEWER_MD", "PAGER"})
+ {"MDVIEWER_texdoc", "TEXDOCVIEW_md", "TEXDOC_VIEWER_MD"})
+ set_config_elt_from_option_env('viewer_md', "PAGER")
set_config_elt_from_vars('viewer_txt',
- {"PAGER_texdoc", "TEXDOCVIEW_txt", "TEXDOC_VIEWER_TXT", "PAGER"})
+ {"PAGER_texdoc", "TEXDOCVIEW_txt", "TEXDOC_VIEWER_TXT"})
+ set_config_elt_from_option_env('viewer_txt', "PAGER")
end
---------------------- options and aliases from files ----------------------
More information about the tex-live-commits
mailing list