* lily/grob.cc (mark_smob): mark \layout block from Grob::mark_smob().

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

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 54c3eb18634768d8ebc8f2d075b75d9e0ca41671..9acf07106b601525e6a388cfc0fa85bbbb9390b2 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -1,17 +1,14 @@
-/*   
-  tuplet-engraver.cc --  implement Tuplet_engraver
-  
+/*
+  tuplet-engraver.cc -- implement Tuplet_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "tuplet-bracket.hh"
 #include "note-column.hh"
-#include "time-scaled-music.hh"
 #include "beam.hh"
-#include "music-list.hh"
 #include "engraver.hh"
 #include "spanner.hh"
 
@@ -21,7 +18,7 @@ struct Tuplet_description
   Rational stop_;
   Rational span_stop_;
   Spanner *spanner_;
-  Tuplet_description()
+  Tuplet_description ()
   {
     music_ = 0;
     spanner_ = 0;
@@ -37,7 +34,7 @@ protected:
   Array<Tuplet_description> tuplets_;
 
   virtual void acknowledge_grob (Grob_info);
-  virtual bool try_music (Music*r);
+  virtual bool try_music (Music *r);
   virtual void start_translation_timestep ();
   virtual void process_music ();
 };
@@ -52,13 +49,13 @@ Tuplet_engraver::try_music (Music *music)
        {
          Tuplet_description d;
          d.music_ = music;
-         d.stop_  = now_mom ().main_part_ + music->get_length ().main_part_;
+         d.stop_ = now_mom ().main_part_ + music->get_length ().main_part_;
          d.span_stop_ = d.stop_;
-         
+
          SCM s = get_property ("tupletSpannerDuration");
          if (unsmob_moment (s))
            d.span_stop_ = d.span_stop_ <? (now_mom () + *unsmob_moment (s)).main_part_;
-         
+
          tuplets_.push (d);
        }
       return true;
@@ -69,12 +66,12 @@ Tuplet_engraver::try_music (Music *music)
 void
 Tuplet_engraver::process_music ()
 {
-  for (int i= 0; i < tuplets_.size (); i++)
+  for (int i = 0; i < tuplets_.size (); i++)
     {
       if (tuplets_[i].spanner_)
        continue;
 
-      Spanner* spanner = make_spanner ("TupletBracket",
+      Spanner *spanner = make_spanner ("TupletBracket",
                                       tuplets_[i].music_->self_scm ());
       tuplets_[i].spanner_ = spanner;
 
@@ -92,10 +89,10 @@ Tuplet_engraver::acknowledge_grob (Grob_info i)
 {
   if (Note_column::has_interface (i.grob_))
     {
-      for (int j =0; j < tuplets_.size (); j++)
-       if (tuplets_[j].spanner_) 
+      for (int j = 0; j < tuplets_.size (); j++)
+       if (tuplets_[j].spanner_)
          Tuplet_bracket::add_column (tuplets_[j].spanner_,
-                                     dynamic_cast<Item*> (i.grob_));
+                                     dynamic_cast<Item *> (i.grob_));
     }
 }
 
@@ -117,15 +114,15 @@ Tuplet_engraver::start_translation_timestep ()
            {
              if (!sp->get_bound (RIGHT))
                sp->set_bound (RIGHT, sp->get_bound (LEFT));
-             
+
              tuplets_[i].spanner_ = 0;
            }
-         
+
          if (tsd.to_bool ())
            tuplets_[i].span_stop_ += tsd.main_part_;
        }
 
-      if (now.main_part_ >= tuplets_[i].span_stop_)
+      if (now.main_part_ >= tuplets_[i].stop_)
        {
          tuplets_.del (i);
        }
@@ -136,10 +133,10 @@ Tuplet_engraver::Tuplet_engraver ()
 {
 }
 
-ENTER_DESCRIPTION (Tuplet_engraver,
-/* descr */       "Catch Time_scaled_music and generate appropriate bracket  ",
-/* creats*/       "TupletBracket",
-/* accepts */     "time-scaled-music",
-/* acks  */      "note-column-interface",
-/* reads */       "tupletNumberFormatFunction tupletSpannerDuration",
-/* write */       "");
+ADD_TRANSLATOR (Tuplet_engraver,
+               /* descr */ "Catch Time_scaled_music and generate appropriate bracket  ",
+               /* creats*/ "TupletBracket",
+               /* accepts */ "time-scaled-music",
+               /* acks  */ "note-column-interface",
+               /* reads */ "tupletNumberFormatFunction tupletSpannerDuration",
+               /* write */ "");