final newline

[lilypond.git] / lily / paper-column-engraver.cc

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index f061b910bd787c725215bce6d738483e78fca0f8..2df287aa371cf07a7d289c485981508d7c90e099 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column-engraver.hh"
@@ -11,7 +11,6 @@
 #include "international.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
-#include "item.hh"
 #include "note-spacing.hh"
 #include "paper-column.hh"
 #include "pointer-group-interface.hh"
@@ -155,7 +154,7 @@ Paper_column_engraver::process_music ()
                           && !measure_position (context ()).main_part_);
 
   /*
-    We can't do this in start_translation_timestep(), since time sig
+    We can't do this in start_translation_timestep (), since time sig
     changes won't have happened by then.
   */
   if (start_of_measure)
@@ -189,7 +188,16 @@ Paper_column_engraver::stop_translation_timestep ()
   items_.clear ();
 
   if (to_boolean (get_property ("forbidBreak")))
-    command_column_->set_property ("line-break-permission", SCM_EOL);
+    {
+      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");
+         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?"));
+       }
+    }
   else if (Paper_column::is_breakable (command_column_))
     {
       breaks_++;
@@ -244,8 +252,6 @@ ADD_TRANSLATOR (Paper_column_engraver,
                /* create */
                "PaperColumn "
                "NonMusicalPaperColumn",
-               
-               /* accept */ "break-event",
                /* read */
                 "forbidBreak "
                ,