X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fscore-element.cc;h=487a6c0d56bebb6d1612bf7e2d1d71a7271a8d07;hb=685452c8675e89a84692420fb9891756d318e771;hp=7985f952eb3435a4397d70cbf08146c3bab2eaf3;hpb=622b379cd71af8dde94f68135a489b2536309e6f;p=lilypond.git diff --git a/lily/score-element.cc b/lily/score-element.cc index 7985f952eb..487a6c0d56 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -3,13 +3,13 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--1999 Han-Wen Nienhuys */ #include -#include "p-score.hh" +#include "paper-score.hh" #include "paper-def.hh" #include "lookup.hh" #include "molecule.hh" @@ -18,69 +18,108 @@ #include "spanner.hh" #include "line-of-score.hh" #include "item.hh" -#include "p-col.hh" +#include "paper-column.hh" #include "molecule.hh" #include "misc.hh" #include "paper-outputter.hh" +#include "dimension-cache.hh" + + +Interval +Score_element::dim_cache_callback (Dimension_cache*c) +{ + Score_element * e =dynamic_cast( c->element_l()); + if(e->dim_cache_[X_AXIS] == c) + return e->do_width (); + else + return e->do_height (); +} Score_element::Score_element() { output_p_ =0; - transparent_b_ = false; - size_i_ = 0; + dim_cache_[X_AXIS]->set_callback (dim_cache_callback); + dim_cache_[Y_AXIS]->set_callback (dim_cache_callback); + used_b_ = false; pscore_l_=0; + lookup_l_ =0; status_i_ = 0; + self_scm_ = SCM_EOL; + original_l_ = 0; + element_property_alist_ = scm_protect_object (gh_cons (gh_cons (void_scm_sym, SCM_BOOL_T) , SCM_EOL)); + + smobify_self (); } Score_element::Score_element (Score_element const&s) - : Directed_graph_node (s), Graphical_element (s) + : Graphical_element (s) { - /* called from derived ctor, so most info points to the same deps - as (Directed_graph_node&)s. Nobody points to us, so don't copy - dependents. - */ - copy_edges_out (s); + + self_scm_ = SCM_EOL; + used_b_ = true; + original_l_ =(Score_element*) &s; + element_property_alist_ = scm_protect_object (scm_list_copy (s.element_property_alist_)); + dependency_arr_ = s.dependency_arr_; output_p_ =0; - transparent_b_ = s.transparent_b_; status_i_ = s.status_i_; + lookup_l_ = s.lookup_l_; pscore_l_ = s.pscore_l_; - size_i_ = s.size_i_; -} - - + smobify_self (); +} Score_element::~Score_element() { - delete output_p_; + assert (!output_p_); assert (status_i_ >=0); + status_i_ = -1; } Score_element* Score_element::dependency (int i) const { - return (Score_element*) (get_out_edge_arr ()[i]); + return dependency_arr_ [i]; } int Score_element::dependency_size () const { - return get_out_edge_arr ().size (); + return dependency_arr_.size (); } -Score_element* -Score_element::dependent (int i) const +SCM +Score_element::get_elt_property (SCM sym) const { - return (Score_element *)( get_in_edge_arr()[i]); + SCM s = scm_assq(sym, element_property_alist_); + + // is this a good idea? + if (s != SCM_BOOL_F) + return s; + + if (pscore_l_) + { + // should probably check for Type::sym as well. + if (pscore_l_->paper_l_->default_properties_.elem_b (sym)) + return pscore_l_->paper_l_->default_properties_[sym]; + } + + return SCM_BOOL_F; } -int -Score_element::dependent_size() const +SCM +Score_element::remove_elt_property (SCM key) { - return get_in_edge_arr().size (); + SCM s = get_elt_property (key); + SCM_CDR(element_property_alist_) = scm_assq_remove_x (SCM_CDR (element_property_alist_), key); + return s; } - +void +Score_element::set_elt_property (SCM s, SCM v) +{ + SCM_CDR(element_property_alist_) = + scm_assoc_set_x (SCM_CDR (element_property_alist_), s, v); +} Interval Score_element::do_width() const @@ -108,62 +147,69 @@ Score_element::do_height() const return r; } - -/* - STANDARD METHS - */ void Score_element::print() const { #ifndef NPRINT - DOUT << classname(this) << "{\n"; - DOUT << "dets: " << dependent_size() << "dependencies: " << - dependency_size(); - + DEBUG_OUT << classname(this) << "{\n"; + if (flower_dstream && !flower_dstream->silent_b ("Score_element")) + ly_display_scm (element_property_alist_); + DEBUG_OUT << "dependencies: " << dependency_size(); + if (original_l_) + DEBUG_OUT << "Copy "; Graphical_element::do_print (); do_print(); - DOUT << "}\n"; + DEBUG_OUT << "}\n"; #endif } - Paper_def* -Score_element::paper() const +Score_element::paper_l () const { - assert (pscore_l_); - return pscore_l_->paper_l_; + return pscore_l_->paper_l_; } - Lookup const * Score_element::lookup_l () const { - return pscore_l_->paper_l_->lookup_l (size_i_); + if (!lookup_l_) + { + Score_element * urg = (Score_element*)this; + SCM sz = urg->remove_elt_property (fontsize_scm_sym); + int i = (sz != SCM_BOOL_F) + ? gh_scm2int (SCM_CDR (sz)) + : 0; + + urg->lookup_l_ = (Lookup*)pscore_l_->paper_l_->lookup_l (i); + } + return lookup_l_; } void Score_element::add_processing() { + assert (status_i_ >=0); if (status_i_) return; status_i_ ++; do_add_processing(); } - void Score_element::calculate_dependencies (int final, int busy, Score_element_method_pointer funcptr) { + assert (status_i_ >=0); + if (status_i_ >= final) return; assert (status_i_!= busy); status_i_= busy; - for (int i=0; i < dependency_size(); i++) - dependency (i)->calculate_dependencies (final, busy, funcptr); + for (int i=0; i < dependency_arr_.size(); i++) + dependency_arr_[i]->calculate_dependencies (final, busy, funcptr); Link_array extra (get_extra_dependencies()); for (int i=0; i < extra.size(); i++) @@ -178,15 +224,22 @@ Score_element::calculate_dependencies (int final, int busy, void Score_element::output_processing () { - if (transparent_b_) + if (get_elt_property (transparent_scm_sym) != SCM_BOOL_F) return; + + // we're being silly here. if (output_p_) delete output_p_; output_p_ = do_brew_molecule_p (); + Offset o (relative_coordinate (0, X_AXIS), relative_coordinate (0, Y_AXIS)); + pscore_l_->outputter_l_->output_molecule (output_p_, - absolute_offset (), + o, classname(this)); + + delete output_p_; + output_p_ =0; } /* @@ -194,7 +247,6 @@ Score_element::output_processing () VIRTUAL STUBS */ - void Score_element::do_break_processing() { @@ -228,25 +280,10 @@ Score_element::do_add_processing() } void -Score_element::do_substitute_dependency (Score_element*,Score_element*) -{ -} -void -Score_element::do_substitute_dependent (Score_element*,Score_element*) +Score_element::do_substitute_element_pointer (Score_element*,Score_element*) { } -void -Score_element::do_unlink() -{ -} - -void -Score_element::do_junk_links() -{ -} - - Molecule* Score_element::do_brew_molecule_p() const @@ -262,29 +299,23 @@ Score_element::line_l() const return 0; } -/* - - DEPENDENCIES - - */ - -void -Score_element::remove_dependency (Score_element*e) -{ - remove_edge_out (e); - substitute_dependency (e, 0); -} - void Score_element::add_dependency (Score_element*e) { - Directed_graph_node::add_edge (e); + if (e) + { + dependency_arr_.push (e); + e->used_b_ = true; + } + else + programming_error ("Null dependency added"); } + void Score_element::substitute_dependency (Score_element* old, Score_element* new_l) { - do_substitute_dependency (old,new_l); - old->do_substitute_dependent (this, 0); + do_substitute_element_pointer (old,new_l); + old->do_substitute_element_pointer (this, 0); } void @@ -294,37 +325,27 @@ Score_element::handle_broken_dependencies() if (!line) return; - Link_array remove_us_arr; + do_substitute_arrays (); + + Link_array new_deps; + for (int i=0; i < dependency_size(); i++) { Score_element * elt = dependency (i); if (elt->line_l() != line) { - if (Spanner *sp = dynamic_cast (elt)) - { - Spanner * broken = sp->find_broken_piece (line); - substitute_dependency (sp, broken); - - add_dependency (broken); - } - else if (Item *original = dynamic_cast (elt)) - { - Item * my_item = original->find_prebroken_piece (line); - - substitute_dependency (elt, my_item); - if (my_item) - add_dependency (my_item); - } - remove_us_arr.push (elt); + Score_element * broken = elt->find_broken_piece (line); + substitute_dependency (elt, broken); + elt = broken ; } + if (elt) + new_deps.push (elt); } + dependency_arr_ = new_deps; - remove_us_arr.default_sort(); - remove_us_arr.uniq(); - for (int i=0; i (this) && + if (!break_status_dir ()) + return; + */ Link_array old_arr, new_arr; for (int i=0; i < dependency_size(); i++) { Score_element * elt = dependency (i); Item *it_l = dynamic_cast (elt); - if (it_l && it_l->breakable_b_) + if (it_l && it_l->broken_original_b ()) if (Item *me = dynamic_cast (this) ) { - Score_element *new_l = it_l->find_prebroken_piece (me->break_status_dir_); + Score_element *new_l = it_l->find_broken_piece (me->break_status_dir ()); if (new_l != elt) { new_arr.push (new_l); @@ -359,10 +387,11 @@ Score_element::handle_prebroken_dependencies() } else { - new_arr.push (it_l->broken_to_drul_[LEFT]); - old_arr.push (0); - old_arr.push (0); - new_arr.push (it_l->broken_to_drul_[RIGHT]); + Direction d = LEFT; + do { + old_arr.push (0); + new_arr.push (it_l->find_broken_piece (d)); + } while (flip(&d)!= LEFT); } } @@ -376,30 +405,11 @@ Score_element::handle_prebroken_dependents() { } - void -Score_element::junk_links () +Score_element::handle_broken_dependents() { - Directed_graph_node::junk_links(); - Graphical_element::junk_links (); - do_junk_links(); } -void -Score_element::unlink() -{ - do_unlink(); - while (dependency_size()) - { - do_substitute_dependency (dependency (0),0); - remove_edge_out_idx (0); - } - while (dependent_size()) - { - dependent (0)->remove_dependency (this); - } - Graphical_element::unlink (); -} Link_array @@ -412,6 +422,58 @@ Score_element::get_extra_dependencies() const bool Score_element::linked_b() const { - return get_extra_dependencies().size() || - dependency_size(); + return used_b_; +} + +void +Score_element::do_print () const +{ +} + +void +Score_element::do_substitute_arrays () +{ +} + + +Score_element* +Score_element::find_broken_piece (Line_of_score*) const +{ + return 0; +} + +SCM +Score_element::mark_smob (SCM ses) +{ + void * mp = (void*) SCM_CDR(ses); + Score_element * s = (Score_element*) mp; + + assert (s->self_scm_ == ses); + return s->element_property_alist_; +} + + +int +Score_element::print_smob (SCM s, SCM port, scm_print_state *) +{ + Score_element *sc = (Score_element *) SCM_CDR (s); + + scm_puts ("#name (), port); + scm_puts (" >", port); + return 1; +} + +void +Score_element::do_smobify_self () +{ + scm_unprotect_object (element_property_alist_); // ugh +} +#include "ly-smobs.icc" +IMPLEMENT_SMOBS(Score_element); + +SCM +Score_element::equal_p (SCM a, SCM b) +{ + return SCM_CDR(a) == SCM_CDR(b) ? SCM_BOOL_T : SCM_BOOL_F; }