X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-name-engraver.cc;h=5320dfd5f77bb8d7403624b0c7614bc1403cec14;hb=31568c504806f35aac420a394c9eab07abd9faa7;hp=0620ae8cfb77016d9549ed481539aca08881bcaf;hpb=77c7eccb319949accf3076b2a138e3ca16cf513e;p=lilypond.git diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 0620ae8cfb..5320dfd5f7 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -7,204 +7,100 @@ */ #include "engraver.hh" -#include "bar-line.hh" -#include "system-start-delimiter.hh" +#include "spanner.hh" +#include "pointer-group-interface.hh" #include "side-position-interface.hh" -#include "align-interface.hh" #include "axis-group-interface.hh" -#include "context.hh" +#include "align-interface.hh" #include "text-interface.hh" -#include "grob-array.hh" #include "translator.icc" class Instrument_name_engraver : public Engraver { - bool first_; public: TRANSLATOR_DECLARATIONS (Instrument_name_engraver); protected: - Grob *text_; + Spanner *text_spanner_; - virtual void create_text (); - virtual void initialize (); - - DECLARE_ACKNOWLEDGER (bar_line); + virtual void finalize (); DECLARE_ACKNOWLEDGER (axis_group); - - void stop_translation_timestep (); void process_music (); }; Instrument_name_engraver::Instrument_name_engraver () { - text_ = 0; - first_ = true; + text_spanner_ = 0; } void -Instrument_name_engraver::initialize () -{ - context ()->set_property ("instrumentSupport", SCM_EOL); -} - -void -Instrument_name_engraver::stop_translation_timestep () +Instrument_name_engraver::process_music () { - if (text_) + if (!text_spanner_) { - SCM support = get_property ("instrumentSupport"); - text_->set_object ("side-support-elements", - grob_list_to_grob_array (support)); - - /* - Hack to get texts on piano staves to disappear. - */ - if (!text_->get_parent (Y_AXIS) - && scm_is_pair (support)) + SCM long_text = get_property ("instrument"); + SCM short_text = get_property ("instr"); + + if (!(Text_interface::is_markup (long_text) + || Text_interface::is_markup (short_text))) { - Axis_group_interface::add_element (unsmob_grob (scm_car (support)), - text_); + long_text = get_property ("vocalName"); + short_text = get_property ("vocNam"); + } + + if (Text_interface::is_markup (long_text) + || Text_interface::is_markup (short_text)) + { + text_spanner_ = make_spanner ("InstrumentName", SCM_EOL); + text_spanner_->set_bound (LEFT, + unsmob_grob (get_property ("currentCommandColumn"))); + text_spanner_->set_property ("text", short_text); + text_spanner_->set_property ("long-text", long_text); } - text_ = 0; } - - first_ = false; -} - -void -Instrument_name_engraver::create_text () -{ - if (text_) - return; - - SCM txt = get_property ("instrument"); - - if (now_mom () > Moment (0)) - txt = get_property ("instr"); - /* - UGH. - */ - if (txt == SCM_EOL) - return; - - text_ = make_item ("InstrumentName", SCM_EOL); - - if (text_->get_property ("text") != txt) - text_->set_property ("text", txt); -} - -void -Instrument_name_engraver::acknowledge_bar_line (Grob_info info) -{ - (void) info; - create_text (); } void Instrument_name_engraver::acknowledge_axis_group (Grob_info info) { - /* - Ugh - typechecking for pedal and dynamic sucks. - */ - if (dynamic_cast (info.grob ()) - && (info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface")) - || info.grob ()->internal_has_interface (ly_symbol2scm ("piano-pedal-interface")))) - return; - - /* - Hang the instrument names on the staves, but not on the alignment - groups enclosing that staff. The alignment has no real location, - but is only a vehicle for the placement routine it contains, and - therefore the location of its refpoint won't be very useful. - - We could also just use stavesFound, but lets keep this working - without staffs as well. - */ - if (dynamic_cast (info.grob ()) - && ((Axis_group_interface::has_interface (info.grob ()) - && Axis_group_interface::has_axis (info.grob (), Y_AXIS)))) + if (text_spanner_ + && dynamic_cast (info.grob ()) + && Axis_group_interface::has_axis (info.grob (), Y_AXIS) + && (!Align_interface::has_interface (info.grob ()))) { - if (!Align_interface::has_interface (info.grob ())) - { - SCM nl = scm_cons (info.grob ()->self_scm (), - get_property ("instrumentSupport")); - - context ()->set_property ("instrumentSupport", nl); - } + Grob *staff = info.grob(); + Pointer_group_interface::add_grob (text_spanner_, ly_symbol2scm ("elements"), staff); + Side_position_interface::add_support (text_spanner_, staff); } } void -Instrument_name_engraver::process_music () +Instrument_name_engraver::finalize () { - /* - Also create text if barlines in other groups. This allows - a name to be attached to lyrics or chords. - */ - if (scm_is_string (get_property ("whichBar")) - || first_) - create_text (); + if (text_spanner_) + { + text_spanner_->set_bound (RIGHT, + unsmob_grob (get_property ("currentCommandColumn"))); + } } #include "translator.icc" -ADD_ACKNOWLEDGER (Instrument_name_engraver, bar_line); ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group); ADD_TRANSLATOR (Instrument_name_engraver, - /* doc */ " Prints the name of the instrument (specified by " - " @code{Staff.instrument} and @code{Staff.instr}) " - "at the left of the staff. ", - /* create */ "InstrumentName", - /* accept */ "", - /* read */ "instrument instr", - /* write */ ""); -/****************************************************************/ - -class Vocal_name_engraver : public Instrument_name_engraver -{ -public: - TRANSLATOR_DECLARATIONS (Vocal_name_engraver); - virtual void create_text (); -}; - -Vocal_name_engraver::Vocal_name_engraver () -{ -} - -void -Vocal_name_engraver::create_text () -{ - if (text_) - return; - - SCM txt = get_property ("vocalName"); - - if (now_mom () > Moment (0)) - txt = get_property ("vocNam"); - - /* - UGH. - */ - if (txt == SCM_EOL) - return; - - text_ = make_item ("VocalName", SCM_EOL); - - if (text_->get_property ("text") != txt) - text_->set_property ("text", txt); -} - -ADD_ACKNOWLEDGER (Vocal_name_engraver, bar_line); -ADD_ACKNOWLEDGER (Vocal_name_engraver, axis_group); -ADD_TRANSLATOR (Vocal_name_engraver, - /* doc */ " Prints the name of the a lyric voice (specified by " - " @code{Staff.vocalName} and @code{Staff.vocNam}) " - "at the left of the staff. ", - /* create */ "VocalName", + /* doc */ + "Creates a system start text for instrument or vocal names.", + + /* create */ + "InstrumentName ", + /* accept */ "", - /* read */ "vocNam vocalName", + + /* read */ + "vocNam vocalName instrument instr " + "currentCommandColumn", + /* write */ "");