Fix 899.

Don't touch the stretch strength when we add full-measure-extra-space.

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index 958d1fa651439a8345c9d011ac39d725b6250d69..56763572862d542981ccac6901f708ee19098794 100644 (file)
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -55,6 +55,8 @@ public:
   void set_inverse_compress_strength (Real);
   void set_blocking_force (Real);
   void set_default_strength ();
+  void set_default_compress_strength ();
+  void set_default_stretch_strength ();
 
   void operator*= (Real);
   bool operator> (Spring const&) const;

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 6ec8108d691decc8040ba297046c395e6650aeb9..783946eb10de5a30e3f3b95ab98e0d445fcda98a 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -539,7 +539,7 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
     {
       Real full_measure_extra_space = robust_scm2double (l->get_property ("full-measure-extra-space"), 1.0);
       spring.set_distance (spring.distance () + full_measure_extra_space);
-      spring.set_default_strength ();
+      spring.set_default_compress_strength ();
     }
   
   if (options->stretch_uniformly_ && l->break_status_dir () != RIGHT)

diff --git a/lily/spring.cc b/lily/spring.cc
index d4b014a3dc79b063c0ad7b9887951e62d102b87d..761ef2467bf0773c770b70a6410b7a2541de2ca1 100644 (file)
--- a/lily/spring.cc
+++ b/lily/spring.cc
@@ -174,12 +174,24 @@ Spring::set_blocking_force (Real f)
 
 void
 Spring::set_default_strength ()
+{
+  set_default_stretch_strength ();
+  set_default_compress_strength ();
+}
+
+void
+Spring::set_default_compress_strength ()
 {
   inverse_compress_strength_ = (distance_ >= min_distance_) ? distance_ - min_distance_ : 0;
-  inverse_stretch_strength_ = distance_;
   update_blocking_force ();
 }
 
+void
+Spring::set_default_stretch_strength ()
+{
+  inverse_stretch_strength_ = distance_;
+}
+
 Real
 Spring::length (Real f) const
 {