(try_music): add moments for

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index f44e8b3b0d80a03d55bd7e37fbd29792c921e6db..8c418564753480dbbd6ed64c5e7ed9c08ebce8e9 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -3,13 +3,14 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "event.hh"
 #include "tie.hh"
-#include "translator-group.hh"
+#include "context.hh"
+
 #include "spanner.hh"
 #include "tie-column.hh"
 #include "engraver.hh"
@@ -26,16 +27,6 @@
 
    TODO: Remove the dependency on musical info. We should tie on the
    basis of position and duration-log of the heads (not of the events).
-
-   TODO: support sparseTies.
-
-   TODO: melismata will fuck up now:
-
-   < { c8 ~ c8 }
-     { c16 c c c  } >
-
-   melisma is after the 2nd 8th note, but will now be signaled as
-   lasting till the 3rd 16th.
 */
 class Tie_engraver : public Engraver
 {
@@ -47,16 +38,15 @@ class Tie_engraver : public Engraver
   
   Spanner * tie_column_;
   
-  
 protected:
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music*);
-  virtual void process_acknowledged_grobs ();
+  virtual void process_music ();
   void typeset_tie (Grob*);
 public:
-  TRANSLATOR_DECLARATIONS(Tie_engraver);
+  TRANSLATOR_DECLARATIONS (Tie_engraver);
 };
 
 
@@ -80,6 +70,13 @@ Tie_engraver::try_music (Music *mus)
   return true;
 }
 
+void
+Tie_engraver::process_music ()
+{
+  if (event_)
+    context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
+}
+
 void
 Tie_engraver::acknowledge_grob (Grob_info i)
 {
@@ -90,49 +87,43 @@ Tie_engraver::acknowledge_grob (Grob_info i)
       for  (int i = heads_to_tie_.size (); i--;)
        {
          Grob *th =  heads_to_tie_[i];
-         Music * right_mus = unsmob_music (h->get_grob_property ("cause"));
-         Music * left_mus = unsmob_music (th->get_grob_property ("cause"));
+         Music * right_mus = unsmob_music (h->get_property ("cause"));
+         Music * left_mus = unsmob_music (th->get_property ("cause"));
 
          /*
            maybe should check positions too.
           */
          if (right_mus && left_mus
-             && gh_equal_p (right_mus->get_mus_property ("pitch"),
-                            left_mus->get_mus_property ("pitch")))
+             && ly_c_equal_p (right_mus->get_property ("pitch"),
+                            left_mus->get_property ("pitch")))
            {
-             Grob * p = new Spanner (get_property ("Tie"));
+             Grob * p = make_spanner ("Tie", last_event_->self_scm ());
              Tie::set_interface (p); // cannot remove yet!
          
              Tie::set_head (p, LEFT, th);
              Tie::set_head (p, RIGHT, h);
          
              ties_.push (p);
-             announce_grob(p, last_event_->self_scm());
            }
        }
-    }
-}
 
-void
-Tie_engraver::process_acknowledged_grobs ()
-{
-  if (ties_.size () > 1 && !tie_column_)
-    {
-      tie_column_ = new Spanner (get_property ("TieColumn"));
-      
-      for (int i = ties_.size (); i--;)
-       Tie_column::add_tie (tie_column_,ties_ [i]);
+      if (ties_.size () && ! tie_column_)
+       {
+         tie_column_ = make_spanner ("TieColumn", SCM_EOL);
+         
+       }
 
-      announce_grob(tie_column_, SCM_EOL);
+      if (tie_column_)
+       for (int i = ties_.size (); i--;)
+         Tie_column::add_tie (tie_column_,ties_ [i]);
     }
 }
 
 void
 Tie_engraver::start_translation_timestep ()
 {
-  if (to_boolean (get_property ("automaticMelismata")))
-      daddy_trans_->set_property ("tieMelismaBusy",
-                                 gh_bool2scm (heads_to_tie_.size ()));
+  context ()->set_property ("tieMelismaBusy",
+                             ly_bool2scm (heads_to_tie_.size ()));
       
 }
 
@@ -147,13 +138,9 @@ Tie_engraver::stop_translation_timestep ()
          typeset_tie (ties_[i]);
        }
 
-      ties_.clear();
+      ties_.clear ();
       last_event_ = 0;
-      if (tie_column_)
-       {
-         typeset_grob (tie_column_);
-         tie_column_ =0;
-       }
+      tie_column_ =0;
     }
   
   if (event_)
@@ -180,14 +167,13 @@ Tie_engraver::typeset_tie (Grob *her)
       new_head_drul[d] = Tie::head (her, (Direction)-d);
   } while (flip (&d) != LEFT);
 
-  index_set_cell (her->get_grob_property ("heads"), LEFT, new_head_drul[LEFT]->self_scm ());
-  index_set_cell (her->get_grob_property ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm ());
+  index_set_cell (her->get_property ("head-pair"), LEFT, new_head_drul[LEFT]->self_scm ());
+  index_set_cell (her->get_property ("head-pair"), RIGHT, new_head_drul[RIGHT]->self_scm ());
 
-  typeset_grob (her);
 }
 
 
-ENTER_DESCRIPTION(Tie_engraver,
+ENTER_DESCRIPTION (Tie_engraver,
 /* descr */       "Generate ties between noteheads of equal pitch.",
 /* creats*/       "Tie TieColumn",
 /* accepts */     "tie-event",