From: Joe Neeman Date: Thu, 26 Oct 2006 06:43:47 +0000 (+0000) Subject: * Documentation/topdocs/NEWS.tely: add 2 entries for the X-Git-Tag: release/2.10.0-2~82 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f1f25f510f6e43a52d8839ff3dca6e4e14ef41ec;p=lilypond.git * Documentation/topdocs/NEWS.tely: add 2 entries for the page breaking stuff * Documentation/user/page.itely: remove time-scaled-music bug for the Page_turn_engraver * lily/paper-book.cc (set_system_penalty): backwards compatibility (breakbefore) for the old page breaker --- diff --git a/ChangeLog b/ChangeLog index 2492b78903..511fdb4857 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-10-26 Joe Neeman + + * Documentation/topdocs/NEWS.tely: add 2 entries for the + page breaking stuff + + * Documentation/user/page.itely: remove time-scaled-music + bug for the Page_turn_engraver + + * lily/paper-book.cc (set_system_penalty): backwards + compatibility (breakbefore) for the old page breaker + 2006-10-25 Graham Percival * Diocumentation/user/instrument-notation.itely: added more diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index d0c85fcb20..23d05e5ac6 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -66,7 +66,11 @@ which scares away people. @end ignore +@item Horizontal and vertical spacing are now done at the same time +so that pages are filled more evenly. +@item The page breaking algorithm is capable of detecting page turns +and formatting the music accordingly. @c Insert any new material above this line. -gp diff --git a/Documentation/user/page.itely b/Documentation/user/page.itely index 74a09ecec6..aa4a6039b8 100644 --- a/Documentation/user/page.itely +++ b/Documentation/user/page.itely @@ -1135,20 +1135,6 @@ only allow turns in repeats whose duration is longer than this value. @refbugs -The @code{Page_turn_engraver} does not respect time-scaled music. For example, the -following example does not behave as expected: - -@example -\new Staff \with @{ \consists "Page_turn_engraver" @} -@{ - a4 b c d | - R1 | % a page turn will be allowed here - a4 b \times 2/3 @{c d e@} | - R1 | % a page turn will NOT be allowed here - a1 -@} -@end example - There should only be one @code{Page_turn_engraver} in a score. If there is more than one, they will interfere with each other. diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 926f9f5a96..d41feabbf4 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -239,7 +239,11 @@ set_system_penalty (SCM sys, SCM header) cols.back ()->set_property ("page-break-permission", sym); } else if (Prob *pb = unsmob_prob (sys)) - pb->set_property ("page-break-permission", sym); + { + pb->set_property ("page-break-permission", sym); + /* backwards compatibility for the old page breaker */ + pb->set_property ("penalty", scm_from_int (b ? -10001 : 10001)); + } } } }