X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=64448f2450ab50c96b7dd5e2a1f3cea71212b8a2;hb=eabde958a9a4559f474d2736e298bfda9920c4e0;hp=d5f9d9e9a9c7ecde26fb6ce9cced66175b229b9a;hpb=f1baf9749eb3315b6f58622e084fc34295bccea7;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index d5f9d9e9a9..64448f2450 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999, 1998 Han-Wen Nienhuys + (c) 1997--1999 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -11,19 +11,23 @@ /* [TODO] - * centre beam symbol + * center beam symbol * less hairy code * redo grouping - */ + +TODO: + +The relationship Stem <-> Beam is way too hairy. Let's figure who +needs what, and what information should be available when. + + */ #include -#include "p-col.hh" -#include "array.hh" +#include "new-beaming.hh" #include "proto.hh" #include "dimensions.hh" #include "beam.hh" -#include "abbreviation-beam.hh" #include "misc.hh" #include "debug.hh" #include "molecule.hh" @@ -31,7 +35,6 @@ #include "stem.hh" #include "paper-def.hh" #include "lookup.hh" -#include "rhythmic-grouping.hh" Beam::Beam () { @@ -39,15 +42,21 @@ Beam::Beam () left_y_ = 0; quantisation_ = NORMAL; multiple_i_ = 0; - vertical_align_drul_[MIN] = 0; - vertical_align_drul_[MAX] = -1; } void Beam::add_stem (Stem*s) { +#if 0 + if (!stems_.size ()) + { + dim_cache_[Y_AXIS]->parent_l_ = s->dim_cache_[Y_AXIS]; + } +#endif stems_.push (s); s->add_dependency (this); + + assert (!s->beam_l_); s->beam_l_ = this; if (!spanned_drul_[LEFT]) @@ -56,6 +65,19 @@ Beam::add_stem (Stem*s) set_bounds (RIGHT,s); } +Stem_info +Beam::get_stem_info (Stem *s) +{ + Stem_info i; + for (int i=0; i < sinfo_.size (); i++) + { + if (sinfo_[i].stem_l_ == s) + return sinfo_[i]; + } + assert (false); + return i; +} + Molecule* Beam::do_brew_molecule_p () const { @@ -79,12 +101,6 @@ Beam::do_brew_molecule_p () const mol_p->translate_axis (x0 - spanned_drul_[LEFT]->absolute_coordinate (X_AXIS), X_AXIS); - // correct if last note (and therefore reference point of beam) - // is on different staff - Stem_info si = sinfo_.top (); - mol_p->translate_axis (-si.interstaff_f_ * si.stem_l_->staff_line_leading_f ()/2, - Y_AXIS); - return mol_p; } @@ -94,7 +110,7 @@ Beam::center () const Stem_info si = sinfo_[0]; Real w= (si.stem_l_->note_delta_f () + extent (X_AXIS).length ())/2.0; - return Offset (w, (left_y_ + w* slope_f_) * + return Offset (w, ( w* slope_f_) * si.stem_l_->staff_line_leading_f ()/2); } @@ -102,7 +118,10 @@ void Beam::do_pre_processing () { if (!dir_) - set_default_dir (); + dir_ = get_default_dir (); + + + set_direction (dir_); } void @@ -142,15 +161,15 @@ Beam::do_width () const stems_.top ()->hpos_f ()); } -void -Beam::set_default_dir () +Direction +Beam::get_default_dir () const { Drul_array total; total[UP] = total[DOWN] = 0; Drul_array count; count[UP] = count[DOWN] = 0; Direction d = DOWN; - + for (int i=0; i get_var ("stem_default_neutral_direction"); + Dir_algorithm a = (Dir_algorithm)rint(paper_l ()->get_var ("beam_dir_algorithm")); switch (a) { case MAJORITY: - dir_ = (count[UP] > count[DOWN]) ? UP : DOWN; + beam_dir = (count[UP] == count[DOWN]) ? neutral_dir + : (count[UP] > count[DOWN]) ? UP : DOWN; break; case MEAN: - // mean centre distance - dir_ = (total[UP] > total[DOWN]) ? UP : DOWN; + // mean center distance + beam_dir = (total[UP] == total[DOWN]) ? neutral_dir + : (total[UP] > total[DOWN]) ? UP : DOWN; break; default: case MEDIAN: - // median centre distance - if (!count[UP]) - dir_ = DOWN; - else if (!count[DOWN]) - dir_ = UP; + // median center distance + if (!count[DOWN] || !count[UP]) + { + beam_dir = (count[UP] == count[DOWN]) ? neutral_dir + : (count[UP] > count[DOWN]) ? UP : DOWN; + } else - dir_ = (total[UP] / count[UP] > total[DOWN] / count[DOWN]) ? UP : DOWN; + { + beam_dir = (total[UP] / count[UP] == total[DOWN] / count[DOWN]) + ? neutral_dir + : (total[UP] / count[UP] > total[DOWN] / count[DOWN]) ? UP : DOWN; + } break; } + return beam_dir; +} +void +Beam::set_direction (Direction d) +{ + dir_ = d; for (int i=0; i set_elt_property (beam_dir_scm_sym, gh_int2scm (dir_)); + s->set_elt_property (beam_dir_scm_sym, gh_int2scm (d)); SCM force = s->remove_elt_property (dir_forced_scm_sym); if (force == SCM_BOOL_F) - s->dir_ = dir_; + s->dir_ = d; } } @@ -216,9 +253,6 @@ Beam::set_default_dir () void Beam::solve_slope () { - /* - should use minimum energy formulation (cf linespacing) - */ assert (sinfo_.size () > 1); DOUT << "Beam::solve_slope: \n"; @@ -230,6 +264,10 @@ Beam::solve_slope () l.minimise (slope_f_, left_y_); } +/* + ugh. Naming: this doesn't check, but sets as well. + */ + Real Beam::check_stemlengths_f (bool set_b) { @@ -284,7 +322,7 @@ Beam::set_steminfo () for (int i=0; i < stems_.size (); i++) { Stem *s = stems_[i]; - s->mult_i_ = multiple_i_; + s->set_default_extents (); if (s->invisible_b ()) continue; @@ -293,20 +331,23 @@ Beam::set_steminfo () total_count_i++; } - Real internote_f = stems_[0]->staff_line_leading_f ()/2; + bool grace_b = get_elt_property (grace_scm_sym) != SCM_BOOL_F; + String type_str = grace_b ? "grace_" : ""; int stem_max = (int)rint(paper_l ()->get_var ("stem_max")); - Real shorten_f = paper_l ()->get_var (String ("forced_stem_shorten" - + to_str (multiple_i_ get_var (type_str + "forced_stem_shorten" + + to_str (multiple_i_ invisible_b ()) continue; +#endif - Stem_info info (s); + Stem_info info (s, multiple_i_); if (leftx == 0) leftx = info.x_; info.x_ -= leftx; @@ -414,9 +455,9 @@ Beam::quantise_dy () Interval iv = quantise_iv (allowed_fraction, interline_f, dy_f); - quanty_f = (dy_f - iv.min () <= iv.max () - dy_f) - ? iv.min () - : iv.max (); + quanty_f = (dy_f - iv[SMALLER] <= iv[BIGGER] - dy_f) + ? iv[SMALLER] + : iv[BIGGER]; slope_f_ = (quanty_f / dx_f) / internote_f * sign (slope_f_); @@ -531,9 +572,9 @@ Beam::quantise_left_y (bool extend_b) Interval iv = quantise_iv (allowed_position, space, dy_f); - Real quanty_f = dy_f - iv.min () <= iv.max () - dy_f ? iv.min () : iv.max (); + Real quanty_f = dy_f - iv[SMALLER] <= iv[BIGGER] - dy_f ? iv[SMALLER] : iv[BIGGER]; if (extend_b) - quanty_f = iv.max (); + quanty_f = iv[BIGGER]; // dim(left_y_) = internote left_y_ = dir_ * quanty_f / internote_f; @@ -546,7 +587,8 @@ Beam::set_stemlens () // enge floots Real epsilon_f = staffline_f / 8; - DOUT << "Beam::set_stemlens: \n"; + + // je bent zelf eng --hwn. Real dy_f = check_stemlengths_f (false); for (int i = 0; i < 2; i++) { @@ -555,7 +597,6 @@ Beam::set_stemlens () dy_f = check_stemlengths_f (true); if (abs (dy_f) <= epsilon_f) { - DOUT << "Beam::set_stemlens: " << i << " iterations\n"; break; } } @@ -564,60 +605,51 @@ Beam::set_stemlens () test_pos %= 4; } -/* - FIXME - ugh. this is broken and should be rewritten. - - [c8. c32 c32] - */ void -Beam::set_grouping (Rhythmic_grouping def, Rhythmic_grouping cur) +Beam::set_beaming (Beaming_info_list *beaming) +{ + Direction d = LEFT; + for (int i=0; i < stems_.size (); i++) + { + do + { + if (stems_[i]->beams_i_drul_[d] < 0) + stems_[i]->beams_i_drul_[d] = beaming->infos_.elem (i).beams_i_drul_[d]; + } + while (flip (&d) != LEFT); + } +} + + +void +Beam::do_add_processing () { - def.OK (); - cur.OK (); - assert (cur.children.size () == stems_.size ()); - - cur.split (def); - - Array b; - { - Array flags; - for (int j=0; j flag_i_ - 2; - assert (f>0); - flags.push (f); - } - int fi =0; - b= cur.generate_beams (flags, fi); - b.insert (0,0); - b.push (0); - assert (stems_.size () == b.size ()/2); - } - - for (int j=0, i=0; i < b.size () && j beams_i_drul_[d] < 0) - s->beams_i_drul_[d] = b[i]; - - multiple_i_ = multiple_i_ >? s->beams_i_drul_[d]; - i++; + multiple_i_ = multiple_i_ >? stems_[i]->beams_i_drul_[d]; } while ((flip (&d)) != LEFT); } + + if (stems_.size ()) + { + stems_[0]->beams_i_drul_[LEFT] =0; + stems_.top()->beams_i_drul_[RIGHT] =0; + } } + + /* beams to go with one stem. */ Molecule Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const { - assert (!next || next->hpos_f () > here->hpos_f ()); - assert (!prev || prev->hpos_f () < here->hpos_f ()); + if ((next && !(next->hpos_f () > here->hpos_f ())) || + (prev && !(prev->hpos_f () < here->hpos_f ()))) + programming_error ("Beams are not left-to-right"); Real staffline_f = paper_l ()->rule_thickness (); Real interbeam_f = paper_l ()->interbeam_f (multiple_i_); @@ -634,7 +666,13 @@ Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const Molecule rightbeams; // UGH - Real nw_f = paper_l ()->note_width () * 0.8; + Real nw_f; + if (here->type_i ()== 1) + nw_f = paper_l ()->get_var ("wholewidth"); + else if (here->type_i () == 2) + nw_f = paper_l ()->note_width () * 0.8; + else + nw_f = paper_l ()->get_var ("quartwidth"); /* half beams extending to the left. */ if (prev) @@ -669,9 +707,13 @@ Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const a.translate_axis( - stemdx/2, X_AXIS); int j = 0; Real gap_f = 0; - if (here->beam_gap_i_) + + SCM gap = get_elt_property (beam_gap_scm_sym); + if (gap != SCM_BOOL_F) { - int nogap = rwholebeams - here->beam_gap_i_; + int gap_i = gh_scm2int (SCM_CDR (gap)); + int nogap = rwholebeams - gap_i; + for (; j < nogap; j++) { Molecule b (a); @@ -687,7 +729,10 @@ Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const for (; j < rwholebeams; j++) { Molecule b (a); - b.translate (Offset (gap_f, -dir_ * dy * j)); + if (!here->invisible_b ()) + b.translate (Offset (gap_f, -dir_ * dy * j)); + else + b.translate (Offset (0, -dir_ * dy * j)); rightbeams.add_molecule (b); }