Run grand replace for 2015.

[lilypond.git] / lily / include / beam-scoring-problem.hh

diff --git a/lily/include/beam-scoring-problem.hh b/lily/include/beam-scoring-problem.hh
index fee15d7d8c7540b127dca7ebb196830e48d7e65b..bbabfde7deca96823ca0477b84500af4f2cc22ca 100644 (file)
--- a/lily/include/beam-scoring-problem.hh
+++ b/lily/include/beam-scoring-problem.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -115,24 +115,23 @@ struct Beam_collision
 class Beam_scoring_problem
 {
 public:
-  Beam_scoring_problem (Grob *me, Drul_array<Real> ys);
+  Beam_scoring_problem (Grob *me, Drul_array<Real> ys, bool);
   Drul_array<Real> solve () const;
 
 private:
   Spanner *beam_;
 
   Interval unquanted_y_;
-  bool consistent_broken_slope_;
+  bool align_broken_intos_;
+  bool do_initial_slope_calculations_;
 
   Real staff_space_;
   Real beam_thickness_;
   Real line_thickness_;
   Real musical_dy_;
   int normal_stem_count_;
-
   Real x_span_;
 
-
   /*
     Do stem computations.  These depend on YL and YR linearly, so we can
     precompute for every stem 2 factors.
@@ -171,10 +170,11 @@ private:
   vsize first_normal_index ();
   vsize last_normal_index ();
 
-  void init_stems ();
+  void init_instance_variables (Grob *me, Drul_array<Real> ys, bool align_broken_intos);
   void add_collision (Real x, Interval y, Real factor);
   void no_visible_stem_positions ();
   void least_squares_positions ();
+  Real calc_concaveness ();
   void slope_damping ();
   void shift_region_to_valid ();
 
@@ -190,7 +190,7 @@ private:
   void score_slope_direction (Beam_configuration *config) const;
   void score_slope_musical (Beam_configuration *config) const;
   void score_stem_lengths (Beam_configuration *config) const;
-  void generate_quants (vector<Beam_configuration *>* scores) const;
+  void generate_quants (vector<Beam_configuration *> *scores) const;
   void score_collisions (Beam_configuration *config) const;
 };