(Multi_measure_rest_engraver): init bar_seen_ to true. Notice

separation items on start. Fixes mm rests in start of score.

diff --git a/ChangeLog b/ChangeLog
index 59d1fab6d89f2d21c7492d34fe77ef3b67e0a484..5d6fcd387477b9af38e70d5db9fdd2ac948043b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
 2005-05-12  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/multi-measure-rest-engraver.cc
+       (Multi_measure_rest_engraver): init bar_seen_ to true. Notice
+       separation items on start. Fixes mm rests in start of score.
+
        * lily/slur-scoring.cc (move_away_from_staffline): robustness,
        don't access StaffSymbol if not there.
+       Fixes: crash-staff-symbol-engraver.ly.
 
        * lily/instrument-name-engraver.cc (class
        Instrument_name_engraver): data member first_. Create

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 654252eff00b01adbaaf24465251dba00f517e61..399b94b6d816bd83c294ccd5667b1022ce646076 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -46,7 +46,11 @@ private:
 Multi_measure_rest_engraver::Multi_measure_rest_engraver ()
 {
   last_command_item_ = 0;
-  bar_seen_ = false;
+
+  /*
+    For the start of a score.
+   */
+  bar_seen_ = true;
   start_measure_ = 0;
   mmrest_ = 0;
   last_rest_ = 0;
@@ -130,7 +134,7 @@ Multi_measure_rest_engraver::process_music ()
        = scm_to_int (get_property ("currentBarNumber"));
     }
 
-  bar_seen_ = scm_is_string (get_property ("whichBar"));
+  bar_seen_ = bar_seen_ || scm_is_string (get_property ("whichBar"));
 }
 
 void
@@ -175,6 +179,7 @@ Multi_measure_rest_engraver::stop_translation_timestep ()
     }
 
   text_events_.clear ();
+  bar_seen_ = false;
 }
 
 void
@@ -185,8 +190,6 @@ Multi_measure_rest_engraver::start_translation_timestep ()
       rest_ev_ = 0;
     }
 
-  bar_seen_ = false;
-
   Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
 
   Moment now = now_mom ();