X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=d0891c08d78d1d4c454890127fbbe8b60df567b6;hb=9106e3bd374198c5457c35181ae1d66b3ec95236;hp=4b57352413d30ffbf86c7d48d310eb6fd103f833;hpb=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 4b57352413..d0891c08d7 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,7 +1,9 @@ /* phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver - (c) 1997--2004 Han-Wen Nienhuys + source file of the GNU LilyPond music typesetter + + (c) 1997--2005 Han-Wen Nienhuys */ #include "context.hh" @@ -11,6 +13,7 @@ #include "note-column.hh" #include "spanner.hh" #include "tie.hh" +#include "warn.hh" /* It is possible that a slur starts and ends on the same note. At @@ -21,16 +24,26 @@ class Phrasing_slur_engraver : public Engraver { Drul_array events_; - Music * running_slur_start_; + Music *running_slur_start_; Link_array slurs_; Link_array end_slurs_; protected: - virtual bool try_music (Music*); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); + virtual bool try_music (Music *); + + void acknowledge_extra_object (Grob_info); + DECLARE_ACKNOWLEDGER (accidental); + DECLARE_ACKNOWLEDGER (dynamic_line_spanner); + DECLARE_ACKNOWLEDGER (fingering); + DECLARE_ACKNOWLEDGER (note_column); + DECLARE_ACKNOWLEDGER (script); + DECLARE_ACKNOWLEDGER (slur); + DECLARE_ACKNOWLEDGER (text_script); + DECLARE_ACKNOWLEDGER (tie); + + void stop_translation_timestep (); virtual void finalize (); - virtual void process_music (); + void process_music (); public: TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver); @@ -59,7 +72,7 @@ Phrasing_slur_engraver::try_music (Music *m) { if (slurs_.is_empty ()) return false; - + events_[STOP] = m; return true; } @@ -67,48 +80,87 @@ Phrasing_slur_engraver::try_music (Music *m) return false; } +void +Phrasing_slur_engraver::acknowledge_note_column (Grob_info info) +{ + Grob *e = info.grob (); + for (int i = slurs_.size (); i--;) + Slur::add_column (slurs_[i], e); + for (int i = end_slurs_.size (); i--;) + Slur::add_column (end_slurs_[i], e); +} +/* FIXME: cut + paste job from Slur:: */ void -Phrasing_slur_engraver::acknowledge_grob (Grob_info info) +Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info) { - Grob *e = info.grob_; - if (Note_column::has_interface (info.grob_)) + Grob *e = info.grob (); + SCM avoid = e->get_property ("avoid-slur"); + if (Tie::has_interface (e) + || avoid == ly_symbol2scm ("inside")) { - for (int i = slurs_.size (); i--; ) - Slur::add_column (slurs_[i], e); - for (int i = end_slurs_.size (); i-- ; ) - Slur::add_column (end_slurs_[i], e); + for (int i = slurs_.size (); i--;) + Slur::add_extra_encompass (slurs_[i], e); + for (int i = end_slurs_.size (); i--;) + Slur::add_extra_encompass (end_slurs_[i], e); } - else + else if (avoid == ly_symbol2scm ("outside") + || avoid == ly_symbol2scm ("around")) { - /* - ugh. cut & paste from slur-engraver.cc - */ - SCM inside = e->get_property ("inside-slur"); - if (Tie::has_interface (e) - || Slur::has_interface (e) - || to_boolean (inside)) - { - for (int i = slurs_.size (); i--; ) - Slur::add_extra_encompass (slurs_[i], e); - for (int i = end_slurs_.size (); i--; ) - Slur::add_extra_encompass (end_slurs_[i], e); - } - else if (inside == SCM_BOOL_F) + Grob *slur = slurs_.size () ? slurs_[0] : 0; + slur = (end_slurs_.size () && !slur) + ? end_slurs_[0] : slur; + + if (slur) { - Grob *slur = slurs_.size()?slurs_[0] : 0; - slur = (end_slurs_.size () && !slur) - ? end_slurs_[0] : slur; - - if (slur) - { - e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS); - e->set_property ("slur", slur->self_scm()); - } + chain_offset_callback (e, Slur::outside_slur_callback_proc, Y_AXIS); + e->set_object ("slur", slur->self_scm ()); } } } +void +Phrasing_slur_engraver::acknowledge_accidental (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_script (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_tie (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_slur (Grob_info info) +{ + acknowledge_extra_object (info); +} + void Phrasing_slur_engraver::finalize () { @@ -124,12 +176,12 @@ Phrasing_slur_engraver::process_music () end_slurs_ = slurs_; slurs_.clear (); } - + if (events_[START] && slurs_.is_empty ()) { Music *ev = events_[START]; - Grob * slur = make_spanner ("PhrasingSlur", events_[START]->self_scm ()); + Grob *slur = make_spanner ("PhrasingSlur", events_[START]->self_scm ()); Direction updown = to_dir (ev->get_property ("direction")); if (updown) set_grob_direction (slur, updown); @@ -145,11 +197,20 @@ Phrasing_slur_engraver::stop_translation_timestep () events_[START] = events_[STOP] = 0; } - -ENTER_DESCRIPTION (Phrasing_slur_engraver, -/* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", -/* creats*/ "PhrasingSlur", -/* accepts */ "phrasing-slur-event", -/* acks */ "note-column-interface tie-interface fingering-interface script-interface slur-interface", -/* reads */ "", -/* write */ ""); +#include "translator.icc" + +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, dynamic_line_spanner); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering) + ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie); + +ADD_TRANSLATOR (Phrasing_slur_engraver, + /* doc */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", + /* create */ "PhrasingSlur", + /* accept */ "phrasing-slur-event", + /* read */ "", + /* write */ "");