summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/tex-glyph.c15
2 files changed, 11 insertions, 9 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 775863e8330..6505a2087d1 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tex-glyph.c (try_format): Drop unused params fontname and dpi;
+ mention the use of $KPATHSEA_{NAME,DPI} from environment.
+
2010-11-10 Peter Breitenlohner <peb@mppmu.mpg.de>
Update version number to 6.0.1dev.
diff --git a/Build/source/texk/kpathsea/tex-glyph.c b/Build/source/texk/kpathsea/tex-glyph.c
index b3e82371de7..b3b9174a50b 100644
--- a/Build/source/texk/kpathsea/tex-glyph.c
+++ b/Build/source/texk/kpathsea/tex-glyph.c
@@ -30,16 +30,15 @@
/* Support both cmr10.300pk and dpi300/cmr10.pk. (Use the latter
instead of dpi300\cmr10.pk since DOS supports /'s, but Unix doesn't
- support \'s. */
+ support \'s.) */
#define UNIX_BITMAP_SPEC "$KPATHSEA_NAME.$KPATHSEA_DPI$KPATHSEA_FORMAT"
#define DPI_BITMAP_SPEC "dpi$KPATHSEA_DPI/$KPATHSEA_NAME.$KPATHSEA_FORMAT"
-/* Look up FONTNAME at resolution DPI in PATH, with filename suffix
- EXTENSION. Return file found or NULL. */
+/* Look up font $KPATHSEA_NAME at resolution $KPATHSEA_DPI in PATH,
+ with filename suffix EXTENSION. Return file found or NULL. */
static string
-try_format (kpathsea kpse, const_string fontname, unsigned dpi,
- kpse_file_format_type format)
+try_format (kpathsea kpse, kpse_file_format_type format)
{
static const_string bitmap_specs[]
= { UNIX_BITMAP_SPEC, DPI_BITMAP_SPEC, NULL };
@@ -48,8 +47,6 @@ try_format (kpathsea kpse, const_string fontname, unsigned dpi,
const_string *sfx;
string ret = NULL;
const_string path = kpse->format_info[format].path;
- (void)dpi; /* -Wunused */
- (void)fontname; /* -Wunused */
if (!path)
path = kpathsea_init_format (kpse, format);
@@ -94,12 +91,12 @@ try_size (kpathsea kpse, const_string fontname, unsigned dpi,
kpathsea_xputenv_int (kpse, "KPATHSEA_DPI", dpi);
/* Look for PK first (since it's more likely to be found), then GF. */
- ret = try_pk ? try_format (kpse, fontname, dpi, kpse_pk_format) : NULL;
+ ret = try_pk ? try_format (kpse, kpse_pk_format) : NULL;
format_found = kpse_pk_format;
if (ret == NULL && try_gf)
{
- ret = try_format (kpse, fontname, dpi, kpse_gf_format);
+ ret = try_format (kpse, kpse_gf_format);
format_found = kpse_gf_format;
}