* lily/slur-scoring.cc (move_away_from_staffline): robustness,

[lilypond.git] / lily / translator-group.cc

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 85e9d43b62d65e9371a9ab2fd42eafc205354cc3..081cd8611359d2f894f31b1beee27a18b37b834d 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -1,37 +1,34 @@
 /*
-  Translator_group.cc -- implement Translator_group
+  translator-group.cc -- implement Translator_group
 
   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>
 */
 
-#include "music-output-def.hh"
 #include "translator-group.hh"
-#include "translator.hh"
+
+#include "output-def.hh"
 #include "warn.hh"
-#include "moment.hh"
 #include "scm-hash.hh"
 #include "context-def.hh"
 #include "context.hh"
 #include "main.hh"
 #include "music.hh"
 
-Translator_group*
+Translator_group *
 Translator_group::get_daddy_translator () const
 {
   return context ()->get_parent_context ()->implementation ();
 }
 
-
 void
 translator_each (SCM list, Translator_method method)
 {
-  for (SCM p = list; ly_c_pair_p (p); p = ly_cdr (p))
-    (unsmob_translator (ly_car (p))->*method) ();
+  for (SCM p = list; scm_is_pair (p); p = scm_cdr (p))
+    (unsmob_translator (scm_car (p))->*method) ();
 }
 
-
 void
 Translator_group::initialize ()
 {
@@ -39,15 +36,14 @@ Translator_group::initialize ()
   context ()->set_property ("acceptHashTable", tab);
 }
 
-
 bool
-translator_accepts_any_of (Translator*tr, SCM ifaces)
+translator_accepts_any_of (Translator *tr, SCM ifaces)
 {
   SCM ack_ifs = scm_assoc (ly_symbol2scm ("events-accepted"),
                           tr->translator_description ());
-  ack_ifs = ly_cdr (ack_ifs);
-  for (SCM s = ifaces; ly_c_pair_p (s); s = ly_cdr (s))
-    if (scm_c_memq (ly_car (s), ack_ifs) != SCM_BOOL_F)
+  ack_ifs = scm_cdr (ack_ifs);
+  for (SCM s = ifaces; scm_is_pair (s); s = scm_cdr (s))
+    if (scm_c_memq (scm_car (s), ack_ifs) != SCM_BOOL_F)
       return true;
   return false;
 }
@@ -56,11 +52,11 @@ SCM
 find_accept_translators (SCM gravlist, SCM ifaces)
 {
   SCM l = SCM_EOL;
-  for (SCM s = gravlist; ly_c_pair_p (s);  s = ly_cdr (s))
+  for (SCM s = gravlist; scm_is_pair (s); s = scm_cdr (s))
     {
-      Translator* tr = unsmob_translator (ly_car (s));
+      Translator *tr = unsmob_translator (scm_car (s));
       if (translator_accepts_any_of (tr, ifaces))
-       l = scm_cons (tr->self_scm (), l); 
+       l = scm_cons (tr->self_scm (), l);
     }
   l = scm_reverse_x (l, SCM_EOL);
 
@@ -68,16 +64,16 @@ find_accept_translators (SCM gravlist, SCM ifaces)
 }
 
 bool
-Translator_group::try_music (Music* m)
+Translator_group::try_music (Music *m)
 {
   SCM tab = get_property ("acceptHashTable");
   SCM name = scm_sloppy_assq (ly_symbol2scm ("name"),
                              m->get_property_alist (false));
 
-  if (!ly_c_pair_p (name))
+  if (!scm_is_pair (name))
     return false;
 
-  name = ly_cdr (name);
+  name = scm_cdr (name);
   SCM accept_list = scm_hashq_ref (tab, name, SCM_UNDEFINED);
   if (accept_list == SCM_BOOL_F)
     {
@@ -86,16 +82,15 @@ Translator_group::try_music (Music* m)
       scm_hashq_set_x (tab, name, accept_list);
     }
 
-  for (SCM p = accept_list; ly_c_pair_p (p); p = ly_cdr (p))
+  for (SCM p = accept_list; scm_is_pair (p); p = scm_cdr (p))
     {
-      Translator * t = unsmob_translator (ly_car (p));
+      Translator *t = unsmob_translator (scm_car (p));
       if (t && t->try_music (m))
        return true;
     }
   return false;
 }
 
-
 SCM
 Translator_group::get_simple_trans_list ()
 {
@@ -103,34 +98,44 @@ Translator_group::get_simple_trans_list ()
 }
 
 void
-recurse_over_translators (Context * c, Translator_method ptr, Direction dir)
+recurse_over_translators (Context *c, Translator_method ptr, Direction dir)
 {
-  Translator_group * tg
-    = dynamic_cast<Translator_group*> (c->implementation ());
-
+  Translator_group *tg
+    = dynamic_cast<Translator_group *> (c->implementation ());
 
   /*
-    Top down: 
-   */
+    Top down:
+  */
   if (dir == DOWN)
     {
       translator_each (tg->get_simple_trans_list (),
-                         ptr);
+                      ptr);
 
       (tg->*ptr) ();
     }
 
-  for (SCM s = c->children_contexts () ; ly_c_pair_p (s);
-       s =ly_cdr (s))
+  for (SCM s = c->children_contexts (); scm_is_pair (s);
+       s = scm_cdr (s))
     {
-      recurse_over_translators (unsmob_context (ly_car (s)), ptr, dir);
+      recurse_over_translators (unsmob_context (scm_car (s)), ptr, dir);
     }
 
   if (dir == UP)
     {
       translator_each (tg->get_simple_trans_list (),
-                    ptr);
+                      ptr);
 
       (tg->*ptr) ();
     }
 }
+
+Translator_group::Translator_group ()
+{
+  simple_trans_list_ = SCM_EOL;
+}
+
+void
+Translator_group::derived_mark () const
+{
+  scm_gc_mark (simple_trans_list_);
+}