lily/system.cc (get_paper_system): reinstate the backwards-

compatible page breaking for the old page breaker.

diff --git a/ChangeLog b/ChangeLog
index 3bcf616d5c9389b26968441a4865ad5a59b162b6..112ab77158e826bef5321eae186b2ab20e193e5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2006-10-17  Joe Neeman  <joeneeman@gmail.com>
+
+       * lily/system.cc (get_paper_system): reinstate the backwards-
+       compatible page breaking for the old page breaker.
+
 2006-10-17  Erik Sandberg  <mandolaerik@gmail.com>
        
        * lily/recording-group-engraver.cc: removed
 
        * lily/context.cc, lily/translator-group.cc: Don't touch
        Context::implementation_ if it's null
-       
+
 2006-10-17  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * scm/define-grob-interfaces.scm (stroke-finger-interface): typo.

diff --git a/lily/system.cc b/lily/system.cc
index 07c705ffe6ba4dfb13f80531b532af5be32a5c99..32dd2f367d36e0c37ee09e184584e52fc108d1fb 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -403,6 +403,13 @@ System::get_paper_system ()
   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"));
+
+  /* backwards compatibility with the old page breaker */
+  SCM perm = left_bound->get_property ("page-break-permission");
+  if (!scm_is_symbol (perm))
+    pl->set_property ("penalty", scm_from_double (10001));
+  else if (perm == ly_symbol2scm ("force"))
+    pl->set_property ("penalty", scm_from_double (-10001));
   
   if (!scm_is_pair (pl->get_property ("refpoint-Y-extent")))
     {