From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 19 Apr 2005 22:45:41 +0000 (+0000)
Subject: (process_music): set right bound to
X-Git-Tag: release/2.5.21~27
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9cffbb11851e3078b9f2106765d6df673b21cb2a;p=lilypond.git

(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.
---

diff --git a/ChangeLog b/ChangeLog
index 01ac7dceed..7879a6c25d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-04-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* 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  <janneke@gnu.org>
diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 7a7c9c9dc5..dd7e8ad4fb 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -157,11 +157,12 @@ Dynamic_engraver::process_music ()
 	{
 	  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 @@ Dynamic_engraver::acknowledge_grob (Grob_info info)
 	      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_);
 	}