/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <cstdio>
#include "freetype.hh"
-#include <freetype/tttables.h>
+#include FT_TRUETYPE_TABLES_H
#include "international.hh"
#include "memory-stream.hh"
lily_cookie_fprintf (out, "%d dict begin\n", 11);
lily_cookie_fprintf (out, "/FontName /%s def\n",
- FT_Get_Postscript_Name (face));
+ get_postscript_name (face).c_str ());
lily_cookie_fprintf (out, "/Encoding StandardEncoding def\n");
lily_cookie_fprintf (out, "/PaintType 0 def\n");
LY_ASSERT_TYPE (scm_is_string, ttf_file_name, 1);
int i = 0;
- if (idx != SCM_UNDEFINED)
+ if (!SCM_UNBNDP (idx))
{
LY_ASSERT_TYPE (scm_is_integer, idx, 2);
i = scm_to_int (idx);
}
face = open_ft_face (file_name, i);
- char const *ps_name_str0 = FT_Get_Postscript_Name (face);
- SCM ps_name = scm_from_locale_string (ps_name_str0 ? ps_name_str0 : "");
+ SCM ps_name = scm_from_locale_string (get_postscript_name (face).c_str ());
FT_Done_Face (face);
debug_output ("]", false);
LY_ASSERT_TYPE (scm_is_string, ttf_file_name, 1);
int i = 0;
- if (idx != SCM_UNDEFINED)
+ if (!SCM_UNBNDP (idx))
{
LY_ASSERT_TYPE (scm_is_integer, idx, 2);
i = scm_to_int (idx);
Memory_out_stream stream;
create_type42_font (&stream, file_name, i);
- SCM asscm = scm_from_locale_stringn (stream.get_string (),
+ SCM asscm = scm_from_latin1_stringn (stream.get_string (),
stream.get_length ());
debug_output ("]", false);