X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-engraver.cc;h=4c67c67f112f8143534c0c4f1979bdb5dc4a8a9a;hb=7979d8adaa8393daefd6585534221a93dd526758;hp=478ad40abd99345b213c8a74459423020e671490;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 478ad40abd..4c67c67f11 100644
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -1,30 +1,61 @@
 /*   
-  auto-plet-engraver.cc --  implement Auto_plet_engraver
+  plet-engraver.cc --  implement Tuplet_engraver
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2003 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 "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 finalize ();
+  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 (Time_scaled_music * c = dynamic_cast<Time_scaled_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_mus_property ("element"));
+      if (el && !el->is_mus_type ("event-chord"))
 	{
-	  time_scaled_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;
     }
@@ -32,79 +63,99 @@ Tuplet_engraver::do_try_music (Music *r)
 }
 
 void
-Tuplet_engraver::do_process_requests ()
+Tuplet_engraver::process_acknowledged_grobs ()
 {
-  int dir = 0;
-  SCM prop = get_property ("tupletDirection", 0);
-  if (isdir_b (prop))
-    dir = to_dir (prop);
-  int visibility = 3;
-  prop = get_property ("tupletVisibility", 0);
-  if (gh_number_p(prop))
-    visibility = gh_scm2int (prop);	// bool ?
-
-  for (int i= started_span_p_arr_.size ();
-       i < time_scaled_music_arr_.size (); i++)
+  SCM v = get_property ("tupletInvisible");
+  if (to_boolean (v))
+    return;
+
+  for (int i= 0; i < time_scaled_musics_.size (); i++)
     {
-      Tuplet_spanner* glep = new Tuplet_spanner;
-      started_span_p_arr_.push (glep);
-      glep->set_elt_property ("text",
-			      ly_str02scm (to_str (time_scaled_music_arr_[i]->den_i_).ch_C()));
+      if (i < started_spanners_.size () && started_spanners_[i])
+	continue;
+
+      Spanner* glep = new Spanner (get_property ("TupletBracket"));
+
+      if (i >= started_spanners_.size ())
+	started_spanners_.push (glep);
+      else
+	started_spanners_[i] = glep;
+      
+
+      SCM proc = get_property ("tupletNumberFormatFunction");
+      if (gh_procedure_p (proc))
+	{
+	  SCM t = gh_apply (proc, scm_list_n (time_scaled_musics_[i]->self_scm (), SCM_UNDEFINED));
+	  glep->set_grob_property ("text", t);
+	}
       
-      glep->set_elt_property("tuplet-visibility",
-                             gh_int2scm (visibility));
-      if (dir != 0)
-	glep->set_elt_property("dir-forced", gh_int2scm (dir));
-      announce_element (Score_element_info (glep, time_scaled_music_arr_ [i]));
+      announce_grob(glep, time_scaled_musics_ [i]->self_scm());
     }
 }
 
 void
-Tuplet_engraver::acknowledge_element (Score_element_info i)
+Tuplet_engraver::acknowledge_grob (Grob_info i)
 {
-  bool grace= to_boolean (i.elem_l_->get_elt_property ("grace"));
-  SCM wg = get_property ("weAreGraceContext",0);
-  bool wgb = to_boolean (wg);
-  if (grace != wgb)
-    return;
-  
-  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]->add_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])
+	{
+	  if (started_spanners_[i])
+	    {
+	      typeset_grob (started_spanners_[i]);
+	      started_spanners_[i] =0;
+	    }
+	  
+	  if (tsd.to_bool ())
+	    span_stop_moments_[i] += tsd.main_part_;
+	}
+
+      if (now.main_part_ >= stop_moments_[i])
 	{
-	  typeset_element (started_span_p_arr_[i]);
-	  started_span_p_arr_.del (i);
-	  stop_moments_.del(i);
-	  time_scaled_music_arr_.del(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::finalize ()
 {
-  for (int i=0; i < started_span_p_arr_.size (); i++)
+  for (int i=0; i < started_spanners_.size (); i++)
     {
-      typeset_element (started_span_p_arr_[i]);
+      if (started_spanners_[i])
+	typeset_grob (started_spanners_[i]);
     }  
 }
 
-ADD_THIS_TRANSLATOR(Tuplet_engraver);
 
 
+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 tupletInvisible",
+/* write */       "");