/*
- hyphen-engraver.cc -- implement Hyphen_engraver
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
-
- (c) 1999--2009 Glen Prideaux <glenprideaux@iname.com>,
+ Copyright (C) 1999--2012 Glen Prideaux <glenprideaux@iname.com>,
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 "engraver.hh"
Spanner *hyphen_;
Spanner *finished_hyphen_;
- bool current_lyric_is_skip_;
public:
TRANSLATOR_DECLARATIONS (Hyphen_engraver);
Hyphen_engraver::Hyphen_engraver ()
{
- current_lyric_is_skip_ = false;
hyphen_ = 0;
finished_hyphen_ = 0;
finished_ev_ = 0;
Hyphen_engraver::acknowledge_lyric_syllable (Grob_info i)
{
Item *item = i.item ();
- SCM text = item->get_property ("text");
- current_lyric_is_skip_ = ly_is_equal (text, scm_from_locale_string (" "));
-
- if (!hyphen_ && !current_lyric_is_skip_)
+
+ if (!hyphen_)
hyphen_ = make_spanner ("LyricSpace", item->self_scm ());
if (hyphen_)
hyphen_->set_bound (LEFT, item);
-
- if (finished_hyphen_ && !current_lyric_is_skip_)
+
+ if (finished_hyphen_)
finished_hyphen_->set_bound (RIGHT, item);
}
{
extract_item_set (sp, "heads", heads);
if (heads.size ())
- sp->set_bound (RIGHT, heads.back ());
+ sp->set_bound (RIGHT, heads.back ());
}
}
completize_hyphen (hyphen_);
if (!hyphen_->get_bound (RIGHT))
- {
- hyphen_->warning (_ ("removing unterminated hyphen"));
- hyphen_->suicide ();
- }
+ {
+ hyphen_->warning (_ ("removing unterminated hyphen"));
+ hyphen_->suicide ();
+ }
hyphen_ = 0;
}
completize_hyphen (finished_hyphen_);
if (!finished_hyphen_->get_bound (RIGHT))
- {
- if (finished_ev_)
- finished_hyphen_->warning (_ ("unterminated hyphen; removing"));
- finished_hyphen_->suicide ();
- }
+ {
+ if (finished_ev_)
+ finished_hyphen_->warning (_ ("unterminated hyphen; removing"));
+ finished_hyphen_->suicide ();
+ }
finished_hyphen_ = 0;
}
}
finished_hyphen_ = 0;
finished_ev_ = 0;
}
-
- if (finished_hyphen_ && hyphen_ && !current_lyric_is_skip_)
+
+ if (finished_hyphen_ && hyphen_)
{
programming_error ("hyphen not finished yet");
finished_hyphen_ = 0;
finished_hyphen_ = hyphen_;
finished_ev_ = ev_;
}
-
+
hyphen_ = 0;
ev_ = 0;
}
ADD_ACKNOWLEDGER (Hyphen_engraver, lyric_syllable);
ADD_TRANSLATOR (Hyphen_engraver,
- /* doc */
- "Create lyric hyphens and distance constraints between words.",
+ /* doc */
+ "Create lyric hyphens and distance constraints between words.",
- /* create */
- "LyricHyphen "
- "LyricSpace ",
+ /* create */
+ "LyricHyphen "
+ "LyricSpace ",
- /* read */
- "",
+ /* read */
+ "",
- /* write */
- ""
- );
+ /* write */
+ ""
+ );