lilypond-1.1.39

diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc
index 2fc8e86b177098475dc367d1b58ee49fd9ea6691..7897404c657bd1ef977ea1fcbaf8e07ae759e16e 100644 (file)
--- a/lily/bar-script-engraver.cc
+++ b/lily/bar-script-engraver.cc
@@ -13,6 +13,7 @@
 #include "g-staff-side.hh"
 #include "g-text-item.hh"
 #include "lily-guile.hh"
+#include "p-col.hh"
 
 Bar_script_engraver::Bar_script_engraver ()
 {
@@ -46,7 +47,12 @@ Bar_script_engraver::do_acknowledge_element (Item *i)
        =  &i->dim_cache_[axis_];         
 
       staff_side_p_->add_support (i);
-      i->add_dependency (staff_side_p_); // UGH. 
+
+      /*
+       How do we make sure that staff_side_p_ has a dependency from
+       someone else? We can't use i for that, 
+       */
+      get_staff_info ().command_pcol_l ()->add_dependency (staff_side_p_);
     }
 }
 

diff --git a/lily/include/staff-info.hh b/lily/include/staff-info.hh
index cbedf848edb0458057428af6a1c84801db673b7e..72ec7831da917f3e8e7b1f0a31cf3261e8a38ca1 100644 (file)
--- a/lily/include/staff-info.hh
+++ b/lily/include/staff-info.hh
@@ -17,14 +17,14 @@
     JUNKME.
  */
 struct Staff_info {
-    Time_description const *time_C_;
-    Rhythmic_grouping const *rhythmic_C_;
-    Score_column *musical_l_;
-    Score_column *command_l_;
-
-    Paper_column * command_pcol_l();
-    Paper_column * musical_pcol_l();
-    Staff_info();
+  Time_description const *time_C_;
+  Rhythmic_grouping const *rhythmic_C_;
+  Score_column *musical_l_;
+  Score_column *command_l_;
+
+  Paper_column * command_pcol_l();
+  Paper_column * musical_pcol_l();
+  Staff_info();
 };
 
 #endif // STAFF_INFO_HH