Merge with master

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

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 7f165ce8fcd4fa2aa71662ccb5f4478ab922dc0c..8b1229fe90917bc3f508fb6f20ad1b8372f16b67 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "open-type-font.hh"
@@ -15,6 +15,7 @@ using namespace std;
 #include <freetype/tttables.h>
 
 #include "dimensions.hh"
+#include "international.hh"
 #include "modified-font-metric.hh"
 #include "warn.hh"
 
@@ -29,11 +30,11 @@ 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;
     }
@@ -43,8 +44,8 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length)
   return 0;
 }
 
-String
-Open_type_font::get_otf_table (String tag) const
+string
+Open_type_font::get_otf_table (string tag) const
 {
   return ::get_otf_table (face_, tag);
 }
@@ -58,7 +59,7 @@ load_scheme_table (char const *tag_str, FT_Face face)
   SCM tab = SCM_EOL;
   if (buffer)
     {
-      String contents ((Byte const *)buffer, length);
+      string contents ((char const*)buffer, length);
       contents = "(quote (" + contents + "))";
 
       tab = scm_c_eval_string (contents.c_str ());
@@ -67,18 +68,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 ()
 {
@@ -88,17 +77,19 @@ Open_type_font::~Open_type_font ()
 /*
   UGH fix naming
 */
-String
-get_otf_table (FT_Face face, 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 String (tab, len);
+  return ret;
 }
 
 FT_Face
-open_ft_face (String str)
+open_ft_face (string str)
 {
   FT_Face face;
   int error_code = FT_New_Face (freetype2_library, str.c_str (), 0, &face);
@@ -112,7 +103,7 @@ open_ft_face (String str)
 }
 
 SCM
-Open_type_font::make_otf (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);
@@ -146,7 +137,7 @@ Open_type_font::derived_mark () const
 }
 
 Offset
-Open_type_font::attachment_point (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);
@@ -162,11 +153,12 @@ Open_type_font::attachment_point (String glyph_name) const
 }
 
 Box
-Open_type_font::get_indexed_char (int signed_idx) const
+Open_type_font::get_indexed_char (size_t signed_idx) const
 {
   if (SCM_HASHTABLE_P (lily_index_to_bbox_table_))
     {
-      SCM box = scm_hashq_ref (lily_index_to_bbox_table_, scm_from_int (signed_idx), SCM_BOOL_F);
+      SCM box = scm_hashq_ref (lily_index_to_bbox_table_,
+                              scm_from_unsigned (signed_idx), SCM_BOOL_F);
       Box *box_ptr = Box::unsmob (box);
       if (box_ptr)
        return *box_ptr;
@@ -174,11 +166,11 @@ Open_type_font::get_indexed_char (int signed_idx) const
 
   if (SCM_HASHTABLE_P (lily_character_table_))
     {
-      const int len = 256;
+      const size_t len = 256;
       char name[len];
-      int 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() returned error: %u", unsigned (code)));
 
       SCM sym = ly_symbol2scm (name);
       SCM alist = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F);
@@ -200,7 +192,7 @@ Open_type_font::get_indexed_char (int signed_idx) const
          b.scale (point_constant);
 
          scm_hashq_set_x (lily_index_to_bbox_table_,
-                          scm_from_int (signed_idx),
+                          scm_from_unsigned (signed_idx),
                           b.smobbed_copy ());
          return b;
        }
@@ -221,22 +213,23 @@ Open_type_font::get_indexed_char (int signed_idx) const
   return b;
 }
 
-int
-Open_type_font::name_to_index (String nm) const
+size_t
+Open_type_font::name_to_index (string nm) const
 {
   char *nm_str = (char *) nm.c_str ();
-  if (int idx = FT_Get_Name_Index (face_, nm_str))
+  if (size_t idx = FT_Get_Name_Index (face_, nm_str))
     return idx;
-  return -1;
+  
+  return (size_t) -1;
 }
 
-unsigned
-Open_type_font::index_to_charcode (int i) const
+size_t
+Open_type_font::index_to_charcode (size_t i) const
 {
   return ((Open_type_font *) this)->index_to_charcode_map_[i];
 }
 
-int
+size_t
 Open_type_font::count () const
 {
   return ((Open_type_font *) this)->index_to_charcode_map_.size ();
@@ -254,7 +247,7 @@ Open_type_font::design_size () const
                               which will trip errors more
                               quickly. --hwn.
                             */
-                            scm_from_int (1));
+                            scm_from_unsigned (1));
   return scm_to_double (entry) * Real (point_constant);
 }
 
@@ -282,7 +275,7 @@ Open_type_font::get_global_table () const
   return lily_global_table_;
 }
 
-String
+string
 Open_type_font::font_name () const
 {
   return FT_Get_Postscript_Name (face_);
@@ -297,13 +290,13 @@ Open_type_font::glyph_list () const
   
   for (int i = 0; i < face_->num_glyphs; i++)
     {
-      const int len = 256;
+      const size_t len = 256;
       char name[len];
-      int 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() returned error: %u", unsigned (code)));
 
-      *tail = scm_cons (scm_makfrom0str (name), SCM_EOL);
+      *tail = scm_cons (scm_from_locale_string (name), SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }