patch::: 1.3.8.uu1

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

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index ef7c95e23307608a997a185e0569f390fc9db540..e1e0f54c8542b6e2ed70663bed33152470b5b791 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,16 +11,21 @@
 #include "command-request.hh"
 #include "tuplet-spanner.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"
 
 bool
 Tuplet_engraver::do_try_music (Music *r)
 {
-  if (Compressed_music * c = dynamic_cast<Compressed_music *> (r))
+  if (Time_scaled_music * c = dynamic_cast<Time_scaled_music *> (r))
     {
-      compressed_music_arr_.push (c);
-      stop_moments_.push (now_moment () + c->duration ());
+      Music *el = c->element_l ();
+      if (!dynamic_cast<Request_chord*> (el))
+       {
+         time_scaled_music_arr_.push (c);
+         stop_moments_.push (now_mom () + c->length_mom ());
+       }
       return true;
     }
   return false;
@@ -29,33 +34,54 @@ Tuplet_engraver::do_try_music (Music *r)
 void
 Tuplet_engraver::do_process_requests ()
 {
+  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 < compressed_music_arr_.size (); i++)
+       i < time_scaled_music_arr_.size (); i++)
     {
-      Plet_spanner* glep = new Plet_spanner;
+      Tuplet_spanner* glep = new Tuplet_spanner;
       started_span_p_arr_.push (glep);
-
-      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]));
+      glep->number_str_ = to_str (time_scaled_music_arr_[i]->den_i_);
+      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]));
     }
 }
 
 void
 Tuplet_engraver::acknowledge_element (Score_element_info i)
 {
+  bool grace= (i.elem_l_->get_elt_property ("grace") != SCM_UNDEFINED);
+  SCM wg = get_property ("weAreGraceContext",0);
+  bool wgb = gh_boolean_p (wg) && gh_scm2bool (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_))
+    {
+      for (int j = 0; j < started_span_p_arr_.size (); j++)
+       started_span_p_arr_[j]->add_beam (b);
+    }
 }
 
 void
 Tuplet_engraver::do_post_move_processing ()
 {
-  Moment now = now_moment ();
+  Moment now = now_mom ();
   for (int i= started_span_p_arr_.size (); i--; )
     {
       if (now >= stop_moments_[i])
@@ -63,7 +89,7 @@ Tuplet_engraver::do_post_move_processing ()
          typeset_element (started_span_p_arr_[i]);
          started_span_p_arr_.del (i);
          stop_moments_.del(i);
-         compressed_music_arr_.del(i);
+         time_scaled_music_arr_.del(i);
        }
     }
 }
@@ -79,3 +105,4 @@ Tuplet_engraver::do_removal_processing ()
 
 ADD_THIS_TRANSLATOR(Tuplet_engraver);
 
+