release: 1.0.15

[lilypond.git] / lily / include / score-column.hh

diff --git a/lily/include/score-column.hh b/lily/include/score-column.hh
index 699c84a280786d30413c5732f01a4e3f307dd357..dfe944c5a589ccd7588959ddca8ff9ae24a29e37 100644 (file)
--- a/lily/include/score-column.hh
+++ b/lily/include/score-column.hh
@@ -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>
 */
 
 
@@ -11,7 +11,7 @@
 #define SCORE_COLUMN_HH
 
 #include "lily-proto.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "moment.hh"
 #include "p-col.hh"
 
@@ -26,27 +26,27 @@
   */
 
 class Score_column : public Paper_column {
-    friend class Score;
-    friend class Score_engraver;
+  friend class Score;
+  friend class Score_engraver;
+
+  bool musical_b_;
+  int break_penalty_i_;
+  Moment when_;
 
-    bool musical_b_;
-    Moment when_;
 public:
+  int break_penalty_i () { return break_penalty_i_; }
   DECLARE_MY_RUNTIME_TYPEINFO;
-  SCORE_ELEM_CLONE(Score_column);
-    /// length of notes/rests in this column
-    Array<Moment> durations;
+  SCORE_ELEMENT_CLONE(Score_column);
+  /// length of notes/rests in this column
+  Array<Moment> durations;
     
-    /* *************** */
-
-    Moment when() {  return when_; }
-    Score_column (Moment when);       
-    void add_duration (Moment);
-    void preprocess();
-    bool musical_b() { return musical_b_; }
-    void do_print() const;
-
 
+  Moment when() {  return when_; }
+  Score_column (Moment when);       
+  void add_duration (Moment);
+  void preprocess();
+  bool musical_b() { return musical_b_; }
+  void do_print() const;
 };
 
 #endif // SCORE_COLUMN_HH