X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeat-acknowledge-engraver.cc;h=a76484e086633345d888c88ea992b8a47ef9e2b6;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=18907b15b38f3c998bc140bd2727df55b906ca5a;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc index 18907b15b3..a76484e086 100644 --- a/lily/repeat-acknowledge-engraver.cc +++ b/lily/repeat-acknowledge-engraver.cc @@ -1,45 +1,56 @@ -/* - repeat-acknowledge-engraver.cc -- implement Repeat_acknowledge_engraver - - source file of the GNU LilyPond music typesetter - - (c) 2000--2004 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: - TRANSLATOR_DECLARATIONS(Repeat_acknowledge_engraver); - virtual void start_translation_timestep (); - virtual void process_music (); + TRANSLATOR_DECLARATIONS (Repeat_acknowledge_engraver); +protected: + void start_translation_timestep (); + void process_music (); virtual void initialize (); - }; void Repeat_acknowledge_engraver::initialize () { - daddy_trans_->set_property ("repeatCommands", SCM_EOL); + context ()->set_property ("repeatCommands", SCM_EOL); } - Repeat_acknowledge_engraver::Repeat_acknowledge_engraver () { } @@ -47,9 +58,10 @@ Repeat_acknowledge_engraver::Repeat_acknowledge_engraver () void Repeat_acknowledge_engraver::start_translation_timestep () { - Translator_group * tr = daddy_trans_->where_defined (ly_symbol2scm ("repeatCommands")); + SCM rc; + Context *tr = context ()->where_defined (ly_symbol2scm ("repeatCommands"), &rc); if (!tr) - tr = daddy_trans_; + tr = context (); tr->set_property ("repeatCommands", SCM_EOL); } @@ -59,59 +71,89 @@ Repeat_acknowledge_engraver::process_music () { /* At the start of a piece, we don't print any repeat bars. - */ - if (now_mom () == Moment (0)) - return ; - + */ + if (!now_mom ().main_part_) + return; + SCM cs = get_property ("repeatCommands"); - - String s = ""; + + string s = ""; bool start = false; bool end = false; + bool segno = false; bool volta_found = false; - while (gh_pair_p (cs)) + while (scm_is_pair (cs)) { - SCM command = ly_car (cs); + SCM command = scm_car (cs); if (command == ly_symbol2scm ("start-repeat")) - start = true; + start = true; else if (command == ly_symbol2scm ("end-repeat")) - end = true; - else if (gh_pair_p (command) && ly_car (command) == ly_symbol2scm ("volta")) - volta_found = true; - cs = ly_cdr (cs); + end = true; + else if (command == ly_symbol2scm ("segno-display")) + segno = true; + else if (scm_is_pair (command) && 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"), ":|."); /* 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 (!gh_string_p (wb) || gh_equal_p (db, wb)) + SCM db = get_property ("defaultBarType"); + if (!scm_is_string (wb) || ly_is_equal (db, wb)) { - if (s != "" || (volta_found && !gh_string_p (wb))) - { - daddy_trans_->set_property ("whichBar", scm_makfrom0str (s.to_str0 ())); - } + if (s != "" || (volta_found && !scm_is_string (wb))) + context ()->set_property ("whichBar", ly_string2scm (s)); } } -ENTER_DESCRIPTION(Repeat_acknowledge_engraver, -/* descr */ "Acknowledge repeated music, and convert the contents of " -"repeatCommands ainto an appropriate setting for whichBar.", -/* creats*/ "", -/* accepts */ "", -/* acks */ "", -/* reads */ "repeatCommands whichBar", -/* write */ ""); +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 ", + + /* write */ + "" + );