Output_def *
Grob::get_layout () const
{
- return pscore_ ? pscore_->layout_ : 0;
+ return pscore_ ? pscore_->layout () : 0;
}
/* Recursively track all dependencies of this Grob. The status_ field
if (status_ == busy)
{
- programming_error ("Element is busy, come back later");
+ programming_error ("element is busy, come back later");
return;
}
Grob::add_dependency (Grob *e)
{
if (e)
- Pointer_group_interface::add_grob (this, ly_symbol2scm ("dependencies"),
- e);
+ Pointer_group_interface::add_grob (this, ly_symbol2scm ("dependencies"), e);
else
- programming_error ("Null dependency added");
+ programming_error ("null dependency added");
}
void
void
Grob::programming_error (String s) const
{
- s = "Programming error: " + s;
- warning (s);
+ s = _f ("programming error: %s", s);
+ message (s);
}
/****************************************************
scm_gc_mark (s->original_->self_scm ());
if (s->pscore_)
- scm_gc_mark (s->pscore_->layout_->self_scm ());
+ scm_gc_mark (s->pscore_->self_scm ());
s->do_derived_mark ();
return s->mutable_property_alist_;