patch::: 1.1.25.jcn1: jcn1

[lilypond.git] / lily / score-column.cc

diff --git a/lily/score-column.cc b/lily/score-column.cc
index 0da2f640cbd0b024cc89f4b0b9156424ccf1d750..ab3ceb8a505f39f2249f1454c77e86c632303331 100644 (file)
--- a/lily/score-column.cc
+++ b/lily/score-column.cc
@@ -3,26 +3,27 @@
 
   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 "debug.hh"
 #include "p-col.hh"
 #include "score-column.hh"
+#include "command-request.hh"
 
-Score_column::Score_column (Moment w)
+Score_column::Score_column (Moment w, bool musical_b)
 {
-  forced_break_b_ = false;
+  break_penalty_i_ = 0;
   when_ = w;
-  musical_b_ = false;
+  musical_b_ = musical_b;
 }
 
 void
 Score_column::do_print() const
 {
 #ifndef NPRINT
-  DOUT << "mus "<< musical_b_ <<" at " <<  when_<< '\n';
-  if (forced_break_b_)
+  DOUT << "mus "<< musical_b_ << " at " <<  when_ << '\n';
+  if (break_penalty_i_ >= Break_req::FORCE)
     DOUT << "Break forced";
       
   DOUT << "durations: [";
@@ -51,8 +52,8 @@ Score_column::add_duration (Moment d)
 {
   if (!d)
     {
-      warning (_("Ignoring zero duration added to column at ")
-              + when_.str ());
+      warning (_f ("ignoring zero duration added to column at %s",
+              when_.str ()));
       return;
     }
   
@@ -64,4 +65,4 @@ Score_column::add_duration (Moment d)
   durations.push (d);
 }
 
-IMPLEMENT_IS_TYPE_B1(Score_column, Paper_column);
+