release: 1.5.7

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

diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc
index d56ee274c8f83c37c5bfeb889e8d5ce20d22be39..62096373140702908231a55dcbfb55a3010d22a0 100644 (file)
--- a/lily/property-engraver.cc
+++ b/lily/property-engraver.cc
@@ -31,19 +31,19 @@ protected:
   virtual void initialize ();
   virtual void finalize ();
 public:
-  ~Property_engraver();
-  Property_engraver();
-  VIRTUAL_COPY_CONS(Translator);
+  ~Property_engraver ();
+  Property_engraver ();
+  VIRTUAL_COPY_CONS (Translator);
 };
 
 
 
-Property_engraver::Property_engraver()
+Property_engraver::Property_engraver ()
 {
   prop_dict_ = 0;
 }
 void
-Property_engraver::finalize()
+Property_engraver::finalize ()
 {
   
 }
@@ -51,7 +51,7 @@ Property_engraver::finalize()
 Property_engraver::~Property_engraver ()
 {
   if (prop_dict_)
-    scm_unprotect_object (prop_dict_->self_scm ());
+    scm_gc_unprotect_object (prop_dict_->self_scm ());
 }
 
 void
@@ -103,7 +103,7 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
       SCM type_p   = gh_cadr (entry);
       SCM elt_prop_sym = gh_caddr (entry);
 
-      SCM preset = scm_assq(elt_prop_sym, e->mutable_property_alist_);
+      SCM preset = scm_assq (elt_prop_sym, e->mutable_property_alist_);
       if (preset != SCM_BOOL_F)
        continue;
   
@@ -111,14 +111,14 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
 
       if (val == SCM_EOL)
        ;                       // Not defined in context.
-      else if (gh_apply (type_p, scm_listify (val, SCM_UNDEFINED))
+      else if (gh_apply (type_p, scm_list_n (val, SCM_UNDEFINED))
               == SCM_BOOL_T)   // defined and  right type: do it
        {
          e->set_grob_property (elt_prop_sym, val);
 
          SCM meta = e->get_grob_property ("meta");
          SCM name = scm_assoc (ly_symbol2scm ("name"), meta);
-         warning (_f ("%s is deprecated.  Use\n \\property %s.%s \\override #'%s = #%s",
+         warning (_f ("`%s' is deprecated.  Use\n \\property %s.%s \\override #'%s = #%s",
                       ly_symbol2string (prop_sym).ch_C (),
                       origin->type_str_.ch_C (),
                       ly_scm2string (gh_cdr (name)).ch_C (),
@@ -140,7 +140,7 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
        if (val != SCM_EOL)
          {                     // not the right type: error message.
            SCM errport = scm_current_error_port ();
-           SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL);
+           SCM typefunc = scm_primitive_eval (ly_symbol2scm ("type-name"));
            SCM type_name = gh_call1 (typefunc, type_p);
            warning (_f ("Wrong type for property: %s, type: %s, value found: %s, type: %s",
                         ly_symbol2string (prop_sym).ch_C (),
@@ -152,4 +152,4 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
     }
 }
 
-ADD_THIS_TRANSLATOR(Property_engraver);
+ADD_THIS_TRANSLATOR (Property_engraver);