Add beam typenames to typename list.

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

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 6be9dc41f83a29a2b2dfc0d951404bbded164444..73d93ccb7dd103079722f1d06e100628951f813d 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length)
       return buffer;
     }
   else
-    programming_error (_f ("Free type error: %s",
+    programming_error (_f ("FreeType error: %s",
                           freetype_error_string (error_code).c_str ()
                           ));
 
@@ -172,7 +172,7 @@ Open_type_font::get_indexed_char_dimensions (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_unsigned (signed_idx), SCM_BOOL_F);
+                              scm_from_unsigned_integer (signed_idx), SCM_BOOL_F);
       Box *box_ptr = Box::unsmob (box);
       if (box_ptr)
        return *box_ptr;
@@ -208,7 +208,7 @@ Open_type_font::get_indexed_char_dimensions (size_t signed_idx) const
          b.scale (point_constant);
 
          scm_hashq_set_x (lily_index_to_bbox_table_,
-                          scm_from_unsigned (signed_idx),
+                          scm_from_unsigned_integer (signed_idx),
                           b.smobbed_copy ());
          return b;
        }
@@ -270,7 +270,7 @@ Open_type_font::design_size () const
                               which will trip errors more
                               quickly. --hwn.
                             */
-                            scm_from_unsigned (1));
+                            scm_from_unsigned_integer (1));
   return scm_to_double (entry) * Real (point_constant);
 }