*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index c6a9bb7e27bf310cf20345ae039a483225d35f24..c6f0f84cb178e6eb8f12ccfcefa86bffebe94bef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-01  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/include/simple-spacer.hh (struct Simple_spacer): remove
+       expand_only option.
+
 2004-08-29  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/system.cc (get_line): add System stencil to exprs. Fixes

diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh
index 1f45f40070fdd6e2e962b00df552d1745cf04674..10cac3e18ae697825e9e92bfc030a133d7e39e4f 100644 (file)
--- a/lily/include/spaceable-grob.hh
+++ b/lily/include/spaceable-grob.hh
@@ -17,7 +17,7 @@ struct Spaceable_grob
 {
   /// set a minimum distance
   static void add_rod (Grob*me, Grob * to, Real distance);
-  static void add_spring (Grob*me,Grob * to, Real dist, Real strength, bool);
+  static void add_spring (Grob*me,Grob * to, Real dist, Real strength);
   static bool has_interface (Grob*);
   static void remove_interface (Grob*);
   static SCM get_minimum_distances (Grob*);

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index f8c1f94b646079bbf9c7cb48c589127768b8c886..746da5826a2ad5410d43a02691d4667a23e45929 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -62,7 +62,6 @@ Simple_spacer::Simple_spacer ()
     Give an extra penalty for compression. Needed to avoid compressing
     tightly spaced lines.
   */
-  compression_penalty_b_ = false;
   active_count_ = 0;
   force_ = 0.;
   indent_ =0.0;

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index a25f2973dbba8def6e80a0aa85f5d7634470724e..ffc354575149eeb77373cba343d863b17ac601ea 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -84,7 +84,6 @@ Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength)
   Spring_smob spring;
   spring.strength_ = strength;
   spring.distance_ = d;
-  spring.expand_only_b_ = expand_only;
   spring.other_ = p;
   
   Group_interface::add_thing (me, ly_symbol2scm ("ideal-distances"), spring.smobbed_copy ());

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 85b7c3dbaf716374c3b526cc7c70a67ab5fcba58..4c6622b0b1b89e08ac2d5b0c7e7e2c6ca6fe66f7 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -941,7 +941,7 @@ ADD_INTERFACE (Spacing_spanner,"spacing-spanner-interface",
 
 
 
-ADD_INTERFACE (Spacing_interface,"spacing-interface",
+ADD_INTERFACE (Spacing_interface, "spacing-interface",
   "Something to do with line breaking and spacing. Kill this one after determining line breaks.",
   "");