X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeat-acknowledge-engraver.cc;h=d11b633fd5cb4b92ffb32af56f83c340056892bd;hb=91020f65ff553c2ece26991adaad7d3ea3e7a5fa;hp=477e295fb1885d180116ad3a19f0cc36ff6a62ac;hpb=7181c77e5d46a271f5f76e99bee7f844611e23e4;p=lilypond.git diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc index 477e295fb1..d11b633fd5 100644 --- a/lily/repeat-acknowledge-engraver.cc +++ b/lily/repeat-acknowledge-engraver.cc @@ -1,89 +1,166 @@ -/* - repeat-acknowledge-engraver.cc -- implement Repeat_acknowledge_engraver - - source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 2000--2015 Han-Wen Nienhuys + + 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 . +*/ + #include "engraver.hh" #include "translator-group.hh" +#include "context.hh" #include "repeated-music.hh" +#include "translator.icc" /* Objective: -- set and reset repeatCommands, so Unfolded_repeat_iterator knows - where to set variables. + where to set variables. -- collect information passed by Unfolded_repeat_iterator for - Bar_engraver: writes whichBar property. (TODO: check for - interactions with timing engraver.) - - */ + Bar_engraver: writes whichBar property. (TODO: check for + interactions with timing engraver.) +*/ class Repeat_acknowledge_engraver : public Engraver { public: - VIRTUAL_COPY_CONS (Translator); - Repeat_acknowledge_engraver(); - - virtual void do_post_move_processing (); - virtual void do_process_music (); - virtual void do_creation_processing (); + + TRANSLATOR_DECLARATIONS (Repeat_acknowledge_engraver); +protected: + void start_translation_timestep (); + void process_music (); + virtual void initialize (); }; void -Repeat_acknowledge_engraver::do_creation_processing () +Repeat_acknowledge_engraver::initialize () { - daddy_trans_l_->set_property ("repeatCommands", SCM_EOL); + context ()->set_property ("repeatCommands", SCM_EOL); } - -Repeat_acknowledge_engraver::Repeat_acknowledge_engraver() +Repeat_acknowledge_engraver::Repeat_acknowledge_engraver () { } void -Repeat_acknowledge_engraver::do_post_move_processing () +Repeat_acknowledge_engraver::start_translation_timestep () { - Translator_group * tr = daddy_trans_l_->where_defined (ly_symbol2scm ("repeatCommands")); + SCM rc; + Context *tr = context ()->where_defined (ly_symbol2scm ("repeatCommands"), &rc); if (!tr) - tr = daddy_trans_l_; + tr = context (); tr->set_property ("repeatCommands", SCM_EOL); } void -Repeat_acknowledge_engraver::do_process_music () +Repeat_acknowledge_engraver::process_music () { + /* + At the start of a piece, we don't print any repeat bars. + */ + if (!now_mom ().main_part_) + return; + SCM cs = get_property ("repeatCommands"); - String s = ""; - bool start = false; + string s = ""; + bool start = false; bool end = false; - while (gh_pair_p (cs)) + bool segno = false; + bool volta_found = false; + while (scm_is_pair (cs)) { - SCM command = gh_car (cs); - if (command == ly_symbol2scm ("start-repeat")) - start = true; - else if (command == ly_symbol2scm ("end-repeat")) - end = true; - cs = gh_cdr (cs); + SCM command = scm_car (cs); + if (scm_is_eq (command, ly_symbol2scm ("start-repeat"))) + start = true; + else if (scm_is_eq (command, ly_symbol2scm ("end-repeat"))) + end = true; + else if (scm_is_eq (command, ly_symbol2scm ("segno-display"))) + segno = true; + else if (scm_is_pair (command) + && scm_is_eq (scm_car (command), ly_symbol2scm ("volta"))) + volta_found = true; + cs = scm_cdr (cs); } - if ( start && end ) - s = ":|:"; + /* + Select which bar type to set + */ + if (segno) + if (start) + if (end) // { segno, start, end } + s = robust_scm2string (get_property ("doubleRepeatSegnoType"), ":|.S.|:"); + else // { segno, start } + s = robust_scm2string (get_property ("startRepeatSegnoType"), "S.|:"); + else if (end) // { segno, end } + s = robust_scm2string (get_property ("endRepeatSegnoType"), ":|.S"); + else // { segno } + s = robust_scm2string (get_property ("segnoType"), "S"); else if (start) - s = "|:"; - else if (end) - s = ":|"; + if (end) // { start, end } + s = robust_scm2string (get_property ("doubleRepeatType"), ":|.|:"); + else // { start } + s = robust_scm2string (get_property ("startRepeatType"), ".|:"); + else if (end) // { end } + s = robust_scm2string (get_property ("endRepeatType"), ":|."); - if (s != "") + /* + TODO: line breaks might be allowed if we set whichBar to "". + */ + + /* + We only set the barline if we wouldn't overwrite a previously set + barline. + */ + SCM wb = get_property ("whichBar"); + SCM db = get_property ("defaultBarType"); + if (!scm_is_string (wb) || ly_is_equal (db, wb)) { - daddy_trans_l_->set_property ("whichBar", ly_str02scm(s.ch_C())); + if (s != "" || (volta_found && !scm_is_string (wb))) + context ()->set_property ("whichBar", ly_string2scm (s)); } } +void +Repeat_acknowledge_engraver::boot () +{ + +} + +ADD_TRANSLATOR (Repeat_acknowledge_engraver, + /* doc */ + "Acknowledge repeated music, and convert the contents of" + " @code{repeatCommands} into an appropriate setting for" + " @code{whichBar}.", + + /* create */ + "", + + /* read */ + "doubleRepeatType " + "startRepeatType " + "endRepeatType " + "doubleRepeatSegnoType " + "startRepeatSegnoType " + "endRepeatSegnoType " + "segnoType " + "repeatCommands " + "whichBar ", -ADD_THIS_TRANSLATOR(Repeat_acknowledge_engraver); + /* write */ + "" + );