X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-engraver.cc;h=25ca3af774e08250cd6f5def1705b46791754dd4;hb=0817e0513d1016ff22a633b6fee20ddba2a062f2;hp=1ff12820ff501fce8527515eab307f660cdaff05;hpb=685452c8675e89a84692420fb9891756d318e771;p=lilypond.git diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index 1ff12820ff..25ca3af774 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -3,72 +3,162 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "lily-guile.hh" #include "engraver.hh" -#include "protected-scm.hh" #include "dictionary.hh" -#include "score-element.hh" +#include "grob.hh" +#include "scm-hash.hh" +#include "translator-group.hh" +/* + JUNKME: should use pushproperty everywhere. + + */ class Property_engraver : public Engraver { - Dictionary prop_dict_; - void apply_properties (SCM, Score_element*); + /* + UGH. Junk Dictionary + */ + Scheme_hash_table *prop_dict_; // junkme + void apply_properties (SCM, Grob*, Translator_group *origin); protected: - virtual void acknowledge_element (Score_element_info ei); - virtual void do_creation_processing (); - - VIRTUAL_COPY_CONS(Translator); + virtual void acknowledge_grob (Grob_info ei); + virtual void initialize (); + virtual void finalize (); +public: + ~Property_engraver (); + TRANSLATOR_DECLARATIONS(Property_engraver); }; + + +Property_engraver::Property_engraver () +{ + prop_dict_ = 0; +} +void +Property_engraver::finalize () +{ + +} + +Property_engraver::~Property_engraver () +{ + if (prop_dict_) + scm_gc_unprotect_object (prop_dict_->self_scm ()); +} + void -Property_engraver::do_creation_processing () +Property_engraver::initialize () { - SCM plist = get_property ("Generic_property_list", 0); - for (; SCM_NIMP (plist); plist = gh_cdr (plist)) + prop_dict_ = new Scheme_hash_table; + + SCM plist = get_property ("Generic_property_list"); + for (; gh_pair_p (plist); plist = ly_cdr (plist)) { - SCM elt_props = gh_car (plist); - prop_dict_[ly_scm2string (gh_car (elt_props))] = gh_cdr (elt_props); + SCM elt_props = ly_car (plist); + prop_dict_->set (ly_car (elt_props), ly_cdr (elt_props)); } } void -Property_engraver::acknowledge_element (Score_element_info i) +Property_engraver::acknowledge_grob (Grob_info i) { - if (prop_dict_.elem_b (i.elem_l_->name())) - { - SCM p = prop_dict_[i.elem_l_->name()]; - apply_properties (p,i.elem_l_); + SCM ifs = i.grob_l_->get_grob_property ("interfaces"); + SCM props; + for (; gh_pair_p (ifs); ifs = ly_cdr (ifs)) + { + if (prop_dict_->try_retrieve (ly_car (ifs), &props)) + { + apply_properties (props,i.grob_l_, i.origin_trans_l_->daddy_trans_l_); + } } - if (prop_dict_.elem_b ("all")) + + if (prop_dict_->try_retrieve (ly_symbol2scm ("all"), &props)) { - apply_properties (prop_dict_["all"], i.elem_l_); + apply_properties (props, i.grob_l_, i.origin_trans_l_->daddy_trans_l_); } } + void -Property_engraver::apply_properties (SCM p, Score_element *e) -{ - for (; SCM_NIMP (p); p = gh_cdr (p)) +Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin) +{ + for (; gh_pair_p (p); p = ly_cdr (p)) { - SCM entry = gh_car (p); - SCM prop_sym = gh_car (entry); - SCM type_p = gh_cadr (entry); - SCM elt_prop_name = gh_caddr (entry); + /* + Try each property in order; earlier descriptions take + precedence over later ones, and we don't touch elt-properties if + they're already set. + */ + + SCM entry = ly_car (p); + SCM prop_sym = ly_car (entry); + SCM type_p = ly_cadr (entry); + SCM elt_prop_sym = ly_caddr (entry); - if (e->get_elt_property (elt_prop_name) != SCM_BOOL_F) + SCM preset = scm_assq (elt_prop_sym, e->mutable_property_alist_); + if (preset != SCM_BOOL_F) continue; - - SCM val = get_property (prop_sym, 0); - if (val != SCM_UNDEFINED - && gh_apply (type_p, scm_listify (val, SCM_UNDEFINED)) - == SCM_BOOL_T) - e->set_elt_property (elt_prop_name, val); + + SCM val = internal_get_property (prop_sym); + + if (val == SCM_EOL) + ; // Not defined in context. + else if (gh_apply (type_p, scm_list_n (val, SCM_UNDEFINED)) + == SCM_BOOL_T) // defined and right type: do it + { + e->internal_set_grob_property (elt_prop_sym, val); + + SCM meta = e->get_grob_property ("meta"); + SCM name = scm_assoc (ly_symbol2scm ("name"), meta); + warning (_f ("`%s' is deprecated. Use\n \\property %s.%s \\override #'%s = #%s", + ly_symbol2string (prop_sym).ch_C (), + origin->type_str_.ch_C (), + ly_scm2string (ly_cdr (name)).ch_C (), + ly_symbol2string (elt_prop_sym).ch_C (), + ly_scm2string (ly_write2scm (val)).ch_C ())); + } + else + + /* + we don't print a warning if VAL == (), because we would + get lots of warnings when we restore stuff to default, eg. + + slurDash = #1 [...] slurDash = () + + should not cause "type error: slurDash expects number not + boolean + + */ + if (val != SCM_EOL) + { // not the right type: error message. + SCM errport = scm_current_error_port (); + SCM typefunc = scm_primitive_eval (ly_symbol2scm ("type-name")); + SCM type_name = gh_call1 (typefunc, type_p); + warning (_f ("Wrong type for property: %s, type: %s, value found: %s, type: %s", + ly_symbol2string (prop_sym).ch_C (), + ly_scm2string (type_name).ch_C (), + ly_scm2string (ly_write2scm (val)).ch_C (), + ly_scm2string (ly_type (val)).ch_C ())); + scm_puts ("\n", errport); + } } } -ADD_THIS_TRANSLATOR(Property_engraver); + +ENTER_DESCRIPTION(Property_engraver, +/* descr */ "This is a engraver that converts property settings into +back-end grob-property settings. Example: Voice.stemLength will set +#'length in all Stem objects. + +Due to CPU and memory requirements, the use of this engraver is deprecated.", +/* creats*/ "", +/* acks */ "grob-interface", +/* reads */ "Generic_property_list", +/* write */ "");