X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-group.cc;h=84a97bf52e206bdf980ab6bae228fabac470cbab;hb=15bbdd381a1d754c6b405f9fc271f79ebd2fca91;hp=4ef8c49d6bb0755664f018397ad82491f3d7c8bd;hpb=bbe5e6b67f58883202aa2038a7b9e94ce6d92868;p=lilypond.git

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 4ef8c49d6b..84a97bf52e 100644
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -1,10 +1,21 @@
 /*
-  translator-group.cc -- implement Translator_group
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>,
                  Erik Sandberg <mandolaerik@gmail.com>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "translator-group.hh"
@@ -18,16 +29,10 @@
 #include "music.hh"
 #include "output-def.hh"
 #include "performer-group.hh"
+#include "scheme-engraver.hh"
 #include "scm-hash.hh"
-#include "stream-event.hh"
 #include "warn.hh"
 
-Translator_group *
-Translator_group::get_daddy_translator () const
-{
-  return context ()->get_parent_context ()->implementation ();
-}
-
 void
 translator_each (SCM list, Translator_method method)
 {
@@ -147,15 +152,38 @@ Translator_group::create_child_translator (SCM sev)
 
   for (SCM s = trans_names; scm_is_pair (s); s = scm_cdr (s))
     {
-      Translator *type = get_translator (scm_car (s));
+      SCM definition = scm_car (s);
+      bool is_scheme = false;
+
+      Translator *type = 0;
+      if (ly_is_symbol (definition))
+	type = get_translator (definition);
+      else if (ly_is_pair (definition))
+	{
+	  type = get_translator (ly_symbol2scm ("Scheme_engraver"));
+	  is_scheme = true;
+	}
+      else if (ly_is_procedure (definition))
+	{
+	  // `definition' is a procedure, which takes the context as
+	  // an argument and evaluates to an a-list scheme engraver
+	  // definition.
+	  definition = scm_call_1 (definition, cs);
+	  type = get_translator (ly_symbol2scm ("Scheme_engraver"));
+	  is_scheme = true;
+	}
+	 
       if (!type)
-	warning (_f ("can't find: `%s'", ly_symbol2string (scm_car (s)).c_str ()));
+	warning (_f ("cannot find: `%s'", ly_symbol2string (scm_car (s)).c_str ()));
       else
 	{
-	  Translator *tr = type->clone ();
-	  SCM str = tr->self_scm ();
+	  Translator *instance = type->clone ();
+	  if (is_scheme)
+	    dynamic_cast<Scheme_engraver *> (instance)->init_from_scheme (definition);
+
+	  SCM str = instance->self_scm ();
 
-	  if (tr->must_be_last ())
+	  if (instance->must_be_last ())
 	    {
 	      SCM cons = scm_cons (str, SCM_EOL);
 	      if (scm_is_pair (trans_list))
@@ -166,13 +194,13 @@ Translator_group::create_child_translator (SCM sev)
 	  else
 	    trans_list = scm_cons (str, trans_list);
 
-	  tr->daddy_context_ = new_context;
-	  tr->unprotect ();
+	  instance->daddy_context_ = new_context;
+	  instance->unprotect ();
 	}
     }
 
   /* Filter unwanted translator types. Required to make
-     \with {\consists "..."} work. */
+     \with { \consists "..." } work. */
   if (dynamic_cast<Engraver_group *> (g))
     g->simple_trans_list_ = filter_performers (trans_list);
   else if (dynamic_cast<Performer_group *> (g))
@@ -220,7 +248,8 @@ precomputed_recurse_over_translators (Context *c, Translator_precompute_index id
 }
 
 void
-recurse_over_translators (Context *c, Translator_method ptr, Translator_group_method tg_ptr, Direction dir)
+recurse_over_translators (Context *c, Translator_method ptr,
+			  Translator_group_method tg_ptr, Direction dir)
 {
   Translator_group *tg
     = dynamic_cast<Translator_group *> (c->implementation ());