release: 1.3.47

[lilypond.git] / lily / grace-align-item.cc

diff --git a/lily/grace-align-item.cc b/lily/grace-align-item.cc
index 0256679458f11b067002c7d8435ccccf66134253..0745e3fe640eafda4bb9fd62e56fb3a9fc0e4c00 100644 (file)
--- a/lily/grace-align-item.cc
+++ b/lily/grace-align-item.cc
@@ -3,33 +3,33 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "grace-align-item.hh"
+#include "align-interface.hh"
 #include "lookup.hh"
 #include "paper-column.hh"
 #include "paper-def.hh"
 
 Grace_align_item::Grace_align_item ()
 {
-  stacking_dir_ = RIGHT;
-  set_axis (X_AXIS);
+  set_elt_property ("stacking-dir", gh_int2scm (RIGHT));
+  Align_interface (this).set_interface();
+  Align_interface (this).set_axis (X_AXIS);
 }
   
 void
-Grace_align_item::do_pre_processing ()
+Grace_align_item::before_line_breaking ()
 {
   Real nhw = // lookup_l ()->notehead (2, "").dim_[X_AXIS].length();
     paper_l ()->get_var ("quartwidth");
   
-  threshold_interval_[MIN] = nhw* 1.5;
+  set_elt_property ("threshold",
+                   gh_cons (gh_double2scm (nhw* 1.5),
+                            gh_double2scm (infinity_f)));
   column_l ()->set_elt_property ("contains-grace", SCM_BOOL_T);
-
-  
-  Axis_align_item::do_pre_processing ();
-  translate_axis (-0.5* nhw, X_AXIS); // ugh.
 }