diff options
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 2 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/kpsewhich.c | 35 |
2 files changed, 19 insertions, 18 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 77681015008..a100e2f44d3 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,5 +1,7 @@ 2009-12-14 Karl Berry <karl@tug.org> + * kpsewhich.c (separator): remove never-used variable/option. + * kpsewhich.c (find_format): remove rearrangement of checking kpse_fmt_format last, since it doesn't have any special extensions now (what were they?). diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c index 8a76c08400d..dd4bc017404 100644 --- a/Build/source/texk/kpathsea/kpsewhich.c +++ b/Build/source/texk/kpathsea/kpsewhich.c @@ -32,42 +32,42 @@ #include <kpathsea/version.h> -/* Base resolution. (-D, -dpi) */ -unsigned dpi = 600; - /* For variable and path expansion. (-expand-var, -expand-path, - -show-path, -separator) */ + -show-path) */ string var_to_expand = NULL; string braces_to_expand = NULL; string path_to_expand = NULL; string path_to_show = NULL; string var_to_value = NULL; -/* Only match files in given subdirs. (-subdir) */ -str_list_type subdir_paths; +/* Base resolution. (-D, -dpi) */ +unsigned dpi = 600; -/* The file type and path for lookups. (-format, -path) */ -kpse_file_format_type user_format = kpse_last_format; -string user_format_string; -string user_path; +/* The engine name, for '$engine' construct in texmf.cnf. (-engine) */ +string engine = NULL; /* Interactively ask for names to look up? (-interactive) */ boolean interactive = false; +/* The device name, for $MAKETEX_MODE. (-mode) */ +string mode = NULL; + /* Search the disk as well as ls-R? (-must-exist, -mktex) */ boolean must_exist = false; +/* The program name, for `.PROG' construct in texmf.cnf. (-program) */ +string progname = NULL; + /* Return all matches, not just the first one? (-all) */ boolean show_all = false; -/* The device name, for $MAKETEX_MODE. (-mode) */ -string mode = NULL; - -/* The program name, for `.PROG' construct in texmf.cnf. (-program) */ -string progname = NULL; +/* Only match files in given subdirs. (-subdir) */ +str_list_type subdir_paths; -/* The engine name, for '$engine' construct in texmf.cnf. (-engine) */ -string engine = NULL; +/* The file type and path for lookups. (-format, -path) */ +kpse_file_format_type user_format = kpse_last_format; +string user_format_string; +string user_path; /* Return the <number> substring in `<name>.<number><stuff>', if S has that form. If it doesn't, return 0. */ @@ -355,7 +355,6 @@ static struct option long_options[] { "path", 1, 0, 0 }, { "no-mktex", 1, 0, 0 }, { "progname", 1, 0, 0 }, - { "separator", 1, 0, 0 }, { "subdir", 1, 0, 0 }, { "show-path", 1, 0, 0 }, { "var-value", 1, 0, 0 }, |