* lily/paper-score.cc (process): Do not show progress newline.

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

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 128238a34364c20de43c25c11bfbb228bd7f5b9c..70378670ebc28cf85e08c359e2dfdf5053e0b377 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -20,7 +20,7 @@
 class Tuplet_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Tuplet_engraver);
+  TRANSLATOR_DECLARATIONS (Tuplet_engraver);
 
 protected:
   Link_array<Music> time_scaled_musics_;
@@ -32,7 +32,6 @@ protected:
   /// The spanners. Array order is synced with time_scaled_musics_
   Link_array<Spanner> started_spanners_;
 
-  virtual void finalize ();
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music*r);
   virtual void start_translation_timestep ();
@@ -70,7 +69,7 @@ Tuplet_engraver::process_acknowledged_grobs ()
       if (i < started_spanners_.size () && started_spanners_[i])
        continue;
 
-      Spanner* glep = make_spanner ("TupletBracket");
+      Spanner* glep = make_spanner ("TupletBracket", time_scaled_musics_ [i]->self_scm ());
 
       if (i >= started_spanners_.size ())
        started_spanners_.push (glep);
@@ -79,13 +78,12 @@ Tuplet_engraver::process_acknowledged_grobs ()
       
 
       SCM proc = get_property ("tupletNumberFormatFunction");
-      if (gh_procedure_p (proc))
+      if (ly_c_procedure_p (proc))
        {
-         SCM t = gh_apply (proc, scm_list_n (time_scaled_musics_[i]->self_scm (), SCM_UNDEFINED));
+         SCM t = scm_apply_0 (proc, scm_list_n (time_scaled_musics_[i]->self_scm (), SCM_UNDEFINED));
          glep->set_property ("text", t);
        }
       
-      announce_grob(glep, time_scaled_musics_ [i]->self_scm());
     }
 }
 
@@ -94,7 +92,7 @@ Tuplet_engraver::acknowledge_grob (Grob_info i)
 {
   if (Note_column::has_interface (i.grob_))
     {
-      for (int j =0; j  <started_spanners_.size (); j++)
+      for (int j =0; j < started_spanners_.size (); j++)
        if (started_spanners_[j]) 
          Tuplet_bracket::add_column (started_spanners_[j], dynamic_cast<Item*> (i.grob_));
     }
@@ -119,8 +117,6 @@ Tuplet_engraver::start_translation_timestep ()
              if (!sp->get_bound (RIGHT))
                sp->set_bound (RIGHT, sp->get_bound (LEFT));
              
-             typeset_grob (sp);
-
              started_spanners_[i] =0;
            }
          
@@ -138,21 +134,11 @@ Tuplet_engraver::start_translation_timestep ()
     }
 }
 
-void
-Tuplet_engraver::finalize ()
+Tuplet_engraver::Tuplet_engraver ()
 {
-  for (int i=0; i < started_spanners_.size (); i++)
-    {
-      if (started_spanners_[i])
-       typeset_grob (started_spanners_[i]);
-    }  
 }
 
-
-
-Tuplet_engraver::Tuplet_engraver(){}
-
-ENTER_DESCRIPTION(Tuplet_engraver,
+ENTER_DESCRIPTION (Tuplet_engraver,
 /* descr */       "Catch Time_scaled_music and generate appropriate bracket  ",
 /* creats*/       "TupletBracket",
 /* accepts */     "time-scaled-music",