#include "score-engraver.hh"
#include "paper-score.hh"
#include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "axis-group-interface.hh"
#include "context-def.hh"
#include "staff-spacing.hh"
if (!command_column_)
{
SCM nmp
- = updated_grob_properties (daddy_context_,
+ = updated_grob_properties (context (),
ly_symbol2scm ("NonMusicalPaperColumn"));
- SCM pc = updated_grob_properties (daddy_context_,
+ SCM pc = updated_grob_properties (context (),
ly_symbol2scm ("PaperColumn"));
set_columns (new Paper_column (nmp), new Paper_column (pc));
command_column_->set_property ("when", w);
musical_column_->set_property ("when", w);
- recurse_over_translators (daddy_context_, &Translator::start_translation_timestep, DOWN);
+ recurse_over_translators (context (), &Translator::start_translation_timestep, DOWN);
}
void
if ((breaks_%8))
progress_indication ("[" + to_string (breaks_) + "]");
- recurse_over_translators (daddy_context_, &Translator::finalize, UP);
+ recurse_over_translators (context (), &Translator::finalize, UP);
}
/*
pscore_ = new Paper_score;
- pscore_->paper_ = dynamic_cast<Paper_def*> (get_output_def ());
+ pscore_->paper_ = dynamic_cast<Output_def*> (get_output_def ());
- SCM props = updated_grob_properties (daddy_context_, ly_symbol2scm ("System"));
+ SCM props = updated_grob_properties (context (), ly_symbol2scm ("System"));
pscore_->typeset_line (new System (props));
{
if (!to_boolean (get_property ("skipTypesetting")))
{
- recurse_over_translators (daddy_context_, &Engraver::process_music, UP);
- recurse_over_translators (daddy_context_, &Engraver::do_announces, UP);
+ recurse_over_translators (context (), &Engraver::process_music, UP);
+ recurse_over_translators (context (), &Engraver::do_announces, UP);
}
- recurse_over_translators (daddy_context_, &Translator::stop_translation_timestep, UP);
+ recurse_over_translators (context (), &Translator::stop_translation_timestep, UP);
}
void
{
announce_infos_.push (info);
pscore_->system_->typeset_grob (info.grob_);
+ elems_.push (info.grob_);
}
-void
-Score_engraver::typeset_grob (Grob *elem)
-{
- if (!elem)
- programming_error ("Score_engraver: empty elt\n");
- else
- elems_.push (elem);
-}
void
Score_engraver::typeset_all ()
for (int i =0; i < elems_.size (); i++)
{
Grob * elem = elems_[i];
+
- if (Spanner *s = dynamic_cast <Spanner *> (elem))
- {
- /*
- do something sensible if spanner not
- spanned on 2 items.
- */
- Direction d = LEFT;
- do {
- if (!s->get_bound (d))
- {
- Grob * cc
- = unsmob_grob (get_property ("currentCommandColumn"));
- s->set_bound (d, cc);
- /* don't warn for empty/suicided spanners,
- it makes real warningsinvisible.
- maybe should be junked earlier? */
- if (elem->live ())
- elem->warning (_f ("unbound spanner `%s'", s->name ().to_str0 ()));
- }
- }
- while (flip (&d) != LEFT);
-
- if (dynamic_cast<Item*> (s->get_parent (Y_AXIS)))
- programming_error ("Spanner Y-parent is an item.");
- }
- else
+ if (dynamic_cast<Item*> (elem))
{
- if (!elem->get_parent (X_AXIS))
+ if (!elem->get_parent (X_AXIS)
+ && elem != command_column_
+ && elem != musical_column_
+ )
{
bool br = to_boolean (elem->get_property ("breakable"));
Axis_group_interface::add_element (br ? command_column_ : musical_column_, elem);
musical_column_ = new_musical;
if (new_command)
{
- daddy_context_->set_property ("currentCommandColumn", new_command->self_scm ());
+ context ()->set_property ("currentCommandColumn", new_command->self_scm ());
}
if (new_musical)
{
- daddy_context_->set_property ("currentMusicalColumn", new_musical->self_scm ());
+ context ()->set_property ("currentMusicalColumn", new_musical->self_scm ());
}
}
if (m->is_mus_type ("break-event"))
{
SCM pen = command_column_->get_property ("penalty");
- Real total_penalty = is_number (pen) ? ly_scm2double (pen) : 0.0;
+ Real total_penalty = ly_c_number_p (pen) ? ly_scm2double (pen) : 0.0;
SCM mpen = m->get_property ("penalty");
- if (is_number (mpen))
+ if (ly_c_number_p (mpen))
total_penalty += ly_scm2double (mpen);
command_column_->set_property ("penalty", scm_make_real (total_penalty));
forbid_breaks ();
SCM page_pen = command_column_->get_property ("page-penalty");
- Real total_pp = is_number (page_pen) ? ly_scm2double (page_pen) : 0.0;
+ Real total_pp = ly_c_number_p (page_pen) ? ly_scm2double (page_pen) : 0.0;
SCM mpage_pen = m->get_property ("page-penalty");
- if (is_number (mpage_pen))
+ if (ly_c_number_p (mpage_pen))
total_pp += ly_scm2double (mpage_pen);
command_column_->set_property ("page-penalty", scm_make_real (total_pp));