CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/19 22:45:42
Modified files:
. : ChangeLog
lily : dynamic-engraver.cc
Log message:
(process_music): set right bound to
script if present. Else, do not set.
(acknowledge_grob): only set right bound of finished spanner to
note column if no other bound is set.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3480&tr2=1.3481&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/dynamic-engraver.cc.diff?tr1=1.165&tr2=1.166&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3480 lilypond/ChangeLog:1.3481
--- lilypond/ChangeLog:1.3480 Tue Apr 19 22:19:36 2005
+++ lilypond/ChangeLog Tue Apr 19 22:45:41 2005
@@ -1,5 +1,10 @@
2005-04-20 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/dynamic-engraver.cc (process_music): set right bound to
+ script if present. Else, do not set.
+ (acknowledge_grob): only set right bound of finished spanner to
+ note column if no other bound is set.
+
* python/lilylib.py (make_ps_images): switch back to png16m.
2005-04-19 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
Index: lilypond/lily/dynamic-engraver.cc
diff -u lilypond/lily/dynamic-engraver.cc:1.165
lilypond/lily/dynamic-engraver.cc:1.166
--- lilypond/lily/dynamic-engraver.cc:1.165 Tue Apr 19 13:22:20 2005
+++ lilypond/lily/dynamic-engraver.cc Tue Apr 19 22:45:41 2005
@@ -157,11 +157,12 @@
{
assert (!finished_cresc_ && cresc_);
- cresc_->set_bound (RIGHT, script_
- ? script_
- : unsmob_grob (get_property
("currentMusicalColumn")));
- add_bound_item (line_spanner_, cresc_->get_bound (RIGHT));
-
+ if (script_)
+ {
+ cresc_->set_bound (RIGHT, script_);
+ add_bound_item (line_spanner_, script_);
+ }
+
finished_cresc_ = cresc_;
cresc_ = 0;
current_cresc_ev_ = 0;
@@ -391,10 +392,9 @@
cresc_->set_bound (LEFT, info.grob_);
add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
}
- cresc_->set_bound (RIGHT, info.grob_);
}
- if (finished_cresc_)
+ if (finished_cresc_ && !finished_cresc_->get_bound (RIGHT))
{
finished_cresc_->set_bound (RIGHT, info.grob_);
}
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
