2003 -> 2004

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

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 8291f81a2372de3c28679f6860dcfad85991a8fd..56f8e2e109fa102975dd4e5255d6bcd2bbfa24f1 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -3,62 +3,32 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "score-column.hh"
-#include "break.hh"
+#include "paper-column.hh"
+#include "break-algorithm.hh"
 #include "paper-def.hh"
-#include "spring-spacer.hh"
-#include "debug.hh"
-#include "line-of-score.hh"
+#include "system.hh"
 #include "paper-score.hh"
 #include "paper-column.hh"
 #include "cpu-timer.hh"
-#include "command-request.hh"
-
-String
-Col_stats::str () const
-{
-  String s;
-  if (!count_i_)
-    s = _ ("0 lines");
-  else if (count_i_ == 1)
-    s = _f ("1 line (of %.0f columns)", (Real)cols_i_/count_i_);
-  else
-    s = _f ("%d lines (with an average of %.1f columns)", 
-      count_i_, (Real)cols_i_/count_i_);
-  return s;
-}
-
-void
-Col_stats::add (Line_of_cols const& line)
-{
-  count_i_++;
-  cols_i_ += line.size ();
-}
-
 
-Col_stats::Col_stats ()
-{
-  count_i_ =0;
-  cols_i_ =0;
-}
-
-/* **************************************************************** */
+#include "simple-spacer.hh"
+#include "group-interface.hh"
 
 
 Array<int>
 Break_algorithm::find_break_indices () const
 {
-  Line_of_cols all (pscore_l_->col_l_arr_);
+  Link_array<Grob> all = pscore_->system_->columns ();
   Array<int> retval;
 
   for (int i=0; i < all.size (); i++)
-    if (all[i]->breakable_b ())
+    if (Item::breakable_b (all[i]))
       retval.push (i);
 
-  if (linelength <=0)
+  if (linewidth_ <=0)
     while (retval.size () >2)
       retval.del (1);
 
@@ -66,18 +36,17 @@ Break_algorithm::find_break_indices () const
 }
 
 
-Line_of_cols
+Link_array<Grob>
 Break_algorithm::find_breaks () const
 {
-  Line_of_cols all (pscore_l_->col_l_arr_);
-  Line_of_cols retval;
+  Link_array<Grob> all = pscore_->system_->columns ();
+  Link_array<Grob> retval;
 
   for (int i=0; i < all.size (); i++)
-    if (all[i]->breakable_b ())
+    if (Item::breakable_b (all[i]))
       retval.push (all[i]);
 
-
-  if (linelength <=0)
+  if (linewidth_ <=0)
     while (retval.size () >2)
       retval.del (1);
 
@@ -85,93 +54,55 @@ Break_algorithm::find_breaks () const
 }
 
 
+Simple_spacer*
+Break_algorithm::generate_spacing_problem (Link_array<Grob> const &curline,
+                                          Interval line) const
+{
+  Simple_spacer * sp =  new Simple_spacer;
 
+  /*
+    this is hardcoded, but this shouldn't happen anyway.
+    used to be get_realvar (ly_symbol2scm ("loose_column_distance"));        
+   */
+  sp->default_space_ = 1.0;
 
 
-Line_spacer*
-Break_algorithm::generate_spacing_problem (Line_of_cols curline, Interval line) const
-{
-  // ugh
-  Spring_spacer * sp= dynamic_cast<Spring_spacer*> ((*get_line_spacer) ());
-
-  sp->paper_l_ = pscore_l_->paper_l_;
-  sp->add_column (curline[0], true, line[LEFT]);
-  for (int i=1; i< curline.size ()-1; i++)
-    sp->add_column (curline[i]);
+  sp->indent_ = line[LEFT];
 
-  if (line.length () > 0)
+  /*
+    sort out how interfacing this should work;
+   */
+  if (line.is_empty ())
     {
-      sp->add_column (curline.top (), true, line[RIGHT]);
-      sp->energy_normalisation_f_  = sqr (line.length ());
+     sp->line_len_ = -1;
     }
   else
-    sp->add_column (curline.top ());
+    sp->line_len_ = line.length ();
+  
+  sp->add_columns (curline);
+
 
-  sp->prepare ();
   return sp;
 }
 
 Break_algorithm::Break_algorithm ()
 {
-  pscore_l_ = 0;
-  get_line_spacer =0;
-  linelength = 0;
+  pscore_ = 0;
+  linewidth_ = 0;
 }
 
 void
 Break_algorithm::set_pscore (Paper_score*s)
 {
-  pscore_l_ = s;
-  linelength = s->paper_l_->linewidth_f ();
-  do_set_pscore ();
-}
-
-bool
-Break_algorithm::feasible (Line_of_cols curline) const
-{
-  if (linelength <=  0)
-    return true;
-
-  for (int i=0; i < curline.size (); i++)
-    {
-      if (i && i < curline.size () -1
-         && ((dynamic_cast<Score_column*>(curline[i]))->break_penalty_i () >= Break_req::FORCE))
-       return false;
-    }
-  return true;
-}
-
-void
-Break_algorithm::problem_OK () const
-{
-  if (pscore_l_->col_l_arr_.empty ())
-    error (_("score does not have any columns"));
-  OK ();
-}
-
-void
-Break_algorithm::OK () const
-{
+  pscore_ = s;
+  linewidth_ = s->paper_->get_realvar (ly_symbol2scm ("linewidth"));
 }
 
 Array<Column_x_positions>
 Break_algorithm::solve () const
 {
-  Cpu_timer timer;
-
   Array<Column_x_positions> h= do_solve ();
-
-  if (approx_stats_.count_i_)
-    *mlog << '\n' << _f ("approximated %s", approx_stats_.str ()) << endl;
-  if (exact_stats_.count_i_)
-    *mlog << _f ("calculated %s exactly", exact_stats_.str ()) << endl;
-  *mlog << _f ("elapsed time %.2f seconds",  timer.read ()) << endl;
-
+  
   return h;
 }
 
-void
-Break_algorithm::do_set_pscore ()
-{
-
-}