X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbreak-algorithm.cc;h=d784b594f48c68de45340575485c7d7709f35508;hb=7697100194a647d04667946bcd0ba35c0554aac0;hp=438bbe4c141503bf76b9e340fea3abcbc8ee020b;hpb=bbcb58184883768ca35d64451d7f693d2db11bb7;p=lilypond.git

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 438bbe4c14..d784b594f4 100644
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -15,66 +15,6 @@
 #include "cpu-timer.hh"
 #include "simple-spacer.hh"
 
-std::vector<int>
-Break_algorithm::find_break_indices () const
-{
-  Link_array__Grob_ all = pscore_->root_system ()->columns ();
-  std::vector<int> retval;
-
-  for (vsize i = 0; i < all.size (); i++)
-    if (Item::is_breakable (all[i]))
-      retval.push_back (i);
-
-  if (linewidth_ <= 0)
-    while (retval.size () > 2)
-      retval.erase (retval.begin () + 1);
-
-  return retval;
-}
-
-Link_array__Grob_
-Break_algorithm::find_breaks () const
-{
-  Link_array__Grob_ all = pscore_->root_system ()->columns ();
-  Link_array__Grob_ retval;
-
-  for (vsize i = 0; i < all.size (); i++)
-    if (Item::is_breakable (all[i]))
-      retval.push_back (all[i]);
-
-  if (linewidth_ <= 0)
-    while (retval.size () > 2)
-      retval.erase (retval.begin () + 1);
-
-  return retval;
-}
-
-Simple_spacer_wrapper *
-Break_algorithm::generate_spacing_problem (Link_array__Grob_ const &curline,
-					   Interval line) const
-{
-  Simple_spacer_wrapper *spw = new Simple_spacer_wrapper;
-  Simple_spacer *sp = spw->spacer_;
-
-  /*
-    this is hardcoded, but this shouldn't happen anyway.
-    used to be get_dimension (ly_symbol2scm ("loose_column_distance"));
-  */
-  sp->default_space_ = 1.0;
-  sp->indent_ = line[LEFT];
-
-  /*
-    sort out how interfacing this should work;
-  */
-  if (line.is_empty ())
-    sp->line_len_ = -1;
-  else
-    sp->line_len_ = line.length ();
-
-  spw->add_columns (curline);
-  return spw;
-}
-
 Break_algorithm::Break_algorithm ()
 {
   pscore_ = 0;
@@ -88,11 +28,10 @@ Break_algorithm::set_pscore (Paper_score *s)
   linewidth_ = s->layout ()->get_dimension (ly_symbol2scm ("line-width"));
 }
 
-std::vector<Column_x_positions>
-Break_algorithm::solve () const
+vector<Column_x_positions>
+Break_algorithm::solve () 
 {
-  std::vector<Column_x_positions> h= do_solve ();
-
+  vector<Column_x_positions> h;
   return h;
 }