* lily/note-column.cc: reformat.

[lilypond.git] / lily / system.cc

diff --git a/lily/system.cc b/lily/system.cc
index a8a0ff5160f7ba0730c8ce20eee15796780cf5a5..54562cdc04be4608b83f0a4c8e48f6ff0772f8f2 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -218,6 +218,7 @@ System::break_into_pieces (vector<Column_x_positions> const &breaking)
          c[j]->translate_axis (breaking[i].config_[j], X_AXIS);
          dynamic_cast<Paper_column *> (c[j])->system_ = system;
        }
+      
       set_loose_columns (system, &breaking[i]);
       broken_intos_.push_back (system);
     }
@@ -396,14 +397,12 @@ System::get_paper_system ()
   Prob *pl = make_paper_system (prop_init);
   paper_system_set_stencil (pl, sys_stencil);
 
-  /* backwards-compatibility hack for the old page-breaker */
-  SCM turn_perm = left_bound->get_property ("page-break-permission");
-  if (!scm_is_symbol (turn_perm))
-    pl->set_property ("penalty", scm_from_double (10001.0));
-  else if (turn_perm == ly_symbol2scm ("force"))
-    pl->set_property ("penalty", scm_from_double (-10001.0));
-  else
-    pl->set_property ("penalty", scm_from_double (0.0));
+  /* information that the page breaker might need */
+  Grob *right_bound = this->get_bound (RIGHT);
+  pl->set_property ("page-break-permission", right_bound->get_property ("page-break-permission"));
+  pl->set_property ("page-turn-permission", right_bound->get_property ("page-turn-permission"));
+  pl->set_property ("page-break-penalty", right_bound->get_property ("page-break-penalty"));
+  pl->set_property ("page-turn-penalty", right_bound->get_property ("page-turn-penalty"));
   
   if (!scm_is_pair (pl->get_property ("refpoint-Y-extent")))
     {