* lily/paper-book.cc (output): call output-preview-framework

[lilypond.git] / lily / property-iterator.cc

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index def29de765d6b7a090fd988da1e9a95f1754ed0c..20f9dc68e8aba9b8e3ad24a82b56b288b0a5aaa1 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -21,7 +21,7 @@ void
 Property_iterator::process (Moment m)
 {
   SCM sym = get_music ()->get_property ("symbol");
-  if (gh_symbol_p (sym))
+  if (ly_c_symbol_p (sym))
     {
       SCM val = get_music ()->get_property ("value");
       bool ok= true;
@@ -82,7 +82,7 @@ check_grob (Music *mus, SCM sym)
 {
   if (!list_p)
     {
-      list_p = gh_eval_str ("list?");
+      list_p = scm_c_eval_string ("list?");
     }
   
   
@@ -106,8 +106,7 @@ Push_property_iterator::process (Moment m)
       SCM val = get_music ()->get_property ("grob-value");
 
       if (to_boolean (get_music ()->get_property ("pop-first"))
-         && !to_boolean (get_music ()->get_property ("once"))
-         )
+         && !to_boolean (get_music ()->get_property ("once")))
        execute_pushpop_property (get_outlet (), sym, eprop, SCM_UNDEFINED);
 
       execute_pushpop_property (get_outlet (), sym, eprop, val);