* 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 113a4595a85b7c01fdf5e00aaf2719c6ba750f1c..081cd8611359d2f894f31b1beee27a18b37b834d 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -1,29 +1,27 @@
 /*
-  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 "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)
 {
@@ -31,7 +29,6 @@ translator_each (SCM list, Translator_method method)
     (unsmob_translator (scm_car (p))->*method) ();
 }
 
-
 void
 Translator_group::initialize ()
 {
@@ -39,9 +36,8 @@ 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 ());
@@ -56,11 +52,11 @@ SCM
 find_accept_translators (SCM gravlist, SCM ifaces)
 {
   SCM l = SCM_EOL;
-  for (SCM s = gravlist; scm_is_pair (s);  s = scm_cdr (s))
+  for (SCM s = gravlist; scm_is_pair (s); s = scm_cdr (s))
     {
-      Translator* tr = unsmob_translator (scm_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,7 +64,7 @@ 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"),
@@ -88,14 +84,13 @@ Translator_group::try_music (Music* m)
 
   for (SCM p = accept_list; scm_is_pair (p); p = scm_cdr (p))
     {
-      Translator * t = unsmob_translator (scm_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,15 +98,14 @@ 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 (),
@@ -120,8 +114,8 @@ recurse_over_translators (Context * c, Translator_method ptr, Direction dir)
       (tg->*ptr) ();
     }
 
-  for (SCM s = c->children_contexts () ; scm_is_pair (s);
-       s =scm_cdr (s))
+  for (SCM s = c->children_contexts (); scm_is_pair (s);
+       s = scm_cdr (s))
     {
       recurse_over_translators (unsmob_context (scm_car (s)), ptr, dir);
     }
@@ -129,13 +123,13 @@ recurse_over_translators (Context * c, Translator_method ptr, Direction dir)
   if (dir == UP)
     {
       translator_each (tg->get_simple_trans_list (),
-                    ptr);
+                      ptr);
 
       (tg->*ptr) ();
     }
 }
 
-Translator_group::Translator_group()
+Translator_group::Translator_group ()
 {
   simple_trans_list_ = SCM_EOL;
 }
@@ -143,5 +137,5 @@ Translator_group::Translator_group()
 void
 Translator_group::derived_mark () const
 {
-  scm_gc_mark (simple_trans_list_); 
+  scm_gc_mark (simple_trans_list_);
 }