Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / staff-symbol-engraver.cc

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 8ec2e655c5564803efa717d0ccee649a8c0e9398..4eee00b116dd8f0377dd3a7aa7a5784314714842 100644 (file)
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-symbol-engraver.hh"
@@ -17,7 +17,7 @@ Staff_symbol_engraver::~Staff_symbol_engraver ()
 Staff_symbol_engraver::Staff_symbol_engraver ()
 {
   finished_span_ = 0;
-  first_start_ = true; 
+  first_start_ = true;
   span_ = 0;
   span_events_[LEFT] = 0;
   span_events_[RIGHT] = 0;
@@ -32,7 +32,7 @@ Staff_symbol_engraver::try_music (Music *music)
       span_events_[d] = music;
       return true;
     }
-  
+
   return false;
 }
 
@@ -43,6 +43,8 @@ Staff_symbol_engraver::process_music ()
     {
       finished_span_ = span_;
       span_ = 0;
+      if (first_start_)
+       first_start_ = false;
     }
 
   if (span_events_[START]
@@ -54,18 +56,14 @@ void
 Staff_symbol_engraver::start_spanner ()
 {
   if (!span_)
-    {
-      span_ = make_spanner ("StaffSymbol", SCM_EOL);
-    }
+    span_ = make_spanner ("StaffSymbol", SCM_EOL);
 }
 
 void
 Staff_symbol_engraver::stop_spanner ()
 {
   if (finished_span_ && !finished_span_->get_bound (RIGHT))
-    {
-      finished_span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
-    }
+    finished_span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
   finished_span_ = 0;
 }
 
@@ -95,15 +93,15 @@ Staff_symbol_engraver::finalize ()
 
 /*
   Todo: staff-symbol-referencer iface.
- */
+*/
 void
 Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 {
   /*
     Perhaps should try to take SeparationItem as bound of the staff
     symbol?
-   */
-  if (span_  || finished_span_ )
+  */
+  if (span_ || finished_span_)
     {
       Spanner *my = span_ ? span_ : finished_span_;
       s.grob ()->set_object ("staff-symbol", my->self_scm ());
@@ -111,12 +109,11 @@ Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Staff_symbol_engraver,grob);
+ADD_ACKNOWLEDGER (Staff_symbol_engraver, grob);
 ADD_TRANSLATOR (Staff_symbol_engraver,
-               /* descr */ "Create the constellation of five (default) "
+               /* doc */ "Create the constellation of five (default) "
                "staff lines.",
-               /* creats*/ "StaffSymbol",
-               /* accepts */ "staff-span-event",
-               /* acks  */ "",
-               /* reads */ "",
+               /* create */ "StaffSymbol",
+               /* accept */ "staff-span-event",
+               /* read */ "",
                /* write */ "");