X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column-engraver.cc;h=1396c1280d94f8815e0ce6ba32f5ee26fd41bd52;hb=f2c4fc35bd651d25bbaca77f32f30807fd7e03ba;hp=517d1c565333b3188f440bd1bdd056d432db71a8;hpb=3071e422537b20aef67606a0edda5aa3e1f7aa2b;p=lilypond.git diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc index 517d1c5653..1396c1280d 100644 --- a/lily/paper-column-engraver.cc +++ b/lily/paper-column-engraver.cc @@ -3,18 +3,21 @@ 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 "item.hh" -#include "paper-column.hh" -#include "staff-spacing.hh" +#include "international.hh" +#include "accidental-placement.hh" +#include "axis-group-interface.hh" +#include "context.hh" #include "note-spacing.hh" +#include "paper-column.hh" #include "pointer-group-interface.hh" -#include "context.hh" -#include "axis-group-interface.hh" +#include "separation-item.hh" +#include "staff-spacing.hh" +#include "system.hh" #include "warn.hh" #include "translator.icc" @@ -25,7 +28,6 @@ Paper_column_engraver::Paper_column_engraver () command_column_ = 0; musical_column_ = 0; breaks_ = 0; - break_event_ = 0; system_ = 0; first_ = true; } @@ -33,12 +35,13 @@ Paper_column_engraver::Paper_column_engraver () void Paper_column_engraver::finalize () { - if ((breaks_ % 8)) + if (! (breaks_ % 8)) progress_indication ("[" + to_string (breaks_) + "]"); if (command_column_) { - command_column_->set_property ("breakable", SCM_BOOL_T); + 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_); } } @@ -51,10 +54,11 @@ Paper_column_engraver::make_columns () */ Paper_column *p1 = make_paper_column ("NonMusicalPaperColumn"); Paper_column *p2 = make_paper_column ("PaperColumn"); - - SCM m = now_mom ().smobbed_copy (); - p1->set_property ("when", m); - p2->set_property ("when", m); + /* + The columns are timestamped with now_mom () in + stop_translation_timestep. Cannot happen now, because the + first column is sometimes created before now_mom is initialised. + */ set_columns (p1, p2); } @@ -66,7 +70,7 @@ Paper_column_engraver::initialize () make_columns (); system_->set_bound (LEFT, command_column_); - command_column_->set_property ("breakable", SCM_BOOL_T); + command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow")); } void @@ -82,6 +86,7 @@ Paper_column_engraver::acknowledge_staff_spacing (Grob_info gi) ly_symbol2scm ("spacing-wishes"), gi.grob ()); } + void Paper_column_engraver::acknowledge_note_spacing (Grob_info gi) { @@ -106,53 +111,66 @@ Paper_column_engraver::set_columns (Paper_column *new_command, system_->add_column (musical_column_); } +IMPLEMENT_TRANSLATOR_LISTENER (Paper_column_engraver, break); void -Paper_column_engraver::forbid_breaks () +Paper_column_engraver::listen_break (Stream_event *ev) { - if (command_column_ && !first_) - command_column_->set_property ("breakable", SCM_EOL); + break_events_.push_back (ev); } -bool -Paper_column_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Paper_column_engraver, label); +void +Paper_column_engraver::listen_label (Stream_event *ev) { - break_event_ = m; - - return true; + label_events_.push_back (ev); } void Paper_column_engraver::process_music () { - if (break_event_) + for (vsize i = 0; i < break_events_.size (); i++) { - SCM pen = command_column_->get_property ("penalty"); - Real total_penalty = scm_is_number (pen) ? scm_to_double (pen) : 0.0; - - SCM mpen = break_event_->get_property ("penalty"); - if (scm_is_number (mpen)) - total_penalty += scm_to_double (mpen); + string prefix; + SCM name_sym = break_events_[i]->get_property ("class"); + string name = ly_scm2string (scm_symbol_to_string (name_sym)); + size_t end = name.rfind ("-event"); + if (end) + prefix = name.substr (0, end); + else + { + programming_error ("Paper_column_engraver doesn't know about this break-event"); + return; + } - command_column_->set_property ("penalty", scm_from_double (total_penalty)); + string perm_str = prefix + "-permission"; + string pen_str = prefix + "-penalty"; - /* ugh. arbitrary, hardcoded */ - if (total_penalty > 10000.0) - forbid_breaks (); + SCM cur_pen = command_column_->get_property (pen_str.c_str ()); + SCM pen = break_events_[i]->get_property ("break-penalty"); + SCM perm = break_events_[i]->get_property ("break-permission"); - SCM page_pen = command_column_->get_property ("page-penalty"); - Real total_pp = scm_is_number (page_pen) ? scm_to_double (page_pen) : 0.0; - SCM mpage_pen = break_event_->get_property ("page-penalty"); - if (scm_is_number (mpage_pen)) - total_pp += scm_to_double (mpage_pen); + if (scm_is_number (pen)) + { + Real new_pen = robust_scm2double (cur_pen, 0.0) + scm_to_double (pen); + command_column_->set_property (pen_str.c_str (), scm_from_double (new_pen)); + command_column_->set_property (perm_str.c_str (), ly_symbol2scm ("allow")); + } + else + command_column_->set_property (perm_str.c_str (), perm); + } - command_column_->set_property ("page-penalty", scm_from_double (total_pp)); + 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) @@ -169,27 +187,64 @@ Paper_column_engraver::process_music () void Paper_column_engraver::stop_translation_timestep () { + SCM m = now_mom ().smobbed_copy (); + command_column_->set_property ("when", m); + musical_column_->set_property ("when", m); + for (vsize i = 0; i < items_.size (); i++) { 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"))) { - bool br = to_boolean (elem->get_property ("breakable")); - Axis_group_interface::add_element (br ? command_column_ : musical_column_, elem); + Axis_group_interface::add_element (col, elem); } + else if (Accidental_placement::has_interface (elem)) + Separation_item::add_conditional_item (col, elem); + else + Separation_item::add_item (col, elem); } items_.clear (); - if (to_boolean (command_column_->get_property ("breakable"))) + 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 (_f ("forced break was overridden by some other event, should you be using bar checks?")); + } + } + else if (Paper_column::is_breakable (command_column_)) { breaks_++; + if (! (breaks_%8)) progress_indication ("[" + to_string (breaks_) + "]"); } + context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak")); + first_ = false; - break_event_ = 0; + 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 @@ -210,18 +265,20 @@ 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, when every Bar_engraver " - "that does not have a barline at a certain point will call " - "Score_engraver::forbid_breaks to stop linebreaks. In practice, this " + "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.) ", /* create */ "PaperColumn " "NonMusicalPaperColumn", - - /* accept */ "break-event", - /* read */ "", + /* read */ + "forbidBreak " + , /* write */ + "forbidBreak " "currentCommandColumn " - "currentMusicalColumn"); + "currentMusicalColumn " + );