* mf/merge.pe.in: Set font names, version, license GPL.

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 0073a880eeb084dc319d105d9b5ecf184af20874..dab482036b9b1e94cbc19f922d93e1c31f239a2a 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -7,10 +7,8 @@
   
  */
 
-#include "event.hh"
 #include "tie.hh"
 #include "context.hh"
-
 #include "protected-scm.hh"
 #include "spanner.hh"
 #include "tie-column.hh"
@@ -109,7 +107,7 @@ Tie_engraver::acknowledge_grob (Grob_info i)
              && ly_c_equal_p (right_mus->get_property ("pitch"),
                             left_mus->get_property ("pitch")))
            {
-             Grob * p = new Spanner  (tie_start_definition_, get_grob_key ("Tie"));
+             Grob * p = new Spanner  (tie_start_definition_, context()->get_grob_key ("Tie"));
              announce_grob (p, last_event_->self_scm ());
              Tie::set_interface (p); // cannot remove yet!
          
@@ -146,14 +144,14 @@ Tie_engraver::stop_translation_timestep ()
   if (ties_.size ())
     {
       heads_to_tie_.clear ();
-      for (int i=0; i<  ties_.size (); i++)
+      for (int i = 0; i<  ties_.size (); i++)
        {
          typeset_tie (ties_[i]);
        }
 
       ties_.clear ();
       last_event_ = 0;
-      tie_column_ =0;
+      tie_column_ = 0;
     }
   
   if (event_)
@@ -187,7 +185,7 @@ Tie_engraver::typeset_tie (Grob *her)
 }
 
 
-ENTER_DESCRIPTION (Tie_engraver,
+ADD_TRANSLATOR (Tie_engraver,
 /* descr */       "Generate ties between noteheads of equal pitch.",
 /* creats*/       "Tie TieColumn",
 /* accepts */     "tie-event",