Configure only pristine build tree or on user

[lilypond.git] / lily / gourlay-breaking.cc

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index c40047173944a8e47bad490901eed8b2e68a41a7..9cfd6b531f5677999a8ac6be1daab5274dd8d95b 100644 (file)
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -14,7 +14,7 @@
 #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"
 
@@ -79,8 +79,8 @@ Gourlay_breaking::do_solve () const
   Break_node first_node ;
   optimal_paths.push (first_node);
 
-  bool ragged_right = to_boolean (pscore_->paper_->get_scmvar ("raggedright"));
-  bool ragged_last = to_boolean (pscore_->paper_->get_scmvar ("raggedlast"));
+  bool ragged_right = to_boolean (pscore_->paper_->c_variable ("raggedright"));
+  bool ragged_last = to_boolean (pscore_->paper_->c_variable ("raggedlast"));
 
   Real worst_force = 0.0;
   for (int break_idx = 1; break_idx< breaks.size (); break_idx++) 
@@ -106,7 +106,7 @@ Gourlay_breaking::do_solve () const
          cp.cols_ = line;
 
          Interval line_dims
-           = pscore_->paper_->line_dimensions_int (optimal_paths[start_idx].line_);
+           = line_dimensions_int (pscore_->paper_, optimal_paths[start_idx].line_);
          Simple_spacer * sp = generate_spacing_problem (line, line_dims);
          bool last_line = break_idx == breaks.size ()-1;
          bool ragged = ragged_right
@@ -233,7 +233,7 @@ Gourlay_breaking::combine_demerits (Column_x_positions const &prev,
   if (pc->original_)
     {
       SCM pen = pc->get_property ("penalty");
-      if (is_number (pen) && fabs (ly_scm2double (pen)) < 10000)
+      if (ly_c_number_p (pen) && fabs (ly_scm2double (pen)) < 10000)
        {
          break_penalties += ly_scm2double (pen);
        }