(do_chroot_jail): paranoia security for webserver

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

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index 14b65f7fc98c3c03ed15ddb192475ed304a4476a..531c8701456f0305f176bf22d4c4eb5d39c0225b 100644 (file)
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 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"
@@ -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 ();
@@ -83,8 +84,8 @@ Gourlay_breaking::do_solve () const
   Break_node first_node ;
   optimal_paths.push (first_node);
 
-  bool ragged_right = to_boolean (pscore_->paper_->c_variable ("raggedright"));
-  bool ragged_last = to_boolean (pscore_->paper_->c_variable ("raggedlast"));
+  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++) 
@@ -110,7 +111,7 @@ Gourlay_breaking::do_solve () const
          cp.cols_ = line;
 
          Interval line_dims
-           = line_dimensions_int (pscore_->paper_, optimal_paths[start_idx].line_);
+           = 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
@@ -194,7 +195,7 @@ Gourlay_breaking::do_solve () const
       i = prev;
     }
 
-  if (verbose_global_b)
+  if (be_verbose_global)
     {
       progress_indication (_f ("Optimal demerits: %f",
                               optimal_paths.top ().demerits_) + "\n");
@@ -203,7 +204,7 @@ 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_);
       
@@ -237,7 +238,7 @@ Gourlay_breaking::combine_demerits (Column_x_positions const &prev,
   if (pc->original_)
     {
       SCM pen = pc->get_property ("penalty");
-      if (ly_c_number_p (pen) && fabs (scm_to_double (pen)) < 10000)
+      if (scm_is_number (pen) && fabs (scm_to_double (pen)) < 10000)
        {
          break_penalties += scm_to_double (pen);
        }