X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font.cc;h=255f7caa0d1431e88e1c18eddb2c52284bbebca8;hb=8f2f4d6f0af1626a333050d367211a7d73437082;hp=76bbff86ed0cfdb762a70d3da57bdd9c4647f459;hpb=e1ce25d2f8182442eec316e33b085922c6a9dcae;p=lilypond.git

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 76bbff86ed..255f7caa0d 100644
--- 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2015 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
@@ -77,7 +77,11 @@ load_scheme_table (char const *tag_str, FT_Face face)
       string contents ((char const *)buffer, length);
       contents = "(quote (" + contents + "))";
 
+#if GUILEV2
+      tab = scm_eval_string (scm_from_utf8_string (contents.c_str ()));
+#else
       tab = scm_c_eval_string (contents.c_str ());
+#endif
       free (buffer);
     }
   return tab;
@@ -158,7 +162,7 @@ Open_type_font::attachment_point (const string &glyph_name) const
   SCM entry = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F);
 
   Offset o;
-  if (entry == SCM_BOOL_F)
+  if (scm_is_false (entry))
     return o;
 
   SCM char_alist = entry;
@@ -192,7 +196,7 @@ Open_type_font::get_indexed_char_dimensions (size_t signed_idx) const
       SCM sym = ly_symbol2scm (name);
       SCM alist = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F);
 
-      if (alist != SCM_BOOL_F)
+      if (scm_is_true (alist))
         {
           SCM bbox = scm_cdr (scm_assq (ly_symbol2scm ("bbox"), alist));
 
@@ -337,7 +341,7 @@ Open_type_font::glyph_list () const
         warning (_f ("FT_Get_Glyph_Name () error: %s",
                      freetype_error_string (code).c_str ()));
 
-      *tail = scm_cons (scm_from_locale_string (name), SCM_EOL);
+      *tail = scm_cons (scm_from_ascii_string (name), SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }