release: 0.1.47

[lilypond.git] / lily / include / idealspacing.hh

diff --git a/lily/include/idealspacing.hh b/lily/include/idealspacing.hh
index 05f58ba9c8675a01b06e52037c0b74a6ea17eb43..198b7e000b5f59f78df0de2b1561165dc58cd76f 100644 (file)
--- a/lily/include/idealspacing.hh
+++ b/lily/include/idealspacing.hh
@@ -1,28 +1,30 @@
 /*
-  idealspacing.hh -- part of LilyPond
+  idealspacing.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */
 
 #ifndef IDEALSPACING_HH
 #define IDEALSPACING_HH
-#include "proto.hh"
+#include "lily-proto.hh"
 
 /// ideal spacing between two columns
 struct Idealspacing {
 
-    /// the ideal distance
-    Real space;
+  /// the ideal distance
+  Real space_f_;
 
-    /// Hooke's constant: how strong are the "springs" attached to columns
-    Real hooke;
+  /// Hooke's constant: how strong are the "springs" attached to columns
+  Real hooke_f_;
 
-    /// the two columns
-    const PCol *left, *right;
+  /// the two columns
+  int left_i_;
+  int right_i_;
     
-    void print()const;
-    void OK() const ;
-    Idealspacing(const PCol *left,const PCol *right);    
+  Real energy_f (Real x) const;
+  void print() const;
+  void OK() const ;
+  Idealspacing();
 };