X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column-engraver.cc;h=c662a9baf7ea117fc025273f69fe062dadfa864d;hb=419ab1be077ad383bc5a3eda3c3e982507ab3e17;hp=276834951175821cdd15b9f4e14c339c07a1b2f5;hpb=47469fac22d2223c368a403d20539ac1caa2acef;p=lilypond.git diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc index 2768349511..c662a9baf7 100644 --- a/lily/paper-column-engraver.cc +++ b/lily/paper-column-engraver.cc @@ -3,18 +3,20 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2006 Han-Wen Nienhuys + (c) 2005--2007 Han-Wen Nienhuys */ #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" @@ -28,21 +30,19 @@ Paper_column_engraver::Paper_column_engraver () musical_column_ = 0; breaks_ = 0; system_ = 0; - last_special_barline_column_ = 0; - last_breakable_column_ = 0; first_ = true; } 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_); } } @@ -119,6 +119,13 @@ Paper_column_engraver::listen_break (Stream_event *ev) 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 () { @@ -153,11 +160,18 @@ 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) @@ -171,56 +185,6 @@ Paper_column_engraver::process_music () } } -/* return either - - the last column with a special (ie. not "|" or "") barline - - the last column - after the given moment -*/ -Paper_column* -Paper_column_engraver::find_turnable_column (Moment after_this) -{ - if (last_special_barline_column_) - { - Moment m = *unsmob_moment (last_special_barline_column_->get_property ("when")); - if (m >= after_this) - return last_special_barline_column_; - } - if (last_breakable_column_) - { - Moment m = *unsmob_moment (last_breakable_column_->get_property ("when")); - if (m >= after_this) - return last_breakable_column_; - } - return 0; -} - -void -Paper_column_engraver::revoke_page_turns (Moment after_this, Real new_penalty) -{ - if (!page_turnable_columns_.size ()) - return; - - for (vsize i = page_turnable_columns_.size () - 1; i--;) - { - Paper_column *col = page_turnable_columns_[i]; - Moment mom = *unsmob_moment (col->get_property ("when")); - if (mom >= after_this) - { - if (isinf (new_penalty)) - { - col->del_property ( ly_symbol2scm ("page-turn-permission")); - page_turnable_columns_.erase (page_turnable_columns_.begin () + i); - } - else - { - Real prev_pen = robust_scm2double (col->get_property ("page-turn-penalty"), 0); - if (new_penalty > prev_pen) - col->set_property ("page-turn-penalty", scm_from_double (new_penalty)); - } - } - } -} - void Paper_column_engraver::stop_translation_timestep () { @@ -231,68 +195,57 @@ 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); - } - } - items_.clear (); + Grob *col = Item::is_non_musical (elem) ? command_column_ : musical_column_; - if (to_boolean (get_property ("forbidBreak"))) - command_column_->set_property ("line-break-permission", SCM_EOL); - else if (Paper_column::is_breakable (command_column_)) - { - breaks_++; - last_breakable_column_ = command_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 ()); - SCM which_bar = get_property ("whichBar"); - if (scm_is_string (which_bar)) - { - string bar = ly_scm2string (which_bar); - if (bar != "" && bar != "|") - last_special_barline_column_ = command_column_; - } - - if (! (breaks_%8)) - progress_indication ("[" + to_string (breaks_) + "]"); + 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 page_br = get_property ("allowPageTurn"); - if (scm_is_pair (page_br) && last_breakable_column_) + if (to_boolean (get_property ("forbidBreak")) + && breaks_) /* don't honour forbidBreak if it occurs on the first moment of a score */ { - SCM pen = scm_cdr (page_br); - Moment *m = unsmob_moment (scm_car (page_br)); - if (m) + 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++) { - Paper_column *turn = find_turnable_column (*m); - if (turn) - { - turn->set_property ("page-turn-permission", ly_symbol2scm ("allow")); - turn->set_property ("page-turn-penalty", pen); - page_turnable_columns_.push_back (turn); - } + 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?")); } } - - /* The page-turn-engraver is allowed to change its mind and revoke previously-allowed - page turns (for example if there is a volta repeat where a turn is inconvenient) */ - SCM revokes = get_property ("revokePageTurns"); - if (scm_is_pair (revokes)) + else if (Paper_column::is_breakable (command_column_)) { - Moment *start = unsmob_moment (scm_car (revokes)); - Real pen = robust_scm2double (scm_cdr (revokes), infinity_f); - if (start) - revoke_page_turns (*start, pen); + breaks_++; + + if (! (breaks_%8)) + progress_indication ("[" + to_string (breaks_) + "]"); } context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak")); - context ()->get_score_context ()->unset_property (ly_symbol2scm ("allowPageTurn")); - context ()->get_score_context ()->unset_property (ly_symbol2scm ("revokePageTurns")); first_ = false; break_events_.clear (); + label_events_.clear (); + + SCM mpos = get_property ("measurePosition"); + SCM barnum = get_property ("internalBarNumber"); + if (unsmob_moment (mpos) + && scm_is_integer (barnum)) + { + SCM where = scm_cons (barnum, + mpos); + + command_column_->set_property ("rhythmic-location", where); + musical_column_->set_property ("rhythmic-location", where); + } } void @@ -310,29 +263,27 @@ 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", - - /* accept */ "break-event", + "NonMusicalPaperColumn ", + /* read */ - "forbidBreak " - "allowPageTurn " - "revokePageTurns " - , + "forbidBreak ", + /* write */ "forbidBreak " - "allowPageTurn " - "revokePageTurns " "currentCommandColumn " "currentMusicalColumn " );