*/
#include "main.hh"
-#include "translator-group.hh"
+#include "context.hh"
#include "warn.hh"
#include "item.hh"
#include "spanner.hh"
+#include "engraver.hh"
/*
Grob descriptions (ie. alists with layout properties) are
void
-execute_pushpop_property (Translator_group * trg,
+execute_pushpop_property (Context * trg,
SCM prop, SCM eltprop, SCM val)
{
- if (gh_symbol_p (prop) && gh_symbol_p (eltprop))
+ if (scm_is_symbol (prop) && scm_is_symbol (eltprop))
{
if (val != SCM_UNDEFINED)
{
SCM prev = SCM_EOL;
- Translator_group * where = trg->where_defined (prop);
+ Context * where = trg->where_defined (prop);
/*
Don't mess with MIDI.
*/
if (!where)
return ;
+
if (where != trg)
{
SCM base = updated_grob_properties (trg, prop);
- prev = gh_cons (base, base);
+ prev = scm_cons (base, base);
trg->internal_set_property (prop, prev);
}
else
prev = trg->internal_get_property (prop);
- if (!gh_pair_p (prev))
+ if (!scm_is_pair (prev))
{
programming_error ("Grob definition should be cons.");
return ;
}
- SCM prev_alist = gh_car (prev);
+ SCM prev_alist = ly_car (prev);
- if (gh_pair_p (prev_alist) || prev_alist == SCM_EOL)
+ if (scm_is_pair (prev_alist) || prev_alist == SCM_EOL)
{
bool ok = type_check_assignment (eltprop, val, ly_symbol2scm ("backend-type?"));
tack onto alist:
*/
if (ok)
- gh_set_car_x (prev, scm_acons (eltprop, val, prev_alist));
+ scm_set_car_x (prev, scm_acons (eltprop, val, prev_alist));
}
else
{
else if (trg->where_defined (prop) == trg)
{
SCM prev = trg->internal_get_property (prop);
- SCM prev_alist = gh_car (prev);
- SCM daddy = gh_cdr (prev);
+ SCM prev_alist = ly_car (prev);
+ SCM daddy = ly_cdr (prev);
SCM new_alist = SCM_EOL;
SCM *tail = &new_alist;
while (prev_alist != daddy)
{
- if (!gh_equal_p (gh_caar (prev_alist), eltprop))
+ if (ly_c_equal_p (ly_caar (prev_alist), eltprop))
{
- *tail = gh_cons (gh_car (prev_alist), daddy);
- tail = SCM_CDRLOC (*tail);
+ prev_alist = ly_cdr (prev_alist);
+ break ;
}
- prev_alist = gh_cdr (prev_alist);
+
+
+ *tail = scm_cons (ly_car (prev_alist), SCM_EOL);
+ tail = SCM_CDRLOC (*tail);
+ prev_alist = ly_cdr (prev_alist);
}
- if (new_alist == SCM_EOL)
+ if (new_alist == SCM_EOL && prev_alist == daddy)
trg->unset_property (prop);
else
- trg->internal_set_property (prop, gh_cons (new_alist, daddy));
+ {
+ *tail = prev_alist;
+ trg->internal_set_property (prop, scm_cons (new_alist, daddy));
+ }
}
}
else
PRE_INIT_OPS is in the order specified, and hence must be reversed.
*/
void
-apply_property_operations (Translator_group*tg, SCM pre_init_ops)
+apply_property_operations (Context *tg, SCM pre_init_ops)
{
SCM correct_order = scm_reverse (pre_init_ops);
- for (SCM s = correct_order; gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = correct_order; scm_is_pair (s); s = ly_cdr (s))
{
SCM entry = ly_car (s);
SCM type = ly_car (entry);
if (type == ly_symbol2scm ("push") || type == ly_symbol2scm ("poppush"))
{
SCM val = ly_cddr (entry);
- val = gh_pair_p (val) ? ly_car (val) : SCM_UNDEFINED;
+ val = scm_is_pair (val) ? ly_car (val) : SCM_UNDEFINED;
execute_pushpop_property (tg, ly_car (entry), ly_cadr (entry), val);
}
contexts has changed. The alist is updated if necessary.
*/
SCM
-updated_grob_properties (Translator_group* tg, SCM sym)
+updated_grob_properties (Context * tg, SCM sym)
{
- assert (gh_symbol_p (sym));
+ assert (scm_is_symbol (sym));
tg = tg->where_defined (sym);
+ if (!tg)
+ return SCM_EOL;
+
SCM daddy_props
- = (tg->daddy_trans_)
- ? updated_grob_properties (tg->daddy_trans_, sym)
+ = (tg->get_parent_context ())
+ ? updated_grob_properties (tg->get_parent_context (), sym)
: SCM_EOL;
SCM props = tg->internal_get_property (sym);
- if (!gh_pair_p (props))
+ if (!scm_is_pair (props))
{
programming_error ("grob props not a pair?");
return SCM_EOL;
}
- SCM based_on = gh_cdr (props);
+ SCM based_on = ly_cdr (props);
if (based_on == daddy_props)
{
- return gh_car (props);
+ return ly_car (props);
}
else
{
SCM copy = daddy_props;
SCM * tail = ©
- SCM p = gh_car (props);
+ SCM p = ly_car (props);
while (p != based_on)
{
- *tail = gh_cons (gh_car (p), daddy_props);
+ *tail = scm_cons (ly_car (p), daddy_props);
tail = SCM_CDRLOC (*tail);
- p = SCM_CDR (p);
+ p = ly_cdr (p);
}
scm_set_car_x (props, copy);
}
Item*
-make_item_from_properties (Translator_group* tg, SCM x)
+make_item_from_properties (Translator *tr, SCM x, SCM cause)
{
+ Context *tg = tr->context ();
+
SCM props = updated_grob_properties (tg, x);
- return new Item (props);
+ Item *it= new Item (props);
+
+ dynamic_cast<Engraver*>(tr)->announce_grob (it, cause);
+
+ return it;
}
Spanner*
-make_spanner_from_properties (Translator_group *tg, SCM x)
+make_spanner_from_properties (Translator *tr, SCM x, SCM cause)
{
+ Context *tg = tr->context ();
+
SCM props = updated_grob_properties (tg, x);
- return new Spanner (props);
-}
+ Spanner *it= new Spanner (props);
+ dynamic_cast<Engraver*>(tr)->announce_grob (it, cause);
+
+ return it;
+}
projects / lilypond.git / blobdiff