/*
- lyric-engraver.cc -- implement Lyric_engraver
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
+
+ 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 <http://www.gnu.org/licenses/>.
*/
#include "context.hh"
if (last_text_)
last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
}
- else
- {
- text_ = make_item ("LyricText", event_->self_scm ());
- }
+ /*
+ "Empty" LyricText objects are needed to allow the Extender_engraver to
+ distinguish between the end of a lyrics block and manual melismata.
+ */
+ text_ = make_item ("LyricText", event_->self_scm ());
}
}
if (scm_is_string (voice_name))
nm = ly_scm2string (voice_name);
+ else if (nm == "")
+ return 0;
else
{
ssize idx = nm.rfind ('-');
programming_error ("busyGrobs invalid");
continue;
}
-
+
if (end_mom->main_part_ > now.main_part_
&& dynamic_cast<Item *> (g)
&& Note_head::has_interface (g))
if (head)
{
text_->set_parent (head, X_AXIS);
- if (melisma_busy (voice))
- text_->set_property ("self-alignment-X", get_property("lyricMelismaAlignment"));
+ if (melisma_busy (voice)
+ && !to_boolean (get_property ("ignoreMelismata")))
+ text_->set_property ("self-alignment-X",
+ get_property("lyricMelismaAlignment"));
}
else
{
}
ADD_TRANSLATOR (Lyric_engraver,
- /* doc */ "",
- /* create */ "LyricText",
- /* read */ "lyricMelismaAlignment",
- /* write */ "");
+ /* doc */
+ "Engrave text for lyrics.",
+
+ /* create */
+ "LyricText ",
+
+ /* read */
+ "ignoreMelismata "
+ "lyricMelismaAlignment ",
+
+ /* write */
+ ""
+ );