2003 -> 2004

[lilypond.git] / lily / break-algorithm.cc

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index bfacc859f3ed2b9c1855e845bf407ca8cd55be93..56f8e2e109fa102975dd4e5255d6bcd2bbfa24f1 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "paper-column.hh"
@@ -62,7 +62,7 @@ Break_algorithm::generate_spacing_problem (Link_array<Grob> const &curline,
 
   /*
     this is hardcoded, but this shouldn't happen anyway.
-    used to be get_var ("loose_column_distance");        
+    used to be get_realvar (ly_symbol2scm ("loose_column_distance"));        
    */
   sp->default_space_ = 1.0;
 
@@ -72,7 +72,7 @@ Break_algorithm::generate_spacing_problem (Link_array<Grob> const &curline,
   /*
     sort out how interfacing this should work;
    */
-  if (line.empty_b ())
+  if (line.is_empty ())
     {
      sp->line_len_ = -1;
     }
@@ -95,7 +95,7 @@ void
 Break_algorithm::set_pscore (Paper_score*s)
 {
   pscore_ = s;
-  linewidth_ = s->paper_->get_var ("linewidth");
+  linewidth_ = s->paper_->get_realvar (ly_symbol2scm ("linewidth"));
 }
 
 Array<Column_x_positions>