X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-placement.cc;h=2de33f07d686bec950171ee2dccdfbf2a28e8736;hb=a8d54f44df1fe4f89823f6b78364870ce51174dc;hp=02f0a2a6094c00d30bd2148d624dd82f5da137ff;hpb=cfc4cbf34569db6a6c8968694f86e36b206a9d05;p=lilypond.git diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index 02f0a2a609..2de33f07d6 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -1,26 +1,36 @@ /* - accidental-placement.cc -- implement Accidental_placement + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2002--2010 Han-Wen Nienhuys - (c) 2002--2009 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #include "accidental-placement.hh" -#include "item.hh" -#include "rhythmic-head.hh" #include "accidental-interface.hh" +#include "item.hh" #include "music.hh" #include "note-collision.hh" #include "note-column.hh" #include "pointer-group-interface.hh" +#include "rhythmic-head.hh" #include "skyline.hh" #include "stream-event.hh" #include "warn.hh" -static Pitch* +static Pitch * accidental_pitch (Grob *acc) { SCM cause = acc->get_parent (Y_AXIS)->get_property ("cause"); @@ -66,8 +76,8 @@ Accidental_placement::add_accidental (Grob *me, Grob *a) */ void Accidental_placement::split_accidentals (Grob *accs, - vector *break_reminder, - vector *real_acc) + vector *break_reminder, + vector *real_acc) { for (SCM acs = accs->get_object ("accidental-grobs"); scm_is_pair (acs); acs = scm_cdr (acs)) @@ -83,18 +93,18 @@ Accidental_placement::split_accidentals (Grob *accs, } } -vector -Accidental_placement::get_relevant_accidentals (vector const &elts, Grob *left) +vector +Accidental_placement::get_relevant_accidentals (vector const &elts, Grob *left) { - vector br; - vector ra; - vector ret; + vector br; + vector ra; + vector ret; bool right = dynamic_cast (left)->break_status_dir () == RIGHT; for (vsize i = 0; i < elts.size (); i++) { split_accidentals (elts[i], &br, &ra); - + ret.insert (ret.end (), ra.begin (), ra.end ()); if (right) @@ -109,7 +119,7 @@ struct Accidental_placement_entry Skyline right_skyline_; Interval vertical_extent_; vector extents_; - vector grobs_; + vector grobs_; }; Real ape_priority (Accidental_placement_entry const *a) @@ -161,15 +171,15 @@ acc_less (Grob *const &a, Grob *const &b) /* TODO: should favor - b - b + * b + * b placement */ void -stagger_apes (vector *apes) +stagger_apes (vector *apes) { - vector asc = *apes; + vector asc = *apes; vector_sort (asc, &ape_less); @@ -194,10 +204,10 @@ stagger_apes (vector *apes) reverse (*apes); } -static vector +static vector build_apes (SCM accs) { - vector apes; + vector apes; for (SCM s = accs; scm_is_pair (s); s = scm_cdr (s)) { Accidental_placement_entry *ape = new Accidental_placement_entry; @@ -213,9 +223,9 @@ build_apes (SCM accs) static void set_ape_skylines (Accidental_placement_entry *ape, - Grob **common) + Grob **common, Real padding) { - vector accs (ape->grobs_); + vector accs (ape->grobs_); vector_sort (accs, &acc_less); /* We know that each accidental has the same note name and we assume that @@ -238,7 +248,7 @@ set_ape_skylines (Accidental_placement_entry *ape, if (i == accs.size () - 1 || p->get_octave () != last_octave) { last_offset = 0; - offset = a->extent (a, X_AXIS)[LEFT] - 0.2; + offset = a->extent (a, X_AXIS)[LEFT] - padding; } else if (p->get_alteration () == last_alteration) a->translate_axis (last_offset, X_AXIS); @@ -247,9 +257,8 @@ set_ape_skylines (Accidental_placement_entry *ape, Real this_offset = offset - a->extent (a, X_AXIS)[RIGHT]; a->translate_axis (this_offset, X_AXIS); - /* FIXME: read the padding from the AccidentalPlacement grob */ last_offset = this_offset; - offset -= a->extent (a, X_AXIS).length () + 0.2; + offset -= a->extent (a, X_AXIS).length () + padding; } vector boxes = Accidental_interface::accurate_boxes (a, common); @@ -265,11 +274,11 @@ set_ape_skylines (Accidental_placement_entry *ape, ape->right_skyline_ = Skyline (ape->extents_, 0, Y_AXIS, RIGHT); } -static vector -extract_heads_and_stems (vector const &apes) +static vector +extract_heads_and_stems (vector const &apes) { - vector note_cols; - vector ret; + vector note_cols; + vector ret; for (vsize i = apes.size (); i--;) { @@ -310,14 +319,13 @@ extract_heads_and_stems (vector const &apes) if (Grob *s = Rhythmic_head::get_stem (ret[i])) ret.push_back (s); - - vector_sort (ret, less ()); + vector_sort (ret, less ()); uniq (ret); return ret; } -static Grob* -common_refpoint_of_accidentals (vector const &apes, Axis a) +static Grob * +common_refpoint_of_accidentals (vector const &apes, Axis a) { Grob *ret = 0; @@ -334,7 +342,7 @@ common_refpoint_of_accidentals (vector const &apes, } static Skyline -build_heads_skyline (vector const &heads_and_stems, +build_heads_skyline (vector const &heads_and_stems, Grob **common) { vector head_extents; @@ -351,13 +359,13 @@ build_heads_skyline (vector const &heads_and_stems, */ static Interval position_apes (Grob *me, - vector const &apes, + vector const &apes, Skyline const &heads_skyline) { Real padding = robust_scm2double (me->get_property ("padding"), 0.2); Skyline left_skyline = heads_skyline; left_skyline.raise (-robust_scm2double (me->get_property ("right-padding"), 0)); - + /* Add accs entries right-to-left. */ @@ -391,7 +399,6 @@ position_apes (Grob *me, return width; } - /* This routine computes placements of accidentals. During add_accidental (), accidentals are already grouped by note, so that @@ -404,12 +411,11 @@ position_apes (Grob *me, TODO: more advanced placement. Typically, the accs should be placed to form a C shape, like this - - ## - b b - # # - b - b b + * ## + * b b + * # # + * b + * b b The naturals should be left of the C as well; they should be separate accs. @@ -442,23 +448,24 @@ Accidental_placement::calc_positioning_done (SCM smob) return SCM_BOOL_T; me->set_property ("positioning-done", SCM_BOOL_T); - + SCM accs = me->get_object ("accidental-grobs"); if (!scm_is_pair (accs)) return SCM_BOOL_T; - vector apes = build_apes (accs); + vector apes = build_apes (accs); Grob *common[] = {me, 0}; - vector heads_and_stems = extract_heads_and_stems (apes); + vector heads_and_stems = extract_heads_and_stems (apes); common[Y_AXIS] = common_refpoint_of_accidentals (apes, Y_AXIS); common[Y_AXIS] = common_refpoint_of_array (heads_and_stems, common[Y_AXIS], Y_AXIS); common[X_AXIS] = common_refpoint_of_array (heads_and_stems, me, X_AXIS); + Real padding = robust_scm2double (me->get_property ("padding"), 0.2); for (vsize i = apes.size (); i--;) - set_ape_skylines (apes[i], common); + set_ape_skylines (apes[i], common, padding); Skyline heads_skyline = build_heads_skyline (heads_and_stems, common); stagger_apes (&apes); @@ -478,9 +485,8 @@ ADD_INTERFACE (Accidental_placement, /* properties */ "accidental-grobs " "direction " - "left-padding " "padding " "positioning-done " "right-padding " "script-priority " - ) + );