/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "align-interface.hh"
+#include "axis-group-interface.hh"
#include "engraver.hh"
+#include "page-layout-problem.hh"
#include "pointer-group-interface.hh"
#include "side-position-interface.hh"
-#include "axis-group-interface.hh"
-#include "align-interface.hh"
-#include "text-interface.hh"
#include "system.hh"
+#include "text-interface.hh"
#include "translator.icc"
SCM short_text_;
vector<Grob *> axis_groups_;
-
+ vector<Grob *> backup_axis_groups_;
+
virtual void finalize ();
- DECLARE_ACKNOWLEDGER (axis_group);
+ void acknowledge_axis_group (Grob_info);
void process_music ();
void start_spanner ();
void consider_start_spanner ();
scm_gc_mark (short_text_);
}
-Instrument_name_engraver::Instrument_name_engraver ()
+Instrument_name_engraver::Instrument_name_engraver (Context *c)
+ : Engraver (c)
{
text_spanner_ = 0;
SCM short_text = get_property ("shortInstrumentName");
if (!(Text_interface::is_markup (long_text)
- || Text_interface::is_markup (short_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))
+ || !scm_is_eq (short_text_, short_text)
+ || !scm_is_eq (long_text_, long_text)))
{
if (text_spanner_)
- stop_spanner ();
+ stop_spanner ();
short_text_ = short_text;
long_text_ = long_text;
{
text_spanner_ = make_spanner ("InstrumentName", SCM_EOL);
- Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
+ 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"));
+ Grob *system = unsmob<Grob> (get_property ("rootSystem"));
if (system)
Axis_group_interface::add_element (system, text_spanner_);
else
&& !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 ())))
+ && (!has_interface<Align_interface> (info.grob ())))
{
- axis_groups_.push_back (info.grob ());
+ if (Page_layout_problem::is_spaceable (info.grob ()))
+ axis_groups_.push_back (info.grob ());
+ else
+ // By default, don't include non-spaceable staves in the
+ // support of an instrument name. However, if the only staves
+ // are non-spaceable, we'll fall back to using them.
+ backup_axis_groups_.push_back (info.grob ());
}
}
void
Instrument_name_engraver::stop_spanner ()
{
+ if (axis_groups_.empty ())
+ axis_groups_ = backup_axis_groups_;
+
for (vsize i = 0; i < axis_groups_.size (); i++)
Pointer_group_interface::add_grob (text_spanner_,
- ly_symbol2scm ("elements"),
- axis_groups_[i]);
-
+ ly_symbol2scm ("elements"),
+ axis_groups_[i]);
+
text_spanner_->set_bound (RIGHT,
- unsmob_grob (get_property ("currentCommandColumn")));
+ unsmob<Grob> (get_property ("currentCommandColumn")));
Pointer_group_interface::set_ordered (text_spanner_,
- ly_symbol2scm ("elements"),
- false);
+ ly_symbol2scm ("elements"),
+ false);
text_spanner_ = 0;
}
-ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group);
+void
+Instrument_name_engraver::boot ()
+{
+ 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 */
- ""
- );
+ /* doc */
+ "Create a system start text for instrument or vocal names.",
+
+ /* create */
+ "InstrumentName ",
+
+ /* read */
+ "currentCommandColumn "
+ "instrumentName "
+ "shortInstrumentName "
+ "shortVocalName "
+ "vocalName ",
+
+ /* write */
+ ""
+ );