X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-interface.cc;h=ea9b81ad9f9dc666e79998901dead9b5f731e814;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=edda80ad2dfce020650200aa941f7844d277450c;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index edda80ad2d..ea9b81ad9f 100644
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2002--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
@@ -27,8 +27,8 @@
 #include "misc.hh"
 
 SCM add_interface (char const *cxx_name,
-		    char const *descr,
-		    char const *vars)
+                   char const *descr,
+                   char const *vars)
 {
   string suffix ("-interface");
   string lispy_name = camel_case_to_lisp_identifier (cxx_name);
@@ -37,7 +37,7 @@ SCM add_interface (char const *cxx_name,
     lispy_name += suffix;
 
   SCM s = ly_symbol2scm (lispy_name.c_str ());
-  SCM d = scm_from_locale_string (descr);
+  SCM d = scm_from_utf8_string (descr);
   SCM l = parse_symbol_list (vars);
 
   internal_add_interface (s, d, l);
@@ -48,10 +48,10 @@ SCM add_interface (char const *cxx_name,
 void
 check_interfaces_for_property (Grob const *me, SCM sym)
 {
-  if (sym == ly_symbol2scm ("meta"))
+  if (scm_is_eq (sym, ly_symbol2scm ("meta")))
     {
       /*
-	otherwise we get in a nasty recursion loop.
+        otherwise we get in a nasty recursion loop.
       */
       return;
     }
@@ -63,22 +63,22 @@ check_interfaces_for_property (Grob const *me, SCM sym)
   for (; !found && scm_is_pair (ifs); ifs = scm_cdr (ifs))
     {
       SCM iface = scm_hashq_ref (all_ifaces, scm_car (ifs), SCM_BOOL_F);
-      if (iface == SCM_BOOL_F)
-	{
-	  string msg = to_string (_f ("Unknown interface `%s'",
-				      ly_symbol2string (scm_car (ifs)).c_str ()));
-	  programming_error (msg);
-	  continue;
-	}
+      if (scm_is_false (iface))
+        {
+          string msg = to_string (_f ("Unknown interface `%s'",
+                                      ly_symbol2string (scm_car (ifs)).c_str ()));
+          programming_error (msg);
+          continue;
+        }
 
-      found = found || (scm_c_memq (sym, scm_caddr (iface)) != SCM_BOOL_F);
+      found = found || scm_is_true (scm_c_memq (sym, scm_caddr (iface)));
     }
 
   if (!found)
     {
       string str = to_string (_f ("Grob `%s' has no interface for property `%s'",
-				  me->name ().c_str (),
-				  ly_symbol2string (sym).c_str ()));
+                                  me->name ().c_str (),
+                                  ly_symbol2string (sym).c_str ()));
       programming_error (str);
     }
 }