X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-element.cc;h=141d95a22d9f819541d56d3982c8330b3d5e487c;hb=ad7defd5f5a3d0151a711555c2d680c56ef559c7;hp=94b6da163f49972c7219feaf8360fd69989d32b7;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git diff --git a/lily/score-element.cc b/lily/score-element.cc index 94b6da163f..141d95a22d 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -3,183 +3,264 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ #include -#include "tex-outputter.hh" -#include "p-score.hh" +#include "group-interface.hh" +#include "misc.hh" +#include "paper-score.hh" #include "paper-def.hh" #include "lookup.hh" #include "molecule.hh" #include "score-element.hh" #include "debug.hh" -#include "tex.hh" -#include "dimension.hh" #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" - -#define PARANOID +#include "paper-outputter.hh" +#include "dimension-cache.hh" +#include "side-position-interface.hh" +#include "item.hh" Score_element::Score_element() { - transparent_b_ = false; - size_i_ = 0; + dim_cache_[X_AXIS] = new Dimension_cache; + dim_cache_[Y_AXIS] = new Dimension_cache; + dim_cache_[X_AXIS]->elt_l_ = dim_cache_[Y_AXIS]->elt_l_ = this; + + used_b_ = false; + + dim_cache_[X_AXIS]->set_callback (molecule_extent); + dim_cache_[Y_AXIS]->set_callback (molecule_extent); + used_b_ = false; pscore_l_=0; + lookup_l_ =0; status_i_ = 0; + self_scm_ = SCM_EOL; + original_l_ = 0; + 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) - : Directed_graph_node (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); - transparent_b_ = s.transparent_b_; + dim_cache_[X_AXIS] = new Dimension_cache (*s.dim_cache_[X_AXIS]); + dim_cache_[Y_AXIS] = new Dimension_cache (*s.dim_cache_[Y_AXIS]); + dim_cache_[X_AXIS]->elt_l_ = dim_cache_[Y_AXIS]->elt_l_ = this; + + self_scm_ = SCM_EOL; + used_b_ = true; + original_l_ =(Score_element*) &s; + element_property_alist_ = SCM_EOL; // onstack; + 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() { assert (status_i_ >=0); + status_i_ = -1; + + delete dim_cache_[X_AXIS]; + delete dim_cache_[Y_AXIS]; } -Score_element* -Score_element::dependency (int i) const + +Real +Score_element::get_real (String s) const { - return (Score_element*) get_out_edge_arr ()[i]; + return gh_scm2double (get_elt_property (s)); } -int -Score_element::dependency_size () const +void +Score_element::set_real (String s, Real r) { - return get_out_edge_arr ().size (); + set_elt_property (s, gh_double2scm (r)); } -Score_element* -Score_element::dependent (int i) const +// should also have one that takes SCM arg. +SCM +Score_element::get_elt_property (String nm) const { - return (Score_element*) get_in_edge_arr()[i]; + SCM sym = ly_symbol2scm (nm.ch_C()); + SCM s = scm_assq(sym, element_property_alist_); + + 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; } -int -Score_element::dependent_size() const +SCM +Score_element::remove_elt_property (String key) { - return get_in_edge_arr().size (); + SCM s = get_elt_property (key); + SCM sym = ly_symbol2scm (key.ch_C()); + element_property_alist_ = scm_assq_remove_x (element_property_alist_, sym); + return s; } - - -Interval -Score_element::do_width() const +/* + UGH. assoc vs. assq + */ +void +Score_element::set_elt_property (String k, SCM v) { - Interval r; - - Molecule*m = brew_molecule_p(); - r = m->extent().x (); - delete m; - - return r; + SCM s = ly_symbol2scm (k.ch_C( )); + element_property_alist_ = scm_assoc_set_x (element_property_alist_, s, v); } Interval -Score_element::do_height() const +Score_element::molecule_extent(Dimension_cache const *c) { - Interval r; - Molecule*m = brew_molecule_p(); - r = m->extent().y (); - delete m; - return r; + Score_element *s = dynamic_cast(c->element_l()); + Molecule m = s->do_brew_molecule(); + return m.extent()[c->axis ()]; } -/* - STANDARD METHS - */ void Score_element::print() const { #ifndef NPRINT - DOUT << name() << "{\n"; - DOUT << "dets: " << dependent_size() << "dependencies: " << - dependency_size(); - - Graphical_element::do_print (); + DEBUG_OUT << classname(this) << "{\n"; + + if (flower_dstream && !flower_dstream->silent_b ("Score_element")) + ly_display_scm (element_property_alist_); + + if (original_l_) + DEBUG_OUT << "Copy "; 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_ ? pscore_l_->paper_l_ : 0; } - -Lookup * +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"); + int i = (gh_number_p (sz)) + ? gh_scm2int (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_ ++; + +#if 0 + /* + UGH. UGH. UGH. + */ + if (get_elt_property ("self-alignment-X") != SCM_UNDEFINED + && !dim_cache_[X_AXIS]->off_callback_l_) + { + dim_cache_[X_AXIS]->off_callbacks_.push (Side_position_interface::aligned_on_self); + } + + if (get_elt_property ("self-alignment-Y") != SCM_UNDEFINED + && !dim_cache_[X_AXIS]->off_callback_l_) + + { + dim_cache_[Y_AXIS]->set_offset_callback (Side_position_interface::aligned_on_self); + } +#endif + do_add_processing(); } - void -Score_element::calcalute_dependencies (int final, int busy, - Score_element_method_pointer funcptr) +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)->calcalute_dependencies (final, busy, funcptr); + Link_array dependency_arr = + Group_interface__extract_elements (this, (Score_element*)0, "dependencies"); + + 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++) - extra[i]->calcalute_dependencies (final, busy, funcptr); + extra[i]->calculate_dependencies (final, busy, funcptr); - invalidate_cache (X_AXIS); - invalidate_cache (Y_AXIS); (this->*funcptr)(); status_i_= final; } void -Score_element::do_brew_molecule () +Score_element::output_processing () { - if (transparent_b_) + if (to_boolean (get_elt_property ("transparent"))) return; - Molecule *output= brew_molecule_p (); - pscore_l_->outputter_l_->output_molecule (output, absolute_offset (), name()); - delete output; + + + Molecule m (do_brew_molecule ()); + Offset o (relative_coordinate (0, X_AXIS), relative_coordinate (0, Y_AXIS)); + + SCM s = get_elt_property ("extra-offset"); + if (gh_pair_p (s)) + { + Real il = paper_l ()->get_var ("interline"); + o[X_AXIS] += il * gh_scm2double (gh_car (s)); + o[Y_AXIS] += il * gh_scm2double (gh_cdr (s)); + } + + pscore_l_->outputter_l_->output_molecule (m.expr_, o, classname(this)); } /* @@ -187,15 +268,13 @@ Score_element::do_brew_molecule () VIRTUAL STUBS */ - void Score_element::do_break_processing() { - handle_broken_dependencies(); } void -Score_element::do_post_processing() +Score_element::after_line_breaking () { } @@ -206,7 +285,7 @@ Score_element::do_breakable_col_processing() } void -Score_element::do_pre_processing() +Score_element::before_line_breaking () { } @@ -220,187 +299,394 @@ Score_element::do_add_processing() { } -void -Score_element::do_substitute_dependency (Score_element*,Score_element*) + + +Molecule +Score_element::do_brew_molecule() const { + 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; + } } + + +Line_of_score * +Score_element::line_l() const +{ + return 0; +} + void -Score_element::do_substitute_dependent (Score_element*,Score_element*) +Score_element::add_dependency (Score_element*e) { + if (e) + { + Group_interface gi (this, "dependencies"); + gi.add_element (e); + } + else + programming_error ("Null dependency added"); +} + + + + +/** + 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) +{ + again: + + + Score_element *sc = unsmob_element (src); + if (sc) + { + if (criterion == SCM_UNDEFINED) + return SCM_UNDEFINED; + else 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_broken_piece (d); + return (br) ? br->self_scm_ : SCM_UNDEFINED; + } + } + else + { + Score_element * ln = unsmob_element ( criterion); + Line_of_score * line = dynamic_cast (ln); + Score_element * br =0; + Line_of_score * dep_line = sc->line_l (); + if (dep_line != line) + { + br = sc->find_broken_piece (line); + return (br) ? br->self_scm_ : SCM_UNDEFINED; + } + if (!dep_line) + return SCM_UNDEFINED; + } + } + else if (gh_pair_p (src)) + { + /* + UGH! breaks on circular lists. + */ + SCM car = handle_broken_smobs (gh_car (src), criterion); + SCM cdr = gh_cdr (src); + + if (car == SCM_UNDEFINED + && (gh_pair_p (cdr) || cdr == 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. */ + src = cdr; + goto again; + } + + return gh_cons (car, handle_broken_smobs (cdr, criterion)); + } + else + return src; + + return src; } void -Score_element::do_unlink() +Score_element::handle_broken_dependencies() { + Spanner * s= dynamic_cast (this); + if (original_l_ && s) + return; + + 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); + } + } + + Line_of_score *line = line_l(); + element_property_alist_ + = handle_broken_smobs (element_property_alist_, + line ? line->self_scm_ : SCM_UNDEFINED); } + +/* + TODO: cleanify. + */ void -Score_element::do_junk_links() +Score_element::handle_prebroken_dependencies() { + if (Item*i =dynamic_cast (this)) + { + if (original_l_) + { + element_property_alist_ + = handle_broken_smobs (original_l_->element_property_alist_, + gh_int2scm (i->break_status_dir ())); + } + } } -IMPLEMENT_IS_TYPE_B1(Score_element, Graphical_element); +Link_array +Score_element::get_extra_dependencies() const +{ + Link_array empty; + return empty; +} -Molecule* -Score_element::brew_molecule_p() const +bool +Score_element::linked_b() const { - Atom a (lookup_l ()->fill (Box (Interval (0,0), Interval (0,0)))); - return new Molecule (a); + return used_b_; } +void +Score_element::do_print () const +{ +} -Line_of_score * -Score_element::line_l() const +Score_element* +Score_element::find_broken_piece (Line_of_score*) const { return 0; } -/* - - DEPENDENCIES +void +Score_element::translate_axis (Real y, Axis a) +{ + dim_cache_[a]->translate (y); +} - */ +Real +Score_element::relative_coordinate (Score_element const*e, Axis a) const +{ + return dim_cache_[a]->relative_coordinate (e ? e->dim_cache_[a] : 0); +} -void -Score_element::remove_dependency (Score_element*e) +Score_element * +Score_element::common_refpoint (Score_element const* s, Axis a) const { - remove_edge_out (e); - substitute_dependency (e, 0); + Dimension_cache *dim = dim_cache_[a]->common_refpoint (s->dim_cache_[a]); + return dim ? dim->element_l () : 0; } void -Score_element::add_dependency (Score_element*e) +Score_element::set_empty (Axis a) { - Directed_graph_node::add_edge (e); + dim_cache_[a]->callback_l_ =0; } -void -Score_element::substitute_dependency (Score_element* old, Score_element* new_l) + +bool +Score_element::empty_b (Axis a)const +{ + return !dim_cache_[a]->callback_l_; +} + +Interval +Score_element::extent (Axis a) const +{ + Dimension_cache const * d = dim_cache_[a]; + + return d->get_dim (); +} + + +Score_element* +Score_element::parent_l (Axis a) const +{ + Dimension_cache*d= dim_cache_[a]->parent_l_; + return d ? d->elt_l_ : 0; +} + +Score_element * +Score_element::common_refpoint (Link_array gs, Axis a) const { - do_substitute_dependency (old,new_l); - old->do_substitute_dependent (this, 0); + Dimension_cache * common = dim_cache_[a]; + for (int i=0; i < gs.size (); i++) + { + common = common->common_refpoint (gs[i]->dim_cache_[a]); + } + + return common->element_l (); } +char const * +Score_element::name () const +{ + return classname (this); +} + + void -Score_element::handle_broken_dependencies() +Score_element::set_parent (Score_element *g, Axis a) { - Line_of_score *line = line_l(); - if (!line) - return; + dim_cache_[a]->parent_l_ = g ? g->dim_cache_[a]: 0; +} - Link_array remove_us_arr; - for (int i=0; i < dependency_size(); i++) +void +Score_element::fixup_refpoint () +{ + for (int a = X_AXIS; a < NO_AXES; a ++) { - Score_element * elt = dependency (i); - if (elt->line_l() != line) + Axis ax = (Axis)a; + Score_element * parent = parent_l (ax); + + if (!parent) + continue; + + if (parent->line_l () != line_l ()) { - if (elt->access_Spanner ()) - { - Spanner * sp = elt->access_Spanner (); - Spanner * broken = sp->find_broken_piece (line); - substitute_dependency (sp, broken); + Score_element * newparent = parent->find_broken_piece (line_l ()); + set_parent (newparent, ax); + } - add_dependency (broken); - } - else if (elt->access_Item ()) + if (Item * i = dynamic_cast (this)) + { + Item *parenti = dynamic_cast (parent); + + if (parenti && i) { - Item * my_item = elt->access_Item ()->find_prebroken_piece (line); - - substitute_dependency (elt, my_item); - if (my_item) - add_dependency (my_item); + Direction my_dir = i->break_status_dir () ; + if (my_dir!= parenti->break_status_dir()) + { + Item *newparent = parenti->find_broken_piece (my_dir); + set_parent (newparent, ax); + } } - remove_us_arr.push (elt); } } - - remove_us_arr.default_sort(); - remove_us_arr.uniq(); - for (int i=0; i old_arr, new_arr; - - for (int i=0; i < dependency_size(); i++) + Score_element * s = SMOB_TO_TYPE (Score_element, ses); + if (s->self_scm_ != ses) { - Score_element * elt = dependency (i); - Item *it_l = elt->access_Item (); - if (it_l && it_l->breakable_b_) - if (access_Item ()) - { - Score_element *new_l = it_l->find_prebroken_piece (access_Item ()->break_status_dir_); - if (new_l != elt) - { - new_arr.push (new_l); - old_arr.push (elt); - } - } - 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]); - } + programming_error ("SMOB marking gone awry"); + return SCM_EOL; } - - for (int i=0; i < old_arr.size(); i++) - if (old_arr[i]) - substitute_dependency (old_arr[i], new_arr[i]); + return s->element_property_alist_; } +int +Score_element::print_smob (SCM s, SCM port, scm_print_state *) +{ + 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::junk_links () +Score_element::do_smobify_self () { - Directed_graph_node::junk_links(); - Graphical_element::junk_links (); - do_junk_links(); } -void -Score_element::unlink() +SCM +Score_element::equal_p (SCM a, SCM b) +{ + return gh_cdr(a) == gh_cdr(b) ? SCM_BOOL_T : SCM_BOOL_F; +} + + +SCM +Score_element::ly_set_elt_property (SCM elt, SCM sym, SCM val) { - do_unlink(); - while (dependency_size()) + Score_element * sc = unsmob_element (elt); + + if (!gh_symbol_p (sym)) { - do_substitute_dependency (dependency (0),0); - remove_edge_out_idx (0); + error ("Not a symbol"); + ly_display_scm (sym); + return SCM_UNDEFINED; } - while (dependent_size()) + + if (sc) { - dependent (0)->remove_dependency (this); + sc->element_property_alist_ = scm_assoc_set_x (sc->element_property_alist_, sym, val); } - Graphical_element::unlink (); + else + { + error ("Not a score element"); + ly_display_scm (elt); + } + + return SCM_UNDEFINED; } -Link_array -Score_element::get_extra_dependencies() const +SCM +Score_element::ly_get_elt_property (SCM elt, SCM sym) { - Link_array empty; - return empty; + 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; } -bool -Score_element::linked_b() const + +static void +init_functions () { - return get_extra_dependencies().size() || - dependency_size(); + 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);