Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / spaceable-grob.cc

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 12012be46d9df5500148977af8b5675f18691082..679c2bcb195651dc1954d371c59830d7d447b887 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -3,14 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spaceable-grob.hh"
 
 #include <cstdio>
-#include <cmath>
-using namespace std;
 
 #include "warn.hh"
 #include "spring.hh"
@@ -122,8 +120,17 @@ Spaceable_grob::remove_interface (Grob *me)
   me->set_object ("ideal-distances", SCM_EOL);
 }
 
-ADD_INTERFACE (Spaceable_grob, "spaceable-grob-interface",
+ADD_INTERFACE (Spaceable_grob,
               "A layout object that takes part in the spacing problem. ",
-              "measure-length spacing-wishes penalty minimum-distances ideal-distances "
-              "keep-inside-line left-neighbors right-neighbors");
+              
+
+              /* properties */
+              "allow-loose-spacing "
+              "ideal-distances "
+              "keep-inside-line "
+              "left-neighbors "
+              "measure-length "
+              "minimum-distances "
+              "right-neighbors "
+              "spacing-wishes");