Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / hara-kiri-engraver.cc

diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index 30eda507cdeb5b3f2dc1db70596d3306f7ffff13..39cc48a90bcbbd62d8144aac7833d4e64b5ee722 100644 (file)
--- a/lily/hara-kiri-engraver.cc
+++ b/lily/hara-kiri-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-engraver.hh"
@@ -13,6 +13,10 @@
 
 #include "translator.icc"
 
+/*
+  TODO: fold together with axis_group_engraver? 
+ */
+
 class Hara_kiri_engraver : public Axis_group_engraver
 {
 protected:
@@ -26,6 +30,12 @@ public:
   TRANSLATOR_DECLARATIONS (Hara_kiri_engraver);
 };
 
+
+Hara_kiri_engraver::Hara_kiri_engraver ()
+{
+  interesting_ = SCM_EOL;
+}
+
 void
 Hara_kiri_engraver::derived_mark () const
 {
@@ -42,14 +52,13 @@ Hara_kiri_engraver::start_translation_timestep ()
 void
 Hara_kiri_engraver::add_element (Grob *e)
 {
-  Hara_kiri_group_spanner::add_element (staffline_, e);
+  Axis_group_engraver::add_element (e);
 }
 
 Spanner *
 Hara_kiri_engraver::get_spanner ()
 {
-  Spanner *sp = make_spanner ("RemoveEmptyVerticalGroup", SCM_EOL);
-
+  Spanner *sp = make_spanner ("VerticalAxisGroup", SCM_EOL);
   return sp;
 }
 
@@ -67,16 +76,12 @@ Hara_kiri_engraver::acknowledge_grob (Grob_info i)
     }
 }
 
-Hara_kiri_engraver::Hara_kiri_engraver ()
-{
-  interesting_ = SCM_EOL;
-}
 
 ADD_ACKNOWLEDGER (Hara_kiri_engraver, grob);
 ADD_TRANSLATOR (Hara_kiri_engraver,
                /* doc */ "Like Axis_group_engraver, but make a hara-kiri spanner, and add "
                "interesting items (ie. note heads, lyric syllables and normal rests) ",
-               /* create */ "RemoveEmptyVerticalGroup",
+               /* create */ "VerticalAxisGroup",
                /* accept */ "",
                /* read */ "keepAliveInterfaces",
                /* write */ "");