source file of the GNU LilyPond music typesetter
- (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "freetype.hh"
#include <freetype/tttables.h>
-#include "lily-proto.hh"
#include "memory-stream.hh"
#include "warn.hh"
#include "lily-guile.hh"
FT_CharMap current_cmap = face->charmap;
FT_Select_Charmap(face, FT_ENCODING_UNICODE);
+
+ int j = 0;
for (charcode = FT_Get_First_Char (face, &gindex); gindex != 0;
charcode = FT_Get_Next_Char (face, charcode, &gindex))
- m[gindex] = charcode;
+ {
+ m[gindex] = charcode;
+ j++;
+ }
FT_Set_Charmap (face, current_cmap);
+
return m;
}
= (TT_Postscript *) FT_Get_Sfnt_Table (face, ft_sfnt_post);
if (pt->maxMemType42)
- lily_cookie_fprintf (out, "%%%%VMUsage: %ld %ld\n", 0, 0);
+ lily_cookie_fprintf (out, "%%%%VMUsage: %d %d\n", 0, 0);
lily_cookie_fprintf (out, "%d dict begin\n", 11);
lily_cookie_fprintf (out, "/FontName /%s def\n",
lily_cookie_fprintf (out, "/FontType 42 def\n");
lily_cookie_fprintf (out, "/FontInfo 8 dict dup begin\n");
lily_cookie_fprintf (out, "/version (%d.%d) def\n",
- (ht->Font_Revision >> 16),
- (ht->Font_Revision &((1 << 16) -1)));
+ int (ht->Font_Revision >> 16),
+ int (ht->Font_Revision &((1 << 16) -1)));
#if 0
if (strings[0])
GLYPH_NAME_LEN);
if (error)
{
- programming_error ("print_trailer(): FT_Get_Glyph_Name() returned error");
+ programming_error ("FT_Get_Glyph_Name(): error.");
glyph_name[0] = 0;
}
}
get_unicode_name (glyph_name, ucode);
}
+ if (glyph_name == string (".notdef"))
+ glyph_name[0] = '\0';
+
+
+ if (!glyph_name[0])
+ {
+ get_glyph_index_name (glyph_name, i);
+ }
+
if (glyph_name[0])
{
lily_cookie_fprintf (out, "/%s %d def ", glyph_name, i);
output_count ++;
}
-
+ else
+ {
+ programming_error (to_string ("no name for glyph %d", i));
+ }
+
if (! (output_count % 5))
lily_cookie_fprintf (out, "\n");
}
1, 0, 0, (SCM ttf_file_name),
"Extract the PostScript name from a TrueType font.")
{
- SCM_ASSERT_TYPE (scm_is_string (ttf_file_name), ttf_file_name,
- SCM_ARG1, __FUNCTION__, "string");
+ LY_ASSERT_TYPE (scm_is_string, ttf_file_name, 1);
string file_name = ly_scm2string (ttf_file_name);
if (be_verbose_global)
progress_indication ("[" + file_name);
FT_Face face = open_ft_face (file_name);
char const *ps_name_str0 = FT_Get_Postscript_Name (face);
- SCM ps_name = scm_makfrom0str (ps_name_str0 ? ps_name_str0 : "");
+ SCM ps_name = scm_from_locale_string (ps_name_str0 ? ps_name_str0 : "");
FT_Done_Face (face);
-LY_DEFINE (ly_ttf_to_pfa, "ly:ttf->pfa",
+LY_DEFINE (ly_ttf_2_pfa, "ly:ttf->pfa",
1, 0, 0, (SCM ttf_file_name),
"Convert the contents of a TTF file to Type42 PFA, returning it as "
" a string.")
{
- SCM_ASSERT_TYPE (scm_is_string (ttf_file_name), ttf_file_name,
- SCM_ARG1, __FUNCTION__, "string");
+ LY_ASSERT_TYPE (scm_is_string, ttf_file_name, 1);
string file_name = ly_scm2string (ttf_file_name);
if (be_verbose_global)