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 961de68e2bc0790e4ada149fa87f18a91171a9e3..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--1998 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"
 
@@ -30,16 +30,16 @@ class Score_column : public Paper_column {
   friend class Score_engraver;
 
   bool musical_b_;
-  bool forced_break_b_;
+  int break_penalty_i_;
   Moment when_;
+
 public:
-  bool forced_break_b () { return forced_break_b_ ; }
+  int break_penalty_i () { return break_penalty_i_; }
   DECLARE_MY_RUNTIME_TYPEINFO;
-  SCORE_ELEM_CLONE(Score_column);
+  SCORE_ELEMENT_CLONE(Score_column);
   /// length of notes/rests in this column
   Array<Moment> durations;
     
-  /* *************** */
 
   Moment when() {  return when_; }
   Score_column (Moment when);       
@@ -47,8 +47,6 @@ public:
   void preprocess();
   bool musical_b() { return musical_b_; }
   void do_print() const;
-
-
 };
 
 #endif // SCORE_COLUMN_HH