* lily/pfb.cc (LY_DEFINE): ly:ttf->pfa, new function.

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

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 2fe726b5b861e0c2de1956bb400f4151b62df5b4..e112e0a19d5d64551b49fdf01e594929c21526a2 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -3,57 +3,53 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "paper-column.hh"
 #include "break-algorithm.hh"
+#include "paper-column.hh"
 #include "output-def.hh"
 #include "system.hh"
 #include "paper-score.hh"
 #include "paper-column.hh"
 #include "cpu-timer.hh"
-
 #include "simple-spacer.hh"
 #include "group-interface.hh"
 
-
 Array<int>
 Break_algorithm::find_break_indices () const
 {
   Link_array<Grob> all = pscore_->system_->columns ();
   Array<int> retval;
 
-  for (int i=0; i < all.size (); i++)
+  for (int i= 0; i < all.size (); i++)
     if (Item::is_breakable (all[i]))
       retval.push (i);
 
-  if (linewidth_ <=0)
-    while (retval.size () >2)
+  if (linewidth_ <= 0)
+    while (retval.size () > 2)
       retval.del (1);
 
   return retval;
 }
 
-
 Link_array<Grob>
 Break_algorithm::find_breaks () const
 {
   Link_array<Grob> all = pscore_->system_->columns ();
   Link_array<Grob> retval;
 
-  for (int i=0; i < all.size (); i++)
+  for (int i= 0; i < all.size (); i++)
     if (Item::is_breakable (all[i]))
       retval.push (all[i]);
 
-  if (linewidth_ <=0)
+  if (linewidth_ <= 0)
     while (retval.size () >2)
       retval.del (1);
 
   return retval;
 }
 
-
 Simple_spacer_wrapper*
 Break_algorithm::generate_spacing_problem (Link_array<Grob> const &curline,
                                           Interval line) const
@@ -92,7 +88,7 @@ void
 Break_algorithm::set_pscore (Paper_score*s)
 {
   pscore_ = s;
-  linewidth_ = s->paper_->get_dimension (ly_symbol2scm ("linewidth"));
+  linewidth_ = s->layout_->get_dimension (ly_symbol2scm ("linewidth"));
 }
 
 Array<Column_x_positions>