From 0d46a35828bc5b78b7ddb0ea5dbe576db0c9bb82 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Jan 2017 22:40:18 +0000 Subject: (setup_config_from_env): define viewer_md from usual envvars, default PAGER. (get_default_viewers): use txt version as default for md. git-svn-id: svn://tug.org/texlive/trunk@43055 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/scripts/texdoc/config.tlu | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/scripts/texdoc') diff --git a/Master/texmf-dist/scripts/texdoc/config.tlu b/Master/texmf-dist/scripts/texdoc/config.tlu index ed35d0efd76..25d64617831 100644 --- a/Master/texmf-dist/scripts/texdoc/config.tlu +++ b/Master/texmf-dist/scripts/texdoc/config.tlu @@ -190,15 +190,17 @@ function setup_config_from_env () end end set_config_elt_from_vars('viewer_pdf', - {"PDFVIEWER_texdoc", "TEXDOCVIEW_pdf", "TEXDOC_VIEWER_PDF", "PDFVIEWER"}) + {"PDFVIEWER_texdoc", "TEXDOCVIEW_pdf", "TEXDOC_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", "PSVIEWER"}) set_config_elt_from_vars('viewer_dvi', - {"DVIVIEWER_texdoc", "TEXDOCVIEW_dvi", "TEXDOC_VIEWER_DVI", "DVIVIEWER"}) + {"DVIVIEWER_texdoc", "TEXDOCVIEW_dvi", "TEXDOC_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", "BROWSER"}) + set_config_elt_from_vars('viewer_md', + {"MDVIEWER_texdoc", "TEXDOCVIEW_md", "TEXDOC_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", "PAGER"}) end ---------------------- options and aliases from files ---------------------- @@ -396,6 +398,7 @@ function get_default_viewers() -- (it can be run from the start->run menu), hence we make sure -- to open a new window if needed. viewer_txt = 'start cmd /k more', + viewer_md = viewer_txt, } elseif (os.name == 'macosx') then set_config_ls { @@ -404,6 +407,7 @@ function get_default_viewers() viewer_pdf = 'open', viewer_ps = 'open', viewer_txt = 'less', + viewer_md = viewer_txt, } else -- generic Unix set_config_ls { @@ -452,7 +456,8 @@ function get_default_viewers() {'most', 'most'}, {'less', 'less'}, {'more', 'more'} - } + }, + viewer_md = viewer_txt, } end end @@ -463,7 +468,7 @@ function setup_config_from_defaults() local function set_config_elt(key, val) set_config_element(key, val, {src='def'}) end - -- various, platform independant, stuff + -- various, platform independent, stuff set_config_ls { mode = 'view', interact_switch = 'true', -- cgit v1.2.3