X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-element.cc;h=9aeac9c546040b844e283812424ea553b348be1c;hb=736088f09a0b77acc84f6e1a54cddb8bad3d94c1;hp=bdb4f4bd3067cb7228dad3c3453066ba30e6394d;hpb=0cf97b5cdceecbba937f43ac827f4065aad5001e;p=lilypond.git diff --git a/lily/score-element.cc b/lily/score-element.cc index bdb4f4bd30..9aeac9c546 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -3,12 +3,16 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ #include +#include +#include "libc-extension.hh" +#include "group-interface.hh" +#include "misc.hh" #include "paper-score.hh" #include "paper-def.hh" #include "lookup.hh" @@ -23,137 +27,133 @@ #include "misc.hh" #include "paper-outputter.hh" #include "dimension-cache.hh" +#include "side-position-interface.hh" +#include "item.hh" +/* +TODO: -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 (); -} +remove dynamic_cast and put this code into respective + subclass. +*/ Score_element::Score_element() { - output_p_ =0; - dim_cache_[X_AXIS]->set_callback (dim_cache_callback); - dim_cache_[Y_AXIS]->set_callback (dim_cache_callback); + // junkme. + used_b_ = false; + set_extent_callback (molecule_extent, X_AXIS); + set_extent_callback (molecule_extent, Y_AXIS); + 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)); + element_property_alist_ = SCM_EOL; + + smobify_self (); + set_elt_property ("dependencies", SCM_EOL); + set_elt_property ("interfaces", SCM_EOL); } + Score_element::Score_element (Score_element const&s) - : Graphical_element (s) + : dim_cache_ (s.dim_cache_) { + 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; + element_property_alist_ = SCM_EOL; // onstack; + status_i_ = s.status_i_; lookup_l_ = s.lookup_l_; pscore_l_ = s.pscore_l_; -} -Score_element::~Score_element() -{ - delete output_p_; - assert (status_i_ >=0); - status_i_ = -1; -} - -Score_element* -Score_element::dependency (int i) const -{ - return dependency_arr_ [i]; + smobify_self (); } -int -Score_element::dependency_size () const +Score_element::~Score_element() { - return dependency_arr_.size (); } +// should also have one that takes SCM arg. SCM -Score_element::get_elt_property (SCM sym) const +Score_element::get_elt_property (String nm) const { - SCM s = scm_assq(sym, element_property_alist_); - - // is this a good idea? - if (s == SCM_BOOL_F && pscore_l_ && pscore_l_->paper_l_) - s = pscore_l_->paper_l_->get_scm_var (sym); + SCM sym = ly_symbol2scm (nm.ch_C()); + SCM s = scm_assq(sym, element_property_alist_); - return s; + if (s != SCM_BOOL_F) + return gh_cdr (s); + + if (pscore_l_) + { + SCM sym2 = ly_symbol2scm ((name () + ("::" + nm)).ch_C()); + SCM val; + + // should probably check for Type::sym as well. + Paper_def * p= pscore_l_->paper_l_; + if (p->default_properties_.try_retrieve (sym2, &val)) + return val; + else if (p->default_properties_.try_retrieve (sym, &val)) + return val; + } + + return SCM_UNDEFINED; } SCM -Score_element::remove_elt_property (SCM key) +Score_element::remove_elt_property (String key) { SCM s = get_elt_property (key); - SCM_CDR(element_property_alist_) = scm_assq_remove_x (SCM_CDR (element_property_alist_), key); + SCM sym = ly_symbol2scm (key.ch_C()); + element_property_alist_ = scm_assq_remove_x (element_property_alist_, sym); return s; } +/* + UGH. assoc vs. assq + */ void -Score_element::set_elt_property (SCM s, SCM v) +Score_element::set_elt_property (String k, SCM v) { - SCM_CDR(element_property_alist_) = - scm_assoc_set_x (SCM_CDR (element_property_alist_), s, v); + SCM s = ly_symbol2scm (k.ch_C( )); + element_property_alist_ = scm_assoc_set_x (element_property_alist_, s, v); } Interval -Score_element::do_width() const +Score_element::molecule_extent (Score_element const *s, Axis a ) { - Interval r; - - Molecule*m = output_p_ ? output_p_ : do_brew_molecule_p(); - r = m->extent().x (); - - if (!output_p_) - delete m; - - return r; + Molecule m = s->do_brew_molecule(); + return m.extent(a); } Interval -Score_element::do_height() const +Score_element::preset_extent (Score_element const *s , Axis a ) { - Interval r; - Molecule*m = output_p_ ? output_p_ : do_brew_molecule_p(); - r = m->extent().y (); - if (!output_p_) - delete m; - - return r; -} - -void -Score_element::print() const -{ -#ifndef NPRINT - 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(); + SCM ext = s->get_elt_property ((a == X_AXIS) + ? "extent-X" + : "extent-Y"); + + if (gh_pair_p (ext)) + { + Real l = gh_scm2double (gh_car (ext)); + Real r = gh_scm2double (gh_cdr (ext)); + l *= s->paper_l ()->get_var ("staffspace"); + r *= s->paper_l ()->get_var ("staffspace"); + return Interval (l, r); + } - DEBUG_OUT << "}\n"; -#endif + return Interval (); } + + Paper_def* Score_element::paper_l () const { - return pscore_l_->paper_l_; + return pscore_l_ ? pscore_l_->paper_l_ : 0; } Lookup const * @@ -162,9 +162,9 @@ Score_element::lookup_l () const 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)) + SCM sz = urg->remove_elt_property ("fontsize"); + int i = (gh_number_p (sz)) + ? gh_scm2int (sz) : 0; urg->lookup_l_ = (Lookup*)pscore_l_->paper_l_->lookup_l (i); @@ -179,52 +179,47 @@ Score_element::add_processing() if (status_i_) return; status_i_ ++; + do_add_processing(); } void Score_element::calculate_dependencies (int final, int busy, - Score_element_method_pointer funcptr) + Score_element_method_pointer funcptr) { assert (status_i_ >=0); if (status_i_ >= final) return; - assert (status_i_!= busy); + if (status_i_== busy) + { + programming_error ("Element is busy, come back later"); + return; + } + status_i_= busy; - for (int i=0; i < dependency_arr_.size(); i++) - dependency_arr_[i]->calculate_dependencies (final, busy, funcptr); + for (SCM d= get_elt_property ("dependencies"); gh_pair_p (d); d = gh_cdr (d)) + { + unsmob_element (gh_car (d)) + ->calculate_dependencies (final, busy, funcptr); + } - Link_array extra (get_extra_dependencies()); - for (int i=0; i < extra.size(); i++) - extra[i]->calculate_dependencies (final, busy, funcptr); - - invalidate_cache (X_AXIS); - invalidate_cache (Y_AXIS); (this->*funcptr)(); status_i_= final; } -void -Score_element::output_processing () +Molecule +Score_element::get_molecule () const { - if (get_elt_property (transparent_scm_sym) != SCM_BOOL_F) - return; + if (to_boolean (get_elt_property ("transparent"))) + return Molecule (); - // 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_, - o, - classname(this)); + return do_brew_molecule (); } + /* VIRTUAL STUBS @@ -233,22 +228,16 @@ Score_element::output_processing () void Score_element::do_break_processing() { - handle_broken_dependencies(); } void -Score_element::do_post_processing() +Score_element::after_line_breaking () { } -void -Score_element::do_breakable_col_processing() -{ - handle_prebroken_dependencies(); -} void -Score_element::do_pre_processing() +Score_element::before_line_breaking () { } @@ -262,17 +251,25 @@ Score_element::do_add_processing() { } -void -Score_element::do_substitute_element_pointer (Score_element*,Score_element*) -{ -} - -Molecule* -Score_element::do_brew_molecule_p() const +/* + ugh. + */ +Molecule +Score_element::do_brew_molecule() const { - Molecule a (lookup_l ()->fill (Box (Interval (0,0), Interval (0,0)))); - return new Molecule (a); + SCM glyph = get_elt_property ("glyph"); + if (gh_string_p (glyph)) + { + return lookup_l ()->afm_find (String (ly_scm2string (glyph))); + + } + else + { + Molecule m ; + m.set_empty (true); + return m; + } } @@ -287,140 +284,495 @@ Score_element::add_dependency (Score_element*e) { if (e) { - dependency_arr_.push (e); - e->used_b_ = true; + Group_interface gi (this, "dependencies"); + gi.add_element (e); } else programming_error ("Null dependency added"); } -void -Score_element::substitute_dependency (Score_element* old, Score_element* new_l) + + + +/** + Do break substitution in S, using CRITERION. Return new value. + CRITERION is either a SMOB pointer to the desired line, or a number + representing the break direction. Do not modify SRC. +*/ +SCM +Score_element::handle_broken_smobs (SCM src, SCM criterion) { - do_substitute_element_pointer (old,new_l); - old->do_substitute_element_pointer (this, 0); + again: + Score_element *sc = unsmob_element (src); + if (sc) + { + if (gh_number_p (criterion)) + { + Item * i = dynamic_cast (sc); + Direction d = to_dir (criterion); + if (i && i->break_status_dir () != d) + { + Item *br = i->find_prebroken_piece (d); + return (br) ? br->self_scm_ : SCM_UNDEFINED; + } + } + else + { + Line_of_score * line + = dynamic_cast (unsmob_element (criterion)); + if (sc->line_l () != line) + { + sc = sc->find_broken_piece (line); + + } + + /* now: !sc || (sc && sc->line_l () == line) */ + if (!sc) + return SCM_UNDEFINED; + + /* now: sc && sc->line_l () == line */ + if (!line + || (sc->common_refpoint (line, X_AXIS) + && sc->common_refpoint (line, Y_AXIS))) + { + return sc->self_scm_; + } + return SCM_UNDEFINED; + } + } + else if (gh_pair_p (src)) + { + SCM oldcar =gh_car (src); + /* + UGH! breaks on circular lists. + */ + SCM newcar = handle_broken_smobs (oldcar, criterion); + SCM oldcdr = gh_cdr (src); + + if (newcar == SCM_UNDEFINED + && (gh_pair_p (oldcdr) || oldcdr == SCM_EOL)) + { + /* + This is tail-recursion, ie. + + return handle_broken_smobs (cdr, criterion); + + We don't want to rely on the compiler to do this. Without + tail-recursion, this easily crashes with a stack overflow. */ + src = oldcdr; + goto again; + } + + SCM newcdr = handle_broken_smobs (oldcdr, criterion); + return gh_cons (newcar, newcdr); + } + else + return src; + + return src; } void Score_element::handle_broken_dependencies() { - Line_of_score *line = line_l(); - if (!line) + Spanner * s= dynamic_cast (this); + if (original_l_ && s) return; - do_substitute_arrays (); + if (s) + { + for (int i = 0; i< s->broken_into_l_arr_ .size (); i++) + { + Score_element * sc = s->broken_into_l_arr_[i]; + Line_of_score * l = sc->line_l (); + s->broken_into_l_arr_[i]->element_property_alist_ = + handle_broken_smobs (element_property_alist_, + l ? l->self_scm_ : SCM_UNDEFINED); + } + } + - Link_array new_deps; + Line_of_score *line = line_l(); - for (int i=0; i < dependency_size(); i++) + if (line && common_refpoint (line, X_AXIS) && common_refpoint (line, Y_AXIS)) { - Score_element * elt = dependency (i); - if (elt->line_l() != line) + element_property_alist_ + = handle_broken_smobs (element_property_alist_, + line ? line->self_scm_ : SCM_UNDEFINED); + } + else if (dynamic_cast (this)) + { + element_property_alist_ = handle_broken_smobs (element_property_alist_, + SCM_UNDEFINED); + } + else + { + /* + This element is `invalid'; it has been removed from all + dependencies, so let's junk the element itself. + + do not do this for Line_of_score, since that would remove + references to the originals of score-elts, which get then GC'd + (a bad thing.) + */ + suicide(); + } +} + +/* + Note that we still want references to this element to be + rearranged, and not silently thrown away, so we keep pointers + like {broken_into_{drul,array}, original} +*/ +void +Score_element::suicide () +{ + element_property_alist_ = SCM_EOL; + set_extent_callback (0, Y_AXIS); + set_extent_callback (0, X_AXIS); +} + + +void +Score_element::handle_prebroken_dependencies() +{ +} + + +bool +Score_element::linked_b() const +{ + return used_b_; +} + +Score_element* +Score_element::find_broken_piece (Line_of_score*) const +{ + return 0; +} + +void +Score_element::translate_axis (Real y, Axis a) +{ + dim_cache_[a].offset_ += y; +} + +Real +Score_element::relative_coordinate (Score_element const*refp, Axis a) const +{ + if (refp == this) + return 0.0; + + /* + We catch PARENT_L_ == nil case with this, but we crash if we did + not ask for the absolute coordinate (ie. REFP == nil.) + + */ + if (refp == dim_cache_[a].parent_l_) + return get_offset (a); + else + return get_offset (a) + dim_cache_[a].parent_l_->relative_coordinate (refp, a); +} + +Real +Score_element::get_offset (Axis a) const +{ + Score_element *me = (Score_element*) this; + while (dim_cache_[a].off_callbacks_.size ()) + { + Offset_callback c = dim_cache_[a].off_callbacks_[0]; + me->dim_cache_[a].off_callbacks_.del (0); + Real r = (*c) (me,a ); + if (isinf (r) || isnan (r)) { - Score_element * broken = elt->find_broken_piece (line); - substitute_dependency (elt, broken); - elt = broken ; + r = 0.0; + programming_error ("Infinity or NaN encountered"); } - if (elt) - new_deps.push (elt); + me->dim_cache_[a].offset_ +=r; } - dependency_arr_ = new_deps; + return dim_cache_[a].offset_; +} + +Interval +Score_element::point_dimension_callback (Score_element const* , Axis) +{ + return Interval (0,0); } +bool +Score_element::empty_b (Axis a)const +{ + return !dim_cache_[a].extent_callback_l_; +} -/* - This sux. +Interval +Score_element::extent (Axis a) const +{ + Dimension_cache * d = (Dimension_cache *)&dim_cache_[a]; + if (!d->extent_callback_l_) + { + d->dim_.set_empty (); + } + else if (!d->valid_b_) + { + d->dim_= (*d->extent_callback_l_ ) (this, a); + d->valid_b_ = true; + } - unlike with spanners, the number of items can increase + Interval ext = d->dim_; + + if (empty_b (a)) + return ext; + + SCM extra = get_elt_property (a == X_AXIS + ? "extra-extent-X" + : "extra-extent-Y"); + + /* + signs ? + */ + Real s = paper_l ()->get_var ("staffspace"); + if (gh_pair_p (extra)) + { + ext[BIGGER] += s * gh_scm2double (gh_cdr (extra)); + ext[SMALLER] += s * gh_scm2double (gh_car (extra)); + } + + extra = get_elt_property (a == X_AXIS + ? "minimum-extent-X" + : "minimum-extent-Y"); + if (gh_pair_p (extra)) + { + ext.unite (Interval (s * gh_scm2double (gh_car (extra)), + s * gh_scm2double (gh_cdr (extra)))); + } + + return ext; +} - span: item1 - becomes +Score_element* +Score_element::parent_l (Axis a) const +{ + return dim_cache_[a].parent_l_; +} - span: item1 item2 item3 +Score_element * +Score_element::common_refpoint (Score_element const* s, Axis a) const +{ + /* + I don't like the quadratic aspect of this code. Maybe this should + be rewritten some time, but the largest chain of parents might be + 10 high or so, so it shouldn't be a real issue. */ + for (Score_element const *c = this; c; c = c->dim_cache_[a].parent_l_) + for (Score_element const * d = s; d; d = d->dim_cache_[a].parent_l_) + if (d == c) + return (Score_element*)d; - How to let span (a derived class) know that this happened? + return 0; +} - TODO: cleanify. - */ +Score_element * +Score_element::common_refpoint (SCM elist, Axis a) const +{ + Score_element * common = (Score_element*) this; + for (; gh_pair_p (elist); elist = gh_cdr (elist)) + { + Score_element * s = unsmob_element (gh_car (elist)); + if (s) + common = common->common_refpoint (s, a); + } + + return common; +} + +char const * +Score_element::name () const +{ + return classname (this); +} + void -Score_element::handle_prebroken_dependencies() +Score_element::add_offset_callback (Offset_callback cb, Axis a) { - /* dynamic_cast (this) && - if (!break_status_dir ()) - return; - */ - Link_array old_arr, new_arr; - - for (int i=0; i < dependency_size(); i++) + dim_cache_[a].off_callbacks_.push (cb); +} + +bool +Score_element::has_extent_callback_b (Extent_callback cb, Axis a)const +{ + return cb == dim_cache_[a].extent_callback_l_; +} + +bool +Score_element::has_offset_callback_b (Offset_callback cb, Axis a)const +{ + for (int i= dim_cache_[a].off_callbacks_.size (); i--;) { - Score_element * elt = dependency (i); - Item *it_l = dynamic_cast (elt); - if (it_l && it_l->broken_original_b ()) - if (Item *me = dynamic_cast (this) ) - { - Score_element *new_l = it_l->find_broken_piece (me->break_status_dir ()); - if (new_l != elt) - { - new_arr.push (new_l); - old_arr.push (elt); - } - } - else - { - Direction d = LEFT; - do { - old_arr.push (0); - new_arr.push (it_l->find_broken_piece (d)); - } while (flip(&d)!= LEFT); - } + if (dim_cache_[a].off_callbacks_[i] == cb) + return true; } - - for (int i=0; i < old_arr.size(); i++) - if (old_arr[i]) - substitute_dependency (old_arr[i], new_arr[i]); + return false; +} + +void +Score_element::set_extent_callback (Dim_cache_callback dc, Axis a) +{ + dim_cache_[a].extent_callback_l_ = dc ; } + void -Score_element::handle_prebroken_dependents() +Score_element::set_parent (Score_element *g, Axis a) { + dim_cache_[a].parent_l_ = g; } void -Score_element::handle_broken_dependents() +Score_element::fixup_refpoint () { + for (int a = X_AXIS; a < NO_AXES; a ++) + { + Axis ax = (Axis)a; + Score_element * parent = parent_l (ax); + + if (!parent) + continue; + + if (parent->line_l () != line_l () && line_l ()) + { + Score_element * newparent = parent->find_broken_piece (line_l ()); + set_parent (newparent, ax); + } + + if (Item * i = dynamic_cast (this)) + { + Item *parenti = dynamic_cast (parent); + + if (parenti && i) + { + Direction my_dir = i->break_status_dir () ; + if (my_dir!= parenti->break_status_dir()) + { + Item *newparent = parenti->find_prebroken_piece (my_dir); + set_parent (newparent, ax); + } + } + } + } } -Link_array -Score_element::get_extra_dependencies() const +/**************************************************** + SMOB funcs + ****************************************************/ + +#include "ly-smobs.icc" + +IMPLEMENT_UNSMOB(Score_element, element); +IMPLEMENT_SMOBS(Score_element); + +SCM +Score_element::mark_smob (SCM ses) { - Link_array empty; - return empty; + Score_element * s = SMOB_TO_TYPE (Score_element, ses); + if (s->self_scm_ != ses) + { + programming_error ("SMOB marking gone awry"); + return SCM_EOL; + } + return s->element_property_alist_; } -bool -Score_element::linked_b() const +int +Score_element::print_smob (SCM s, SCM port, scm_print_state *) { - return used_b_; + Score_element *sc = (Score_element *) gh_cdr (s); + + scm_puts ("#name (), port); + + /* + don't try to print properties, that is too much hassle. + */ + scm_puts (" >", port); + return 1; } void -Score_element::do_print () const +Score_element::do_smobify_self () { } -void -Score_element::do_substitute_arrays () +SCM +Score_element::equal_p (SCM a, SCM b) { + return gh_cdr(a) == gh_cdr(b) ? SCM_BOOL_T : SCM_BOOL_F; } -Score_element* -Score_element::find_broken_piece (Line_of_score*) const +SCM +Score_element::ly_set_elt_property (SCM elt, SCM sym, SCM val) +{ + Score_element * sc = unsmob_element (elt); + + if (!gh_symbol_p (sym)) + { + error ("Not a symbol"); + ly_display_scm (sym); + return SCM_UNDEFINED; + } + + if (sc) + { + sc->element_property_alist_ = scm_assoc_set_x (sc->element_property_alist_, sym, val); + } + else + { + error ("Not a score element"); + ly_display_scm (elt); + } + + return SCM_UNDEFINED; +} + + +SCM +Score_element::ly_get_elt_property (SCM elt, SCM sym) +{ + Score_element * sc = unsmob_element (elt); + + if (sc) + { + SCM s = scm_assq(sym, sc->element_property_alist_); + + if (s != SCM_BOOL_F) + return gh_cdr (s); + else + return SCM_UNDEFINED; + } + else + { + error ("Not a score element"); + ly_display_scm (elt); + } + return SCM_UNDEFINED; +} + + +static void +init_functions () +{ + scm_make_gsubr ("ly-get-elt-property", 2, 0, 0, (SCM(*)(...))Score_element::ly_get_elt_property); + scm_make_gsubr ("ly-set-elt-property", 3, 0, 0, (SCM(*)(...))Score_element::ly_set_elt_property); +} + +ADD_SCM_INIT_FUNC(scoreelt, init_functions); + +void +Score_element::discretionary_processing() { - return 0; }