X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-element.cc;h=141d95a22d9f819541d56d3982c8330b3d5e487c;hb=ad7defd5f5a3d0151a711555c2d680c56ef559c7;hp=918550d15862f95578f8542db0a4c95460584804;hpb=163503e56aa0c03d41d37fd083bdb96a6a473a11;p=lilypond.git diff --git a/lily/score-element.cc b/lily/score-element.cc index 918550d158..141d95a22d 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ @@ -30,7 +30,6 @@ Score_element::Score_element() { - output_p_ =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; @@ -51,19 +50,7 @@ Score_element::Score_element() set_elt_property ("dependencies", SCM_EOL); -} - -SCM ly_deep_copy (SCM); - -SCM -ly_deep_copy (SCM l) -{ - if (gh_pair_p (l)) - { - return gh_cons (ly_deep_copy (gh_car (l)), ly_deep_copy (gh_cdr (l))); - } - else - return l; + set_elt_property ("interfaces", SCM_EOL); } @@ -76,13 +63,8 @@ Score_element::Score_element (Score_element const&s) self_scm_ = SCM_EOL; used_b_ = true; original_l_ =(Score_element*) &s; + element_property_alist_ = SCM_EOL; // onstack; - /* - should protect because smobify_self () might trigger GC. - */ - element_property_alist_ = scm_protect_object (ly_deep_copy (s.element_property_alist_)); - - output_p_ =0; status_i_ = s.status_i_; lookup_l_ = s.lookup_l_; pscore_l_ = s.pscore_l_; @@ -92,7 +74,6 @@ Score_element::Score_element (Score_element const&s) Score_element::~Score_element() { - assert (!output_p_); assert (status_i_ >=0); status_i_ = -1; @@ -121,7 +102,7 @@ Score_element::get_elt_property (String nm) const SCM s = scm_assq(sym, element_property_alist_); if (s != SCM_BOOL_F) - return SCM_CDR (s); + return gh_cdr (s); if (pscore_l_) { @@ -162,8 +143,8 @@ Interval Score_element::molecule_extent(Dimension_cache const *c) { Score_element *s = dynamic_cast(c->element_l()); - Molecule*m = s->do_brew_molecule_p(); - return m->extent()[c->axis ()]; + Molecule m = s->do_brew_molecule(); + return m.extent()[c->axis ()]; } @@ -172,8 +153,7 @@ 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_); @@ -198,7 +178,7 @@ Score_element::lookup_l () const { Score_element * urg = (Score_element*)this; SCM sz = urg->remove_elt_property ("fontsize"); - int i = (sz != SCM_UNDEFINED) + int i = (gh_number_p (sz)) ? gh_scm2int (sz) : 0; @@ -222,14 +202,14 @@ Score_element::add_processing() 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::self_alignment); + 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::self_alignment); + dim_cache_[Y_AXIS]->set_offset_callback (Side_position_interface::aligned_on_self); } #endif @@ -265,14 +245,11 @@ Score_element::calculate_dependencies (int final, int busy, void Score_element::output_processing () { - if (get_elt_property ("transparent") != SCM_UNDEFINED) + if (to_boolean (get_elt_property ("transparent"))) return; - // we're being silly here. - if (output_p_) - delete output_p_; - output_p_ = do_brew_molecule_p (); + Molecule m (do_brew_molecule ()); Offset o (relative_coordinate (0, X_AXIS), relative_coordinate (0, Y_AXIS)); SCM s = get_elt_property ("extra-offset"); @@ -283,12 +260,7 @@ Score_element::output_processing () o[Y_AXIS] += il * gh_scm2double (gh_cdr (s)); } - pscore_l_->outputter_l_->output_molecule (output_p_, - o, - classname(this)); - - delete output_p_; - output_p_ =0; + pscore_l_->outputter_l_->output_molecule (m.expr_, o, classname(this)); } /* @@ -302,7 +274,7 @@ Score_element::do_break_processing() } void -Score_element::do_post_processing() +Score_element::after_line_breaking () { } @@ -313,7 +285,7 @@ Score_element::do_breakable_col_processing() } void -Score_element::do_pre_processing() +Score_element::before_line_breaking () { } @@ -329,13 +301,21 @@ Score_element::do_add_processing() -Molecule* -Score_element::do_brew_molecule_p() const +Molecule +Score_element::do_brew_molecule() const { - Interval emp; - emp.set_empty (); - Molecule a (lookup_l ()->fill (Box (emp,emp))); - 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; + } } @@ -362,12 +342,16 @@ Score_element::add_dependency (Score_element*e) /** 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. */ + 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 s, SCM criterion) +Score_element::handle_broken_smobs (SCM src, SCM criterion) { - Score_element *sc = unsmob_element ( s); + again: + + + Score_element *sc = unsmob_element (src); if (sc) { if (criterion == SCM_UNDEFINED) @@ -397,57 +381,58 @@ Score_element::handle_broken_smobs (SCM s, SCM criterion) return SCM_UNDEFINED; } } - else if (gh_pair_p (s)) + else if (gh_pair_p (src)) { /* UGH! breaks on circular lists. */ - gh_set_car_x (s, handle_broken_smobs (gh_car (s), criterion)); - gh_set_cdr_x (s, handle_broken_smobs (gh_cdr (s), criterion)); - - SCM c = gh_cdr(s); - - // gh_list_p () is linear, this is O(1) - bool list = gh_pair_p (c) || c == SCM_EOL; + SCM car = handle_broken_smobs (gh_car (src), criterion); + SCM cdr = gh_cdr (src); - if (gh_car (s) == SCM_UNDEFINED && list) - return c; - } - return s; -} -#if 0 -void -Score_element::recurse_into_smobs (SCM s, void (Score_element::*meth_ptr)()) -{ - Score_element * sc = unsmob_element ( s); - if (sc) - { - (sc->*meth_ptr) (); - } - else if (gh_pair_p (s)) - { - recurse_into_smobs (gh_car (s), meth_ptr); - recurse_into_smobs (gh_cdr (s), meth_ptr); + 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; } -#endif void Score_element::handle_broken_dependencies() { - Line_of_score *line = line_l(); - - SCM rec = get_elt_property ("handle-broken-deps"); - if (gh_boolean_p (rec) && gh_scm2bool (rec)) + Spanner * s= dynamic_cast (this); + if (original_l_ && s) return; - - set_elt_property ("handle-broken-deps", SCM_BOOL_T); - element_property_alist_ = handle_broken_smobs (element_property_alist_, - line ? line->self_scm_ : SCM_UNDEFINED); + 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); + } + } - if (!line) - return; + Line_of_score *line = line_l(); + element_property_alist_ + = handle_broken_smobs (element_property_alist_, + line ? line->self_scm_ : SCM_UNDEFINED); } @@ -459,16 +444,15 @@ Score_element::handle_prebroken_dependencies() { if (Item*i =dynamic_cast (this)) { - element_property_alist_ - = handle_broken_smobs (element_property_alist_, + if (original_l_) + { + element_property_alist_ + = handle_broken_smobs (original_l_->element_property_alist_, gh_int2scm (i->break_status_dir ())); + } } } - - - - Link_array Score_element::get_extra_dependencies() const { @@ -493,45 +477,6 @@ 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 (" properties = ", port); - // scm_display (sc->element_property_alist_, 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; -} - void Score_element::translate_axis (Real y, Axis a) { @@ -548,8 +493,6 @@ Score_element * Score_element::common_refpoint (Score_element const* s, Axis a) const { Dimension_cache *dim = dim_cache_[a]->common_refpoint (s->dim_cache_[a]); - if (!dim) - programming_error ("No common reference point"); return dim ? dim->element_l () : 0; } @@ -573,24 +516,6 @@ Score_element::extent (Axis a) const return d->get_dim (); } -Score_element* -unsmob_element (SCM s) -{ - if (SMOB_IS_TYPE_B (Score_element, s)) - return SMOB_TO_TYPE(Score_element,s); - else - return 0; -} - - -/* - JUNKME - */ -void -Score_element::invalidate_cache (Axis a) -{ - // dim_cache_[a]->invalidate (); -} Score_element* Score_element::parent_l (Axis a) const @@ -630,30 +555,138 @@ Score_element::fixup_refpoint () for (int a = X_AXIS; a < NO_AXES; a ++) { Axis ax = (Axis)a; - Score_element * par = parent_l (ax); + Score_element * parent = parent_l (ax); - if (!par) + if (!parent) continue; - if (par->line_l () != line_l ()) + if (parent->line_l () != line_l ()) { - Score_element * newpar = par->find_broken_piece (line_l ()); - set_parent (newpar, ax); + Score_element * newparent = parent->find_broken_piece (line_l ()); + set_parent (newparent, ax); } if (Item * i = dynamic_cast (this)) { - Item *pari = dynamic_cast (par); + Item *parenti = dynamic_cast (parent); - if (pari && i) + if (parenti && i) { Direction my_dir = i->break_status_dir () ; - if (my_dir!= pari->break_status_dir()) + if (my_dir!= parenti->break_status_dir()) { - Item *newpar = pari->find_broken_piece (my_dir); - set_parent (newpar, ax); + Item *newparent = parenti->find_broken_piece (my_dir); + set_parent (newparent, ax); } } } } } + + + +/**************************************************** + SMOB funcs + ****************************************************/ + + +#include "ly-smobs.icc" + +IMPLEMENT_UNSMOB(Score_element, element); +IMPLEMENT_SMOBS(Score_element); +SCM +Score_element::mark_smob (SCM ses) +{ + 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_; +} + +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::do_smobify_self () +{ +} + +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) +{ + 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);