/*
fixme: default should be no callback.
*/
-
- pscore_l_=0;
- status_c_ = 0;
- original_l_ = 0;
+ self_scm_ = SCM_EOL;
+ pscore_=0;
+ status_ = 0;
+ original_ = 0;
immutable_property_alist_ = basicprops;
mutable_property_alist_ = SCM_EOL;
Grob::Grob (Grob const&s)
: dim_cache_ (s.dim_cache_)
{
- original_l_ = (Grob*) &s;
+ original_ = (Grob*) &s;
+ self_scm_ = SCM_EOL;
+
immutable_property_alist_ = s.immutable_property_alist_;
mutable_property_alist_ = SCM_EOL;
No properties are copied. That is the job of handle_broken_dependencies.
*/
- status_c_ = s.status_c_;
- pscore_l_ = s.pscore_l_;
+ status_ = s.status_;
+ pscore_ = s.pscore_;
smobify_self ();
Axis a = (Axis) gh_scm2int (scm_axis);
SCM ext = s->get_grob_property ((a == X_AXIS)
- ? "extent-X"
- : "extent-Y");
+ ? "X-extent"
+ : "Y-extent");
if (gh_pair_p (ext))
{
Paper_def*
-Grob::paper_l () const
+Grob::get_paper () const
{
- return pscore_l_ ? pscore_l_->paper_l_ : 0;
+ return pscore_ ? pscore_->paper_ : 0;
}
void
Grob::calculate_dependencies (int final, int busy, SCM funcname)
{
- if (status_c_ >= final)
+ if (status_ >= final)
return;
- if (status_c_== busy)
+ if (status_== busy)
{
programming_error ("Element is busy, come back later");
return;
}
- status_c_= busy;
+ status_= busy;
for (SCM d = get_grob_property ("dependencies"); gh_pair_p (d);
d = ly_cdr (d))
if (gh_procedure_p (proc))
gh_call1 (proc, this->self_scm ());
- status_c_= final;
+ status_= final;
}
Molecule *
mol = get_uncached_molecule ();
- Grob *me = (Grob*)this;
- me->set_grob_property ("molecule", mol);
+ if (live ())
+ {
+ Grob *me = (Grob*)this;
+ me->set_grob_property ("molecule", mol);
+ }
return unsmob_molecule (mol);
}
+
SCM
Grob::get_uncached_molecule ()const
{
SCM mol = SCM_EOL;
if (gh_procedure_p (proc))
mol = gh_apply (proc, scm_list_n (this->self_scm (), SCM_UNDEFINED));
-
Molecule *m = unsmob_molecule (mol);
{
SCM origin = ly_symbol2scm ("no-origin");
- if (store_locations_global_b){
- SCM cause = get_grob_property ("cause");
- if (Music*m = unsmob_music (cause))
- {
- SCM music_origin = m->get_mus_property ("origin");
- if (unsmob_input (music_origin))
- origin = music_origin;
- }
+ if (store_locations_global_b)
+ {
+ SCM cause = get_grob_property ("cause");
+ if (Music*m = unsmob_music (cause))
+ {
+ SCM music_origin = m->get_mus_property ("origin");
+ if (unsmob_input (music_origin))
+ origin = music_origin;
+ }
}
// ugr.
{
}
-
-
-
-
-
System *
-Grob::line_l () const
+Grob::get_system () const
{
return 0;
}
-LY_DEFINE (get_line,
- "get-line",
- 1, 0, 0, (SCM grob),
- "
-Return the Line Grob of @var{grob}.
-")
-{
- Grob *me = unsmob_grob (grob);
- SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "grob");
-
- if (Grob *g = me->line_l ())
- return g->self_scm ();
-
- return SCM_EOL;
-}
-
-LY_DEFINE (get_original,
- "get-original",
- 1, 0, 0, (SCM grob),
- "
-Return the original Grob of @var{grob}
-")
-{
- Grob *me = unsmob_grob (grob);
- SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "grob");
- return me->original_l_ ? me->original_l_->self_scm () : me->self_scm ();
-}
-
void
Grob::add_dependency (Grob*e)
{
}
-
void
Grob::handle_broken_dependencies ()
{
- Spanner * s= dynamic_cast<Spanner*> (this);
- if (original_l_ && s)
+ Spanner * sp = dynamic_cast<Spanner*> (this);
+ if (original_ && sp)
return;
- if (s)
+ if (sp)
{
- for (int i = 0; i< s->broken_into_l_arr_ .size (); i++)
+ for (SCM s = mutable_property_alist_; gh_pair_p(s);
+ s = gh_cdr(s))
{
- Grob * sc = s->broken_into_l_arr_[i];
- System * l = sc->line_l ();
-
- sc->substitute_mutable_properties (l ? l->self_scm () : SCM_UNDEFINED,
- mutable_property_alist_);
+ sp->substitute_one_mutable_property (gh_caar (s),
+ gh_cdar (s));
+
}
}
-
- System *line = line_l ();
+ System *system = get_system ();
if (live ()
- && line && common_refpoint (line, X_AXIS) && common_refpoint (line, Y_AXIS))
+ && system && common_refpoint (system, X_AXIS) && common_refpoint (system, Y_AXIS))
{
- substitute_mutable_properties (line ? line->self_scm () : SCM_UNDEFINED,
- mutable_property_alist_);
+ substitute_mutable_properties (system ? system->self_scm () : SCM_UNDEFINED,
+ mutable_property_alist_);
}
else if (dynamic_cast <System*> (this))
{
void
Grob::suicide ()
{
+ if (!live ())
+ return;
+
+#if 0 // see below.
+ String nm = name();
+#endif
+
mutable_property_alist_ = SCM_EOL;
immutable_property_alist_ = SCM_EOL;
dim_cache_[a].offset_callbacks_ = SCM_EOL;
dim_cache_[a].offsets_left_ = 0;
}
+
+#if 0
+ /*
+ This can make debugging a little easier: we can still know what
+ the object used to be. However, since all its links have been
+ broken, it's usually more convenient to set a conditional
+ breakpoint in GDB before the property lists are wiped.
+ */
+ mutable_property_alist_ = scm_acons (ly_symbol2scm ("name"),
+ scm_makfrom0str (nm.to_str0()),
+ mutable_property_alist_
+ );
+#endif
}
void
Don't do this in the derived method, since we want to keep access to
mutable_property_alist_ centralized.
*/
- if (original_l_)
+ if (original_)
{
Item * it = dynamic_cast<Item*> (this);
substitute_mutable_properties (gh_int2scm (it->break_status_dir ()),
- original_l_->mutable_property_alist_);
+ original_->mutable_property_alist_);
}
}
not ask for the absolute coordinate (ie. REFP == nil.)
*/
- if (refp == dim_cache_[a].parent_l_)
+ if (refp == dim_cache_[a].parent_)
return get_offset (a);
else
- return get_offset (a) + dim_cache_[a].parent_l_->relative_coordinate (refp, a);
+ return get_offset (a) + dim_cache_[a].parent_->relative_coordinate (refp, a);
}
ext = ly_scm2interval (d->dimension_);
SCM extra = get_grob_property (a == X_AXIS
- ? "extra-extent-X"
- : "extra-extent-Y");
+ ? "extra-X-extent"
+ : "extra-Y-extent");
/*
signs ?
}
extra = get_grob_property (a == X_AXIS
- ? "minimum-extent-X"
- : "minimum-extent-Y");
+ ? "minimum-X-extent"
+ : "minimum-Y-extent");
if (gh_pair_p (extra))
{
ext.unite (Interval (gh_scm2double (ly_car (extra)),
I don't like the quadratic aspect of this code, but I see no other
way. The largest chain of parents might be 10 high or so, so
it shouldn't be a real issue. */
- for (Grob const *c = this; c; c = c->dim_cache_[a].parent_l_)
- for (Grob const * d = s; d; d = d->dim_cache_[a].parent_l_)
+ for (Grob const *c = this; c; c = c->dim_cache_[a].parent_)
+ for (Grob const * d = s; d; d = d->dim_cache_[a].parent_)
if (d == c)
return (Grob*)d;
void
Grob::set_parent (Grob *g, Axis a)
{
- dim_cache_[a].parent_l_ = g;
+ dim_cache_[a].parent_ = g;
}
MAKE_SCHEME_CALLBACK (Grob,fixup_refpoint,1);
if (!parent)
continue;
- if (parent->line_l () != me->line_l () && me->line_l ())
+ if (parent->get_system () != me->get_system () && me->get_system ())
{
- Grob * newparent = parent->find_broken_piece (me->line_l ());
+ Grob * newparent = parent->find_broken_piece (me->get_system ());
me->set_parent (newparent, ax);
}
Grob::warning (String s)const
{
SCM cause = self_scm();
- while (cause != SCM_EOL && !unsmob_music (cause))
+ while (Grob * g = unsmob_grob (cause))
{
- Grob * g = unsmob_grob (cause);
cause = g->get_grob_property ("cause");
}
*/
}
- if (s->original_l_)
- scm_gc_mark (s->original_l_->self_scm ());
+ if (s->original_)
+ scm_gc_mark (s->original_->self_scm ());
s->do_derived_mark ();
return s->mutable_property_alist_;
Grob *sc = (Grob *) ly_cdr (s);
scm_puts ("#<Grob ", port);
- scm_puts ((char *)sc->name ().ch_C (), port);
+ scm_puts ((char *)sc->name ().to_str0 (), port);
/*
don't try to print properties, that is too much hassle.
}
SCM
-Grob::do_derived_mark ()
+Grob::do_derived_mark () const
{
return SCM_EOL;
}
/** Return Array of Grobs in SCM list L */
Link_array<Grob>
-ly_scm2grob_array (SCM l)
+ly_scm2grobs (SCM l)
{
Link_array<Grob> arr;
/** Return SCM list of Grob array A */
SCM
-ly_grob_array2scm (Link_array<Grob> a)
+ly_grobs2scm (Link_array<Grob> a)
{
SCM s = SCM_EOL;
for (int i = a.size (); i; i--)
}
-IMPLEMENT_TYPE_P (Grob, "ly-grob?");
+IMPLEMENT_TYPE_P (Grob, "ly:grob?");
ADD_INTERFACE (Grob, "grob-interface",
"In music notation, lots of symbols are related in some way. You can
anything.
",
"X-offset-callbacks Y-offset-callbacks X-extent-callback molecule cause
-Y-extent-callback molecule-callback extra-offset
-spacing-procedure
-staff-symbol interfaces dependencies extra-extent-X causes meta
-layer before-line-breaking-callback after-line-breaking-callback extra-extent-Y minimum-extent-X minimum-extent-Y transparent");
+Y-extent-callback molecule-callback extra-offset spacing-procedure
+staff-symbol interfaces dependencies X-extent Y-extent extra-X-extent
+causes meta layer before-line-breaking-callback
+after-line-breaking-callback extra-Y-extent minimum-X-extent
+minimum-Y-extent transparent");
projects / lilypond.git / blobdiff