]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/tuplet-engraver.cc
* The grand 2005-2006 replace.
[lilypond.git] / lily / tuplet-engraver.cc
index b751d5eae7d4d4a9ae825e4642c3e786ba9f79d0..1bdda38c69a21c7a7a08a2ab21953f2cca0735f3 100644 (file)
@@ -1,31 +1,73 @@
-/*   
-  auto-plet-engraver.cc --  implement Auto_plet_engraver
-  
+/*
+  tuplet-engraver.cc -- implement Tuplet_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "tuplet-engraver.hh"
-#include "command-request.hh"
-#include "tuplet-spanner.hh"
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "tuplet-bracket.hh"
 #include "note-column.hh"
-#include "compressed-music.hh"
-#include "text-def.hh"
 #include "beam.hh"
-#include "music-list.hh"
+#include "engraver.hh"
+#include "spanner.hh"
+
+#include "translator.icc"
+
+struct Tuplet_description
+{
+  Music *music_;
+  Rational stop_;
+  Rational span_stop_;
+  Rational length_;
+  Spanner *bracket_;
+  Spanner *number_;
+  Tuplet_description ()
+  {
+    music_ = 0;
+    bracket_ = 0;
+    number_ = 0;
+  }
+  static int compare (Tuplet_description const &a, Tuplet_description const &b)
+  {
+    return ::compare (a.length_, b.length_);
+  }
+};
+
+class Tuplet_engraver : public Engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS (Tuplet_engraver);
+
+protected:
+  Array<Tuplet_description> tuplets_;
+  Link_array<Spanner> last_tuplets_;
+  DECLARE_ACKNOWLEDGER (note_column);
+  virtual bool try_music (Music *r);
+  virtual void finalize ();
+  void start_translation_timestep ();
+  void process_music ();
+};
 
 bool
-Tuplet_engraver::do_try_music (Music *r)
+Tuplet_engraver::try_music (Music *music)
 {
-  if (Compressed_music * c = dynamic_cast<Compressed_music *> (r))
+  if (music->is_mus_type ("time-scaled-music"))
     {
-      Music *el = c->element_l ();
-      if (!dynamic_cast<Request_chord*> (el))
+      Music *el = unsmob_music (music->get_property ("element"));
+      if (el && !el->is_mus_type ("event-chord"))
        {
-         compressed_music_arr_.push (c);
-         stop_moments_.push (now_mom () + c->length_mom ());
+         Tuplet_description d;
+         d.music_ = music;
+         d.length_ = music->get_length ().main_part_;
+         d.stop_ = now_mom ().main_part_ + d.length_;
+         d.span_stop_ = d.stop_;
+
+         SCM s = get_property ("tupletSpannerDuration");
+         if (unsmob_moment (s))
+           d.span_stop_ = min (d.span_stop_, (now_mom () + *unsmob_moment (s)).main_part_);
+
+         tuplets_.push (d);
        }
       return true;
     }
@@ -33,60 +75,122 @@ Tuplet_engraver::do_try_music (Music *r)
 }
 
 void
-Tuplet_engraver::do_process_requests ()
+Tuplet_engraver::process_music ()
 {
-  for (int i= started_span_p_arr_.size ();
-       i < compressed_music_arr_.size (); i++)
+  if (!tuplets_.size ())
+    return;
+
+  tuplets_.sort (&Tuplet_description::compare);
+  for (int i = 0; i < tuplets_.size (); i++)
     {
-      Tuplet_spanner* glep = new Tuplet_spanner;
-      started_span_p_arr_.push (glep);
+      if (tuplets_[i].bracket_)
+       continue;
 
-      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]));
+      tuplets_[i].bracket_ = make_spanner ("TupletBracket",
+                                          tuplets_[i].music_->self_scm ());
+      tuplets_[i].number_ = make_spanner ("TupletNumber",
+                                         tuplets_[i].music_->self_scm ());
+      tuplets_[i].number_->set_object ("bracket", tuplets_[i].bracket_->self_scm ());
+      tuplets_[i].bracket_->set_object ("tuplet-number", tuplets_[i].number_->self_scm ());
+      
+      if (i > 0 && tuplets_[i - 1].bracket_)
+       Tuplet_bracket::add_tuplet_bracket (tuplets_[i].bracket_, tuplets_[i - 1].bracket_);
+
+      if (i < tuplets_.size () - 1 && tuplets_[i + 1].bracket_)
+       Tuplet_bracket::add_tuplet_bracket (tuplets_[i + 1].bracket_, tuplets_[i].bracket_);
+
+      SCM proc = get_property ("tupletNumberFormatFunction");
+      if (ly_is_procedure (proc))
+       {
+         SCM t = scm_apply_0 (proc, scm_list_1 (tuplets_[i].music_->self_scm ()));
+         tuplets_[i].number_->set_property ("text", t);
+       }
     }
 }
 
 void
-Tuplet_engraver::acknowledge_element (Score_element_info i)
+Tuplet_engraver::acknowledge_note_column (Grob_info inf)
 {
-  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]->set_beam (b);
-    }
+  for (int j = 0; j < tuplets_.size (); j++)
+    if (tuplets_[j].bracket_)
+      {
+       Item *i = dynamic_cast<Item *> (inf.grob ());
+       Tuplet_bracket::add_column (tuplets_[j].bracket_, i);
+       add_bound_item (tuplets_[j].number_, i);
+      }
 }
 
 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--; )
+
+  last_tuplets_.clear ();
+  if (tuplets_.is_empty ())
+    return;
+
+  Moment tsdmom = robust_scm2moment (get_property ("tupletSpannerDuration"), Moment (0));
+  bool full_length = to_boolean (get_property ("tupletFullLength"));
+
+  for (int i = tuplets_.size (); i--;)
     {
-      if (now >= stop_moments_[i])
+      Rational tsd = tsdmom.main_part_;
+
+      if (now.main_part_ >= tuplets_[i].span_stop_)
        {
-         typeset_element (started_span_p_arr_[i]);
-         started_span_p_arr_.del (i);
-         stop_moments_.del(i);
-         compressed_music_arr_.del(i);
+         if (tuplets_[i].bracket_)
+           {
+             if (full_length)
+               {
+                 Item *col = unsmob_item (get_property ("currentMusicalColumn"));
+
+                 tuplets_[i].bracket_->set_bound (RIGHT, col);
+                 tuplets_[i].number_->set_bound (RIGHT, col);
+               }
+             else if (!tuplets_[i].bracket_->get_bound (RIGHT))
+               {
+                 tuplets_[i].bracket_->set_bound (RIGHT,
+                                                  tuplets_[i].bracket_->get_bound (LEFT));
+                 tuplets_[i].number_->set_bound (RIGHT,
+                                                 tuplets_[i].bracket_->get_bound (LEFT));
+               }
+             last_tuplets_.push (tuplets_[i].bracket_);
+             last_tuplets_.push (tuplets_[i].number_);
+             
+             tuplets_[i].bracket_ = 0;
+             tuplets_[i].number_ = 0;
+           }
+
+         if (tsd)
+           tuplets_[i].span_stop_ += tsd;
        }
+
+      if (now.main_part_ >= tuplets_[i].stop_)
+       tuplets_.del (i);
     }
 }
 
 void
-Tuplet_engraver::do_removal_processing ()
+Tuplet_engraver::finalize ()
 {
-  for (int i=0; i < started_span_p_arr_.size (); i++)
+  if (to_boolean (get_property ("tupletFullLength")))
     {
-      typeset_element (started_span_p_arr_[i]);
-    }  
+      for (int i = 0; i < last_tuplets_.size (); i++)
+       {
+         Item *col = unsmob_item (get_property ("currentCommandColumn"));
+         last_tuplets_[i]->set_bound (RIGHT, col);
+       }
+    }
 }
 
-ADD_THIS_TRANSLATOR(Tuplet_engraver);
+Tuplet_engraver::Tuplet_engraver ()
+{
+}
 
+ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
+ADD_TRANSLATOR (Tuplet_engraver,
+               /* doc */ "Catch Time_scaled_music and generate appropriate bracket  ",
+               /* create */ "TupletBracket TupletNumber",
+               /* accept */ "time-scaled-music",
+               /* read */ "tupletNumberFormatFunction tupletSpannerDuration tupletFullLength",
+               /* write */ "");