* configure.in: Test for and accept lmodern if EC fonts not found.

[lilypond.git] / lily / event-chord-iterator.cc

diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index e588574020e06e93b310ebc702f2aa92f5d91ce0..56fe24f6cb4d1597735242c37d1630dde07e715e 100644 (file)
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -6,9 +6,10 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "event-chord-iterator.hh"
+
 #include "context.hh"
 #include "warn.hh"
-#include "event-chord-iterator.hh"
 #include "music-list.hh"
 #include "event.hh"
 
@@ -23,7 +24,7 @@ Event_chord_iterator::get_req_translator ()
   if (get_outlet ()->is_bottom_context ())
     return get_outlet ();
 
-  set_translator (get_outlet ()->get_default_interpreter ());
+  set_context (get_outlet ()->get_default_interpreter ());
   return get_outlet ();
 }
 
@@ -47,9 +48,9 @@ Event_chord_iterator::process (Moment m)
   if (last_processed_mom_ < Moment (0))
     {
       for (SCM s = dynamic_cast<Music_sequence *> (get_music ())->music_list ();
-          ly_c_pair_p (s);  s = ly_cdr (s))
+          scm_is_pair (s);  s = scm_cdr (s))
        {
-         Music *mus = unsmob_music (ly_car (s));
+         Music *mus = unsmob_music (scm_car (s));
 
          bool gotcha = try_music (mus);
          if (!gotcha)