From: Joe Neeman Date: Tue, 17 Oct 2006 17:47:04 +0000 (+0000) Subject: lily/system.cc (get_paper_system): reinstate the backwards- X-Git-Tag: release/2.10.0-2~150 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f20a6882444bfa274e03f459d4c45630c798dde5;p=lilypond.git lily/system.cc (get_paper_system): reinstate the backwards- compatible page breaking for the old page breaker. --- diff --git a/ChangeLog b/ChangeLog index 3bcf616d5c..112ab77158 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,15 @@ +2006-10-17 Joe Neeman + + * lily/system.cc (get_paper_system): reinstate the backwards- + compatible page breaking for the old page breaker. + 2006-10-17 Erik Sandberg * 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 * scm/define-grob-interfaces.scm (stroke-finger-interface): typo. diff --git a/lily/system.cc b/lily/system.cc index 07c705ffe6..32dd2f367d 100644 --- 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"))) {