* 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 2492b789039d41899eeb562a5b6cf0ab00f14f3c..511fdb4857bdeb67e973efd0755bf54a4420dbe9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-26  Joe Neeman  <joeneeman@gmail.com>
+
+       * 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  <gpermus@gmail.com>
 
        * Diocumentation/user/instrument-notation.itely: added more

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index d0c85fcb209839ce73091072193ea6a71297dd27..23d05e5ac65d0bd3f7e457bce0c94c29e88f7905 100644 (file)
--- 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 74a09ecec677e39162a4a8b1608eeaca93e87e13..aa4a6039b8f9f5fffc7f6f3dd914586e9377e050 100644 (file)
--- 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 926f9f5a962afed18ba94dfdc394ace7df50d5bf..d41feabbf42b29de174d3918444b29d2d10a76a6 100644 (file)
--- 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));
+           }
        }
     }
 }