* lily/engraver.cc (internal_make_item): centralize item/spanner

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 3a836cee47ee2d7d10fa1534945fe3713c26e109..79377e0176ae57ad60d9b3c5f869cfef4efcc0d1 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -64,7 +64,6 @@ protected:
   virtual bool try_music (Music *req);
   virtual void stop_translation_timestep ();
   virtual void process_music ();  
-  virtual void start_translation_timestep ();
 };
 
 
@@ -84,14 +83,6 @@ Dynamic_engraver::Dynamic_engraver ()
   accepted_spanreqs_drul_[STOP] = 0;
 }
 
-void
-Dynamic_engraver::start_translation_timestep ()
-{
-  script_ev_ = 0;
-  accepted_spanreqs_drul_[START] = 0;
-  accepted_spanreqs_drul_[STOP] = 0;
-}
-
 bool
 Dynamic_engraver::try_music (Music * m)
 {
@@ -122,7 +113,10 @@ Dynamic_engraver::try_music (Music * m)
           || m->is_mus_type ("crescendo-event"))
     {
       Direction d = to_dir (m->get_mus_property ("span-direction"));
+
       accepted_spanreqs_drul_[d] = m;
+      if (current_cresc_ev_ && d == START)
+       accepted_spanreqs_drul_[STOP] = m;
       return true;
     }
   return false;
@@ -135,7 +129,7 @@ Dynamic_engraver::process_music ()
     {
       if (!line_spanner_)
        {
-         line_spanner_ = new Spanner (get_property ("DynamicLineSpanner"));
+         line_spanner_ = make_spanner ("DynamicLineSpanner");
 
          Music * rq = accepted_spanreqs_drul_[START];
          if (script_ev_)
@@ -161,13 +155,13 @@ Dynamic_engraver::process_music ()
   */
   if (script_ev_)
     {
-      script_ = new Item (get_property ("DynamicText"));
+      script_ = make_item ("DynamicText");
       script_->set_grob_property ("text",
                                   script_ev_->get_mus_property ("text"));
 
       
       if (Direction d = to_dir (script_ev_->get_mus_property ("direction")))
-       Directional_element_interface::set (line_spanner_, d);
+       set_grob_direction (line_spanner_, d);
 
       Axis_group_interface::add_element (line_spanner_, script_);
 
@@ -224,7 +218,7 @@ Dynamic_engraver::process_music ()
          current_cresc_ev_ = accepted_spanreqs_drul_[START];
 
          if (Direction d = to_dir (current_cresc_ev_->get_mus_property ("direction")))
-           Directional_element_interface::set (line_spanner_, d);
+           set_grob_direction (line_spanner_, d);
 
          /*
            TODO: Use symbols.
@@ -244,7 +238,7 @@ Dynamic_engraver::process_music ()
          SCM s = get_property ((start_type + "Spanner").to_str0 ());
          if (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
            {
-             cresc_  = new Spanner (get_property ("Hairpin"));
+             cresc_  = make_spanner ("Hairpin");
              cresc_->set_grob_property ("grow-direction",
                                           gh_int2scm ((start_type == "crescendo")
                                                       ? BIGGER : SMALLER));
@@ -259,8 +253,8 @@ Dynamic_engraver::process_music ()
          */
          else
            {
-             cresc_  = new Spanner (get_property ("TextSpanner"));
-             cresc_->set_grob_property ("type", s);
+             cresc_  = make_spanner ("TextSpanner");
+             cresc_->set_grob_property ("style", s);
              daddy_trans_->set_property ((start_type
                                            + "Spanner").to_str0 (), SCM_EOL);
              s = get_property ((start_type + "Text").to_str0 ());
@@ -299,6 +293,10 @@ Dynamic_engraver::stop_translation_timestep ()
       line_spanner_ =0;
       typeset_all ();
     }
+
+  script_ev_ = 0;
+  accepted_spanreqs_drul_[START] = 0;
+  accepted_spanreqs_drul_[STOP] = 0;
 }
 
 void