X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-engraver.cc;h=16b2222ab578243a4107e6cc697c6332ad4a73c6;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=49b4cfa20990366c1b6915de4df9d9490818f730;hpb=9c76cf99a80ed4fad6ff73b98d61a5676b2a18c8;p=lilypond.git diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc index 49b4cfa209..16b2222ab5 100644 --- a/lily/ligature-engraver.cc +++ b/lily/ligature-engraver.cc @@ -1,29 +1,31 @@ -/* +/* ligature-engraver.cc -- implement Ligature_engraver - + source file of the GNU LilyPond music typesetter - - (c) 2002--2004 Juergen Reuter - - */ + + (c) 2002--2008 Juergen Reuter +*/ + #include "ligature-engraver.hh" -#include "spanner.hh" -#include "score-engraver.hh" + +#include "context.hh" +#include "international.hh" #include "note-head.hh" #include "rest.hh" -#include "warn.hh" -#include "translator-group.hh" +#include "spanner.hh" +#include "stream-event.hh" +#include "translator.icc" /* * This abstract class provides the general framework for ligatures of - * any kind. It cares for handling start/stop ligatures requests and + * any kind. It cares for handling start/stop ligatures events and * collecting all noteheads inbetween, but delegates creation of a * ligature spanner for each start/stop pair and typesetting of the * ligature spanner to a concrete subclass. * * A concrete ligature engraver must subclass this class and provide * functions create_ligature_spanner () and typeset_ligature - * (Spanner *, Array). Subclasses of this class basically + * (Spanner *, vector). Subclasses of this class basically * fall into two categories. * * The first category consists of engravers that engrave ligatures in @@ -57,7 +59,7 @@ * Mensural_ligature_engraver) to the proper translator * (e.g. VoiceContext) to choose between various representations. * Since adding/removing an engraver to a translator is a global - * action in the paper block, you can not mix various representations + * action in the layout block, you cannot mix various representations * _within_ the same score. Hence, for selecting a representation, * one would rather like to have a property that can be set e.g. for * several staves individually. However, it seems that this approach @@ -68,154 +70,71 @@ Ligature_engraver::Ligature_engraver () { ligature_ = 0; finished_ligature_ = 0; - reqs_drul_[LEFT] = reqs_drul_[RIGHT] = 0; - prev_start_req_ = 0; + events_drul_[LEFT] = events_drul_[RIGHT] = 0; + prev_start_event_ = 0; last_bound_ = 0; brew_ligature_primitive_proc = SCM_EOL; } -bool -Ligature_engraver::try_music (Music *m) -{ - if (m->is_mus_type ("ligature-event")) - { - Direction d = to_dir (m->get_mus_property ("span-direction")); - reqs_drul_[d] = m; - return true; - } - return false; -} - -Spanner * -Ligature_engraver::create_ligature_spanner () -{ - programming_error ("Ligature_engraver::create_ligature_spanner (): " - "this is an abstract method that should not be called, " - "but overridden by a subclass"); - return 0; -} - -/* - * This method should do something that comes close to the following - * .ly snippet: - * - * \property Voice.NoteHead \override #'print-function = - * < value of #'ligature-primitive-callback of Voice.NoteHead > - * - * TODO: What we are doing here on the c++ level, should actually be - * performed on the SCM level. However, I do not know how to teach - * lilypond to apply an \override and \revert on #'print-function, - * whenever lily encounters a \[ and \] in an .ly file, respectively. - * Also encounter, that lily should not crash if a user erronously - * nests \[ and \]. - */ void -Ligature_engraver::override_molecule_callback () +Ligature_engraver::listen_ligature (Stream_event *ev) { - SCM target_callback = ly_symbol2scm ("print-function"); - SCM source_callback = ly_symbol2scm ("ligature-primitive-callback"); - SCM noteHeadProperties = updated_grob_properties (daddy_trans_, ly_symbol2scm ("NoteHead")); - SCM value = ly_cdr (scm_sloppy_assq (source_callback, noteHeadProperties)); - execute_pushpop_property (daddy_trans_, ly_symbol2scm ("NoteHead"), - target_callback, value); -} - -/* - * This method should do something that comes close to the following - * .ly snippet: - * - * \property Voice.NoteHead \revert #'print-function - * - * TODO: What we are doing here on the c++ level, should actually be - * performed on the SCM level. However, I do not know how to teach - * lilypond to apply an \override and \revert on #'print-function, - * whenever lily encounters a \[ and \] in an .ly file, respectively. - * Also encounter, that lily should not crash if a user erronously - * nests \[ and \]. - */ -void -Ligature_engraver::revert_molecule_callback () -{ - SCM symbol = ly_symbol2scm ("NoteHead"); - SCM key = ly_symbol2scm ("print-function"); - execute_pushpop_property (daddy_trans_, symbol, key, SCM_UNDEFINED); + Direction d = to_dir (ev->get_property ("span-direction")); + ASSIGN_EVENT_ONCE (events_drul_[d], ev); } void Ligature_engraver::process_music () { - if (reqs_drul_[STOP]) + if (events_drul_[STOP]) { if (!ligature_) { - reqs_drul_[STOP]->origin ()->warning (_ ("can't find start of ligature")); + events_drul_[STOP]->origin ()->warning (_ ("cannot find start of ligature")); return; } if (!last_bound_) - { - reqs_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_req_ = 0; + prev_start_event_ = 0; finished_primitives_ = primitives_; finished_ligature_ = ligature_; primitives_.clear (); ligature_ = 0; - revert_molecule_callback (); } last_bound_ = unsmob_grob (get_property ("currentMusicalColumn")); if (ligature_) { // TODO: maybe forbid breaks only if not transcribing - top_engraver ()->forbid_breaks (); + context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T); } - if (reqs_drul_[START]) + if (events_drul_[START]) { if (ligature_) { - reqs_drul_[START]->origin ()->warning (_ ("already have a ligature")); + events_drul_[START]->origin ()->warning (_ ("already have a ligature")); return; } - prev_start_req_ = reqs_drul_[START]; + prev_start_event_ = events_drul_[START]; ligature_ = create_ligature_spanner (); - brew_ligature_primitive_proc = - ligature_->get_grob_property ("ligature-primitive-callback"); - if (brew_ligature_primitive_proc == SCM_EOL) - { - warning ("Ligature_engraver: ligature-primitive-callback undefined"); - } Grob *bound = unsmob_grob (get_property ("currentMusicalColumn")); if (!bound) - { - reqs_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 (); - - announce_grob(ligature_, reqs_drul_[START]->self_scm()); - override_molecule_callback (); - } -} -void -Ligature_engraver::typeset_ligature (Spanner *, Array) -{ - programming_error ("Ligature_engraver::typeset_ligature (): " - "this is an abstract method that should not be called, " - "but overridden by a subclass"); + // TODO: dump cause into make_item/spanner. + // announce_grob (ligature_, events_drul_[START]->self_scm ()); + } } void @@ -236,8 +155,8 @@ Ligature_engraver::stop_translation_timestep () finished_ligature_ = 0; } - reqs_drul_[START] = 0; - reqs_drul_[STOP] = 0; + events_drul_[START] = 0; + events_drul_[STOP] = 0; } void @@ -251,7 +170,7 @@ Ligature_engraver::finalize () } if (ligature_) { - prev_start_req_->origin ()->warning (_ ("unterminated ligature")); + prev_start_event_->origin ()->warning (_ ("unterminated ligature")); ligature_->suicide (); } } @@ -263,30 +182,29 @@ Ligature_engraver::current_ligature () } void -Ligature_engraver::acknowledge_grob (Grob_info info) +Ligature_engraver::acknowledge_note_head (Grob_info info) { if (ligature_) { - if (Note_head::has_interface (info.grob_)) + primitives_.push_back (info); + if (info.grob () && brew_ligature_primitive_proc != SCM_EOL) { - primitives_.push (info); - info.grob_->set_grob_property ("print-function", - brew_ligature_primitive_proc); - } - if (Rest::has_interface (info.grob_)) - { - info.music_cause ()->origin ()->warning (_ ("ligature may not contain rest; ignoring rest")); - prev_start_req_->origin ()->warning (_ ("ligature was started here")); - // TODO: maybe better should stop ligature here rather than - // ignoring the rest? + info.grob ()->set_property ("stencil", brew_ligature_primitive_proc); } } } -ENTER_DESCRIPTION (Ligature_engraver, -/* descr */ "Abstract class; a concrete subclass handles Ligature_events by engraving Ligatures in a concrete style.", -/* creats */ "", -/* accepts */ "ligature-event", -/* acks */ "note-head-interface rest-interface", -/* reads */ "", -/* write */ ""); +void +Ligature_engraver::acknowledge_rest (Grob_info info) +{ + if (ligature_) + { + info.event_cause ()->origin ()->warning (_ ("ignoring rest: ligature may not contain rest")); + prev_start_event_->origin ()->warning (_ ("ligature was started here")); + // TODO: maybe better should stop ligature here rather than + // ignoring the rest? + } +} + +// no ADD_ACKNOWLEDGER / ADD_ACKNOWLEDGER / ADD_TRANSLATOR macro calls +// since this class is abstract