/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2002--2011 Juergen Reuter <reuter@ipd.uka.de>
+ Copyright (C) 2002--2012 Juergen Reuter <reuter@ipd.uka.de>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
if (events_drul_[STOP])
{
if (!ligature_)
- {
- events_drul_[STOP]->origin ()->warning (_ ("cannot find start of ligature"));
- return;
- }
+ {
+ events_drul_[STOP]->origin ()->warning (_ ("cannot find start of ligature"));
+ return;
+ }
if (!last_bound_)
- events_drul_[STOP]->origin ()->warning (_ ("no right bound"));
+ events_drul_[STOP]->origin ()->warning (_ ("no right bound"));
else
- ligature_->set_bound (RIGHT, last_bound_);
+ ligature_->set_bound (RIGHT, last_bound_);
prev_start_event_ = 0;
finished_primitives_ = primitives_;
if (events_drul_[START])
{
if (ligature_)
- {
- events_drul_[START]->origin ()->warning (_ ("already have a ligature"));
- return;
- }
+ {
+ events_drul_[START]->origin ()->warning (_ ("already have a ligature"));
+ return;
+ }
prev_start_event_ = events_drul_[START];
ligature_ = create_ligature_spanner ();
Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
if (!bound)
- events_drul_[START]->origin ()->warning (_ ("no left bound"));
+ events_drul_[START]->origin ()->warning (_ ("no left bound"));
else
- ligature_->set_bound (LEFT, bound);
+ ligature_->set_bound (LEFT, bound);
ligature_start_mom_ = now_mom ();
- // TODO: dump cause into make_item/spanner.
+ // TODO: dump cause into make_item/spanner.
// announce_grob (ligature_, events_drul_[START]->self_scm ());
}
}
if (finished_ligature_)
{
if (!finished_primitives_.size ())
- {
- finished_ligature_->programming_error (
- "Ligature_engraver::stop_translation_timestep ():"
- " junking empty ligature");
- }
+ {
+ finished_ligature_->programming_error ("Ligature_engraver::stop_translation_timestep ():"
+ " junking empty ligature");
+ }
else
- {
- typeset_ligature (finished_ligature_, finished_primitives_);
- finished_primitives_.clear ();
- }
+ {
+ typeset_ligature (finished_ligature_, finished_primitives_);
+ finished_primitives_.clear ();
+ }
finished_ligature_ = 0;
}
}
void
-Ligature_engraver::acknowledge_note_head (Grob_info info)
+Ligature_engraver::acknowledge_ligature_head (Grob_info info)
{
if (ligature_)
{
primitives_.push_back (info);
if (info.grob () && brew_ligature_primitive_proc != SCM_EOL)
- {
- info.grob ()->set_property ("stencil", brew_ligature_primitive_proc);
- }
+ info.grob ()->set_property ("stencil", brew_ligature_primitive_proc);
}
}