release: 1.1.25

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

diff --git a/lily/staff-info.cc b/lily/staff-info.cc
index 615975807753b40cf708123adb7059394f742e39..2a0667a892d6d6c511fa0239d77ac252e710c719 100644 (file)
--- a/lily/staff-info.cc
+++ b/lily/staff-info.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "proto.hh"
@@ -14,44 +14,38 @@
 Score*
 Staff_info::score_l()
 {
-    return score_l_;
+  return score_l_;
 }
+
 Staff_info::Staff_info()
 {
-    score_l_ =0;
-    c0_position_i_l_ = 0;
-    time_C_ = 0;
-    rhythmic_C_ =0;
-    break_allowed_b_ = 0;
+  score_l_ =0;
+  time_C_ = 0;
+  rhythmic_C_ =0;
+  staff_sym_l_=0;
 }
 
 Score_column*
 Staff_info::musical_l()
 {
-    return musical_l_;
+  return musical_l_;
 }
 
 Score_column*
 Staff_info::command_l()
 {
-    return command_l_;
+  return command_l_;
 }
 
-PCol*
+Paper_column*
 Staff_info::command_pcol_l()
 {
-    return command_l();
+  return command_l();
 }
 
-PCol*
+Paper_column*
 Staff_info::musical_pcol_l()
 {
-    return musical_l();
-}
-
-Moment
-Staff_info::when()
-{
-    return command_l()->when();
+  return musical_l();
 }