* lily/horizontal-bracket.cc (make_bracket): new function.

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

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index f5628975eed5510a48277e5d804d06fe1975d5b5..49bfc8bc3a204322c70fad8b73ae10a784450d2d 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -32,8 +32,6 @@ struct Tuplet_description
   }
 };
 
-
-
 class Tuplet_engraver : public Engraver
 {
 public:
@@ -79,7 +77,6 @@ Tuplet_engraver::process_music ()
 {
   if (!tuplets_.size ())
     return;
-  
 
   tuplets_.sort (&Tuplet_description::compare);
   for (int i = 0; i < tuplets_.size (); i++)
@@ -91,10 +88,10 @@ Tuplet_engraver::process_music ()
                                       tuplets_[i].music_->self_scm ());
       tuplets_[i].spanner_ = spanner;
 
-      if (i > 0 && tuplets_[i-1].spanner_)
-       Tuplet_bracket::add_tuplet_bracket (tuplets_[i].spanner_, tuplets_[i-1].spanner_);
-      if (i < tuplets_.size()-1 && tuplets_[i+1].spanner_)
-       Tuplet_bracket::add_tuplet_bracket (tuplets_[i+1].spanner_, tuplets_[i].spanner_);
+      if (i > 0 && tuplets_[i - 1].spanner_)
+       Tuplet_bracket::add_tuplet_bracket (tuplets_[i].spanner_, tuplets_[i - 1].spanner_);
+      if (i < tuplets_.size () - 1 && tuplets_[i + 1].spanner_)
+       Tuplet_bracket::add_tuplet_bracket (tuplets_[i + 1].spanner_, tuplets_[i].spanner_);
 
       SCM proc = get_property ("tupletNumberFormatFunction");
       if (ly_is_procedure (proc))
@@ -119,13 +116,13 @@ Tuplet_engraver::start_translation_timestep ()
 {
   Moment now = now_mom ();
 
-  if (tuplets_.is_empty())
+  last_tuplets_.clear ();
+  if (tuplets_.is_empty ())
     return;
 
   Moment tsdmom = robust_scm2moment (get_property ("tupletSpannerDuration"), Moment (0));
   bool full_length = to_boolean (get_property ("tupletFullLength"));
 
-  last_tuplets_.clear ();
   for (int i = tuplets_.size (); i--;)
     {
       Rational tsd = tsdmom.main_part_;
@@ -134,10 +131,10 @@ Tuplet_engraver::start_translation_timestep ()
        {
          if (tuplets_[i].spanner_)
            {
-             if (full_length )
+             if (full_length)
                {
-                 Item * col = unsmob_item (get_property ("currentMusicalColumn"));
-             
+                 Item *col = unsmob_item (get_property ("currentMusicalColumn"));
+
                  tuplets_[i].spanner_->set_bound (RIGHT, col);
                }
              else if (!tuplets_[i].spanner_->get_bound (RIGHT))
@@ -153,9 +150,7 @@ Tuplet_engraver::start_translation_timestep ()
        }
 
       if (now.main_part_ >= tuplets_[i].stop_)
-       {
-         tuplets_.del (i);
-       }
+       tuplets_.del (i);
     }
 }
 
@@ -166,7 +161,7 @@ Tuplet_engraver::finalize ()
     {
       for (int i = 0; i < last_tuplets_.size (); i++)
        {
-         Item * col = unsmob_item (get_property ("currentCommandColumn"));
+         Item *col = unsmob_item (get_property ("currentCommandColumn"));
          last_tuplets_[i]->set_bound (RIGHT, col);
        }
     }
@@ -176,10 +171,10 @@ Tuplet_engraver::Tuplet_engraver ()
 {
 }
 
-ADD_ACKNOWLEDGER (Tuplet_engraver,note_column);
+ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
 ADD_TRANSLATOR (Tuplet_engraver,
-               /* descr */ "Catch Time_scaled_music and generate appropriate bracket  ",
-               /* creats*/ "TupletBracket",
-               /* accepts */ "time-scaled-music",
-               /* reads */ "tupletNumberFormatFunction tupletSpannerDuration tupletFullLength" ,
+               /* doc */ "Catch Time_scaled_music and generate appropriate bracket  ",
+               /* create */ "TupletBracket",
+               /* accept */ "time-scaled-music",
+               /* read */ "tupletNumberFormatFunction tupletSpannerDuration tupletFullLength",
                /* write */ "");