]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/tuplet-engraver.cc
Fix some bugs in the dynamic engraver and PostScript backend
[lilypond.git] / lily / tuplet-engraver.cc
index ce9c2cd2de27ee75670d9f0b0b55be97e4629f32..92b062f11687f370df88497e1d95d62054248a26 100644 (file)
@@ -1,30 +1,64 @@
-/*   
-  auto-plet-engraver.cc --  implement Auto_plet_engraver
-  
+/*
+  tuplet-engraver.cc -- implement Tuplet_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 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 "time-scaled-music.hh"
 #include "beam.hh"
-#include "music-list.hh"
+#include "engraver.hh"
+#include "spanner.hh"
+
+#include "translator.icc"
+
+struct Tuplet_description
+{
+  Music *music_;
+  Spanner *bracket_;
+  Spanner *number_;
+  Tuplet_description ()
+  {
+    music_ = 0;
+    bracket_ = 0;
+    number_ = 0;
+  }
+};
+
+class Tuplet_engraver : public Engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS (Tuplet_engraver);
+
+protected:
+  vector<Tuplet_description> tuplets_;
+  vector<Tuplet_description> stopped_tuplets_;
+  vector<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 (Time_scaled_music * c = dynamic_cast<Time_scaled_music *> (r))
+  if (music->is_mus_type ("tuplet-spanner-event"))
     {
-      Music *el = c->element_l ();
-      if (!dynamic_cast<Request_chord*> (el))
+      Direction dir = to_dir (music->get_property ("span-direction"));
+      if (dir == START)
        {
-         time_scaled_music_arr_.push (c);
-         stop_moments_.push (now_mom () + c->length_mom ());
+         Tuplet_description d;
+         d.music_ = music;
+         tuplets_.push_back (d);
+       }
+      if (dir == STOP)
+       {
+         stopped_tuplets_.push_back (tuplets_.back ());
+         tuplets_.pop_back ();
        }
       return true;
     }
@@ -32,76 +66,105 @@ Tuplet_engraver::do_try_music (Music *r)
 }
 
 void
-Tuplet_engraver::do_process_requests ()
+Tuplet_engraver::process_music ()
 {
-  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 (SCM_NUMBERP(prop))
-    visibility = gh_scm2int (prop);    // bool ?
-
-  for (int i= started_span_p_arr_.size ();
-       i < time_scaled_music_arr_.size (); i++)
+  for (vsize i = 0; i < stopped_tuplets_.size (); i++)
     {
-      Tuplet_spanner* glep = new Tuplet_spanner;
-      started_span_p_arr_.push (glep);
-      glep->number_str_ = to_str (time_scaled_music_arr_[i]->den_i_);
-      glep->set_elt_property(tuplet_visibility_scm_sym,
-                             gh_int2scm (visibility));
-      if (dir != 0)
-       glep->set_elt_property(dir_forced_scm_sym, gh_int2scm (dir));
-      announce_element (Score_element_info (glep, time_scaled_music_arr_ [i]));
+      bool full_length = to_boolean (get_property ("tupletFullLength"));
+      if (stopped_tuplets_[i].bracket_)
+       {
+         if (full_length)
+           {
+             Item *col = unsmob_item (get_property ("currentMusicalColumn"));
+             
+             stopped_tuplets_[i].bracket_->set_bound (RIGHT, col);
+             stopped_tuplets_[i].number_->set_bound (RIGHT, col);
+           }
+         else if (!stopped_tuplets_[i].bracket_->get_bound (RIGHT))
+           {
+             stopped_tuplets_[i].bracket_->set_bound (RIGHT,
+                                                      stopped_tuplets_[i].bracket_->get_bound (LEFT));
+             stopped_tuplets_[i].number_->set_bound (RIGHT,
+                                                     stopped_tuplets_[i].bracket_->get_bound (LEFT));
+           }
+         // todo: scrap last_tuplets_, use stopped_tuplets_ only.
+         // clear stopped_tuplets_ at start_translation_timestep
+         last_tuplets_.push_back (tuplets_[i].bracket_);
+         last_tuplets_.push_back (tuplets_[i].number_);
+       }
+    }
+  stopped_tuplets_.clear ();
+
+  for (vsize j = tuplets_.size (); j > 0; j--)
+    {
+      /* i goes from size-1 downto 0, inclusively */
+      vsize i = j - 1;
+
+      if (tuplets_[i].bracket_)
+       continue;
+
+      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 < tuplets_.size () - 1 && tuplets_[i + 1].bracket_)
+       Tuplet_bracket::add_tuplet_bracket (tuplets_[i].bracket_, tuplets_[i + 1].bracket_);
+      
+      if (i > 0 && 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)
 {
-  bool grace= (i.elem_l_->get_elt_property (grace_scm_sym) != SCM_BOOL_F);
-  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);
-    }
+  for (vsize 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::start_translation_timestep ()
+{
+  last_tuplets_.clear ();
 }
 
 void
-Tuplet_engraver::do_post_move_processing ()
+Tuplet_engraver::finalize ()
 {
-  Moment now = now_mom ();
-  for (int i= started_span_p_arr_.size (); i--; )
+  if (to_boolean (get_property ("tupletFullLength")))
     {
-      if (now >= stop_moments_[i])
+      for (vsize i = 0; i < last_tuplets_.size (); i++)
        {
-         typeset_element (started_span_p_arr_[i]);
-         started_span_p_arr_.del (i);
-         stop_moments_.del(i);
-         time_scaled_music_arr_.del(i);
+         Item *col = unsmob_item (get_property ("currentCommandColumn"));
+         last_tuplets_[i]->set_bound (RIGHT, col);
        }
     }
 }
 
-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);
-
+ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
+ADD_TRANSLATOR (Tuplet_engraver,
+               /* doc */ "Catch TupletSpannerEvent and generate appropriate bracket  ",
+               /* create */ "TupletBracket TupletNumber ",
+               /* accept */ "tuplet-spanner-event",
+               /* read */ "tupletNumberFormatFunction tupletSpannerDuration tupletFullLength ",
+               /* write */ "");