#include <libpspp/compiler.h>
#include <libpspp/freaderror.h>
#include <libpspp/hash.h>
-#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/start-date.h>
#include <libpspp/version.h>
-#include <data/filename.h>
+#include <data/file-name.h>
#include "afm.h"
#include "chart.h"
/* Driver initialization. */
static bool
-ps_open_driver (struct outp_driver *this, const char *options)
+ps_open_driver (struct outp_driver *this, const struct string *options)
{
struct ps_driver_ext *x;
size_t i;
}
/* Looks for a PostScript font file or config file in all the
- appropriate places. Returns the filename on success, NULL on
+ appropriate places. Returns the file name on success, NULL on
failure. */
static char *
find_ps_file (const char *name)
{
- if (fn_absolute_p (name))
+ if (fn_is_absolute (name))
return xstrdup (name);
else
{
- char *base_name = xasprintf ("psfonts%c%s", DIR_SEPARATOR, name);
+ char *base_name = xasprintf ("psfonts/%s", name);
char *file_name = fn_search_path (base_name, config_path, NULL);
free (base_name);
return file_name;