X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column-engraver.cc;h=0620bafdbd4385a22e400bdeaf165a6a8e58b368;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=64db810b3f7fc86486750d073cad36c490737ce0;hpb=00e3e15364b9d3c94cda1bcab9f889bb95f6832d;p=lilypond.git diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc index 64db810b3f..0620bafdbd 100644 --- a/lily/paper-column-engraver.cc +++ b/lily/paper-column-engraver.cc @@ -1,19 +1,34 @@ /* - 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--2014 Han-Wen Nienhuys - (c) 2005--2007 Han-Wen Nienhuys + 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 . */ #include "paper-column-engraver.hh" #include "system.hh" #include "international.hh" +#include "accidental-placement.hh" +#include "accidental-interface.hh" +#include "arpeggio.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" @@ -22,24 +37,43 @@ Paper_column_engraver::Paper_column_engraver () { - last_moment_.main_part_ = Rational (-1,1); + last_moment_.main_part_ = Rational (-1, 1); command_column_ = 0; musical_column_ = 0; breaks_ = 0; system_ = 0; first_ = true; + made_columns_ = false; } void Paper_column_engraver::finalize () { - if ((breaks_ % 8)) - progress_indication ("[" + to_string (breaks_) + "]"); + if (! (breaks_ % 8)) + progress_indication ("[" + ::to_string (breaks_) + "]"); + + if (!made_columns_) + { + make_columns (); + SCM m = now_mom ().smobbed_copy (); + command_column_->set_property ("when", m); + musical_column_->set_property ("when", m); + } if (command_column_) { - command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow")); + // At the end of the score, allow page breaks and turns by default, but... + command_column_->set_property ("page-break-permission", ly_symbol2scm ("allow")); command_column_->set_property ("page-turn-permission", ly_symbol2scm ("allow")); + + // ...allow the user to override them. + handle_manual_breaks (true); + + // On the other hand, line breaks are always allowed at the end of a score, + // even if they try to stop us. + 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_); } } @@ -52,7 +86,7 @@ Paper_column_engraver::make_columns () */ Paper_column *p1 = make_paper_column ("NonMusicalPaperColumn"); Paper_column *p2 = make_paper_column ("PaperColumn"); - /* + /* 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. @@ -81,21 +115,21 @@ void Paper_column_engraver::acknowledge_staff_spacing (Grob_info gi) { Pointer_group_interface::add_grob (command_column_, - ly_symbol2scm ("spacing-wishes"), - gi.grob ()); + ly_symbol2scm ("spacing-wishes"), + gi.grob ()); } void Paper_column_engraver::acknowledge_note_spacing (Grob_info gi) { Pointer_group_interface::add_grob (musical_column_, - ly_symbol2scm ("spacing-wishes"), - gi.grob ()); + ly_symbol2scm ("spacing-wishes"), + gi.grob ()); } void Paper_column_engraver::set_columns (Paper_column *new_command, - Paper_column *new_musical) + Paper_column *new_musical) { command_column_ = new_command; musical_column_ = new_musical; @@ -116,22 +150,29 @@ Paper_column_engraver::listen_break (Stream_event *ev) break_events_.push_back (ev); } +IMPLEMENT_TRANSLATOR_LISTENER (Paper_column_engraver, label); void -Paper_column_engraver::process_music () +Paper_column_engraver::listen_label (Stream_event *ev) +{ + label_events_.push_back (ev); +} + +void +Paper_column_engraver::handle_manual_breaks (bool only_do_permissions) { for (vsize i = 0; i < break_events_.size (); i++) { string prefix; - SCM name_sym = break_events_[i]->get_property ("class"); - string name = ly_scm2string (scm_symbol_to_string (name_sym)); + SCM name_sym = scm_car (break_events_[i]->get_property ("class")); + string name = ly_symbol2string (name_sym); size_t end = name.rfind ("-event"); if (end) - prefix = name.substr (0, end); + prefix = name.substr (0, end); else - { - programming_error ("Paper_column_engraver doesn't know about this break-event"); - return; - } + { + programming_error ("Paper_column_engraver doesn't know about this break-event"); + return; + } string perm_str = prefix + "-permission"; string pen_str = prefix + "-penalty"; @@ -140,18 +181,31 @@ Paper_column_engraver::process_music () SCM pen = break_events_[i]->get_property ("break-penalty"); SCM perm = break_events_[i]->get_property ("break-permission"); - 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")); - } + if (!only_do_permissions && 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 (perm_str.c_str (), perm); + } +} + +void +Paper_column_engraver::process_music () +{ + handle_manual_breaks (false); + + 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_); + && !measure_position (context ()).main_part_); /* We can't do this in start_translation_timestep (), since time sig @@ -162,15 +216,18 @@ Paper_column_engraver::process_music () Moment mlen = Moment (measure_length (context ())); Grob *column = unsmob_grob (get_property ("currentCommandColumn")); if (column) - column->set_property ("measure-length", mlen.smobbed_copy ()); + column->set_property ("measure-length", mlen.smobbed_copy ()); else - programming_error ("No command column?"); + programming_error ("No command column?"); } } void Paper_column_engraver::stop_translation_timestep () { + if (to_boolean (get_property ("skipTypesetting"))) + return; + SCM m = now_mom ().smobbed_copy (); command_column_->set_property ("when", m); musical_column_->set_property ("when", m); @@ -178,30 +235,47 @@ 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) + || Arpeggio::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-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 (_ ("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_) + "]"); + if (! (breaks_ % 8)) + progress_indication ("[" + ::to_string (breaks_) + "]"); } context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak")); first_ = false; - break_events_.clear (); - + label_events_.clear (); SCM mpos = get_property ("measurePosition"); SCM barnum = get_property ("internalBarNumber"); @@ -209,7 +283,7 @@ Paper_column_engraver::stop_translation_timestep () && scm_is_integer (barnum)) { SCM where = scm_cons (barnum, - mpos); + mpos); command_column_->set_property ("rhythmic-location", where); musical_column_->set_property ("rhythmic-location", where); @@ -219,11 +293,12 @@ Paper_column_engraver::stop_translation_timestep () void Paper_column_engraver::start_translation_timestep () { - /* - TODO: don't make columns when skipTypesetting is true. - */ - if (!first_) - make_columns (); + break_events_.clear (); + if (!first_ && !to_boolean (get_property ("skipTypesetting"))) + { + make_columns (); + made_columns_ = true; + } } ADD_ACKNOWLEDGER (Paper_column_engraver, item); @@ -231,23 +306,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.) ", - - /* create */ - "PaperColumn " - "NonMusicalPaperColumn", - /* read */ - "forbidBreak " - , - /* write */ + /* 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 ", + + /* read */ + "forbidBreak ", + + /* write */ "forbidBreak " - "currentCommandColumn " - "currentMusicalColumn " - ); + "currentCommandColumn " + "currentMusicalColumn " + );