po-replace

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

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 7568a08679c7bffe6c4588c6a1f8b7b7be0b9376..8ace269d131fbbc0782b35f709f97aca740ed9a1 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -3,13 +3,13 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 
 #include "command-request.hh"
-#include "tuplet-spanner.hh"
+#include "tuplet-bracket.hh"
 #include "note-column.hh"
 #include "time-scaled-music.hh"
 #include "beam.hh"
@@ -20,14 +20,14 @@
 class Tuplet_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(Tuplet_engraver);
 
 protected:
   Link_array<Time_scaled_music> time_scaled_music_arr_;
   /// when does the scaled music stop? Array order is synced with time_scaled_music_arr_
-  Array<Moment> stop_moments_;
+  Array<Rational> stop_moments_;
   /// when does the current spanner stop? Array order is synced with time_scaled_music_arr_
-  Array<Moment> span_stop_moments_;
+  Array<Rational> span_stop_moments_;
   
   /// The spanners. Array order is synced with time_scaled_music_arr_
   Link_array<Spanner> started_span_p_arr_;
@@ -48,12 +48,12 @@ Tuplet_engraver::try_music (Music *r)
       if (!dynamic_cast<Request_chord*> (el))
        {
          time_scaled_music_arr_.push (c);
-         Moment m = now_mom () + c->length_mom ();
+         Rational m = now_mom ().main_part_ + c->length_mom ().main_part_;
          stop_moments_.push (m);
 
          SCM s = get_property ("tupletSpannerDuration");
          if (unsmob_moment (s))
-           m = m <? (now_mom () + *unsmob_moment (s));
+           m = m <? (now_mom () + *unsmob_moment (s)).main_part_;
          
          span_stop_moments_.push (m);
        }
@@ -75,7 +75,7 @@ Tuplet_engraver::create_grobs ()
        continue;
 
       Spanner* glep = new Spanner (get_property ("TupletBracket"));
-      Tuplet_bracket::set_interface (glep);
+
       if (i >= started_span_p_arr_.size ())
        started_span_p_arr_.push (glep);
       else
@@ -85,34 +85,22 @@ Tuplet_engraver::create_grobs ()
       SCM proc = get_property ("tupletNumberFormatFunction");
       if (gh_procedure_p (proc))
        {
-         SCM t = gh_apply (proc, gh_list (time_scaled_music_arr_[i]->self_scm (), SCM_UNDEFINED));
+         SCM t = gh_apply (proc, scm_list_n (time_scaled_music_arr_[i]->self_scm (), SCM_UNDEFINED));
          glep->set_grob_property ("text", t);
        }
       
-      announce_grob (glep, time_scaled_music_arr_ [i]);
+      announce_grob(glep, time_scaled_music_arr_ [i]->self_scm());
     }
 }
 
 void
 Tuplet_engraver::acknowledge_grob (Grob_info i)
 {
-  bool grace= to_boolean (i.elem_l_->get_grob_property ("grace"));
-  SCM wg = get_property ("weAreGraceContext");
-  bool wgb = to_boolean (wg);
-  if (grace != wgb)
-    return;
-  
-  if (Note_column::has_interface (i.elem_l_))
+  if (Note_column::has_interface (i.grob_l_))
     {
       for (int j =0; j  <started_span_p_arr_.size (); j++)
        if (started_span_p_arr_[j]) 
-         Tuplet_bracket::add_column (started_span_p_arr_[j], dynamic_cast<Item*> (i.elem_l_));
-    }
-  else if (Beam::has_interface (i.elem_l_))
-    {
-      for (int j = 0; j < started_span_p_arr_.size (); j++)
-       if (started_span_p_arr_[j]) 
-         Tuplet_bracket::add_beam (started_span_p_arr_[j],i.elem_l_);
+         Tuplet_bracket::add_column (started_span_p_arr_[j], dynamic_cast<Item*> (i.grob_l_));
     }
 }
 
@@ -124,11 +112,11 @@ Tuplet_engraver::start_translation_timestep ()
   Moment tsd;
   SCM s = get_property ("tupletSpannerDuration");
   if (unsmob_moment (s))
-    tsd = *unsmob_moment (s);
+    tsd = unsmob_moment (s)->main_part_;
 
   for (int i= started_span_p_arr_.size (); i--;)
     {
-      if (now >= span_stop_moments_[i])
+      if (now.main_part_ >= span_stop_moments_[i])
        {
          if (started_span_p_arr_[i])
            {
@@ -136,11 +124,11 @@ Tuplet_engraver::start_translation_timestep ()
              started_span_p_arr_[i] =0;
            }
          
-         if (tsd)
-           span_stop_moments_[i] += tsd;
+         if (tsd.to_bool ())
+           span_stop_moments_[i] += tsd.main_part_;
        }
 
-      if (now >= stop_moments_[i])
+      if (now.main_part_ >= stop_moments_[i])
        {
          started_span_p_arr_.del (i);
          stop_moments_.del (i);
@@ -160,6 +148,13 @@ Tuplet_engraver::finalize ()
     }  
 }
 
-ADD_THIS_TRANSLATOR (Tuplet_engraver);
 
 
+Tuplet_engraver::Tuplet_engraver(){}
+
+ENTER_DESCRIPTION(Tuplet_engraver,
+/* descr */       "Catch Time_scaled_music and generate appropriate bracket  ",
+/* creats*/       "TupletBracket",
+/* acks  */       "note-column-interface",
+/* reads */       "tupletNumberFormatFunction tupletSpannerDuration tupletInvisible",
+/* write */       "");