X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvolta-engraver.cc;h=a988218ca0a6c2739f96f81a4393aee4c7dde723;hb=754d360118e26e2e48ec080849d9c0f94d1c7416;hp=a6a9bbd7ba21b83d8b784ac3eedd5b9fa29c20fa;hpb=5d5fbb2641fda6605cde61ebcd99b9bef2e94b4a;p=lilypond.git diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index a6a9bbd7ba..a988218ca0 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -3,17 +3,19 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys */ #include "engraver.hh" -#include "translator-group.hh" -#include "volta-spanner.hh" +#include "context.hh" +#include "volta-bracket.hh" #include "item.hh" #include "note-column.hh" -#include "bar.hh" +#include "bar-line.hh" #include "side-position-interface.hh" +#include "warn.hh" +#include "staff-symbol.hh" /* Create Volta spanners, by reading repeatCommands property, usually @@ -22,29 +24,75 @@ class Volta_engraver : public Engraver { public: - Volta_engraver(); - VIRTUAL_COPY_CONS(Translator); + TRANSLATOR_DECLARATIONS (Volta_engraver); protected: virtual void acknowledge_grob (Grob_info); virtual void finalize (); virtual void stop_translation_timestep (); virtual void process_music (); - virtual void create_grobs (); Moment started_mom_; - Spanner *volta_span_p_; - Spanner *end_volta_span_p_; + Spanner *volta_span_; + Spanner *end_volta_span_; + SCM staff_; + SCM start_string_; - SCM start_str_; + bool staff_eligible (); + }; -ADD_THIS_TRANSLATOR(Volta_engraver); - Volta_engraver::Volta_engraver () { - volta_span_p_ = 0; - end_volta_span_p_ = 0; + staff_ = SCM_EOL; + volta_span_ = 0; + end_volta_span_ = 0; +} + + +/* + TODO: this logic should be rewritten, it is buggy. + + One of the problems is that we can't determine wether or not to + print the volta bracket during the first step, since that requires + acknowledging the staff. + */ +bool +Volta_engraver::staff_eligible () +{ + SCM doit =get_property ("voltaOnThisStaff"); + if (scm_is_bool (doit)) + { + return to_boolean (doit); + } + + + if (!unsmob_grob (staff_)) + return false; + + /* + TODO: this does weird things when you open a piece with a + volta spanner. + */ + SCM staffs = get_property ("stavesFound"); + + /* + only put a volta on the top staff. + + May be this is a bit convoluted, and we should have a single + volta engraver in score context or somesuch. + + */ + if (!scm_is_pair (staffs)) + { + programming_error ("Huh? Volta engraver can't find staffs?"); + return false; + } + else if (scm_car (scm_last_pair (staffs)) != staff_) + { + return false; + } + return true; } @@ -53,24 +101,30 @@ Volta_engraver::process_music () { SCM cs = get_property ("repeatCommands"); + if (!staff_eligible ()) + return ; + + bool end = false; - start_str_ = SCM_EOL; - while (gh_pair_p (cs)) + start_string_ = SCM_EOL; + while (scm_is_pair (cs)) { - SCM c = gh_car (cs); + SCM c = scm_car (cs); - if (gh_pair_p (c) && gh_car (c) == ly_symbol2scm ("volta")) + if (scm_is_pair (c) + && scm_car (c) == ly_symbol2scm ("volta") + && scm_is_pair (scm_cdr (c))) { - if (gh_cadr (c) == SCM_BOOL_F) + if (scm_cadr (c) == SCM_BOOL_F) end = true; else - start_str_ = gh_cadr (c); + start_string_ = scm_cadr (c); } - cs = gh_cdr (cs); + cs = scm_cdr (cs); } - if (volta_span_p_) + if (volta_span_) { SCM l (get_property ("voltaSpannerDuration")); Moment now = now_mom (); @@ -82,88 +136,78 @@ Volta_engraver::process_music () } - if (end && !volta_span_p_) + if (end && !volta_span_) { - warning (_("No volta spanner to end")); // fixme: be more verbose. + warning (_ ("No volta spanner to end")); // fixme: be more verbose. } else if (end) { - end_volta_span_p_ = volta_span_p_; - volta_span_p_ =0; - - /* - maybe do typeset_grob () directly? - */ - - if (!gh_string_p (start_str_)) - end_volta_span_p_->set_grob_property ("last-volta", SCM_BOOL_T); + end_volta_span_ = volta_span_; + volta_span_ =0; } - if (gh_string_p (start_str_) && volta_span_p_) + if (volta_span_ && + (scm_is_string (start_string_) || scm_is_pair (start_string_))) { warning (_ ("Already have a volta spanner. Stopping that one prematurely.")); - if (end_volta_span_p_) + if (end_volta_span_) { warning (_ ("Also have a stopped spanner. Giving up.")); return ; } - end_volta_span_p_ = volta_span_p_; - volta_span_p_ = 0; + end_volta_span_ = volta_span_; + volta_span_ = 0; } -} -/* - this could just as well be done in process_music (), but what the hack. - */ -void -Volta_engraver::create_grobs () -{ - if (!volta_span_p_ && gh_string_p (start_str_)) + if (!volta_span_ && + (scm_is_string (start_string_) || scm_is_pair (start_string_))) { started_mom_ = now_mom () ; - volta_span_p_ = new Spanner (get_property ("VoltaBracket")); - Volta_spanner::set_interface (volta_span_p_); - announce_grob (volta_span_p_,0); - volta_span_p_->set_grob_property ("text", start_str_); + volta_span_ = make_spanner ("VoltaBracket", SCM_EOL); + + + volta_span_->set_property ("text", start_string_); } } + void Volta_engraver::acknowledge_grob (Grob_info i) { - if (Item* item = dynamic_cast (i.elem_l_)) + if (Item* item = dynamic_cast (i.grob_)) { if (Note_column::has_interface (item)) { - if (volta_span_p_) - Volta_spanner::add_column (volta_span_p_,item); - if (end_volta_span_p_) - Volta_spanner::add_column (end_volta_span_p_,item); + if (volta_span_) + Volta_bracket_interface::add_column (volta_span_,item); } - if (Bar::has_interface (item)) + if (Bar_line::has_interface (item)) { - if (volta_span_p_) - Volta_spanner::add_bar (volta_span_p_, item); - if (end_volta_span_p_) - Volta_spanner::add_bar(end_volta_span_p_ , item); + if (volta_span_) + Volta_bracket_interface::add_bar (volta_span_, item); + if (end_volta_span_) + Volta_bracket_interface::add_bar (end_volta_span_ , item); } } + else if (Staff_symbol::has_interface (i.grob_)) + { + /* + We only want to know about a single staff: then we add to the + support. */ + if (staff_ != SCM_EOL) + staff_ = SCM_UNDEFINED; + + if (staff_ != SCM_UNDEFINED) + staff_ = i.grob_->self_scm (); + } } void Volta_engraver::finalize () { - if (volta_span_p_) - { - typeset_grob(volta_span_p_); - } - if (end_volta_span_p_) - { - typeset_grob (end_volta_span_p_); - } } @@ -171,15 +215,45 @@ Volta_engraver::finalize () void Volta_engraver::stop_translation_timestep () { - if (end_volta_span_p_) + if (volta_span_ && !staff_eligible ()) { - Side_position_interface::add_staff_support (end_volta_span_p_); + /* + THIS IS A KLUDGE. + + we need to do this here, because STAFF_ is not initialized yet + in the 1st call of process_music () + */ - typeset_grob (end_volta_span_p_ ); - end_volta_span_p_ =0; + volta_span_->suicide ( ); + volta_span_ = 0; + } + + if (end_volta_span_ && !end_volta_span_->get_bound (RIGHT)) + { + Grob * cc = unsmob_grob (get_property ("currentCommandColumn")); + Item * ci = dynamic_cast (cc); + end_volta_span_->set_bound (RIGHT, ci); } + + end_volta_span_ =0; + + if (volta_span_ && !volta_span_->get_bound (LEFT)) + { + Grob * cc = unsmob_grob (get_property ("currentCommandColumn")); + Item * ci = dynamic_cast (cc); + volta_span_->set_bound (LEFT, ci); + } + } /* TODO: should attach volta to paper-column if no bar is found. */ + +ENTER_DESCRIPTION (Volta_engraver, +/* descr */ "Make volta brackets.", +/* creats*/ "VoltaBracket", +/* accepts */ "", +/* acks */ "bar-line-interface staff-symbol-interface note-column-interface", +/* reads */ "repeatCommands voltaSpannerDuration stavesFound", +/* write */ "");