release: 0.1.13

[lilypond.git] / lily / include / staff-info.hh

diff --git a/lily/include/staff-info.hh b/lily/include/staff-info.hh
index a3aa533d2b77ced6d4630d4e4880cee0a08ab382..72cf2663833d499c5782a51111e128f2b1162c0f 100644 (file)
--- a/lily/include/staff-info.hh
+++ b/lily/include/staff-info.hh
@@ -10,27 +10,26 @@
 #ifndef STAFF_INFO_HH
 #define STAFF_INFO_HH
 
-/// struct to pass staff info along a Request_register hierarchy.
+#include "lily-proto.hh"
+
+/// struct to pass staff info along a Engraver hierarchy.
 struct Staff_info {
     int *c0_position_i_l_;
-    Staff_walker *walk_l_;
     Staff_symbol*staff_sym_l_;
     
-    /// when is now?
     Time_description const *time_C_;
     Rhythmic_grouping const *rhythmic_C_;
+    Score_column *musical_l_;
+    Score_column *command_l_;
 
     ///
     bool break_allowed_b_;
-
-    Moment when();
-    Staff * staff_l();
+    Score * score_l_;
     Score *score_l();
-    PCol * command_pcol_l();
-    PCol * musical_pcol_l();
-    Staff_column *column_l();
-    Score_column *musical_l();
+    Paper_column * command_pcol_l();
+    Score_column* musical_l();
     Score_column *command_l();
+    Paper_column * musical_pcol_l();
     Staff_info();
 };