-/*
- repeat-acknowledge-engraver.cc -- implement Repeat_acknowledge_engraver
-
- source file of the GNU LilyPond music typesetter
-
- (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+/*
+ This file is part of LilyPond, the GNU music typesetter.
+
+ Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ 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 <http://www.gnu.org/licenses/>.
+*/
#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);
protected:
- virtual void start_translation_timestep ();
- virtual void process_music ();
+ void start_translation_timestep ();
+ void process_music ();
virtual void initialize ();
-
};
void
context ()->set_property ("repeatCommands", SCM_EOL);
}
-
-Repeat_acknowledge_engraver::Repeat_acknowledge_engraver ()
+Repeat_acknowledge_engraver::Repeat_acknowledge_engraver (Context *c)
+ : Engraver (c)
{
}
void
Repeat_acknowledge_engraver::start_translation_timestep ()
{
- Context * tr = context ()->where_defined (ly_symbol2scm ("repeatCommands"));
+ SCM rc;
+ Context *tr = context ()->where_defined (ly_symbol2scm ("repeatCommands"), &rc);
if (!tr)
tr = context ();
{
/*
At the start of a piece, we don't print any repeat bars.
- */
+ */
if (!now_mom ().main_part_)
- return ;
-
+ return;
+
SCM cs = get_property ("repeatCommands");
-
- String s = "";
+
+ string s = "";
bool start = false;
bool end = false;
+ bool segno = false;
bool volta_found = false;
while (scm_is_pair (cs))
{
SCM command = scm_car (cs);
- if (command == ly_symbol2scm ("start-repeat"))
- start = true;
- else if (command == ly_symbol2scm ("end-repeat"))
- end = true;
- else if (scm_is_pair (command) && scm_car (command) == ly_symbol2scm ("volta"))
- volta_found = true;
- cs = scm_cdr (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"), ":|.");
/*
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_c_equal_p (db, wb))
+ SCM db = get_property ("defaultBarType");
+ if (!scm_is_string (wb) || ly_is_equal (db, wb))
{
if (s != "" || (volta_found && !scm_is_string (wb)))
- {
- context ()->set_property ("whichBar", scm_makfrom0str (s.to_str0 ()));
- }
+ context ()->set_property ("whichBar", ly_string2scm (s));
}
}
+void
+Repeat_acknowledge_engraver::boot ()
+{
+
+}
+
ADD_TRANSLATOR (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 */ "");
+ /* 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 */
+ ""
+ );
projects / lilypond.git / blobdiff