X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-name-engraver.cc;h=a2bf75a777eb767b1dacf6890f59c7540a7317f6;hb=2629d27674cdc52137a4fb0ce62200cfb7ce7e91;hp=bf935c31a7a9f9a5568d0d183c4e2d92dcc20433;hpb=83ed05cef3bfcbd69f4148e8ee0669ca0664e214;p=lilypond.git diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index bf935c31a7..a2bf75a777 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -3,199 +3,119 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2005 Han-Wen Nienhuys + (c) 2000--2006 Han-Wen Nienhuys */ #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 "system.hh" #include "translator.icc" class Instrument_name_engraver : public Engraver { - bool first_; public: TRANSLATOR_DECLARATIONS (Instrument_name_engraver); protected: - Grob *text_; - - virtual void create_text (); - virtual void initialize (); + Spanner *text_spanner_; - DECLARE_ACKNOWLEDGER(bar_line); - DECLARE_ACKNOWLEDGER(axis_group); - - PRECOMPUTED_VIRTUAL void stop_translation_timestep (); - PRECOMPUTED_VIRTUAL void process_music (); - + virtual void finalize (); + DECLARE_ACKNOWLEDGER (axis_group); + void process_music (); }; Instrument_name_engraver::Instrument_name_engraver () { - text_ = 0; - first_ = true; -} - -void -Instrument_name_engraver::initialize () -{ - context ()->set_property ("instrumentSupport", SCM_EOL); + text_spanner_ = 0; } void -Instrument_name_engraver::stop_translation_timestep () +Instrument_name_engraver::process_music () { - if (text_) + if (!text_spanner_) { - text_->set_object ("side-support-elements", - grob_list_to_grob_array (get_property ("instrumentSupport"))); - text_ = 0; - } + 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))) + { + long_text = get_property ("vocalName"); + short_text = get_property ("vocNam"); + } - first_ = false; + if (Text_interface::is_markup (long_text) + || Text_interface::is_markup (short_text)) + { + text_spanner_ = make_spanner ("InstrumentName", SCM_EOL); + + Grob *col = unsmob_grob (get_property ("currentCommandColumn")); + text_spanner_->set_bound (LEFT, col); + text_spanner_->set_property ("text", short_text); + text_spanner_->set_property ("long-text", long_text); + } + } } void -Instrument_name_engraver::create_text () +Instrument_name_engraver::acknowledge_axis_group (Grob_info info) { - 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); + if (text_spanner_ + && dynamic_cast (info.grob ()) + && Axis_group_interface::has_axis (info.grob (), Y_AXIS) + && (!Align_interface::has_interface (info.grob ()))) + { + 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::acknowledge_bar_line (Grob_info i) +Instrument_name_engraver::finalize () { - (void)i; - create_text (); -} + if (text_spanner_) + { + text_spanner_->set_bound (RIGHT, + unsmob_grob (get_property ("currentCommandColumn"))); + Pointer_group_interface::set_ordered (text_spanner_, ly_symbol2scm ("elements"), false); -void -Instrument_name_engraver::acknowledge_axis_group (Grob_info i) -{ - /* - Ugh - typechecking for pedal and dynamic sucks. - */ - if (dynamic_cast (i.grob ()) - && (i.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface")) - || i.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 (i.grob ()) - && ((Axis_group_interface::has_interface (i.grob ()) - && Axis_group_interface::has_axis (i.grob (), Y_AXIS))) - && !Align_interface::has_interface (i.grob ())) - { - SCM nl = scm_cons (i.grob ()->self_scm (), - get_property ("instrumentSupport")); + System *system = get_root_system (text_spanner_); - context ()->set_property ("instrumentSupport", nl); + /* + UGH, should handle this in Score_engraver. + */ + if (system) + Axis_group_interface::add_element (system, text_spanner_); + else + text_spanner_->programming_error ("can't find root system"); } } -void -Instrument_name_engraver::process_music () -{ - /* - 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 (); -} - #include "translator.icc" +ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group); -ADD_ACKNOWLEDGER(Instrument_name_engraver, bar_line); -ADD_ACKNOWLEDGER(Instrument_name_engraver, axis_group); ADD_TRANSLATOR (Instrument_name_engraver, - /* descr */ " Prints the name of the instrument (specified by " - " @code{Staff.instrument} and @code{Staff.instr}) " - "at the left of the staff. ", - /* creats*/ "InstrumentName", - /* accepts */ "", - /* acks */ "bar-line-interface axis-group-interface", - /* reads */ "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); -} + /* doc */ + "Creates a system start text for instrument or vocal names.", + + /* create */ + "InstrumentName ", + + /* accept */ + "", + + /* read */ + "vocNam vocalName instrument instr " + "currentCommandColumn", -ADD_ACKNOWLEDGER(Vocal_name_engraver, bar_line); -ADD_ACKNOWLEDGER(Vocal_name_engraver, axis_group); -ADD_TRANSLATOR (Vocal_name_engraver, - /* descr */ " Prints the name of the a lyric voice (specified by " - " @code{Staff.vocalName} and @code{Staff.vocNam}) " - "at the left of the staff. ", - /* creats*/ "VocalName", - /* accepts */ "", - /* acks */ "", - /* reads */ "vocNam vocalName", /* write */ "");