X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finstrument-name-engraver.cc;h=c99b6f5c775ae93f9807f7b159e3d77dcb1e6d43;hb=5670dc898dbedc105b5ff0719959317850ef443d;hp=1a9bd7da1f2a1cfe5053af60c01c9f41b7cd946e;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 1a9bd7da1f..c453e95411 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -1,96 +1,185 @@ +/* + This file is part of LilyPond, the GNU music typesetter. -/* - new-staff-margin-engraver.cc -- implement Instrument_name_engraver - - source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ + Copyright (C) 2000--2011 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ + +#include "align-interface.hh" +#include "axis-group-interface.hh" #include "engraver.hh" -#include "text-item.hh" -#include "bar.hh" -#include "system-start-delimiter.hh" +#include "page-layout-problem.hh" +#include "pointer-group-interface.hh" #include "side-position-interface.hh" +#include "system.hh" +#include "text-interface.hh" + +#include "translator.icc" class Instrument_name_engraver : public Engraver { - Text_item *text_; - System_start_delimiter * 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: + Spanner *text_spanner_; + + SCM long_text_; + SCM short_text_; + + vector axis_groups_; + + virtual void finalize (); + DECLARE_ACKNOWLEDGER (axis_group); + void process_music (); + void start_spanner (); + void consider_start_spanner (); + void stop_spanner (); + + virtual void derived_mark () const; }; -ADD_THIS_TRANSLATOR(Instrument_name_engraver); +void +Instrument_name_engraver::derived_mark () const +{ + scm_gc_mark (long_text_); + scm_gc_mark (short_text_); +} 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::process_music () +{ + consider_start_spanner (); +} void -Instrument_name_engraver::do_pre_move_processing () +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))) { - text_->add_offset_callback (Side_position_interface::centered_on_parent, - Y_AXIS); + long_text = get_property ("vocalName"); + short_text = get_property ("shortVocalName"); + } - typeset_element (text_); - text_ = 0; + 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; + + start_spanner (); } } void -Instrument_name_engraver::create_text (SCM txt) +Instrument_name_engraver::start_spanner () { - if(!text_) - { - text_ = new Text_item (get_property ("basicInstrumentNameProperties")); - text_->set_elt_property ("text", txt); + 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 ("cannot find root system"); +} - /* - TODO: use more lispish names for break-align-symbols - */ - if (delim_) - text_->set_parent (delim_, Y_AXIS); +void +Instrument_name_engraver::acknowledge_axis_group (Grob_info info) +{ + if (dynamic_cast (info.grob ()) + && Axis_group_interface::has_axis (info.grob (), Y_AXIS) + && Page_layout_problem::is_spaceable (info.grob ()) + + /* ugh. */ - announce_element (Score_element_info (text_,0)); + && !info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface")) + && !info.grob ()->internal_has_interface (ly_symbol2scm ("piano-pedal-interface")) + && !info.grob ()->internal_has_interface (ly_symbol2scm ("volta-interface")) + && (!Align_interface::has_interface (info.grob ()))) + { + axis_groups_.push_back (info.grob ()); } } void -Instrument_name_engraver::acknowledge_element (Score_element_info i) +Instrument_name_engraver::finalize () +{ + if (text_spanner_) + stop_spanner (); +} + +void +Instrument_name_engraver::stop_spanner () { - SCM s = get_property ("instrument"); - - if (now_mom () > Moment (0)) - s = get_property ("instr"); + for (vsize i = 0; i < axis_groups_.size (); i++) + Pointer_group_interface::add_grob (text_spanner_, + ly_symbol2scm ("elements"), + axis_groups_[i]); - if (gh_string_p (s)) - { - if (Bar* b= dynamic_cast (i.elem_l_)) - { - create_text (s); - } - } + text_spanner_->set_bound (RIGHT, + unsmob_grob (get_property ("currentCommandColumn"))); - if (dynamic_cast (i.elem_l_) - && i.origin_trans_l_->daddy_trans_l_ == daddy_trans_l_) - { - delim_ = dynamic_cast (i.elem_l_); - } + Pointer_group_interface::set_ordered (text_spanner_, + ly_symbol2scm ("elements"), + false); + + text_spanner_ = 0; } +ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group); + +ADD_TRANSLATOR (Instrument_name_engraver, + /* doc */ + "Create a system start text for instrument or vocal names.", + /* create */ + "InstrumentName ", + /* read */ + "currentCommandColumn " + "instrumentName " + "shortInstrumentName " + "shortVocalName " + "vocalName ", + /* write */ + "" + );