Run `make grand-replace'.

[lilypond.git] / lily / open-type-font.cc

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index d34654e77045eb698f96dcaedf967ac204742502..97c49feca2880936f5c173c1b685f3ad3491db2f 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "open-type-font.hh"
@@ -30,16 +30,18 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length)
     {
       FT_Byte *buffer = (FT_Byte *) malloc (*length);
       if (buffer == NULL)
-       error (_f ("can't allocate %lu bytes", *length));
+       error (_f ("cannot allocate %lu bytes", *length));
 
       error_code = FT_Load_Sfnt_Table (face, tag, 0, buffer, length);
       if (error_code)
-       error (_f ("can't load font table: %s", tag_str));
+       error (_f ("cannot load font table: %s", tag_str));
 
       return buffer;
     }
   else
-    programming_error ("Cannot find OpenType table.");
+    programming_error (_f ("Free type error: %s",
+                          freetype_error_string (error_code).c_str ()
+                          ));
 
   return 0;
 }
@@ -97,8 +99,10 @@ open_ft_face (string str)
   if (error_code == FT_Err_Unknown_File_Format)
     error (_f ("unsupported font format: %s", str.c_str ()));
   else if (error_code)
-    error (_f ("unknown error: %d reading font file: %s", error_code,
-              str.c_str ()));
+    error (_f ("error reading font file %s: %s", 
+              str.c_str (),
+              freetype_error_string (error_code).c_str ()
+              ));
   return face;
 }
 
@@ -170,7 +174,8 @@ Open_type_font::get_indexed_char (size_t signed_idx) const
       char name[len];
       size_t code = FT_Get_Glyph_Name (face_, signed_idx, name, len);
       if (code)
-       warning (_f ("FT_Get_Glyph_Name() returned error: %u", unsigned (code)));
+       warning (_f ("FT_Get_Glyph_Name () Freetype error: %s",
+                    freetype_error_string (code)));
 
       SCM sym = ly_symbol2scm (name);
       SCM alist = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F);
@@ -294,9 +299,10 @@ Open_type_font::glyph_list () const
       char name[len];
       size_t code = FT_Get_Glyph_Name (face_, i, name, len);
       if (code)
-       warning (_f ("FT_Get_Glyph_Name() returned error: %u", unsigned (code)));
+       warning (_f ("FT_Get_Glyph_Name () error: %s",
+                    freetype_error_string (code).c_str ()));
 
-      *tail = scm_cons (scm_makfrom0str (name), SCM_EOL);
+      *tail = scm_cons (scm_from_locale_string (name), SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }