diff options
Diffstat (limited to 'lily')
| -rw-r--r-- | lily/axis-group-interface.cc | 4 | ||||
| -rw-r--r-- | lily/line-spanner.cc | 4 | ||||
| -rw-r--r-- | lily/paper-column-engraver.cc | 9 |
3 files changed, 10 insertions, 7 deletions
diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 9f7c25c6c4..8cf2e13e3f 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -437,9 +437,7 @@ add_grobs_of_one_priority (Skyline_pair *const skylines, if (b[X_AXIS][LEFT] - 2*horizon_padding < last_affected_position[dir]) continue; - if (b[X_AXIS].is_empty () || b[Y_AXIS].is_empty ()) - warning (_f ("outside-staff object %s has an empty extent", elements[i]->name ().c_str ())); - else + if (!b[X_AXIS].is_empty () && !b[Y_AXIS].is_empty ()) { boxes.clear (); boxes.push_back (b); diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index db36434b04..f631545172 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -36,7 +36,9 @@ public: static Grob * line_spanner_common_parent (Grob *me) { - Grob *common = find_fixed_alignment_parent (me); + /* FIXME: what is the right thing to do here, now that PianoStaves don't + have fixed spacing? */ + Grob *common = 0; //find_fixed_alignment_parent (me); if (!common) { common = Staff_symbol_referencer::get_staff_symbol (me); diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc index 6a765628aa..2df287aa37 100644 --- a/lily/paper-column-engraver.cc +++ b/lily/paper-column-engraver.cc @@ -191,9 +191,12 @@ Paper_column_engraver::stop_translation_timestep () { command_column_->set_property ("page-break-permission", SCM_EOL); command_column_->set_property ("line-break-permission", SCM_EOL); - if (break_events_.size ()) - warning (_f ("break event at moment %d/%d was overridden by some other event, are you using bar checks?", - now_mom ().num (), now_mom ().den ())); + for (vsize i = 0; i < break_events_.size (); i++) + { + SCM perm = break_events_[i]->get_property ("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_)) { |