X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-name-engraver.cc;h=d35e065afb7459bf691acec9a7fcf4a9d0e4bc0a;hb=cdc06869e2f9aa9f6cf0ca6a42aa4024d9fddb10;hp=0620ae8cfb77016d9549ed481539aca08881bcaf;hpb=77c7eccb319949accf3076b2a138e3ca16cf513e;p=lilypond.git diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 0620ae8cfb..d35e065afb 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -3,208 +3,162 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2006 Han-Wen Nienhuys + (c) 2000--2007 Han-Wen Nienhuys */ #include "engraver.hh" -#include "bar-line.hh" -#include "system-start-delimiter.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_; + Spanner *text_spanner_; - virtual void create_text (); - virtual void initialize (); + SCM long_text_; + SCM short_text_; - DECLARE_ACKNOWLEDGER (bar_line); + vector axis_groups_; + + virtual void finalize (); DECLARE_ACKNOWLEDGER (axis_group); - - void stop_translation_timestep (); void process_music (); + void start_spanner (); + void consider_start_spanner (); + void stop_spanner (); }; Instrument_name_engraver::Instrument_name_engraver () { - text_ = 0; - first_ = true; + text_spanner_ = 0; + + long_text_ = SCM_EOL; + short_text_ = SCM_EOL; } void -Instrument_name_engraver::initialize () +Instrument_name_engraver::process_music () { - context ()->set_property ("instrumentSupport", SCM_EOL); + consider_start_spanner (); } void -Instrument_name_engraver::stop_translation_timestep () +Instrument_name_engraver::consider_start_spanner () { - if (text_) + SCM long_text = get_property ("instrumentName"); + SCM short_text = get_property ("shortInstrumentName"); + + if (!(Text_interface::is_markup (long_text) + || Text_interface::is_markup (short_text))) { - 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)) - { - Axis_group_interface::add_element (unsmob_grob (scm_car (support)), - text_); - } - text_ = 0; + long_text = get_property ("vocalName"); + short_text = get_property ("shortVocalName"); } + + if ((Text_interface::is_markup (long_text) + || Text_interface::is_markup (short_text)) + && (!text_spanner_ + || short_text_ != short_text + || long_text_ != long_text)) + { + if (text_spanner_) + stop_spanner (); + + + short_text_ = short_text; + long_text_ = long_text; - first_ = false; + start_spanner (); + } } void -Instrument_name_engraver::create_text () +Instrument_name_engraver::start_spanner () { - if (text_) - return; + 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_); - SCM txt = get_property ("instrument"); - - if (now_mom () > Moment (0)) - txt = get_property ("instr"); /* - UGH. + UGH, should handle this in Score_engraver. */ - if (txt == SCM_EOL) - return; - - text_ = make_item ("InstrumentName", SCM_EOL); - - if (text_->get_property ("text") != txt) - text_->set_property ("text", txt); + Grob *system = unsmob_grob (get_property ("rootSystem")); + if (system) + Axis_group_interface::add_element (system, text_spanner_); + else + text_spanner_->programming_error ("cannot find root system"); } -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; + && Axis_group_interface::has_axis (info.grob (), Y_AXIS) - /* - 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. + /* ugh. */ - 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)))) + && !info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface")) + && !info.grob ()->internal_has_interface (ly_symbol2scm ("piano-pedal-interface")) + && (!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); - } + axis_groups_.push_back (info.grob ()); } } 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, 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 () +Instrument_name_engraver::finalize () { + if (text_spanner_) + { + stop_spanner (); + } } void -Vocal_name_engraver::create_text () +Instrument_name_engraver::stop_spanner () { - if (text_) - return; - - SCM txt = get_property ("vocalName"); + for (vsize i = 0; i < axis_groups_.size (); i++) + Pointer_group_interface::add_grob (text_spanner_, ly_symbol2scm ("elements"), axis_groups_[i]); + + text_spanner_->set_bound (RIGHT, + unsmob_grob (get_property ("currentCommandColumn"))); - if (now_mom () > Moment (0)) - txt = get_property ("vocNam"); + Pointer_group_interface::set_ordered (text_spanner_, ly_symbol2scm ("elements"), false); - /* - UGH. - */ - if (txt == SCM_EOL) - return; + text_spanner_ = 0; +} - text_ = make_item ("VocalName", SCM_EOL); +#include "translator.icc" - if (text_->get_property ("text") != txt) - text_->set_property ("text", txt); -} +ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group); -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", - /* accept */ "", - /* read */ "vocNam vocalName", - /* write */ ""); +ADD_TRANSLATOR (Instrument_name_engraver, + /* doc */ + "Create a system start text for instrument or vocal names.", + + /* create */ + "InstrumentName ", + + /* read */ + "currentCommandColumn " + "shortInstrumentName " + "instrumentName " + "shortVocalName " + "vocalName ", + + /* write */ + "" + );