Don't let lyrics interfere with StaffGrouper.

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

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 58fd467ae6422bbc25446f038d96ad47dd19412e..33690e38a80d1afba55b5ed99abe24e3d5ce9ba1 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  paper-column-engraver.cc -- implement Paper_column_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "paper-column-engraver.hh"
@@ -212,13 +223,15 @@ Paper_column_engraver::stop_translation_timestep ()
   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-turn-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 ("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?"));
+           warning (_ ("forced break was overridden by some other event, "
+                       "should you be using bar checks?"));
        }
     }
   else if (Paper_column::is_breakable (command_column_))
@@ -266,14 +279,14 @@ ADD_TRANSLATOR (Paper_column_engraver,
                /* doc */
                "Take care of generating columns.\n"
                "\n"
-               "This engraver decides whether a column is breakable.  The "
-               "default is that a column is always breakable.  However, "
-               "every @code{Bar_engraver} that does not have a barline at a "
-               "certain point will set @code{forbidBreaks} in the score "
-               "context to stop line breaks.  In practice, this means that "
-               "you can make a break point by creating a bar line (assuming "
-               "that there are no beams or notes that prevent a break "
-               "point).",
+               "This engraver decides whether a column is breakable.  The"
+               " default is that a column is always breakable.  However,"
+               " every @code{Bar_engraver} that does not have a barline at a"
+               " certain point will set @code{forbidBreaks} in the score"
+               " context to stop line breaks.  In practice, this means that"
+               " you can make a break point by creating a bar line (assuming"
+               " that there are no beams or notes that prevent a break"
+               " point).",
                
                /* create */
                "PaperColumn "