source file of the GNU LilyPond music typesetter
- (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#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"
for (vsize i = 0 ; i < label_events_.size () ; i ++)
{
- SCM label = label_events_[i]->get_property ("label");
+ SCM label = label_events_[i]->get_property ("page-label");
SCM labels = command_column_->get_property ("labels");
command_column_->set_property ("labels", scm_cons (label, labels));
}
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 ();
{
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_))
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 "