2003 -> 2004

[lilypond.git] / lily / completion-note-heads-engraver.cc

diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index 8b8257cc0b643a596134998dfeeab1b09ca4314e..1669e9a39ff74f294e9fef3d5f5172159288d353 100644 (file)
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -1,29 +1,31 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <ctype.h>
 
 #include "rhythmic-head.hh"
 #include "paper-def.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "dots.hh"
 #include "dot-column.hh"
 #include "staff-symbol-referencer.hh"
 #include "item.hh"
 #include "score-engraver.hh"
 #include "warn.hh"
+#include "spanner.hh"
+#include "tie.hh"
 
 /*
 
   How does this work?
 
   When we catch the note, we predict the end of the note. We keep the
-  requests living until we reach the predicted end-time.
+  events living until we reach the predicted end-time.
 
-  Every time process_music() is called and there are note requests, we
+  Every time process_music() is called and there are note events, we
   figure out how long the note to typeset should be. It should be no
   longer than what's specified, than what is left to do and it should
   not cross barlines.
@@ -35,6 +37,8 @@
 class Completion_heads_engraver : public Engraver
 {
   Link_array<Item> notes_;
+  Link_array<Item> prev_notes_;
+  Link_array<Grob> ties_;
   
   Link_array<Item> dots_;
   Link_array<Music> note_reqs_;
@@ -73,7 +77,7 @@ Completion_heads_engraver::try_music (Music *m)
       note_reqs_.push (m);
 
       first_b_ = true;
-      Moment musiclen = m->length_mom ();
+      Moment musiclen = m->get_length ();
       Moment now = now_mom();
 
       if (now_mom ().grace_part_)
@@ -122,7 +126,7 @@ Completion_heads_engraver::find_nearest_duration (Rational length)
   /*
     this could surely be done more efficient. Left to the reader as an
     excercise.  */
-  while (d.length_mom () > length && d.duration_log () < log_limit)
+  while (d.get_length () > length && d.duration_log () < log_limit)
     {
       if (d.dot_count ())
        {
@@ -141,7 +145,7 @@ Completion_heads_engraver::find_nearest_duration (Rational length)
       d = Duration (d.duration_log (), 0);
 
       // scale up.
-      d = d.compressed (length / d.length_mom ());
+      d = d.compressed (length / d.get_length ());
     }
   
   return d;
@@ -171,22 +175,22 @@ Completion_heads_engraver::process_music ()
       note_dur = *orig;
     }
   Moment nb = next_barline_moment ();
-  if (nb < note_dur.length_mom ())
+  if (nb < note_dur.get_length ())
     {
       note_dur = find_nearest_duration (nb.main_part_);
 
       Moment next = now;
-      next.main_part_ += note_dur.length_mom ();
+      next.main_part_ += note_dur.get_length ();
       top_engraver ()->add_moment_to_process (next);
       do_nothing_until_ = next.main_part_;
     }
 
   if (orig)
     {
-      left_to_do_ = orig->length_mom ();
+      left_to_do_ = orig->get_length ();
     }
 
-  if (orig && note_dur.length_mom() != orig->length_mom())
+  if (orig && note_dur.get_length () != orig->get_length ())
     {
       if (!scratch_note_reqs_.size ())
        for (int i = 0; i < note_reqs_.size (); i++)
@@ -200,7 +204,7 @@ Completion_heads_engraver::process_music ()
   for (int i = 0;
        left_to_do_ && i < note_reqs_.size (); i++)
     {
-      Item *note  = new Item (get_property ("NoteHead"));
+      Item *note  = make_item ("NoteHead");
       
       Music * req =  note_reqs_[i];
       if (scratch_note_reqs_.size())
@@ -217,7 +221,7 @@ Completion_heads_engraver::process_music ()
       int dots= note_dur.dot_count ();
       if (dots)
        {
-         Item * d = new Item (get_property ("Dots"));
+         Item * d = make_item ("Dots");
          Rhythmic_head::set_dots (note, d);
 
          /*
@@ -242,9 +246,23 @@ Completion_heads_engraver::process_music ()
       announce_grob (note,req->self_scm ());
       notes_.push (note);
     }
+  
+  if (prev_notes_.size() == notes_.size ())
+    {
+      for (int i= 0; i < notes_.size(); i++)
+       {
+         Grob * p = make_spanner ("Tie");
+         Tie::set_interface (p); // cannot remove yet!
+         
+         Tie::set_head (p, LEFT, prev_notes_[i]);
+         Tie::set_head (p, RIGHT, notes_[i]);
+         
+         ties_.push (p);
+         announce_grob(p, SCM_EOL);
+       }
+    }
 
-  left_to_do_ -= note_dur.length_mom ();
-
+  left_to_do_ -= note_dur.get_length ();
 
   /*
     don't do complicated arithmetic with grace notes.
@@ -254,16 +272,21 @@ Completion_heads_engraver::process_music ()
     {
       left_to_do_ = Rational (0,0);
     }
-  
 }
  
 void
 Completion_heads_engraver::stop_translation_timestep ()
 {
+  for (int i = ties_.size (); i--;)
+    typeset_grob (ties_[i]); 
+  ties_.clear();
+  
   for (int i=0; i < notes_.size (); i++)
     {
       typeset_grob (notes_[i]);
     }
+  if (notes_.size())
+    prev_notes_ = notes_;
   notes_.clear ();
   
   for (int i=0; i < dots_.size (); i++)
@@ -277,11 +300,10 @@ Completion_heads_engraver::stop_translation_timestep ()
       scm_gc_unprotect_object (scratch_note_reqs_[i]->self_scm () );
       
     }
+  
   scratch_note_reqs_.clear();
 }
 
-Music * tie_req = 0;
-
 void
 Completion_heads_engraver::start_translation_timestep ()
 {
@@ -289,18 +311,7 @@ Completion_heads_engraver::start_translation_timestep ()
   if (note_end_mom_.main_part_ <= now.main_part_)
     {
       note_reqs_.clear ();
-    }
-
-  if (left_to_do_)
-    {
-      if (!tie_req)
-       tie_req = make_music_by_name (ly_symbol2scm ("TieEvent"));
-      
-      bool succ = daddy_trans_->try_music (tie_req);
-      if (!succ)
-       {
-         programming_error ("Completion_heads_engraver: no-one to make tie.");
-       }
+      prev_notes_.clear ();
     }
 }
 
@@ -309,10 +320,10 @@ Completion_heads_engraver::Completion_heads_engraver()
 }
 
 ENTER_DESCRIPTION(Completion_heads_engraver,
-/* descr */       "This engraver replaces
-@code{Note_heads_engraver}. It plays some trickery to
-break long notes and automatically tie them into the next measure.",
-/* creats*/       "NoteHead Dots",
+/* descr */       "This engraver replaces "
+"@code{Note_heads_engraver}. It plays some trickery to "
+"break long notes and automatically tie them into the next measure.",
+/* creats*/       "NoteHead Dots Tie",
 /* accepts */     "busy-playing-event note-event",
 /* acks  */      "",
 /* reads */       "centralCPosition measurePosition measureLength",