CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/12 09:55:10
Modified files:
. : ChangeLog
lily : multi-measure-rest-engraver.cc
Log message:
(Multi_measure_rest_engraver): init bar_seen_ to true. Notice
separation items on start. Fixes mm rests in start of score.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3598&tr2=1.3599&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/multi-measure-rest-engraver.cc.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3598 lilypond/ChangeLog:1.3599
--- lilypond/ChangeLog:1.3598 Thu May 12 09:30:49 2005
+++ lilypond/ChangeLog Thu May 12 09:55:10 2005
@@ -1,7 +1,12 @@
2005-05-12 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * 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
Index: lilypond/lily/multi-measure-rest-engraver.cc
diff -u lilypond/lily/multi-measure-rest-engraver.cc:1.103
lilypond/lily/multi-measure-rest-engraver.cc:1.104
--- lilypond/lily/multi-measure-rest-engraver.cc:1.103 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/multi-measure-rest-engraver.cc Thu May 12 09:55:10 2005
@@ -46,7 +46,11 @@
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 @@
= 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 @@
}
text_events_.clear ();
+ bar_seen_ = false;
}
void
@@ -185,8 +190,6 @@
rest_ev_ = 0;
}
- bar_seen_ = false;
-
Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
Moment now = now_mom ();
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
