CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/19 12:57:49
Modified files:
. : ChangeLog
lily : grace-engraver.cc
Log message:
(consider_change_grace_settings): new function.
(initialize): also consider_change_grace_settings() on
initialization. Fixes large grace notes at start of score.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3473&tr2=1.3474&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/grace-engraver.cc.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3473 lilypond/ChangeLog:1.3474
--- lilypond/ChangeLog:1.3473 Tue Apr 19 12:48:40 2005
+++ lilypond/ChangeLog Tue Apr 19 12:57:48 2005
@@ -1,5 +1,9 @@
2005-04-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/grace-engraver.cc (consider_change_grace_settings): new function.
+ (initialize): also consider_change_grace_settings() on
+ initialization. Fixes large grace notes at start of score.
+
* lily/break-align-interface.cc (do_alignment): don't translate if
total_extent is empty.
Index: lilypond/lily/grace-engraver.cc
diff -u lilypond/lily/grace-engraver.cc:1.8 lilypond/lily/grace-engraver.cc:1.9
--- lilypond/lily/grace-engraver.cc:1.8 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/grace-engraver.cc Tue Apr 19 12:57:49 2005
@@ -12,9 +12,11 @@
class Grace_engraver : public Engraver
{
+ void consider_change_grace_settings ();
protected:
virtual void start_translation_timestep ();
virtual void derived_mark () const;
+ virtual void initialize ();
TRANSLATOR_DECLARATIONS (Grace_engraver);
Moment last_moment_;
@@ -25,17 +27,17 @@
Grace_engraver::Grace_engraver ()
{
grace_settings_ = SCM_EOL;
+ last_moment_ = Moment (Rational (-1,1));
}
void
-Grace_engraver::derived_mark () const
+Grace_engraver::initialize ()
{
- scm_gc_mark (grace_settings_);
- Engraver::derived_mark ();
+ consider_change_grace_settings ();
}
void
-Grace_engraver::start_translation_timestep ()
+Grace_engraver::consider_change_grace_settings ()
{
Moment now = now_mom ();
if (last_moment_.grace_part_ && !now.grace_part_)
@@ -88,7 +90,20 @@
}
}
- last_moment_ = now;
+ last_moment_ = now_mom();
+}
+
+void
+Grace_engraver::derived_mark () const
+{
+ scm_gc_mark (grace_settings_);
+ Engraver::derived_mark ();
+}
+
+void
+Grace_engraver::start_translation_timestep ()
+{
+ consider_change_grace_settings ();
}
ADD_TRANSLATOR (Grace_engraver,
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
