patch::: 1.3.58.jcn2

[lilypond.git] / lily / staff-info.cc

diff --git a/lily/staff-info.cc b/lily/staff-info.cc
index b2b1e7250443255da7e706835f1f195722b85bb7..10b63d8645ba66657db5e525767c5557302d698d 100644 (file)
--- a/lily/staff-info.cc
+++ b/lily/staff-info.cc
@@ -1,63 +1,32 @@
 /*
   staff-info.cc -- implement Staff_info
 
-  source file of the LilyPond music typesetter
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  source file of the GNU LilyPond music typesetter
+
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
 #include "proto.hh"
-#include "plist.hh"
-#include "staff.hh"
-#include "staff-info.hh"
-#include "score-column.hh"
-#include "complex-walker.hh"
-#include "staff-column.hh"
 
-Staff*
-Staff_info::staff_l()
-{
-    return walk_l_->staff_l_;
-}
+#include "staff-info.hh"
+#include "paper-column.hh"
 
-Score*
-Staff_info::score_l()
-{
-    return staff_l()->score_l_;
-}
 Staff_info::Staff_info()
 {
-    c0_position_i_l_ = 0;
-    walk_l_ = 0;
-    time_C_ = 0;
-    rhythmic_C_ =0;
-    break_allowed_b_ = 0;
+  command_l_ =0;
+  musical_l_ =0;
 }
 
-Staff_column*
-Staff_info::column_l()
-{
-    return  walk_l_->ptr();
-}
 
-Score_column*
-Staff_info::musical_l()
-{
-    return column_l() -> musical_column_l_;
-}
-
-Score_column*
-Staff_info::command_l()
-{
-    return column_l() -> command_column_l_;
-}
-PCol*
+Paper_column*
 Staff_info::command_pcol_l()
 {
-    return command_l()->pcol_l_;
+  return command_l_;
 }
 
-Moment
-Staff_info::when()
+Paper_column*
+Staff_info::musical_pcol_l()
 {
-    return walk_l_->when();
+  return musical_l_;
 }