X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-name-engraver.cc;h=334da9dd59b39d0e692adce9328a9e5c50a5ed8f;hb=11399666c290e5974a2b0a4db954c8928d0e28e2;hp=26520d46e3346d6d270f474a09c6fc5d3f5d0e0e;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 26520d46e3..334da9dd59 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -1,96 +1,188 @@ - /* - 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 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys */ #include "engraver.hh" #include "item.hh" -#include "bar.hh" +#include "bar-line.hh" #include "system-start-delimiter.hh" #include "side-position-interface.hh" +#include "align-interface.hh" +#include "axis-group-interface.hh" +#include "context.hh" +#include "text-item.hh" class Instrument_name_engraver : public Engraver { - Item *text_; - Spanner * delim_ ; - - void create_text (SCM s); + public: - VIRTUAL_COPY_CONS(Translator); - Instrument_name_engraver (); + TRANSLATOR_DECLARATIONS (Instrument_name_engraver); - virtual void acknowledge_element (Score_element_info); - virtual void do_pre_move_processing (); -}; +protected: + Grob *text_; -ADD_THIS_TRANSLATOR(Instrument_name_engraver); + virtual void create_text (); + virtual void initialize (); + virtual void acknowledge_grob (Grob_info); + virtual void stop_translation_timestep (); + virtual void process_music (); +}; Instrument_name_engraver::Instrument_name_engraver () { text_ = 0; - delim_ =0; } void -Instrument_name_engraver::do_pre_move_processing () +Instrument_name_engraver::initialize () { - if (text_) - { - text_->add_offset_callback (Side_position::centered_on_parent, - Y_AXIS); - - typeset_element (text_); - text_ = 0; - } + context ()->set_property ("instrumentSupport", SCM_EOL); } void -Instrument_name_engraver::create_text (SCM txt) +Instrument_name_engraver::stop_translation_timestep () { - if(!text_) + if (text_) { - text_ = new Item (get_property ("basicInstrumentNameProperties")); - text_->set_elt_property ("text", txt); - - /* - TODO: use more lispish names for break-align-symbols - */ - if (delim_) - text_->set_parent (delim_, Y_AXIS); - - announce_element (text_,0); + text_->set_property ("side-support-elements", + get_property ("instrumentSupport")); + text_ = 0; } } + void -Instrument_name_engraver::acknowledge_element (Score_element_info i) +Instrument_name_engraver::create_text () { - SCM s = get_property ("instrument"); + if (text_) + return ; + + SCM txt = get_property ("instrument"); if (now_mom () > Moment (0)) - s = get_property ("instr"); + 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 (gh_string_p (s)) +void +Instrument_name_engraver::acknowledge_grob (Grob_info i) +{ + if (Bar_line::has_interface (i.grob_)) { - if (Bar::has_interface (i.elem_l_)) - { - create_text (s); - } + create_text (); } - if (System_start_delimiter::has_interface (i.elem_l_) - && i.origin_trans_l_->daddy_trans_l_ == daddy_trans_l_) + if (dynamic_cast (i.grob_) + && i.grob_->internal_has_interface (ly_symbol2scm ("dynamic-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_)) { - delim_ = dynamic_cast (i.elem_l_); + SCM nl = scm_cons (i.grob_->self_scm (), + get_property ("instrumentSupport")); + + context ()->set_property ("instrumentSupport", nl); } } +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"))) + create_text (); +} + +ENTER_DESCRIPTION (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); + +} +ENTER_DESCRIPTION (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 */ "bar-line-interface axis-group-interface", +/* reads */ "vocNam vocalName", +/* write */ "");