Nitpick run.

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

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index df0a23e7d5335b9fb087c21dab58b3f627810fb9..cd0c67c0572959f0a356dff016ed95399d1e67a1 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -18,6 +18,7 @@
 FT_Byte *
 load_table (char const *tag_str, FT_Face face, FT_ULong *length)
 {
+  *length = 0;
   FT_ULong tag = FT_MAKE_TAG (tag_str[0], tag_str[1], tag_str[2], tag_str[3]);
 
   int error_code = FT_Load_Sfnt_Table (face, tag, 0, NULL, length);
@@ -33,6 +34,8 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length)
 
       return buffer;
     }
+  else
+    programming_error ("Cannot find OpenType table.");
 
   return 0;
 }
@@ -40,10 +43,7 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length)
 String
 Open_type_font::get_otf_table (String tag) const
 {
-  FT_ULong len;
-  FT_Byte *tab = load_table (tag.to_str0 (), face_,  &len);
-  
-  return String (tab, len);
+  return ::get_otf_table (face_, tag);
 }
 
 SCM
@@ -82,8 +82,20 @@ Open_type_font::~Open_type_font ()
   FT_Done_Face (face_);
 }
 
-SCM
-Open_type_font::make_otf (String str)
+/*
+  UGH fix naming
+*/
+String
+get_otf_table (FT_Face face, String tag)
+{
+  FT_ULong len;
+  FT_Byte *tab = load_table (tag.to_str0 (), face, &len);
+
+  return String (tab, len);
+}
+
+FT_Face
+open_ft_face (String str)
 {
   FT_Face face;
   int error_code = FT_New_Face (freetype2_library, str.to_str0 (), 0, &face);
@@ -93,7 +105,13 @@ Open_type_font::make_otf (String str)
   else if (error_code)
     error (_f ("unknown error: %d reading font file: %s", error_code,
               str.to_str0 ()));
+  return face;
+}
 
+SCM
+Open_type_font::make_otf (String str)
+{
+  FT_Face face = open_ft_face (str);
   Open_type_font *otf = new Open_type_font (face);
 
   return otf->self_scm ();
@@ -105,11 +123,14 @@ Open_type_font::Open_type_font (FT_Face face)
   lily_character_table_ = SCM_EOL;
   lily_global_table_ = SCM_EOL;
   lily_subfonts_ = SCM_EOL;
+  lily_index_to_bbox_table_ = SCM_EOL;
 
   lily_character_table_ = alist_to_hashq (load_scheme_table ("LILC", face_));
   lily_global_table_ = alist_to_hashq (load_scheme_table ("LILY", face_));
   lily_subfonts_ = load_scheme_table ("LILF", face_);
   index_to_charcode_map_ = make_index_to_charcode_map (face_);
+
+  lily_index_to_bbox_table_ = scm_c_make_hash_table (257);
 }
 
 void
@@ -118,6 +139,7 @@ Open_type_font::derived_mark () const
   scm_gc_mark (lily_character_table_);
   scm_gc_mark (lily_global_table_);
   scm_gc_mark (lily_subfonts_);
+  scm_gc_mark (lily_index_to_bbox_table_);
 }
 
 Offset
@@ -139,6 +161,14 @@ Open_type_font::attachment_point (String glyph_name) const
 Box
 Open_type_font::get_indexed_char (int 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);
+      Box *box_ptr = Box::unsmob (box);
+      if (box_ptr)
+       return *box_ptr;
+    }
+
   if (SCM_HASHTABLE_P (lily_character_table_))
     {
       const int len = 256;
@@ -165,6 +195,10 @@ Open_type_font::get_indexed_char (int signed_idx) const
          bbox = scm_cdr (bbox);
 
          b.scale (point_constant);
+
+         scm_hashq_set_x (lily_index_to_bbox_table_,
+                          scm_from_int (signed_idx),
+                          b.smobbed_copy ());
          return b;
        }
     }