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

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

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index f4126189c7056a0a2f7e7fb31d520d66113b1468..4dcdca35b38d177ad9d0ce2b978b2fff10100c3d 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -6,11 +6,10 @@
   (c) 1997--2004 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"
@@ -20,17 +19,15 @@
 Translator_group*
 Translator_group::get_daddy_translator () const
 {
-  Translator *t
-    = unsmob_translator (get_parent_context ()->get_parent_context ()->implementation_);
-  return dynamic_cast<Translator_group*> (t);
+  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) ();
 }
 
 
@@ -38,7 +35,7 @@ void
 Translator_group::initialize ()
 {
   SCM tab = scm_make_vector (scm_int2num (19), SCM_BOOL_F);
-  get_parent_context ()->set_property ("acceptHashTable", tab);
+  context ()->set_property ("acceptHashTable", tab);
 }
 
 
@@ -47,9 +44,9 @@ 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;
 }
@@ -58,9 +55,9 @@ 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); 
     }
@@ -76,10 +73,10 @@ Translator_group::try_music (Music* m)
   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)
     {
@@ -88,9 +85,9 @@ 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;
     }
@@ -104,11 +101,12 @@ Translator_group::get_simple_trans_list ()
   return simple_trans_list_;
 }
 
+
 void
 recurse_over_translators (Context * c, Translator_method ptr, Direction dir)
 {
   Translator_group * tg
-    = dynamic_cast<Translator_group*> (unsmob_translator (c->implementation_));
+    = dynamic_cast<Translator_group*> (c->implementation ());
 
 
   /*
@@ -117,15 +115,15 @@ recurse_over_translators (Context * c, Translator_method ptr, Direction dir)
   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)
@@ -136,3 +134,14 @@ recurse_over_translators (Context * c, Translator_method ptr, Direction dir)
       (tg->*ptr) ();
     }
 }
+
+Translator_group::Translator_group()
+{
+  simple_trans_list_ = SCM_EOL;
+}
+
+void
+Translator_group::derived_mark () const
+{
+  scm_gc_mark (simple_trans_list_); 
+}