duh

[lilypond.git] / lily / script-engraver.cc

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 3defd89c8d298c77dbc051320748097393f329d2..3324488400d04e6fe97b76d8fde591d3472018c9 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -33,19 +33,11 @@ public:
   TRANSLATOR_DECLARATIONS(Script_engraver);
 protected:
   virtual bool try_music (Music*);
-  virtual void initialize ();
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void process_music ();
   virtual void acknowledge_grob (Grob_info);
 };
 
-void
-Script_engraver::initialize ()
-{
-  scripts_.clear ();
-}
-
 bool
 Script_engraver::try_music (Music *r)
 {
@@ -78,8 +70,9 @@ copy_property (Grob * g , SCM sym, SCM alist)
   little space by tacking the props onto the Script grob (i.e. make
   ScriptStaccato , ScriptMarcato, etc. )
  */
-Grob *make_script_from_event (SCM * descr, Translator_group*tg, Music * event,
-                             int index)
+void make_script_from_event (Grob *p,
+                            SCM * descr, Translator_group*tg, Music * event,
+                            int index)
 {
   SCM alist = tg->get_property ("scriptDefinitions");
   SCM art_type= event->get_mus_property ("articulation-type");
@@ -90,12 +83,12 @@ Grob *make_script_from_event (SCM * descr, Translator_group*tg, Music * event,
       event->origin ()->warning (_("Don't know how to interpret articulation:"));
       event->origin ()->warning (_("Scheme encoding: "));
       scm_write (art_type, scm_current_error_port ());
-      return 0 ;
+      return  ;
     }
 
   art = gh_cdr (art);
     
-  Grob *p =new Item (tg->get_property ("Script"));
+  
   *descr = art;  
 
   SCM force_dir = event->get_mus_property ("direction");
@@ -121,7 +114,6 @@ Grob *make_script_from_event (SCM * descr, Translator_group*tg, Music * event,
 
   Side_position_interface::set_axis (p, Y_AXIS);
   p->set_grob_property ("script-priority", gh_int2scm (prio));
-  return p;
 }
 
 void
@@ -131,7 +123,9 @@ Script_engraver::process_music ()
     {
       Music* l=scripts_[i].event_;
 
-      Grob * p = make_script_from_event (&scripts_[i].description_, daddy_trans_, l, i);
+      Grob * p = make_item ("Script");
+
+      make_script_from_event (p, &scripts_[i].description_, daddy_trans_, l, i);
 
       scripts_[i].script_ = p;
       if (p)
@@ -209,20 +203,15 @@ Script_engraver::stop_translation_timestep ()
 
       SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"), scripts_[i].description_);
       if (gh_pair_p (follow) && to_boolean (gh_cdr (follow)))
-       sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS);
-      else
-       Side_position_interface::add_staff_support (sc);
+       {
+         sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS);
+         sc->set_grob_property ("staff-padding", SCM_EOL);
+       }
       typeset_grob (sc);
     }
   scripts_.clear ();
 }
 
-void
-Script_engraver::start_translation_timestep ()
-{
-  scripts_.clear ();
-}
-
 
 
 Script_engraver::Script_engraver(){}