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 6ad743b0a3378e60691dcfb8cce90aa4467e4936..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,22 +30,24 @@ 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 %d 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;
 }
 
-std::string
-Open_type_font::get_otf_table (std::string tag) const
+string
+Open_type_font::get_otf_table (string tag) const
 {
   return ::get_otf_table (face_, tag);
 }
@@ -59,7 +61,7 @@ load_scheme_table (char const *tag_str, FT_Face face)
   SCM tab = SCM_EOL;
   if (buffer)
     {
-      std::string contents ((char const*)buffer, length);
+      string contents ((char const*)buffer, length);
       contents = "(quote (" + contents + "))";
 
       tab = scm_c_eval_string (contents.c_str ());
@@ -68,18 +70,6 @@ load_scheme_table (char const *tag_str, FT_Face face)
   return tab;
 }
 
-Index_to_charcode_map
-make_index_to_charcode_map (FT_Face face)
-{
-  Index_to_charcode_map m;
-  FT_ULong charcode;
-  FT_UInt gindex;
-
-  for (charcode = FT_Get_First_Char (face, &gindex); gindex != 0;
-       charcode = FT_Get_Next_Char (face, charcode, &gindex))
-    m[gindex] = charcode;
-  return m;
-}
 
 Open_type_font::~Open_type_font ()
 {
@@ -89,17 +79,19 @@ Open_type_font::~Open_type_font ()
 /*
   UGH fix naming
 */
-std::string
-get_otf_table (FT_Face face, std::string tag)
+string
+get_otf_table (FT_Face face, string tag)
 {
   FT_ULong len;
   FT_Byte *tab = load_table (tag.c_str (), face, &len);
+  string ret ((char const*) tab, len);
+  free (tab);
 
-  return std::string ((char const*) tab, len);
+  return ret;
 }
 
 FT_Face
-open_ft_face (std::string str)
+open_ft_face (string str)
 {
   FT_Face face;
   int error_code = FT_New_Face (freetype2_library, str.c_str (), 0, &face);
@@ -107,13 +99,15 @@ open_ft_face (std::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;
 }
 
 SCM
-Open_type_font::make_otf (std::string str)
+Open_type_font::make_otf (string str)
 {
   FT_Face face = open_ft_face (str);
   Open_type_font *otf = new Open_type_font (face);
@@ -147,7 +141,7 @@ Open_type_font::derived_mark () const
 }
 
 Offset
-Open_type_font::attachment_point (std::string glyph_name) const
+Open_type_font::attachment_point (string glyph_name) const
 {
   SCM sym = ly_symbol2scm (glyph_name.c_str ());
   SCM entry = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F);
@@ -163,7 +157,7 @@ Open_type_font::attachment_point (std::string glyph_name) const
 }
 
 Box
-Open_type_font::get_indexed_char (vsize signed_idx) const
+Open_type_font::get_indexed_char (size_t signed_idx) const
 {
   if (SCM_HASHTABLE_P (lily_index_to_bbox_table_))
     {
@@ -176,11 +170,12 @@ Open_type_font::get_indexed_char (vsize signed_idx) const
 
   if (SCM_HASHTABLE_P (lily_character_table_))
     {
-      const vsize len = 256;
+      const size_t len = 256;
       char name[len];
-      vsize code = FT_Get_Glyph_Name (face_, signed_idx, name, len);
+      size_t code = FT_Get_Glyph_Name (face_, signed_idx, name, len);
       if (code)
-       warning (_f ("FT_Get_Glyph_Name() returned error: %d", 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);
@@ -223,22 +218,23 @@ Open_type_font::get_indexed_char (vsize signed_idx) const
   return b;
 }
 
-vsize
-Open_type_font::name_to_index (std::string nm) const
+size_t
+Open_type_font::name_to_index (string nm) const
 {
   char *nm_str = (char *) nm.c_str ();
-  if (vsize idx = FT_Get_Name_Index (face_, nm_str))
+  if (size_t idx = FT_Get_Name_Index (face_, nm_str))
     return idx;
-  return VPOS;
+  
+  return (size_t) -1;
 }
 
-vsize
-Open_type_font::index_to_charcode (vsize i) const
+size_t
+Open_type_font::index_to_charcode (size_t i) const
 {
   return ((Open_type_font *) this)->index_to_charcode_map_[i];
 }
 
-vsize
+size_t
 Open_type_font::count () const
 {
   return ((Open_type_font *) this)->index_to_charcode_map_.size ();
@@ -284,7 +280,7 @@ Open_type_font::get_global_table () const
   return lily_global_table_;
 }
 
-std::string
+string
 Open_type_font::font_name () const
 {
   return FT_Get_Postscript_Name (face_);
@@ -299,13 +295,14 @@ Open_type_font::glyph_list () const
   
   for (int i = 0; i < face_->num_glyphs; i++)
     {
-      const vsize len = 256;
+      const size_t len = 256;
       char name[len];
-      vsize code = FT_Get_Glyph_Name (face_, i, name, len);
+      size_t code = FT_Get_Glyph_Name (face_, i, name, len);
       if (code)
-       warning (_f ("FT_Get_Glyph_Name() returned error: %d", 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);
     }