X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column-engraver.cc;h=33690e38a80d1afba55b5ed99abe24e3d5ce9ba1;hb=ee5919c085b841bae3f4f323a5007321f660f47c;hp=1396c1280d94f8815e0ce6ba32f5ee26fd41bd52;hpb=b80683cc94b0c22bbe3fccb94a9b2e23787fd10b;p=lilypond.git

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 1396c1280d..33690e38a8 100644
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -1,15 +1,27 @@
 /*
-  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"
 #include "system.hh"
 #include "international.hh"
 #include "accidental-placement.hh"
+#include "accidental-interface.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
 #include "note-spacing.hh"
@@ -196,14 +208,14 @@ Paper_column_engraver::stop_translation_timestep ()
       Item *elem = items_[i];
       Grob *col = Item::is_non_musical (elem) ? command_column_ : musical_column_;
 
-      if (!elem->get_parent (X_AXIS)
-	  || !unsmob_grob (elem->get_object ("axis-group-parent-X")))
-	{
-	  Axis_group_interface::add_element (col, elem);
-	}
-      else if (Accidental_placement::has_interface (elem))
+      if (!elem->get_parent (X_AXIS))
+	elem->set_parent (col, X_AXIS);
+      if (!unsmob_grob (elem->get_object ("axis-group-parent-X")))
+	elem->set_object ("axis-group-parent-X", col->self_scm ());
+
+      if (Accidental_placement::has_interface (elem))
 	Separation_item::add_conditional_item (col, elem);
-      else
+      else if (!Accidental_interface::has_interface (elem))
 	Separation_item::add_item (col, elem);
     }
   items_.clear ();
@@ -211,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_))
@@ -262,21 +276,25 @@ ADD_ACKNOWLEDGER (Paper_column_engraver, note_spacing);
 ADD_ACKNOWLEDGER (Paper_column_engraver, staff_spacing);
 
 ADD_TRANSLATOR (Paper_column_engraver,
-		/* doc */ "Takes 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 Bar_engraver "
-		"that does not have a barline at a certain point will set forbidBreaks "
-                "in the score context to stop linebreaks.  In practice, this "
-		"means that you can make a breakpoint by creating a barline (assuming "
-		"that there are no beams or notes that prevent a breakpoint.) ",
+		/* 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).",
 		
 		/* create */
 		"PaperColumn "
-		"NonMusicalPaperColumn",
+		"NonMusicalPaperColumn ",
+
 		/* read */
-                "forbidBreak "
-		,
+                "forbidBreak ",
+
 		/* write */
                 "forbidBreak "
 		"currentCommandColumn "