release: 1.3.19

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

diff --git a/lily/staff-info.cc b/lily/staff-info.cc
index 75854b82a92c966bb4f1042930a9521fb2d78ef8..10b63d8645ba66657db5e525767c5557302d698d 100644 (file)
--- a/lily/staff-info.cc
+++ b/lily/staff-info.cc
@@ -3,56 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "proto.hh"
-#include "plist.hh"
-#include "staff-info.hh"
-#include "score-column.hh"
 
-Score*
-Staff_info::score_l()
-{
-  return score_l_;
-}
+#include "staff-info.hh"
+#include "paper-column.hh"
 
 Staff_info::Staff_info()
 {
-  score_l_ =0;
-  c0_position_i_l_ = 0;
-  time_C_ = 0;
-  rhythmic_C_ =0;
-  break_allowed_b_ = 0;
-}
-
-Score_column*
-Staff_info::musical_l()
-{
-  return musical_l_;
+  command_l_ =0;
+  musical_l_ =0;
 }
 
-Score_column*
-Staff_info::command_l()
-{
-  return command_l_;
-}
 
 Paper_column*
 Staff_info::command_pcol_l()
 {
-  return command_l();
+  return command_l_;
 }
 
 Paper_column*
 Staff_info::musical_pcol_l()
 {
-  return musical_l();
-}
-
-Moment
-Staff_info::when()
-{
-  return command_l()->when ();
+  return musical_l_;
 }