X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=67ad8848248c6ac091ac73f23ba80efbedd1d973;hb=beedd09c78a7725d0d52b93c59e3d9840681c3e5;hp=1f4a0c3f728dc174e451b5f26390955fbe06cd49;hpb=91f01637f31c7d904fd8016b49184e935bf1c8ab;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 1f4a0c3f72..67ad884824 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -1,9 +1,20 @@ /* - mark-engraver.cc -- implement Mark_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2011 Jan Nieuwenhuizen - (c) 1998--2007 Jan Nieuwenhuizen + 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 @@ -32,6 +43,7 @@ class Mark_engraver : public Engraver void create_items (Stream_event *); Item *text_; + Item *final_text_; Stream_event *mark_ev_; public: @@ -39,62 +51,58 @@ public: protected: void process_music (); + void start_translation_timestep (); void stop_translation_timestep (); + virtual void finalize (); DECLARE_TRANSLATOR_LISTENER (mark); DECLARE_ACKNOWLEDGER (break_alignment); - DECLARE_ACKNOWLEDGER (break_aligned); }; Mark_engraver::Mark_engraver () { text_ = 0; + final_text_ = 0; mark_ev_ = 0; } -/* - This is a flawed approach, since various break-aligned objects may - not appear depending on key signature etc. - - We keep it in case someone puts the engraver in a lower context than score. - */ void -Mark_engraver::acknowledge_break_aligned (Grob_info inf) +Mark_engraver::acknowledge_break_alignment (Grob_info inf) { Grob *s = inf.grob (); if (text_ - && !text_->get_parent (X_AXIS) - && (text_->get_property_data ("break-align-symbol") - == s->get_property_data ("break-align-symbol")) - && Axis_group_interface::has_interface (s)) - { - /* - RehearsalMark cannot be break-aligned, since the width of the - object should not be taken into alignment considerations. - */ - text_->set_parent (s, X_AXIS); - } + && dynamic_cast (s)) + text_->set_parent (s, X_AXIS); } void -Mark_engraver::acknowledge_break_alignment (Grob_info inf) +Mark_engraver::start_translation_timestep () { - Grob *s = inf.grob (); - if (text_ - && dynamic_cast (s)) - { - text_->set_parent (s, X_AXIS); - } + final_text_ = 0; } - void Mark_engraver::stop_translation_timestep () { - text_ = 0; + if (text_) + { + text_->set_object ("side-support-elements", + grob_list_to_grob_array (get_property ("stavesFound"))); + final_text_ = text_; + text_ = 0; + } mark_ev_ = 0; } +void +Mark_engraver::finalize () +{ + if (final_text_) + final_text_->set_property ("break-visibility", + scm_c_make_vector (3, SCM_BOOL_T)); + final_text_ = 0; +} + void Mark_engraver::create_items (Stream_event *ev) { @@ -156,21 +164,24 @@ Mark_engraver::process_music () } } -ADD_ACKNOWLEDGER (Mark_engraver, break_aligned); ADD_ACKNOWLEDGER (Mark_engraver, break_alignment); ADD_TRANSLATOR (Mark_engraver, - /* doc */ "This engraver will create RehearsalMark objects. " - "It puts them on top of all staves (which is taken from " - "the property @code{stavesFound}). If moving this engraver " - "to a different context, " - "@ref{Staff_collecting_engraver} must move along, otherwise all marks" - "end up on the same Y-location", + /* doc */ + "Create @code{RehearsalMark} objects. It puts them on top of" + " all staves (which is taken from the property" + " @code{stavesFound}). If moving this engraver to a different" + " context, @ref{Staff_collecting_engraver} must move along," + " otherwise all marks end up on the same Y@tie{}location.", - /* create */ "RehearsalMark", + /* create */ + "RehearsalMark ", + /* read */ "markFormatter " "rehearsalMark " "stavesFound ", - /* write */ ""); + /* write */ + "" + );