summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-12-03 01:48:59 +0000
committerKarl Berry <karl@freefriends.org>2009-12-03 01:48:59 +0000
commite133607676ae7d2b36f81225b630e03cc1307e6d (patch)
treea7cfb2e5f2e1a0bd3126c3167fd8a7c198b759db /Build/source/texk/kpathsea
parent67257c18c27c5265b15a55ad61d45da410f2f104 (diff)
formatting fixes continue
git-svn-id: svn://tug.org/texlive/trunk@16275 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog1
-rw-r--r--Build/source/texk/kpathsea/kpsewhich.c24
-rw-r--r--Build/source/texk/kpathsea/tex-file.c4
-rw-r--r--Build/source/texk/kpathsea/tex-file.h8
-rw-r--r--Build/source/texk/kpathsea/tex-glyph.h2
5 files changed, 23 insertions, 16 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index d4ee2195cce..9adefcb0f3d 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1217,7 +1217,6 @@
just dump all font-related files in a single directory and set a
single variable to point to it. It doesn't have a default.
Suggested by Karl Berry, Hans Hagen, Akira Kakuto.
-
2004-08-17 Olaf Weber <olaf@infovore.xs4all.nl>
diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c
index 33b6d327ae7..3c6f83fdd3a 100644
--- a/Build/source/texk/kpathsea/kpsewhich.c
+++ b/Build/source/texk/kpathsea/kpsewhich.c
@@ -446,7 +446,6 @@ read_command_line (kpathsea kpse, int argc, string *argv)
}
putchar ('\n');
}
-
exit (0);
} else if (ARGUMENT_IS ("mktex")) {
@@ -506,28 +505,36 @@ main (int argc, string *argv)
{
unsigned unfound = 0;
kpathsea kpse = kpathsea_new();
+
+ /* Read options. */
read_command_line (kpse, argc, argv);
+
+ /* Initializations that may depend on the options. */
+ /* kpathsea_maketex_option (kpse, "pk", false); */
kpathsea_set_program_name (kpse, argv[0], progname);
if (engine)
- kpathsea_xputenv (kpse, "engine", engine);
+ kpathsea_xputenv (kpse, "engine", engine);
/* NULL for no fallback font. */
kpathsea_init_prog (kpse, uppercasify (kpse->program_name), dpi, mode, NULL);
/* Have to do this after setting the program name. */
if (user_format_string) {
- user_format = find_format (kpse, user_format_string, false);
+ user_format = find_format (kpse, user_format_string, false);
if (user_format == kpse_last_format) {
WARNING1 ("kpsewhich: Ignoring unknown file type `%s'",
user_format_string);
}
}
+
+ /* Perform actions. */
+
/* Variable expansion. */
if (var_to_expand)
- puts (kpathsea_var_expand (kpse, var_to_expand));
+ puts (kpathsea_var_expand (kpse, var_to_expand));
/* Brace expansion. */
if (braces_to_expand)
@@ -553,7 +560,7 @@ main (int argc, string *argv)
const_string value = kpathsea_var_value (kpse, var_to_value);
if (!value) {
unfound++;
- value="";
+ value = "";
}
puts (value);
}
@@ -565,17 +572,18 @@ main (int argc, string *argv)
}
for (; optind < argc; optind++) {
- unfound += lookup (kpse, argv[optind]);
+ unfound += lookup (kpse, argv[optind]);
}
if (interactive) {
for (;;) {
string name = read_line (stdin);
- if (!name || STREQ (name, "q") || STREQ (name, "quit")) break;
+ if (!name || STREQ (name, "q") || STREQ (name, "quit"))
+ break;
unfound += lookup (kpse, name);
free (name);
}
}
- kpathsea_finish(kpse);
+ kpathsea_finish (kpse);
return unfound > 255 ? 1 : unfound;
}
diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c
index 792f9607638..e65ef95d282 100644
--- a/Build/source/texk/kpathsea/tex-file.c
+++ b/Build/source/texk/kpathsea/tex-file.c
@@ -408,8 +408,8 @@ init_maketex (kpathsea kpse, kpse_file_format_type fmt,
if (progval && *progval) {
/* This might actually be from an environment variable value, but in
that case, we'll have previously set it from kpse_init_prog. */
- kpathsea_set_program_enabled (kpse, fmt, *progval == '1',
- kpse_src_client_cnf);
+ kpathsea_set_program_enabled (kpse, fmt, *progval == '1',
+ kpse_src_client_cnf);
}
free (PROG);
diff --git a/Build/source/texk/kpathsea/tex-file.h b/Build/source/texk/kpathsea/tex-file.h
index 48c17d3c3ea..10b4be2364b 100644
--- a/Build/source/texk/kpathsea/tex-file.h
+++ b/Build/source/texk/kpathsea/tex-file.h
@@ -29,8 +29,8 @@
that's not set either, a compile-time default is used. */
extern void kpathsea_init_fallback_resolutions (kpathsea kpse, string envvar);
-/* If LEVEL is higher than `program_enabled_level' for FMT, set
- `program_enabled_p' to VALUE. */
+/* If LEVEL is >= FMT's `program_enable_level', set `program_enabled_p'
+ for FMT to VALUE. */
extern KPSEDLL void kpathsea_set_program_enabled (kpathsea kpse,
kpse_file_format_type fmt, boolean value, kpse_src_type level);
@@ -39,8 +39,8 @@ extern KPSEDLL void kpathsea_set_program_enabled (kpathsea kpse,
extern KPSEDLL void kpathsea_maketex_option (kpathsea kpse,
const_string fmtname, boolean value);
-/* Change the list of searched suffixes (alternate suffixes if alternate is
- true). */
+/* Change the list of searched suffixes for FORMAT to ... (alternate
+ suffixes if ALTERNATE is true). */
extern KPSEDLL void kpathsea_set_suffixes (kpathsea kpse,
kpse_file_format_type format, boolean alternate, ...);
diff --git a/Build/source/texk/kpathsea/tex-glyph.h b/Build/source/texk/kpathsea/tex-glyph.h
index 74eb23bb21f..ee5b84951a9 100644
--- a/Build/source/texk/kpathsea/tex-glyph.h
+++ b/Build/source/texk/kpathsea/tex-glyph.h
@@ -1,6 +1,6 @@
/* tex-glyph.h: look for a TeX glyph font (GF or PK).
- Copyright 1993, 2008 Karl Berry.
+ Copyright 1993, 2008, 2009 Karl Berry.
Copyright 1999, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or