X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-placement.cc;h=3b85e72c0aa21bcc1be17f1d21487a75dca14908;hb=dcf803f51a8621e64670930f89e9e02d845fe598;hp=292f9935512f1195fb6458a994338e7f07dc387b;hpb=46c1dd95d637b86046407b1364794511dd9516c1;p=lilypond.git diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index 292f993551..3b85e72c0a 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -1,14 +1,15 @@ /* -accidental-placement.cc -- implement Accidental_placement + accidental-placement.cc -- implement Accidental_placement -source file of the GNU LilyPond music typesetter + source file of the GNU LilyPond music typesetter -(c) 2002 Han-Wen Nienhuys + (c) 2002--2004 Han-Wen Nienhuys - */ +*/ #include -#include + +#include "libc-extension.hh" // isinf #include "item.hh" #include "skyline.hh" #include "music.hh" @@ -20,73 +21,56 @@ source file of the GNU LilyPond music typesetter #include "note-collision.hh" #include "accidental-interface.hh" -/* - Hmm. why not group-extent? - */ -MAKE_SCHEME_CALLBACK(Accidental_placement,extent_callback, 2); -SCM -Accidental_placement::extent_callback(SCM s, SCM axis) -{ - Grob * me =unsmob_grob (s); - Axis a = Axis (gh_scm2int (axis)); - - assert (a == X_AXIS); - - SCM w = position_accidentals (me); - return w; -} - -MAKE_SCHEME_CALLBACK(Accidental_placement,alignment_callback, 2); +MAKE_SCHEME_CALLBACK (Accidental_placement,alignment_callback, 2); SCM -Accidental_placement::alignment_callback(SCM s, SCM ) +Accidental_placement::alignment_callback (SCM s, SCM ) { - Grob * me =unsmob_grob (s); + Grob * me = unsmob_grob (s); Grob * par = me->get_parent (X_AXIS); - if (!to_boolean (par->get_grob_property ("alignment-done"))) + if (!to_boolean (par->get_property ("positioning-done"))) { - par->set_grob_property ("alignment-done", SCM_BOOL_T); + par->set_property ("positioning-done", SCM_BOOL_T); position_accidentals (par); } - return gh_int2scm (0); + return scm_int2num (0); } - void Accidental_placement::add_accidental (Grob* me, Grob* a) { a->set_parent (me, X_AXIS); a->add_offset_callback (alignment_callback_proc, X_AXIS); - SCM cause = a->get_parent (Y_AXIS)->get_grob_property("cause"); + SCM cause = a->get_parent (Y_AXIS)->get_property ("cause"); - Music *mcause =unsmob_music (cause); + Music *mcause = unsmob_music (cause); if (!mcause) { programming_error ("Note head has no music cause!"); return; } - Pitch *p= unsmob_pitch (mcause->get_mus_property ("pitch")); + Pitch *p= unsmob_pitch (mcause->get_property ("pitch")); - int n = p->notename_i_; + int n = p->get_notename (); - SCM accs = me->get_grob_property ("accidentals"); - SCM key = gh_int2scm (n); + SCM accs = me->get_property ("accidental-grobs"); + SCM key = scm_int2num (n); SCM entry = scm_assq (key, accs); if (entry == SCM_BOOL_F) { entry = SCM_EOL; } else - entry = gh_cdr (entry); + entry = ly_cdr (entry); - entry = gh_cons (a->self_scm (), entry); + entry = scm_cons (a->self_scm (), entry); accs = scm_assq_set_x (accs, key, entry); - me->set_grob_property ("accidentals", accs); + me->set_property ("accidental-grobs", accs); } /* @@ -97,13 +81,13 @@ Accidental_placement::split_accidentals (Grob * accs, Link_array *break_reminder, Link_array *real_acc) { - for (SCM acs =accs->get_grob_property ("accidentals"); gh_pair_p (acs); - acs =gh_cdr (acs)) - for (SCM s = gh_cdar (acs); gh_pair_p (s); s = gh_cdr (s)) + for (SCM acs =accs->get_property ("accidental-grobs"); ly_c_pair_p (acs); + acs =ly_cdr (acs)) + for (SCM s = ly_cdar (acs); ly_c_pair_p (s); s = ly_cdr (s)) { - Grob *a = unsmob_grob (gh_car (s)); + Grob *a = unsmob_grob (ly_car (s)); - if (unsmob_grob (a->get_grob_property ("tie"))) + if (unsmob_grob (a->get_property ("tie"))) break_reminder->push (a); else real_acc->push (a); @@ -131,14 +115,14 @@ Accidental_placement::get_relevant_accidental_extent (Grob *me, which = & ra; Interval extent; - for (int i = 0; i < which->size(); i++) + for (int i = 0; i < which->size (); i++) { - extent.unite (which->elem(i)->extent (item_col, X_AXIS)); + extent.unite (which->elem (i)->extent (item_col, X_AXIS)); } - if (!extent.empty_b()) + if (!extent.is_empty ()) { - Real p = gh_scm2double (me->get_grob_property ("left-padding")); + Real p = robust_scm2double (me->get_property ("left-padding"), 0.2); extent[LEFT] -= p; } @@ -156,7 +140,7 @@ struct Accidental_placement_entry Link_array grobs_; Real offset_; int notename_; - Accidental_placement_entry() + Accidental_placement_entry () { offset_ =0.0; notename_ = -1; @@ -174,13 +158,13 @@ Real ape_priority (Accidental_placement_entry const * a) int ape_compare (Accidental_placement_entry *const &a, Accidental_placement_entry *const &b) { - return sign (ape_priority (a) - ape_priority(b)); + return sign (ape_priority (a) - ape_priority (b)); } int ape_rcompare (Accidental_placement_entry *const &a, Accidental_placement_entry *const &b) { - return -sign (ape_priority (a) - ape_priority(b)); + return -sign (ape_priority (a) - ape_priority (b)); } @@ -202,15 +186,15 @@ stagger_apes (Link_array *apes) asc.sort (&ape_compare); - apes->clear(); + apes->clear (); int i =0; int parity = 1; - while (i < asc.size()) + while (i < asc.size ()) { Accidental_placement_entry * a = 0; if (parity) - a = asc.pop(); + a = asc.pop (); else a = asc[i++]; @@ -218,17 +202,15 @@ stagger_apes (Link_array *apes) parity = !parity; } - apes->reverse(); + apes->reverse (); } /* - Return: width as SCM interval. - This routine computes placements of accidentals. During - add_accidental(), accidentals are already grouped by note, so that + add_accidental (), accidentals are already grouped by note, so that octaves are placed above each other; they form columns. Then the columns are sorted: the biggest columns go closest to the note. Then the columns are spaced as closely as possible (using skyline @@ -253,28 +235,42 @@ stagger_apes (Link_array *apes) */ +/* + TODO: there should be more space in the following situation + + + Natural + downstem + + |_ + | | X + |_| | + | | + + */ SCM Accidental_placement::position_accidentals (Grob * me) { - SCM accs = me->get_grob_property ("accidentals"); + if (!me->is_live ()) + return SCM_UNSPECIFIED; + + SCM accs = me->get_property ("accidental-grobs"); /* TODO: there is a bug in this code. If two accs are on the same - Y-position, they share an Ape, and will be pritned in overstrike. + Y-position, they share an Ape, and will be printed in overstrike. */ Link_array apes; - for (SCM s = accs; gh_pair_p (s); s =gh_cdr (s)) + for (SCM s = accs; ly_c_pair_p (s); s =ly_cdr (s)) { Accidental_placement_entry *ape = new Accidental_placement_entry; - ape->notename_ = gh_scm2int (gh_caar (s)); + ape->notename_ = scm_to_int (ly_caar (s)); - for (SCM t = gh_cdar (s); gh_pair_p (t); t =gh_cdr (t)) - ape->grobs_.push (unsmob_grob (gh_car (t))); + for (SCM t = ly_cdar (s); ly_c_pair_p (t); t =ly_cdr (t)) + ape->grobs_.push (unsmob_grob (ly_car (t))); apes.push (ape); } - Grob *common[] = {me, 0}; /* @@ -285,7 +281,7 @@ Accidental_placement::position_accidentals (Grob * me) for (int i= apes.size (); i--;) { Accidental_placement_entry * ape = apes[i]; - for (int j = ape->grobs_.size(); j--;) + for (int j = ape->grobs_.size (); j--;) { Grob * a = ape->grobs_[j]; @@ -308,7 +304,7 @@ Accidental_placement::position_accidentals (Grob * me) This is a little kludgy: to get all notes, we look if there are collisions as well. */ - for (int i = note_cols.size() ; i--;) + for (int i = note_cols.size () ; i--;) { Grob *c = note_cols[i]->get_parent (X_AXIS); if (Note_collision_interface::has_interface (c)) @@ -320,15 +316,15 @@ Accidental_placement::position_accidentals (Grob * me) } } - for (int i = note_cols.size() ; i--;) + for (int i = note_cols.size () ; i--;) { heads.concat (Pointer_group_interface__extract_grobs (note_cols[i], (Grob*)0, "note-heads")); } - heads.default_sort(); - heads.uniq(); + heads.default_sort (); + heads.uniq (); common[Y_AXIS] = common_refpoint_of_array (heads, common[Y_AXIS], Y_AXIS); @@ -338,14 +334,14 @@ Accidental_placement::position_accidentals (Grob * me) ape->left_skyline_ = empty_skyline (LEFT); ape->right_skyline_ = empty_skyline (RIGHT); - for (int j = apes[i]->grobs_.size(); j--;) + for (int j = apes[i]->grobs_.size (); j--;) { Grob * a = apes[i]->grobs_[j]; Array boxes = Accidental_interface::accurate_boxes (a, common); ape->extents_.concat (boxes); - for (int j = boxes.size(); j--;) + for (int j = boxes.size (); j--;) { insert_extent_into_skyline (&ape->left_skyline_, boxes[j], Y_AXIS, LEFT); insert_extent_into_skyline (&ape->right_skyline_ , boxes[j], Y_AXIS, RIGHT); @@ -355,11 +351,11 @@ Accidental_placement::position_accidentals (Grob * me) Interval total; - for (int i = apes.size(); i--;) + for (int i = apes.size (); i--;) { Interval y ; - for (int j = apes[i]->extents_.size(); j--;) + for (int j = apes[i]->extents_.size (); j--;) { y.unite (apes[i]->extents_[j][Y_AXIS]); } @@ -373,9 +369,9 @@ Accidental_placement::position_accidentals (Grob * me) common[X_AXIS] = common_refpoint_of_array (heads, common[X_AXIS], X_AXIS); Array head_skyline (empty_skyline (LEFT)); Array head_extents; - for (int i = heads.size(); i--;) + for (int i = heads.size (); i--;) { - Box b(heads[i]->extent (common[X_AXIS] , X_AXIS), + Box b (heads[i]->extent (common[X_AXIS] , X_AXIS), heads[i]->extent (common[Y_AXIS], Y_AXIS)); insert_extent_into_skyline (&head_skyline, b , Y_AXIS, LEFT); @@ -384,57 +380,35 @@ Accidental_placement::position_accidentals (Grob * me) head_ape-> left_skyline_ = head_skyline; head_ape->offset_ = 0.0; - SCM rs = me->get_grob_property ("right-padding"); - if (gh_number_p (rs)) - head_ape->offset_ -= gh_scm2double (rs); - - - Real padding = 0.2; - SCM spad = me->get_grob_property ("padding"); - if (gh_number_p (spad)) - padding = gh_scm2double (spad); - + Real padding = robust_scm2double (me->get_property ("padding"),0.2); + Array left_skyline = head_ape->left_skyline_; + heighten_skyline (&left_skyline, + -robust_scm2double (me->get_property ("right-padding"), 0)); /* - TODO: - - There is a bug in this code: the left_skylines should be - accumulated, otherwise the b will collide with bb in - - bb - b - n - + Add accs entries right-to-left. */ - apes.push (head_ape); - for (int i= apes.size () -1 ; i-- > 0;) + for (int i= apes.size (); i-- > 0;) { - Accidental_placement_entry *ape = apes[i]; - Real d = 0.0; - int j = i+1; - do { - d = - skyline_meshing_distance (ape->right_skyline_, - apes[j]->left_skyline_); - - if (!isinf(d) - || j + 1 == apes.size()) - break; - - j = j+ 1; - } while (1); - - if (isinf(d)) - d = 0.0; - - d -= padding; - ape->offset_ += apes[j]->offset_ + d; - } + Real offset = + -skyline_meshing_distance (apes[i]->right_skyline_, left_skyline); + if (isinf (offset)) + offset = (i < apes.size () - 1) ? apes[i+1]->offset_ : 0.0; + else + offset -= padding; + + apes[i]->offset_ = offset; - apes.pop(); - for (int i = apes.size(); i--;) + Array new_left_skyline = apes[i]->left_skyline_; + heighten_skyline (&new_left_skyline, apes[i]->offset_); + merge_skyline (&new_left_skyline, left_skyline, LEFT); + left_skyline = new_left_skyline; + } + + for (int i = apes.size (); i--;) { Accidental_placement_entry* ape = apes[i]; - for (int j = ape->grobs_.size(); j--;) + for (int j = ape->grobs_.size (); j--;) { ape->grobs_[j]->translate_axis (ape->offset_, X_AXIS); } @@ -444,30 +418,27 @@ Accidental_placement::position_accidentals (Grob * me) Interval left_extent, right_extent; Accidental_placement_entry *ape = apes[0]; - for (int i = ape->extents_.size(); i--;) + for (int i = ape->extents_.size (); i--;) left_extent.unite (ape->offset_ + ape->extents_[i][X_AXIS]); - ape = apes.top(); - for (int i = ape->extents_.size(); i--;) + ape = apes.top (); + for (int i = ape->extents_.size (); i--;) right_extent.unite (ape->offset_ + ape->extents_[i][X_AXIS]); - SCM ls = me->get_grob_property ("left-padding"); - if (gh_number_p (rs)) - left_extent[LEFT] -= gh_scm2double (ls); - - Interval width(left_extent[LEFT], right_extent[RIGHT]); + left_extent[LEFT] -= robust_scm2double (me->get_property ("left-padding"), 0); + Interval width (left_extent[LEFT], right_extent[RIGHT]); SCM scm_width = ly_interval2scm (width); me->set_extent (scm_width, X_AXIS); - for (int i = apes.size(); i--;) + for (int i = apes.size (); i--;) delete apes[i]; - return scm_width; + return SCM_UNSPECIFIED; } -ADD_INTERFACE(Accidental_placement, +ADD_INTERFACE (Accidental_placement, "accidental-placement-interface", - "Take care of complex accidental collisions.", - "left-padding padding right-padding accidentals alignment-done") + "Resolve accidental collisions.", + "left-padding padding right-padding accidental-grobs positioning-done")