-/*
- repeat-acknowledge-engraver.cc -- implement Repeat_acknowledge_engraver
-
+/*
+ repeat-acknowledge-engraver.cc -- implement Repeat_acknowledge_engraver
+
source file of the GNU LilyPond music typesetter
-
- (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+
+ (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
#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 ()
{
}
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);
}
{
/*
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 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;
else if (command == ly_symbol2scm ("end-repeat"))
end = true;
- else if (gh_pair_p (command) && ly_car (command) == ly_symbol2scm ("volta"))
+ else if (scm_is_pair (command) && scm_car (command) == ly_symbol2scm ("volta"))
volta_found = true;
- cs = ly_cdr (cs);
+ cs = scm_cdr (cs);
}
if (start && end)
/*
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 "
+ "repeatCommands ainto an appropriate setting for whichBar.",
+ /* create */ "",
+ /* read */ "repeatCommands whichBar",
+ /* write */ "");