summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/texmf/scripts/texlive/texdoc.tlu53
1 files changed, 5 insertions, 48 deletions
diff --git a/Master/texmf/scripts/texlive/texdoc.tlu b/Master/texmf/scripts/texlive/texdoc.tlu
index 38c0dd30132..fc0e45b08ed 100755
--- a/Master/texmf/scripts/texlive/texdoc.tlu
+++ b/Master/texmf/scripts/texlive/texdoc.tlu
@@ -200,46 +200,6 @@ function recurse_tree (path)
end --function recurse_tree
---[[ functions for parsing texmf.cnf ]]
-function set_var_from_texmf(oldvalue,texmfvar)
- local newvalue
- newvalue = kpse.var_value(texmfvar)
- if newvalue then
- return newvalue
- else
- return oldvalue
- end
-end
-function set_listvar_from_texmf(oldvalue,texmfvar)
- local list_as_string
- local templist = {}
- list_as_string = set_var_from_texmf('',texmfvar)
- for element in string.gmatch(list_as_string,'[^,;:]+') do
- table.insert(templist,element)
- end
- if table.maxn(templist) > 0 then
- return templist
- else
- return oldvalue
- end
-end -- set_listvar_from_texmf
-
-function set_listvar_from_expand_braces(oldvalue,texmfvar)
- local list_as_string
- local templist = {}
- list_as_string = kpse.expand_braces(texmfvar)
- for element in string.gmatch(list_as_string,'[^,;:]*:') do
- element = string.gsub(element,':','')
- table.insert(templist,element)
- end
- if table.maxn(templist) > 0 then
- return templist
- else
- return oldvalue
- end
-end -- set_listvar_from_expand_braces
-
-
-- [[ set values from config files or defaults ]]
config = {} -- everything is stored in this table
@@ -402,14 +362,11 @@ else -- since we don't support msdos, if os.type is not windows, it's unix
end
end
-set_config_list {
- zipformats = {'','gz','bz2'},
- formats = {'dvi','pdf','ps','txt','html'},
- extlist = {
- '','.dvi', '.dvi.gz', '.dvi.bz2', '.pdf', '.pdf.gz', '.pdf.bz2',
- '.ps', '.ps.gz', '.ps.bz2', '.txt', '.txt.gz', '.txt.bz2', '.html'
- }
-}
+-- now a particular case for config.extlist
+set_config_element('extlist', {
+ '','.pdf', '.pdf.gz', '.pdf.bz2', '.dvi', '.dvi.gz', '.dvi.bz2',
+ '.ps', '.ps.gz', '.ps.bz2', '.txt', '.txt.gz', '.txt.bz2', '.html'
+})
-- we want an empty string for ext at the beginning, so that it works
-- to specify the complete filename. Doesn't matter when there's one