Merge with master

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

diff --git a/lily/repeat-tie-engraver.cc b/lily/repeat-tie-engraver.cc
index 4bce2113105646b76ad3fb667c021a8c065928cd..6b16fbc08841863d01be8fc7e3afc74ae746214a 100644 (file)
--- a/lily/repeat-tie-engraver.cc
+++ b/lily/repeat-tie-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -11,19 +11,20 @@
 #include "engraver.hh"
 #include "item.hh"
 #include "pointer-group-interface.hh"
+#include "stream-event.hh"
 
 #include "translator.icc"
 
 class Repeat_tie_engraver : public Engraver
 {
-  Music *event_;
+  Stream_event *event_;
   Grob *semi_tie_column_;
   vector<Grob*> semi_ties_;
   
   void stop_translation_timestep (); 
   DECLARE_ACKNOWLEDGER (note_head);
+  DECLARE_TRANSLATOR_LISTENER (repeat_tie);
   
-  virtual bool try_music (Music *);
 public:
   TRANSLATOR_DECLARATIONS (Repeat_tie_engraver);
 };
@@ -42,11 +43,11 @@ Repeat_tie_engraver::stop_translation_timestep ()
   semi_ties_.clear ();
 }
 
-bool
-Repeat_tie_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Repeat_tie_engraver, repeat_tie);
+void
+Repeat_tie_engraver::listen_repeat_tie (Stream_event *ev)
 {
-  event_ = m;
-  return true;
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
 void
@@ -59,17 +60,24 @@ Repeat_tie_engraver::acknowledge_note_head (Grob_info inf)
     {
       semi_tie_column_ = make_item ("RepeatTieColumn", event_->self_scm ());
     }
-  
-  Grob *semi_tie = make_item ("RepeatTie", event_->self_scm ());
+
+  SCM cause = event_->self_scm ();
+  Grob *semi_tie = make_item ("RepeatTie", cause);
   semi_tie->set_object ("note-head", inf.grob ()->self_scm ());
   
   Pointer_group_interface::add_grob (semi_tie_column_, ly_symbol2scm ("ties"),
                                     semi_tie);
   semi_tie->set_parent (semi_tie_column_, Y_AXIS);
   semi_ties_.push_back (semi_tie);
-}
 
 
+  if (is_direction (unsmob_stream_event (cause)->get_property ("direction")))
+    {
+      Direction d = to_dir (unsmob_stream_event (cause)->get_property ("direction"));
+      semi_tie->set_property ("direction", scm_from_int (d)); 
+    }
+
+}
 
 ADD_ACKNOWLEDGER (Repeat_tie_engraver, note_head);
 ADD_TRANSLATOR (Repeat_tie_engraver, 
@@ -78,7 +86,5 @@ ADD_TRANSLATOR (Repeat_tie_engraver,
                /* create */
                "RepeatTie "
                "RepeatTieColumn ",
-
-               /* accept */ "repeat-tie-event",
                /* read */ "",
                /* write */ "");