]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/tuplet-engraver.cc
* scm/lily.scm (ly:all-stencil-expressions):
[lilypond.git] / lily / tuplet-engraver.cc
index b751d5eae7d4d4a9ae825e4642c3e786ba9f79d0..70378670ebc28cf85e08c359e2dfdf5053e0b377 100644 (file)
@@ -1,31 +1,60 @@
 /*   
-  auto-plet-engraver.cc --  implement Auto_plet_engraver
+  plet-engraver.cc --  implement Tuplet_engraver
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "tuplet-engraver.hh"
-#include "command-request.hh"
-#include "tuplet-spanner.hh"
+
+
+#include "tuplet-bracket.hh"
 #include "note-column.hh"
-#include "compressed-music.hh"
-#include "text-def.hh"
+#include "time-scaled-music.hh"
 #include "beam.hh"
 #include "music-list.hh"
+#include "engraver.hh"
+#include "spanner.hh"
+
+class Tuplet_engraver : public Engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS (Tuplet_engraver);
+
+protected:
+  Link_array<Music> time_scaled_musics_;
+  /// when does the scaled music stop? Array order is synced with time_scaled_musics_
+  Array<Rational> stop_moments_;
+  /// when does the current spanner stop? Array order is synced with time_scaled_musics_
+  Array<Rational> span_stop_moments_;
+  
+  /// The spanners. Array order is synced with time_scaled_musics_
+  Link_array<Spanner> started_spanners_;
+
+  virtual void acknowledge_grob (Grob_info);
+  virtual bool try_music (Music*r);
+  virtual void start_translation_timestep ();
+  virtual void process_acknowledged_grobs ();
+};
 
 bool
-Tuplet_engraver::do_try_music (Music *r)
+Tuplet_engraver::try_music (Music *c)
 {
-  if (Compressed_music * c = dynamic_cast<Compressed_music *> (r))
+  if (c->is_mus_type ("time-scaled-music"))
     {
-      Music *el = c->element_l ();
-      if (!dynamic_cast<Request_chord*> (el))
+      Music *el = unsmob_music (c->get_property ("element"));
+      if (el && !el->is_mus_type ("event-chord"))
        {
-         compressed_music_arr_.push (c);
-         stop_moments_.push (now_mom () + c->length_mom ());
+         time_scaled_musics_.push (c);
+         Rational m = now_mom ().main_part_ + c->get_length ().main_part_;
+         stop_moments_.push (m);
+
+         SCM s = get_property ("tupletSpannerDuration");
+         if (unsmob_moment (s))
+           m = m <? (now_mom () + *unsmob_moment (s)).main_part_;
+         
+         span_stop_moments_.push (m);
        }
       return true;
     }
@@ -33,60 +62,86 @@ Tuplet_engraver::do_try_music (Music *r)
 }
 
 void
-Tuplet_engraver::do_process_requests ()
+Tuplet_engraver::process_acknowledged_grobs ()
 {
-  for (int i= started_span_p_arr_.size ();
-       i < compressed_music_arr_.size (); i++)
+  for (int i= 0; i < time_scaled_musics_.size (); i++)
     {
-      Tuplet_spanner* glep = new Tuplet_spanner;
-      started_span_p_arr_.push (glep);
+      if (i < started_spanners_.size () && started_spanners_[i])
+       continue;
+
+      Spanner* glep = make_spanner ("TupletBracket", time_scaled_musics_ [i]->self_scm ());
 
-      Text_def *t = new Text_def;
-      t->text_str_ = to_str (compressed_music_arr_[i]->den_i_);
-      glep->tdef_p_.set_p  (t);
-      announce_element (Score_element_info (glep, compressed_music_arr_ [i]));
+      if (i >= started_spanners_.size ())
+       started_spanners_.push (glep);
+      else
+       started_spanners_[i] = glep;
+      
+
+      SCM proc = get_property ("tupletNumberFormatFunction");
+      if (ly_c_procedure_p (proc))
+       {
+         SCM t = scm_apply_0 (proc, scm_list_n (time_scaled_musics_[i]->self_scm (), SCM_UNDEFINED));
+         glep->set_property ("text", t);
+       }
+      
     }
 }
 
 void
-Tuplet_engraver::acknowledge_element (Score_element_info i)
+Tuplet_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_column *nc = dynamic_cast<Note_column *> (i.elem_l_))
-    {
-      for (int j =0; j  <started_span_p_arr_.size (); j++)
-       started_span_p_arr_[j]->add_column (nc);
-    }
-  else if (Beam *b = dynamic_cast<Beam *> (i.elem_l_))
+  if (Note_column::has_interface (i.grob_))
     {
-      for (int j = 0; j < started_span_p_arr_.size (); j++)
-       started_span_p_arr_[j]->set_beam (b);
+      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_));
     }
 }
 
 void
-Tuplet_engraver::do_post_move_processing ()
+Tuplet_engraver::start_translation_timestep ()
 {
   Moment now = now_mom ();
-  for (int i= started_span_p_arr_.size (); i--; )
+
+  Moment tsd;
+  SCM s = get_property ("tupletSpannerDuration");
+  if (unsmob_moment (s))
+    tsd = unsmob_moment (s)->main_part_;
+
+  for (int i= started_spanners_.size (); i--;)
     {
-      if (now >= stop_moments_[i])
+      if (now.main_part_ >= span_stop_moments_[i])
        {
-         typeset_element (started_span_p_arr_[i]);
-         started_span_p_arr_.del (i);
-         stop_moments_.del(i);
-         compressed_music_arr_.del(i);
+         if (Spanner *sp = started_spanners_[i])
+           {
+             if (!sp->get_bound (RIGHT))
+               sp->set_bound (RIGHT, sp->get_bound (LEFT));
+             
+             started_spanners_[i] =0;
+           }
+         
+         if (tsd.to_bool ())
+           span_stop_moments_[i] += tsd.main_part_;
+       }
+
+      if (now.main_part_ >= stop_moments_[i])
+       {
+         started_spanners_.del (i);
+         stop_moments_.del (i);
+         span_stop_moments_.del (i);
+         time_scaled_musics_.del (i);
        }
     }
 }
 
-void
-Tuplet_engraver::do_removal_processing ()
+Tuplet_engraver::Tuplet_engraver ()
 {
-  for (int i=0; i < started_span_p_arr_.size (); i++)
-    {
-      typeset_element (started_span_p_arr_[i]);
-    }  
 }
 
-ADD_THIS_TRANSLATOR(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 */       "");