X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-placement.cc;h=1a557101223e510aafd382ad91642cb94fdce67d;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=e4cf13c10abfd70c368d9c26bd15bee022b154e4;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index e4cf13c10a..1a55710122 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2002--2011 Han-Wen Nienhuys + Copyright (C) 2002--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,6 +27,7 @@ #include "pointer-group-interface.hh" #include "rhythmic-head.hh" #include "skyline.hh" +#include "skyline-pair.hh" #include "stream-event.hh" #include "warn.hh" @@ -35,38 +36,38 @@ accidental_pitch (Grob *acc) { SCM cause = acc->get_parent (Y_AXIS)->get_property ("cause"); - Stream_event *mcause = unsmob_stream_event (cause); + Stream_event *mcause = unsmob (cause); if (!mcause) { programming_error ("note head has no event cause"); return 0; } - return unsmob_pitch (mcause->get_property ("pitch")); + return unsmob (mcause->get_property ("pitch")); } void -Accidental_placement::add_accidental (Grob *me, Grob *a) +Accidental_placement::add_accidental (Grob *me, Grob *a, bool stagger, long context_hash) { Pitch *p = accidental_pitch (a); if (!p) return; a->set_parent (me, X_AXIS); - a->set_property ("X-offset", Grob::x_parent_positioning_proc); - int n = p->get_notename (); + long n = p->get_notename (); SCM accs = me->get_object ("accidental-grobs"); - SCM key = scm_from_int (n); - SCM entry = scm_assq (key, accs); - if (entry == SCM_BOOL_F) + SCM key = scm_cons (scm_from_int (n), scm_from_long (stagger ? context_hash : 1)); + // assoc because we're dealing with pairs + SCM entry = scm_assoc (key, accs); + if (scm_is_false (entry)) entry = SCM_EOL; else entry = scm_cdr (entry); entry = scm_cons (a->self_scm (), entry); - accs = scm_assq_set_x (accs, key, entry); + accs = scm_assoc_set_x (accs, key, entry); me->set_object ("accidental-grobs", accs); } @@ -83,9 +84,9 @@ Accidental_placement::split_accidentals (Grob *accs, acs = scm_cdr (acs)) for (SCM s = scm_cdar (acs); scm_is_pair (s); s = scm_cdr (s)) { - Grob *a = unsmob_grob (scm_car (s)); + Grob *a = unsmob (scm_car (s)); - if (unsmob_grob (a->get_object ("tie")) + if (unsmob (a->get_object ("tie")) && !to_boolean (a->get_property ("forced"))) break_reminder->push_back (a); else @@ -115,21 +116,24 @@ Accidental_placement::get_relevant_accidentals (vector const &elts, Grob struct Accidental_placement_entry { - Skyline left_skyline_; - Skyline right_skyline_; - Interval vertical_extent_; - vector extents_; + Skyline_pair horizontal_skylines_; vector grobs_; }; Real ape_priority (Accidental_placement_entry const *a) { - return a->vertical_extent_[UP]; + // right is up because we're horizontal + return a->horizontal_skylines_.right (); } bool ape_less (Accidental_placement_entry *const &a, Accidental_placement_entry *const &b) { + vsize size_a = a->grobs_.size (); + vsize size_b = b->grobs_.size (); + if (size_a != size_b) + return size_b < size_a; + return ape_priority (a) < ape_priority (b); } @@ -182,23 +186,42 @@ stagger_apes (vector *apes) vector asc = *apes; vector_sort (asc, &ape_less); + // we do the staggering below based on size + // this ensures that if a placement has 4 entries, it will + // always be closer to the NoteColumn than a placement with 1 + // this allows accidentals to be on-average closer to notes + // while still preserving octave alignment + vector > ascs; + + vsize sz = INT_MAX; + for (vsize i = 0; i < asc.size (); i++) + { + vsize my_sz = asc[i]->grobs_.size (); + if (sz != my_sz) + ascs.push_back (vector ()); + ascs.back ().push_back (asc[i]); + sz = my_sz; + } apes->clear (); - int parity = 1; - for (vsize i = 0; i < asc.size ();) + for (vsize i = 0; i < ascs.size (); i++) { - Accidental_placement_entry *a = 0; - if (parity) + int parity = 1; + for (vsize j = 0; j < ascs[i].size ();) { - a = asc.back (); - asc.pop_back (); - } - else - a = asc[i++]; + Accidental_placement_entry *a = 0; + if (parity) + { + a = ascs[i].back (); + ascs[i].pop_back (); + } + else + a = ascs[i][j++]; - apes->push_back (a); - parity = !parity; + apes->push_back (a); + parity = !parity; + } } reverse (*apes); @@ -213,7 +236,7 @@ build_apes (SCM accs) Accidental_placement_entry *ape = new Accidental_placement_entry; for (SCM t = scm_cdar (s); scm_is_pair (t); t = scm_cdr (t)) - ape->grobs_.push_back (unsmob_grob (scm_car (t))); + ape->grobs_.push_back (unsmob (scm_car (t))); apes.push_back (ape); } @@ -261,17 +284,17 @@ set_ape_skylines (Accidental_placement_entry *ape, offset -= a->extent (a, X_AXIS).length () + padding; } - vector boxes = Accidental_interface::accurate_boxes (a, common); - ape->extents_.insert (ape->extents_.end (), boxes.begin (), boxes.end ()); - - for (vsize j = boxes.size (); j--;) - ape->vertical_extent_.unite (boxes[j][Y_AXIS]); + if (Skyline_pair *sky = unsmob (a->get_property ("horizontal-skylines"))) + { + Skyline_pair copy (*sky); + copy.raise (a->relative_coordinate (common[X_AXIS], X_AXIS)); + copy.shift (a->relative_coordinate (common[Y_AXIS], Y_AXIS)); + ape->horizontal_skylines_.merge (copy); + } last_octave = p->get_octave (); last_alteration = p->get_alteration (); } - ape->left_skyline_ = Skyline (ape->extents_, 0, Y_AXIS, LEFT); - ape->right_skyline_ = Skyline (ape->extents_, 0, Y_AXIS, RIGHT); } static vector @@ -289,7 +312,7 @@ extract_heads_and_stems (vector const &apes) Grob *head = acc->get_parent (Y_AXIS); Grob *col = head->get_parent (X_AXIS); - if (Note_column::has_interface (col)) + if (has_interface (col)) note_cols.push_back (col); else ret.push_back (head); @@ -303,7 +326,7 @@ extract_heads_and_stems (vector const &apes) for (vsize i = note_cols.size (); i--;) { Grob *c = note_cols[i]->get_parent (X_AXIS); - if (Note_collision_interface::has_interface (c)) + if (has_interface (c)) { extract_grob_set (c, "elements", columns); concat (note_cols, columns); @@ -319,8 +342,7 @@ extract_heads_and_stems (vector const &apes) if (Grob *s = Rhythmic_head::get_stem (ret[i])) ret.push_back (s); - vector_sort (ret, less ()); - uniq (ret); + uniquify (ret); return ret; } @@ -348,9 +370,9 @@ build_heads_skyline (vector const &heads_and_stems, vector head_extents; for (vsize i = heads_and_stems.size (); i--;) head_extents.push_back (Box (heads_and_stems[i]->extent (common[X_AXIS], X_AXIS), - heads_and_stems[i]->pure_height (common[Y_AXIS], 0, INT_MAX))); + heads_and_stems[i]->pure_y_extent (common[Y_AXIS], 0, INT_MAX))); - return Skyline (head_extents, 0, Y_AXIS, LEFT); + return Skyline (head_extents, Y_AXIS, LEFT); } /* @@ -375,13 +397,14 @@ position_apes (Grob *me, { Accidental_placement_entry *ape = apes[i]; - Real offset = -ape->right_skyline_.distance (left_skyline); + Real offset = -ape->horizontal_skylines_[RIGHT] + .distance (left_skyline, 0.1); if (isinf (offset)) offset = last_offset; else offset -= padding; - Skyline new_left_skyline = ape->left_skyline_; + Skyline new_left_skyline = ape->horizontal_skylines_[LEFT]; new_left_skyline.raise (offset); new_left_skyline.merge (left_skyline); left_skyline = new_left_skyline; @@ -390,8 +413,12 @@ position_apes (Grob *me, for (vsize j = ape->grobs_.size (); j--;) ape->grobs_[j]->translate_axis (offset, X_AXIS); - for (vsize j = ape->extents_.size (); j--;) - width.unite (offset + ape->extents_[j][X_AXIS]); + for (LEFT_and_RIGHT (d)) + { + Real mh = ape->horizontal_skylines_[d].max_height (); + if (!isinf (mh)) + width.add_point (mh + offset); + } last_offset = offset; } @@ -442,7 +469,7 @@ MAKE_SCHEME_CALLBACK (Accidental_placement, calc_positioning_done, 1); SCM Accidental_placement::calc_positioning_done (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); if (!me->is_live ()) return SCM_BOOL_T;