X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column-engraver.cc;h=d583bc513b88816c781b11652fba4528dff2e559;hb=8aa6337f3aec92cf119f23e17952f73040ce86d2;hp=2df287aa371cf07a7d289c485981508d7c90e099;hpb=4d246c3598feaa9918d01faf4bb6614e60a5cbcf;p=lilypond.git

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 2df287aa37..d583bc513b 100644
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -33,13 +33,13 @@ Paper_column_engraver::Paper_column_engraver ()
 void
 Paper_column_engraver::finalize ()
 {
-  if ((breaks_ % 8))
+  if (! (breaks_ % 8))
     progress_indication ("[" + to_string (breaks_) + "]");
 
   if (command_column_)
     {
-      command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow"));
-      command_column_->set_property ("page-turn-permission", ly_symbol2scm ("allow"));
+      if (!scm_is_symbol (command_column_->get_property ("line-break-permission")))
+	command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow"));
       system_->set_bound (RIGHT, command_column_);
     }
 }
@@ -187,13 +187,14 @@ 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);
       for (vsize i = 0; i < break_events_.size (); i++)
 	{
-	  SCM perm = break_events_[i]->get_property ("permission");
+	  SCM perm = break_events_[i]->get_property ("break-permission");
 	  if (perm == ly_symbol2scm ("force") || perm == ly_symbol2scm ("allow"))
 	    warning (_f ("forced break was overridden by some other event, should you be using bar checks?"));
 	}