* lily/text-item.cc (interpret_string): new file, select font with

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 51aba71a782030a7ab1d4e4a767776c629eae5ba..ce0bf4140e8b0a00b9a78b1ede73431d5fac55a4 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,15 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 /*
   UGH. too many includes.
  */
+#include <stdio.h>
+
 #include "warn.hh"
 #include "music-iterator.hh"
-#include "translator-group.hh"
+#include "context.hh"
 #include "music-wrapper.hh"
 #include "music-wrapper-iterator.hh"
 #include "simple-music-iterator.hh"
@@ -24,27 +26,23 @@ Music_iterator::Music_iterator ()
   smobify_self ();
 }
 
-Music_iterator::Music_iterator (Music_iterator const& src)
+Music_iterator::Music_iterator (Music_iterator const& )
 {
-  handle_ = *src.handle_.clone ();
-  music_ = src.music_;
-  music_length_ = src.music_length_;
-  start_mom_ = src.start_mom_;
-  smobify_self ();
+  assert (false);
 }
 
 Music_iterator::~Music_iterator ()
 {
 }
 
-Translator_group* 
-Music_iterator::report_to () const
+Context * 
+Music_iterator::get_outlet () const
 {
-  return handle_.report_to ();
+  return handle_.get_outlet ();
 }
 
 void
-Music_iterator::set_translator (Translator_group *trans)
+Music_iterator::set_translator (Context *trans)
 {
   handle_.set_translator (trans);
 }
@@ -71,27 +69,18 @@ Music_iterator::ok () const
   return false;
 }
 
-void
-Music_iterator::skip (Moment)
-{
-}
 
-SCM
-Music_iterator::get_pending_events (Moment)const
-{
-  return SCM_EOL;
-}
 
 SCM
 Music_iterator::get_static_get_iterator (Music *m)
 {
   Music_iterator * p =0;
 
-  SCM ctor = m->get_mus_property ("iterator-ctor") ;
+  SCM ctor = m->get_property ("iterator-ctor") ;
   SCM iter = SCM_EOL;
-  if (gh_procedure_p (ctor))
+  if (is_procedure (ctor))
     {
-      iter = gh_call0 (ctor);
+      iter = scm_call_0 (ctor);
       p = unsmob_iterator (iter);
     }
   else
@@ -101,20 +90,21 @@ Music_iterator::get_static_get_iterator (Music *m)
       else
        p = new Simple_music_iterator;
 
-      iter = p->self_scm();
+      iter = p->self_scm ();
       scm_gc_unprotect_object (iter);
     }
 
   p->music_ = m;
   assert (m);
-  p->music_length_ = m->length_mom ();
+  p->music_length_ = m->get_length ();
   p->start_mom_ = m->start_mom ();
+  
   return iter;
 }
 
 
 Moment
-Music_iterator::music_length_mom () const
+Music_iterator::music_get_length () const
 {
   return music_length_;
 }
@@ -126,14 +116,26 @@ Music_iterator::music_start_mom ()const
 }
 
 void
-Music_iterator::init_translator (Music *m, Translator_group *report)
+Music_iterator::init_translator (Music *m, Context *report)
 {
   music_ = m;
   assert (m);
-  if (! report_to ())
+  if (! get_outlet ())
     set_translator (report);
 }
 
+void
+Music_iterator::substitute_outlet (Context *f, Context *t)
+{
+  if (get_outlet () == f)
+    set_translator (t);
+  derived_substitute (f,t);
+}
+
+void
+Music_iterator::derived_substitute (Context *,Context *)
+{
+}
 
 SCM
 Music_iterator::get_iterator (Music *m) const
@@ -141,21 +143,21 @@ Music_iterator::get_iterator (Music *m) const
   SCM ip = get_static_get_iterator (m);
   Music_iterator*p = unsmob_iterator (ip);
   
-  p->init_translator (m, report_to ());
+  p->init_translator (m, get_outlet ());
   
   p->construct_children ();
   return ip;
 }
 
 /*
-  TODO: rename to prevent confusion between Translator::try_music and
+  TODO: rename to prevent confusion between Context::try_music and
   Iterator::try_music
   
  */
 Music_iterator*
 Music_iterator::try_music (Music *m) const
 {
-  bool b = report_to ()->try_music ((Music*)m); // ugh
+  bool b = get_outlet ()->try_music ((Music*)m); // ugh
   Music_iterator * it = b ? (Music_iterator*) this : 0;        // ugh
   if (!it)
     it = try_music_in_children (m);
@@ -178,9 +180,9 @@ Music_iterator::get_music () const
 
 /****************************************************************/
 
-IMPLEMENT_TYPE_P (Music_iterator, "ly-iterator?");
-IMPLEMENT_SMOBS(Music_iterator);
-IMPLEMENT_DEFAULT_EQUAL_P(Music_iterator);
+IMPLEMENT_TYPE_P (Music_iterator, "ly:iterator?");
+IMPLEMENT_SMOBS (Music_iterator);
+IMPLEMENT_DEFAULT_EQUAL_P (Music_iterator);
 
 SCM
 Music_iterator::mark_smob (SCM smob)
@@ -192,24 +194,28 @@ Music_iterator::mark_smob (SCM smob)
     Careful with GC, although we intend the following as pointers
     only, we _must_ mark them.
    */
-  if (mus->report_to())
-    scm_gc_mark (mus->report_to()->self_scm());
+  if (mus->get_outlet ())
+    scm_gc_mark (mus->get_outlet ()->self_scm ());
   if (mus->music_)
-    scm_gc_mark (mus->music_->self_scm());
+    scm_gc_mark (mus->music_->self_scm ());
   
 
   return SCM_EOL;
 }
 
 int
-Music_iterator::print_smob (SCM , SCM port, scm_print_state*)
+Music_iterator::print_smob (SCM sm , SCM port, scm_print_state*)
 {
-  scm_puts ("#<Music iterator>", port);
+  char s[1000];
+
+  Music_iterator *iter = unsmob_iterator (sm);
+  sprintf (s, "#<%s>", classname (iter));
+  scm_puts (s, port);
   return 1;
 }
 
 void
-Music_iterator::derived_mark()const
+Music_iterator::derived_mark ()const
 {
 }
 
@@ -221,6 +227,36 @@ Music_iterator::quit ()
 }
 
 void
-Music_iterator::do_quit()
+Music_iterator::do_quit ()
+{
+}
+
+bool
+Music_iterator::run_always ()const
+{
+  return false;
+}
+
+
+bool
+is_child_context (Context *me, Context *child)
+{
+  while (child && child != me)
+    {
+      child = child->daddy_context_;
+    }
+  
+  return child == me;
+}
+
+/*
+  move to context of child iterator if it is deeper down in the
+  hierarchy.
+  */
+void
+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);
 }