release: 1.3.9

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

diff --git a/lily/grace-align-item.cc b/lily/grace-align-item.cc
index 74e551bfa4f87d6ae3d8c803b63e5d220240a91f..ed1989cd9b817fde2c5187d134f3d6ab3307b810 100644 (file)
--- a/lily/grace-align-item.cc
+++ b/lily/grace-align-item.cc
@@ -9,6 +9,8 @@
 
 #include "grace-align-item.hh"
 #include "lookup.hh"
+#include "paper-column.hh"
+#include "paper-def.hh"
 
 Grace_align_item::Grace_align_item ()
 {
@@ -19,8 +21,12 @@ Grace_align_item::Grace_align_item ()
 void
 Grace_align_item::do_pre_processing ()
 {
-  Real nhw = lookup_l ()->notehead (2, "").dim_[X_AXIS].length();
+  Real nhw = // lookup_l ()->notehead (2, "").dim_[X_AXIS].length();
+    paper_l ()->get_var ("quartwidth");
+  
   threshold_interval_[MIN] = nhw* 1.5;
+  column_l ()->set_elt_property ("contains-grace", SCM_BOOL_T);
+
   
   Axis_align_item::do_pre_processing ();
   Note_head_side::do_pre_processing ();
@@ -28,9 +34,9 @@ Grace_align_item::do_pre_processing ()
   translate_axis (-0.5* nhw, X_AXIS); // ugh.
 }
 
+
 void
-Grace_align_item::do_substitute_element_pointer (Score_element*o, Score_element*n)
+Grace_align_item::do_add_processing ()
 {
-  Axis_align_item::do_substitute_element_pointer (o,n);
-  Note_head_side::do_substitute_element_pointer( o,n);
 }
+