X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-property.cc;h=5234d1113fccc00ccd1b9421697609bb72ea5f13;hb=98311cc29e8664d281bcc40a808684e7553c8eaa;hp=396cd8246ae73a805b22b440f2cf61f5521f3d95;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/context-property.cc b/lily/context-property.cc index 396cd8246a..5234d1113f 100644 --- a/lily/context-property.cc +++ b/lily/context-property.cc @@ -4,64 +4,18 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2006 Han-Wen Nienhuys + (c) 2004--2007 Han-Wen Nienhuys */ #include "context.hh" #include "engraver.hh" +#include "international.hh" #include "item.hh" #include "main.hh" +#include "simple-closure.hh" #include "spanner.hh" #include "warn.hh" -#include "paper-column.hh" -#include "simple-closure.hh" - -SCM -lookup_nested_property (SCM alist, - SCM grob_property_path) -{ - if (scm_is_pair (grob_property_path)) - { - SCM sym = scm_car (grob_property_path); - SCM handle = scm_assq (sym, alist); - if (handle == SCM_BOOL_F) - return SCM_EOL; - else - return lookup_nested_property (scm_cdr (handle), - scm_cdr (grob_property_path)); - } - else - return alist; -} - -/* - copy ALIST leaving out SYMBOL. Copying stops at ALIST_END -*/ -SCM -evict_from_alist (SCM symbol, - SCM alist, - SCM alist_end) -{ - SCM new_alist = SCM_EOL; - SCM *tail = &new_alist; - - while (alist != alist_end) - { - if (ly_is_equal (scm_caar (alist), symbol)) - { - alist = scm_cdr (alist); - break; - } - - *tail = scm_cons (scm_car (alist), SCM_EOL); - tail = SCM_CDRLOC (*tail); - alist = scm_cdr (alist); - } - - *tail = alist; - return new_alist; -} void general_pushpop_property (Context *context, @@ -95,75 +49,105 @@ general_pushpop_property (Context *context, indicates nested alists, eg. '(beamed-stem-lengths details) */ + + void -execute_general_pushpop_property (Context *context, - SCM context_property, - SCM grob_property_path, - SCM new_value - ) +execute_override_property (Context *context, + SCM context_property, + SCM grob_property_path, + SCM new_value) { SCM current_context_val = SCM_EOL; - if (new_value != SCM_UNDEFINED) - { - Context *where = context->where_defined (context_property, ¤t_context_val); + + Context *where = context->where_defined (context_property, + ¤t_context_val); - /* - Don't mess with MIDI. - */ - if (!where) - return; + /* + Don't mess with MIDI. + */ + if (!where) + return; - if (where != context) - { - SCM base = updated_grob_properties (context, context_property); - current_context_val = scm_cons (base, base); - context->internal_set_property (context_property, current_context_val); - } + if (where != context) + { + SCM base = updated_grob_properties (context, context_property); + current_context_val = scm_cons (base, base); + context->set_property (context_property, current_context_val); + } - if (!scm_is_pair (current_context_val)) - { - programming_error ("Grob definition should be cons"); - return; - } + if (!scm_is_pair (current_context_val)) + { + programming_error ("Grob definition should be cons"); + return; + } - SCM prev_alist = scm_car (current_context_val); - SCM symbol = scm_car (grob_property_path); - SCM target_alist - = lookup_nested_property (prev_alist, - scm_reverse (scm_cdr (grob_property_path))); + SCM target_alist = scm_car (current_context_val); - target_alist = scm_acons (symbol, new_value, target_alist); + SCM symbol = scm_car (grob_property_path); + if (scm_is_pair (scm_cdr (grob_property_path))) + { + new_value = nested_property_alist (ly_assoc_get (symbol, target_alist, + SCM_EOL), + scm_cdr (grob_property_path), + new_value); + } - bool ok = true; - if (!scm_is_pair (scm_cdr (grob_property_path))) - { - if (!ly_is_procedure (new_value) - && !is_simple_closure (new_value)) - ok = type_check_assignment (symbol, new_value, - ly_symbol2scm ("backend-type?")); - - /* - tack onto alist. We can use set_car, since - updated_grob_properties() in child contexts will check - for changes in the car. - */ - if (ok) - { - scm_set_car_x (current_context_val, target_alist); - } - } - else - { - execute_general_pushpop_property (context, - context_property, - scm_cdr (grob_property_path), - target_alist - ); - } + // it's tempting to replace the head of the list if it's the same + // property. However, we have to keep this info around, in case we have to + // \revert back to it. + + target_alist = scm_acons (symbol, new_value, target_alist); + + bool ok = true; + if (!ly_is_procedure (new_value) + && !is_simple_closure (new_value)) + ok = type_check_assignment (symbol, new_value, + ly_symbol2scm ("backend-type?")); + + /* + tack onto alist. We can use set_car, since + updated_grob_properties () in child contexts will check + for changes in the car. + */ + if (ok) + { + scm_set_car_x (current_context_val, target_alist); } - else if (context->where_defined (context_property, ¤t_context_val) == context) +} + +void +execute_revert_property (Context *context, + SCM context_property, + SCM grob_property_path); + +void +execute_general_pushpop_property (Context *context, + SCM context_property, + SCM grob_property_path, + SCM new_value + ) +{ + if (new_value != SCM_UNDEFINED) + execute_override_property (context, context_property, + grob_property_path, + new_value); + else + execute_revert_property (context, context_property, + grob_property_path); +} + +void +execute_revert_property (Context *context, + SCM context_property, + SCM grob_property_path) +{ + /* + revert. + */ + SCM current_context_val = SCM_EOL; + if (context->where_defined (context_property, ¤t_context_val) == context) { - SCM current_value = scm_car (current_context_val); + SCM current_alist = scm_car (current_context_val); SCM daddy = scm_cdr (current_context_val); if (!scm_is_pair (grob_property_path) @@ -174,12 +158,29 @@ execute_general_pushpop_property (Context *context, } SCM symbol = scm_car (grob_property_path); - SCM new_alist = evict_from_alist (symbol, current_value, daddy); - if (new_alist == daddy) - context->unset_property (context_property); + if (scm_is_pair (scm_cdr (grob_property_path))) + { + SCM current_sub_alist = ly_assoc_get (symbol, current_alist, SCM_EOL); + SCM new_val = nested_property_revert_alist (current_sub_alist, scm_cdr (grob_property_path)); + + if (scm_is_pair (current_alist) + && scm_caar (current_alist) == symbol + && current_alist != daddy) + current_alist = scm_cdr (current_alist); + + current_alist = scm_acons (symbol, new_val, current_alist); + scm_set_car_x (current_context_val, current_alist); + } else - context->internal_set_property (context_property, scm_cons (new_alist, daddy)); + { + SCM new_alist = evict_from_alist (symbol, current_alist, daddy); + + if (new_alist == daddy) + context->unset_property (context_property); + else + context->set_property (context_property, scm_cons (new_alist, daddy)); + } } } @@ -223,7 +224,7 @@ apply_property_operations (Context *tg, SCM pre_init_ops) execute_general_pushpop_property (tg, context_prop, grob_prop_path, val); } else if (type == ly_symbol2scm ("assign")) - tg->internal_set_property (scm_car (entry), scm_cadr (entry)); + tg->set_property (scm_car (entry), scm_cadr (entry)); } } @@ -273,51 +274,3 @@ updated_grob_properties (Context *tg, SCM sym) return copy; } } - -Grob * -make_grob_from_properties (Engraver *tr, SCM symbol, SCM cause, char const *name) -{ - Context *context = tr->context (); - - SCM props = updated_grob_properties (context, symbol); - - Object_key const *key = context->get_grob_key (name); - Grob *grob = 0; - - SCM handle = scm_sloppy_assq (ly_symbol2scm ("meta"), props); - SCM klass = scm_cdr (scm_sloppy_assq (ly_symbol2scm ("class"), scm_cdr (handle))); - - if (klass == ly_symbol2scm ("Item")) - grob = new Item (props, key); - else if (klass == ly_symbol2scm ("Spanner")) - grob = new Spanner (props, key); - else if (klass == ly_symbol2scm ("Paper_column")) - grob = new Paper_column (props, key); - - assert (grob); - dynamic_cast (tr)->announce_grob (grob, cause); - - return grob; -} - -Item * -make_item_from_properties (Engraver *tr, SCM x, SCM cause, char const *name) -{ - Item *it = dynamic_cast (make_grob_from_properties (tr, x, cause, name)); - assert (it); - return it; -} - -Paper_column * -make_paper_column_from_properties (Engraver *tr, SCM x, char const *name) -{ - return dynamic_cast (make_grob_from_properties (tr, x, SCM_EOL, name)); -} - -Spanner * -make_spanner_from_properties (Engraver *tr, SCM x, SCM cause, char const *name) -{ - Spanner *sp = dynamic_cast (make_grob_from_properties (tr, x, cause, name)); - assert (sp); - return sp; -}