X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgourlay-breaking.cc;h=6632d06bfe7d6195feb0908cb77661cbce4a28b6;hb=15c43df3abc82ef71c674d7a7e4e4b6951b38187;hp=b4657f893ada1c0ea373e93032056f45f534500a;hpb=4dbe4ee7ecf3f4f2ea2108da755dc8186741d93b;p=lilypond.git

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index b4657f893a..6632d06bfe 100644
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -3,18 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <math.h>		// rint
-#include <stdio.h>
 
 #include "gourlay-breaking.hh"
-#include "column-x-positions.hh"
+
+#include <math.h>		// rint
+#include <cstdio>
+
 #include "warn.hh"
 #include "main.hh"
 #include "paper-column.hh"
 #include "paper-score.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "simple-spacer.hh"
 #include "system.hh"
 
@@ -55,7 +56,7 @@ struct Break_node {
 void
 print_break_nodes (Array<Break_node> const & arr)
 {
-  for (int i =0; i < arr.size (); i++)
+  for (int i = 0; i < arr.size (); i++)
     {
       printf ( "node %d: ", i); 
       arr[i].print ();
@@ -66,6 +67,9 @@ print_break_nodes (Array<Break_node> const & arr)
   This algorithms is adapted from the OSU Tech report on breaking lines.
 
   this function is longish, but not very complicated.
+
+  TODO: should rewrite. See the function in scm/page-layout.scm for
+  inspiration.
   
  */
 Array<Column_x_positions>
@@ -80,9 +84,11 @@ Gourlay_breaking::do_solve () const
   Break_node first_node ;
   optimal_paths.push (first_node);
 
+  bool ragged_right = to_boolean (pscore_->layout_->c_variable ("raggedright"));
+  bool ragged_last = to_boolean (pscore_->layout_->c_variable ("raggedlast"));
+
   Real worst_force = 0.0;
-  
-  for (int break_idx=1; break_idx< breaks.size (); break_idx++) 
+  for (int break_idx = 1; break_idx< breaks.size (); break_idx++) 
     {
       /*
 	start with a short line, add measures. At some point 
@@ -94,24 +100,30 @@ Gourlay_breaking::do_solve () const
       
       Real minimal_demerits = infinity_f;
 
-      bool ragged = to_boolean (pscore_->paper_->get_scmvar ("raggedright"));
-
       for (int start_idx = break_idx; start_idx--;)
 	{
 	  Link_array<Grob> line = all.slice (breaks[start_idx], breaks[break_idx]+1);
   
-	  line[0]     = dynamic_cast<Item*> (line[0])    ->find_prebroken_piece (RIGHT);
+	  line[0]     = dynamic_cast<Item*> (line[0])->find_prebroken_piece (RIGHT);
 	  line.top () = dynamic_cast<Item*> (line.top ())->find_prebroken_piece (LEFT);
 	    
 	  Column_x_positions cp;
 	  cp.cols_ = line;
 
 	  Interval line_dims
-	    = pscore_->paper_->line_dimensions_int (optimal_paths[start_idx].line_);
-	  Simple_spacer * sp = generate_spacing_problem (line, line_dims);
+	    = line_dimensions_int (pscore_->layout_, optimal_paths[start_idx].line_);
+	  Simple_spacer_wrapper * sp = generate_spacing_problem (line, line_dims);
+	  bool last_line = break_idx == breaks.size ()-1;
+	  bool ragged = ragged_right
+	    || (last_line && ragged_last);
+	  
 	  sp->solve (&cp, ragged);
+	  
 	  delete sp;
 
+	  if (ragged && last_line)
+	    cp.force_ = 0.0;
+	  
 	  if (fabs (cp.force_) > worst_force)
 	    worst_force = fabs (cp.force_);
 
@@ -140,7 +152,7 @@ Gourlay_breaking::do_solve () const
 	    we couldn't satisfy the constraints, this won't get better
 	    if we add more columns, so we get on with the next one
 	  */
-	  if (!cp.satisfies_constraints_b_)
+	  if (!cp.satisfies_constraints_)
 	    break ; 
 	}
 
@@ -167,7 +179,7 @@ Gourlay_breaking::do_solve () const
 
   /* do the last one */
   if (breaks.size () % HAPPY_DOTS_I)
-    progress_indication (String ("[") + to_string (breaks.size()) + "]");    
+    progress_indication (String ("[") + to_string (breaks.size ()) + "]");    
 
   progress_indication ("\n");
 
@@ -192,12 +204,12 @@ Gourlay_breaking::do_solve () const
   if (optimal_paths.top ().demerits_ >= infinity_f)
     warning (_ ("No feasible line breaking found"));
   
-  for (int i= final_breaks.size (); i--;)
+  for (int i = final_breaks.size (); i--;)
     {
       Column_x_positions cp (optimal_paths[final_breaks[i]].line_config_);
       
       lines.push (cp);
-      if(!cp.satisfies_constraints_b_)
+      if (!cp.satisfies_constraints_)
 	warning ("Could not find line breaking that satisfies constraints.");
     }
   return lines;
@@ -225,10 +237,10 @@ Gourlay_breaking::combine_demerits (Column_x_positions const &prev,
   Grob * pc = this_one.cols_.top ();
   if (pc->original_)
     {
-      SCM pen = pc->get_grob_property ("penalty");
-      if (gh_number_p (pen) && fabs (gh_scm2double (pen)) < 10000)
+      SCM pen = pc->get_property ("penalty");
+      if (scm_is_number (pen) && fabs (scm_to_double (pen)) < 10000)
 	{
-	  break_penalties += gh_scm2double (pen);
+	  break_penalties += scm_to_double (pen);
 	}
     }
 
@@ -247,7 +259,7 @@ Gourlay_breaking::combine_demerits (Column_x_positions const &prev,
   Real demerit = abs (this_one.force_) +  abs (prev.force_ - this_one.force_)
     + break_penalties;
   
-  if (!this_one.satisfies_constraints_b_)
+  if (!this_one.satisfies_constraints_)
      {
        /*
 	 If it doesn't satisfy constraints, we make this one