From: Joe Neeman <joeneeman@gmail.com>
Date: Mon, 19 Feb 2007 11:44:47 +0000 (+1100)
Subject: Move fix for beginning break into paper-column-engraver
X-Git-Tag: release/2.11.20-1~18^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a79a35cbb512c1e1ba291b2e3eb0a5fcb1c6dd45;p=lilypond.git

Move fix for beginning break into paper-column-engraver
---

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index b5aa09e6b8..57457c3777 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -89,7 +89,7 @@ Bar_engraver::typeset_bar ()
 void
 Bar_engraver::stop_translation_timestep ()
 {
-  if (!bar_ && now_mom ().main_part_ > Rational (0))
+  if (!bar_)
     context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
   else
     typeset_bar ();
diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 0876013f89..2c291a796c 100644
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -187,7 +187,8 @@ Paper_column_engraver::stop_translation_timestep ()
     }
   items_.clear ();
 
-  if (to_boolean (get_property ("forbidBreak")))
+  if (to_boolean (get_property ("forbidBreak"))
+     && breaks_) /* don't honour forbidBreak if it occurs on the first moment of a score */
     {
       command_column_->set_property ("page-break-permission", SCM_EOL);
       command_column_->set_property ("line-break-permission", SCM_EOL);