X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-name-engraver.cc;h=a256b8beb19b4e48cc44778e4f780a55613c0c3a;hb=d8082113a0df616e7beabc0417c3590a3fac7320;hp=e58439dc9b66fb1b207ff01364083b7503a19a49;hpb=a2991295b2c1fb36bec19de207161855ca3c1756;p=lilypond.git diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index e58439dc9b..a256b8beb1 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -1,120 +1,164 @@ -/* - new-staff-margin-engraver.cc -- implement Instrument_name_engraver - +/* + instrument-name-engraver.cc -- implement Instrument_name_engraver + source file of the GNU LilyPond music typesetter - - (c) 2000--2001 Han-Wen Nienhuys - - */ + + (c) 2000--2006 Han-Wen Nienhuys +*/ #include "engraver.hh" -#include "item.hh" -#include "bar.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 "translator-group.hh" +#include "align-interface.hh" +#include "text-interface.hh" +#include "system.hh" + +#include "translator.icc" class Instrument_name_engraver : public Engraver { - Item *text_; - Grob *delim_ ; - - void create_text (SCM s); public: - VIRTUAL_COPY_CONS (Translator); - Instrument_name_engraver (); - virtual void initialize (); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); -}; + TRANSLATOR_DECLARATIONS (Instrument_name_engraver); + +protected: + Spanner *text_spanner_; + + SCM long_text_; + SCM short_text_; -ADD_THIS_TRANSLATOR (Instrument_name_engraver); + vector axis_groups_; + + virtual void finalize (); + DECLARE_ACKNOWLEDGER (axis_group); + void process_music (); + void start_spanner (); + void consider_start_spanner (); + void stop_spanner (); +}; Instrument_name_engraver::Instrument_name_engraver () { - text_ = 0; - delim_ =0; -} + text_spanner_ = 0; + long_text_ = SCM_EOL; + short_text_ = SCM_EOL; +} void -Instrument_name_engraver::initialize () +Instrument_name_engraver::process_music () { - daddy_trans_l_->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))) + { + 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)) { - text_->set_grob_property ("side-support-elements", - get_property ("instrumentSupport")); - typeset_grob (text_); - text_ = 0; + if (text_spanner_) + stop_spanner (); + + + short_text_ = short_text; + long_text_ = long_text; + + start_spanner (); } } void -Instrument_name_engraver::create_text (SCM txt) +Instrument_name_engraver::start_spanner () { - if (!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_); + + /* + UGH, should handle this in Score_engraver. + */ + Grob *system = unsmob_grob (get_property ("rootSystem")); + if (system) + Axis_group_interface::add_element (system, text_spanner_); + else + text_spanner_->programming_error ("can't find root system"); +} + + +void +Instrument_name_engraver::acknowledge_axis_group (Grob_info info) +{ + if (dynamic_cast (info.grob ()) + && Axis_group_interface::has_axis (info.grob (), Y_AXIS) + + /* ugh. */ + + && !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 ()))) { - text_ = new Item (get_property ("InstrumentName")); - - if (text_->get_grob_property ("text") != txt) - text_->set_grob_property ("text", txt); - - if (delim_) - text_->set_parent (delim_, Y_AXIS); - - announce_grob (text_,0); + axis_groups_.push_back (info.grob ()); } } void -Instrument_name_engraver::acknowledge_grob (Grob_info i) +Instrument_name_engraver::finalize () { - if (Bar::has_interface (i.elem_l_)) + if (text_spanner_) { - SCM s = get_property ("instrument"); - - if (now_mom () > Moment (0)) - s = get_property ("instr"); - - /* - FIXME: use markup_p () to check type. - */ - if (gh_string_p (s) || gh_pair_p (s)) - create_text (s); - + stop_spanner (); } +} - if (dynamic_cast (i.elem_l_) - && i.elem_l_->has_interface (ly_symbol2scm ("dynamic-interface"))) - return; +void +Instrument_name_engraver::stop_spanner () +{ + 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"))); - /* - Hang the instrument names on the staffs, 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. - - */ - if (dynamic_cast (i.elem_l_) - && ((Axis_group_interface::has_interface (i.elem_l_) - && Axis_group_interface::axis_b (i.elem_l_, Y_AXIS))) - && !Align_interface::has_interface (i.elem_l_)) - { - SCM nl = gh_cons (i.elem_l_->self_scm (), - get_property ("instrumentSupport")); + Pointer_group_interface::set_ordered (text_spanner_, ly_symbol2scm ("elements"), false); - daddy_trans_l_->set_property ("instrumentSupport", nl); - } + text_spanner_ = 0; } +#include "translator.icc" + +ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group); +ADD_TRANSLATOR (Instrument_name_engraver, + /* doc */ + "Creates a system start text for instrument or vocal names.", + + /* create */ + "InstrumentName ", + + /* read */ + "currentCommandColumn " + "shortInstrumentName " + "instrumentName " + "shortVocalName " + "vocalName " + , + /* write */ "");