* input/test/slur-shape.ly (x): remove file.

[lilypond.git] / lily / translator-def.cc

diff --git a/lily/translator-def.cc b/lily/translator-def.cc
index 38457e2543d0ae6d2c93d56d38e7631daccd799d..3873850d01157d5fca67899af44f4630ccf418fa 100644 (file)
--- a/lily/translator-def.cc
+++ b/lily/translator-def.cc
@@ -54,7 +54,6 @@ Translator_def::Translator_def ()
   description_ = SCM_EOL;
 
   smobify_self();
-  
 }
 
 Translator_def::~Translator_def ()
@@ -142,23 +141,15 @@ Translator_def::add_last_element (SCM s)
 {
   this->end_consists_name_list_ = modify_definition (this->end_consists_name_list_, s, true);
 }
-void
-Translator_def::add_push_property (SCM props, SCM syms,  SCM vals)
-{
-  this->property_ops_ = gh_cons (scm_list_n (ly_symbol2scm ("push"), props, syms, vals, SCM_UNDEFINED),
-                                this->property_ops_);
-}
 
 void
-Translator_def::add_pop_property (SCM props, SCM syms)
+Translator_def::add_property_operation (SCM what)
 {
-  this->property_ops_ = gh_cons (scm_list_n (ly_symbol2scm ("push"), props, syms, SCM_UNDEFINED),
-                                this->property_ops_);
+  this->property_ops_ = gh_cons (what, this->property_ops_);
 }
 
 
 
-
 Link_array<Translator_def>
 Translator_def::path_to_acceptable_translator (SCM type_sym, Music_output_def* odef) const
 {
@@ -176,7 +167,6 @@ Translator_def::path_to_acceptable_translator (SCM type_sym, Music_output_def* o
   Link_array<Translator_def> best_result;
   for (int i=0; i < accepteds.size (); i++)
     {
-
       /*
        don't check aliases, because \context Staff should not create RhythmicStaff.
       */
@@ -261,31 +251,13 @@ Translator_def::instantiate (Music_output_def* md)
   return tg;
 }
 
-
 void
-Translator_def::apply_property_operations (Translator_group*tg)
+Translator_def::apply_default_property_operations (Translator_group*tg)
 {
-  SCM correct_order = scm_reverse (property_ops_); // pity of the mem.
-  for (SCM s = correct_order; gh_pair_p (s); s = ly_cdr (s))
-    {
-      SCM entry = ly_car (s);
-      SCM type = ly_car (entry);
-      entry = ly_cdr (entry); 
-      
-      if (type == ly_symbol2scm ("push"))
-       {
-         SCM val = ly_cddr (entry);
-         val = gh_pair_p (val) ? ly_car (val) : SCM_UNDEFINED;
-
-         tg->execute_pushpop_property (ly_car (entry), ly_cadr (entry), val);
-       }
-      else if (type == ly_symbol2scm ("assign"))
-       {
-         tg->internal_set_property (ly_car (entry), ly_cadr (entry));
-       }
-    }
+  apply_property_operations (tg, property_ops_);
 }
 
+
 SCM
 Translator_def::clone_scm () const
 {
@@ -302,12 +274,6 @@ Translator_def::make_scm ()
   return t->self_scm();
 }
 
-void
-Translator_def::add_property_assign (SCM nm, SCM val)
-{
-  this->property_ops_ = gh_cons (scm_list_n (ly_symbol2scm ("assign"), scm_string_to_symbol (nm), val, SCM_UNDEFINED),
-                                this->property_ops_);
-}
 
 /*
   Default child context as a SCM string, or something else if there is