Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / recording-group-engraver.cc

diff --git a/lily/recording-group-engraver.cc b/lily/recording-group-engraver.cc
index 1852b26372bb8c600c696701af52379b7b5de896..c0091cc834571ee68abf6d835ac679a674ee5861 100644 (file)
--- a/lily/recording-group-engraver.cc
+++ b/lily/recording-group-engraver.cc
@@ -1,121 +1,81 @@
-/*   
+/*
   recording-group-engraver.cc -- implement Recording_group_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
- */
+  (c) 2003--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
+#include "recording-group-engraver.hh"
 #include "context.hh"
-#include "engraver-group-engraver.hh"
-#include "protected-scm.hh"
-
-class Recording_group_engraver : public Engraver_group_engraver
-{
-  void start ();
-public:
-  TRANSLATOR_DECLARATIONS (Recording_group_engraver);
-  virtual bool try_music (Music *m);
-  virtual void start_translation_timestep ();
-  virtual void stop_translation_timestep ();
-  virtual void finalize ();
-  virtual void initialize ();
-  virtual void derived_mark () const;
-  SCM accumulator_;
-};
 
 void
 Recording_group_engraver::derived_mark () const
 {
-  Engraver_group_engraver::derived_mark();
+  Engraver_group::derived_mark ();
+  scm_gc_mark (now_events_);
   scm_gc_mark (accumulator_);
 }
 
-void
-Recording_group_engraver::initialize ()
-{
-  Engraver_group_engraver::initialize ();
-  start ();
-}
-
 Recording_group_engraver::Recording_group_engraver ()
 {
   accumulator_ = SCM_EOL;
+  now_events_ = SCM_EOL;
 }
 
 void
-Recording_group_engraver::start_translation_timestep ()
-{
-  Engraver_group_engraver::start_translation_timestep ();
-
-
-  /*
-    We have to do this both in initialize () and
-    start_translation_timestep (), since start_translation_timestep ()
-    isn't called on the first time-step.
-   */
-  start () ;
-}
-
-void
-Recording_group_engraver::start ()
+Recording_group_engraver::add_music (SCM music, SCM success)
 {
-  if (!ly_c_pair_p (accumulator_))
-    accumulator_ = scm_cons (SCM_EOL, SCM_EOL);
-  if (!ly_c_pair_p (ly_car (accumulator_)))
-    {
-      /*
-       Need to store transposition for every moment; transposition changes during pieces.
-       */
-      scm_set_car_x (accumulator_, scm_cons (scm_cons (now_mom ().smobbed_copy (),
-                                                    get_property ("instrumentTransposition")),
-                                                    SCM_EOL));
-    }
+  now_events_ = scm_cons (scm_cons (music, success), now_events_);
 }
 
 void
 Recording_group_engraver::stop_translation_timestep ()
 {
-  Engraver_group_engraver::stop_translation_timestep ();
-  scm_set_cdr_x (accumulator_, scm_cons (ly_car (accumulator_), ly_cdr (accumulator_)));
-
-  scm_set_car_x (accumulator_, SCM_EOL);
+  accumulator_ = scm_acons (scm_cons (context ()->now_mom ().smobbed_copy (),
+                                     context ()->get_property ("instrumentTransposition")),
+                           now_events_,
+                           accumulator_);
+  now_events_ = SCM_EOL;
 }
 
 void
 Recording_group_engraver::finalize ()
 {
-  Engraver_group_engraver::finalize ();
-  SCM proc = get_property ("recordEventSequence");
-
-  if (ly_c_procedure_p (proc))
-    scm_call_2  (proc, context ()->self_scm (), ly_cdr (accumulator_));
+  SCM proc = context ()->get_property ("recordEventSequence");
 
-  accumulator_ = SCM_EOL;
+  if (ly_is_procedure (proc))
+    scm_call_2 (proc, context ()->self_scm (), scm_cdr (accumulator_));
 }
 
 bool
-Recording_group_engraver::try_music (Music  *m)
+Recording_group_engraver::try_music (Music *m)
 {
   bool retval = Translator_group::try_music (m);
 
-  SCM seq = ly_cdar (accumulator_);
-  seq = scm_cons (scm_cons  (m->self_scm (), ly_bool2scm (retval)),
-                seq);
-  
-  scm_set_cdr_x  (ly_car (accumulator_), seq);
-
+  add_music (m->self_scm (), ly_bool2scm (retval));
   return retval;
 }
 
+void
+recording_engraver (Translator_group *tg)
+{
+  Recording_group_engraver *rg = dynamic_cast<Recording_group_engraver *> (tg);
+  rg->stop_translation_timestep ();
+}
+
+void
+Recording_group_engraver::fetch_precomputable_methods (Translator_group_void_method ptrs[])
+{
+  Translator_group::fetch_precomputable_methods (ptrs);
+  ptrs[STOP_TRANSLATION_TIMESTEP] = &recording_engraver;
+}
 
-ENTER_DESCRIPTION (Recording_group_engraver,
-                 "Engraver_group_engraver that records all music events "
-                 "for this context. Calls the procedure "
-                 "in @code{recordEventSequence} when finished.",
-                 "",
-                 "",
-                 "",
-                 "recordEventSequence",
-                 "");
+ADD_TRANSLATOR_GROUP (Recording_group_engraver,
+                     "Engraver_group that records all music events "
+                     "for this context. Calls the procedure "
+                     "in @code{recordEventSequence} when finished.",
+                     "",
+                     "",
+                     "recordEventSequence",
+                     "");