From 0b17af5219104d00cb2453faacee4afa2250507b Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Tue, 31 Aug 2004 22:41:24 +0000
Subject: [PATCH] *** empty log message ***
---
ChangeLog | 5 +++++
lily/include/spaceable-grob.hh | 2 +-
lily/simple-spacer.cc | 1 -
lily/spaceable-grob.cc | 1 -
lily/spacing-spanner.cc | 2 +-
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c6a9bb7e27..c6f0f84cb1 100644
--- 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 1f45f40070..10cac3e18a 100644
--- 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 f8c1f94b64..746da5826a 100644
--- 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 a25f2973db..ffc3545751 100644
--- 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 85b7c3dbaf..4c6622b0b1 100644
--- 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.",
"");
--
2.39.5