* Documentation/user/changing-defaults.itely (Changing defaults):

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index a73e90bf50d99d5a27fa61b1585377a0c8e2cf31..6b48a88173e953d10a0f4afd9876d526d6d516ff 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"
@@ -28,14 +29,6 @@
    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
 {
@@ -83,7 +76,7 @@ void
 Tie_engraver::process_music ()
 {
   if (event_)
-    daddy_trans_->set_property ("tieMelismaBusy", SCM_BOOL_T);
+    daddy_context_->set_property ("tieMelismaBusy", SCM_BOOL_T);
 }
 
 void
@@ -96,15 +89,15 @@ 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")))
+             && gh_equal_p (right_mus->get_property ("pitch"),
+                            left_mus->get_property ("pitch")))
            {
              Grob * p = make_spanner ("Tie");
              Tie::set_interface (p); // cannot remove yet!
@@ -132,7 +125,7 @@ Tie_engraver::acknowledge_grob (Grob_info i)
 void
 Tie_engraver::start_translation_timestep ()
 {
-  daddy_trans_->set_property ("tieMelismaBusy",
+  daddy_context_->set_property ("tieMelismaBusy",
                              gh_bool2scm (heads_to_tie_.size ()));
       
 }
@@ -181,8 +174,8 @@ 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 ("head-pair"), LEFT, new_head_drul[LEFT]->self_scm ());
-  index_set_cell (her->get_grob_property ("head-pair"), 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);
 }