source file of the GNU LilyPond music typesetter
- (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2008 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 "item.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"
void
Paper_column_engraver::finalize ()
{
- if ((breaks_ % 8))
+ if (! (breaks_ % 8))
progress_indication ("[" + to_string (breaks_) + "]");
if (command_column_)
{
- command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow"));
- command_column_->set_property ("page-turn-permission", ly_symbol2scm ("allow"));
+ if (!scm_is_symbol (command_column_->get_property ("line-break-permission")))
+ command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow"));
system_->set_bound (RIGHT, command_column_);
}
}
break_events_.push_back (ev);
}
+IMPLEMENT_TRANSLATOR_LISTENER (Paper_column_engraver, label);
+void
+Paper_column_engraver::listen_label (Stream_event *ev)
+{
+ label_events_.push_back (ev);
+}
+
void
Paper_column_engraver::process_music ()
{
command_column_->set_property (perm_str.c_str (), perm);
}
+ for (vsize i = 0 ; i < label_events_.size () ; i ++)
+ {
+ 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));
+ }
+
bool start_of_measure = (last_moment_.main_part_ != now_mom ().main_part_
&& !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)
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")))
- command_column_->set_property ("line-break-permission", SCM_EOL);
+ 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-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 (_ ("forced break was overridden by some other event, "
+ "should you be using bar checks?"));
+ }
+ }
else if (Paper_column::is_breakable (command_column_))
{
breaks_++;
first_ = false;
break_events_.clear ();
-
+ label_events_.clear ();
SCM mpos = get_property ("measurePosition");
- if (unsmob_moment (mpos))
+ SCM barnum = get_property ("internalBarNumber");
+ if (unsmob_moment (mpos)
+ && scm_is_integer (barnum))
{
- SCM where = scm_cons (get_property ("internalBarNumber"),
+ SCM where = scm_cons (barnum,
mpos);
command_column_->set_property ("rhythmic-location", where);
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",
-
- /* accept */ "break-event",
+ "NonMusicalPaperColumn ",
+
/* read */
- "forbidBreak "
- ,
+ "forbidBreak ",
+
/* write */
"forbidBreak "
"currentCommandColumn "
projects / lilypond.git / blobdiff