Move fix for beginning break into paper-column-engraver

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index b5aa09e6b8e0eae558bd0b80ef6c25432d5e7e4e..57457c37770fa061ca0bd34c7399c81fa8c3bc0b 100644 (file)
--- 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 0876013f8911002d4b75b3ed2040f5ed7b3e284b..2c291a796c8456372247998031a019422b114ae4 100644 (file)
--- 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);