* lily/font-select.cc (get_font_by_design_size): revert

[lilypond.git] / lily / music-iterator.cc

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index c4cf900dca52d6ea51c5fc2f16bebbf7afae0fcd..58e8597905d106f9fe6cff521e79585a6f0e81c4 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,16 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 /*
   UGH. too many includes.
  */
-#include <stdio.h>
 
-#include "warn.hh"
 #include "music-iterator.hh"
+
+#include <cstdio>
+
+#include "warn.hh"
 #include "context.hh"
 #include "music-wrapper.hh"
 #include "music-wrapper-iterator.hh"
@@ -42,9 +44,9 @@ Music_iterator::get_outlet () const
 }
 
 void
-Music_iterator::set_translator (Context *trans)
+Music_iterator::set_context (Context *trans)
 {
-  handle_.set_translator (trans);
+  handle_.set_context (trans);
 }
 
 void
@@ -74,7 +76,7 @@ Music_iterator::ok () const
 SCM
 Music_iterator::get_static_get_iterator (Music *m)
 {
-  Music_iterator * p =0;
+  Music_iterator * p = 0;
 
   SCM ctor = m->get_property ("iterator-ctor") ;
   SCM iter = SCM_EOL;
@@ -121,19 +123,19 @@ Music_iterator::init_translator (Music *m, Context *report)
   music_ = m;
   assert (m);
   if (! get_outlet ())
-    set_translator (report);
+    set_context (report);
 }
 
 void
 Music_iterator::substitute_outlet (Context *f, Context *t)
 {
   if (get_outlet () == f)
-    set_translator (t);
-  derived_substitute (f,t);
+    set_context (t);
+  derived_substitute (f, t);
 }
 
 void
-Music_iterator::derived_substitute (Context *,Context *)
+Music_iterator::derived_substitute (Context *, Context *)
 {
 }
 
@@ -258,5 +260,5 @@ Music_iterator::descend_to_child (Context * child_report)
 {
   Context * me_report = get_outlet ();
   if (is_child_context (me_report, child_report))
-    set_translator (child_report);
+    set_context (child_report);
 }