X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column-engraver.cc;h=bce6febc435a83459b00cbcd992bf7c29869ff36;hb=e62c1e205cd619afcc43fd8c8a9a2c5a093b508e;hp=6ed851243d93809d2a6d226bd73faaf64d6cbb9c;hpb=494480922732721837f76e3d0e78918bfc8f556c;p=lilypond.git

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 6ed851243d..bce6febc43 100644
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -1,19 +1,33 @@
 /*
-  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--2009 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"
 #include "paper-column.hh"
 #include "pointer-group-interface.hh"
+#include "separation-item.hh"
 #include "staff-spacing.hh"
 #include "system.hh"
 #include "warn.hh"
@@ -192,25 +206,32 @@ Paper_column_engraver::stop_translation_timestep ()
   for (vsize i = 0; i < items_.size (); i++)
     {
       Item *elem = items_[i];
-      if (!elem->get_parent (X_AXIS)
-	  || !unsmob_grob (elem->get_object ("axis-group-parent-X")))
-	{
-	  bool br = Item::is_non_musical (elem);
-	  Axis_group_interface::add_element (br ? command_column_ : musical_column_, elem);
-	}
+      Grob *col = Item::is_non_musical (elem) ? command_column_ : musical_column_;
+
+      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 if (!Accidental_interface::has_interface (elem))
+	Separation_item::add_item (col, elem);
     }
   items_.clear ();
 
   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_))
@@ -255,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 "