X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=e7594f5a4d745032e12d00b608d26a5c09eb6e41;hb=4a964b10c411827584eb720c63cd0d6fc5b65d72;hp=a94b0eba908ae61782ac1841540d6693362da578;hpb=ae0a8ce9764d714e026ed7c6f24502ac10df3797;p=lilypond.git

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index a94b0eba90..e7594f5a4d 100644
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -1,76 +1,80 @@
 /*
   beam.hh -- part of GNU LilyPond
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  source file of the LilyPond music typesetter
+
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef BEAM_HH
 #define BEAM_HH
 
 #include "lily-proto.hh"
-#include "directional-spanner.hh"
+#include "lily-guile.hh"
 #include "stem-info.hh"
-#include "plist.hh"
 
-/** a beam connects multiple stems.
 
-  Beam adjusts the stems its owns to make sure that they reach the
-  beam and that point in the correct direction */
-class Beam:  public Directional_spanner {
+class Beam
+{
 public:
-  /** 
-    The beams should be prevented to conflict with the stafflines, 
-    especially at small slopes.
-    */
-  enum Quantisation { NONE, NORMAL, TRADITIONAL, TEST };
-  enum Dir_algorithm { /* DOWN=-1, UP=1, */ MAJORITY=2, MEAN, MEDIAN };
-
-  Link_array<Stem> stems_;
-  /// the slope of the beam in posns / point (dimension)   
-  Real slope_f_;
-  /// the slope as solved; not quantised or damped
-  Real solved_slope_f_;
-
-  /// position of leftmost end of beam  
-  Real left_y_;
-  /// should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams
-  int damping_i_;
-  /// should beam pos / slope be quantised? 0: no, 1: yes, 2: traditional
-  Quantisation quantisation_;
-  /// maximum number of beams (for opening-up of beam-spacing)
-  int multiple_i_;
-
-  /// vertical align distance between staffs
-  Real vertical_align_f_;
+  static int visible_stem_count (Grob*);
+  static Grob* first_visible_stem (Grob*);
+  static Grob* last_visible_stem (Grob*);
+  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM axis));
+  Beam (SCM);
+  static void add_stem (Grob*,Grob*);
+  static bool is_knee (Grob*);
+  static void set_beaming (Grob*,Beaming_info_list *);
+  static void set_stemlens (Grob*);
+  static int get_beam_count (Grob*me);
+  static void position_beam (Grob* me);
+  static Real get_beam_translation (Grob*me);
+  static Real get_thickness (Grob*me);
 
-  Array<Stem_info> sinfo_;
+  static void connect_beams (Grob*me);
+  DECLARE_SCHEME_CALLBACK (space_function, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
   
-  Beam();
-  void add_stem (Stem*);
+  /* position callbacks */
+  DECLARE_SCHEME_CALLBACK (least_squares, (SCM));
+  DECLARE_SCHEME_CALLBACK (check_concave, (SCM));
+  DECLARE_SCHEME_CALLBACK (slope_damping, (SCM));
+  DECLARE_SCHEME_CALLBACK (shift_region_to_valid, (SCM));  
+  DECLARE_SCHEME_CALLBACK (quanting, (SCM));
+  static Real score_slopes_dy (Real, Real, Real, Real, Real, bool);
 
-  void set_grouping (Rhythmic_grouping def, Rhythmic_grouping current);
-  void set_stemlens ();
-  VIRTUAL_COPY_CONS(Score_element);
+  static Real score_stem_lengths (Link_array<Grob> const &stems,
+				  Array<Stem_info> const &stem_infos,
+				  Array<Real> const &base_stem_ys,
+				  Array<Real> const &stem_xs,
+				  Real xl, Real xr, 
+				  bool knee, 
+				  Real yl, Real yr);
+  static Real score_forbidden_quants (Real, Real,
+				      Real, Real, Real, Real,
+				      Drul_array<int>, Direction, Direction);
+  
 
-protected:
-  virtual Interval do_width () const;    
-  Offset center () const;
-  void set_default_dir ();
-  void set_steminfo ();
-  virtual void do_pre_processing ();
-  virtual void do_post_processing ();
-  virtual void do_substitute_dependent (Score_element*, Score_element*);
+  static int get_direction_beam_count (Grob *me, Direction d);
+private:
+  static Direction get_default_dir (Grob*);
+  static void set_stem_directions (Grob*, Direction );
+  static void consider_auto_knees (Grob*);
+  static void set_stem_shorten (Grob*);
+  static Real calc_stem_y (Grob*, Grob* s, Grob**c,
+			   Real, Real,
+			   Drul_array<Real> pos, bool french);
+  static void set_stem_lengths (Grob*);
+  static int forced_stem_count (Grob*);
+};
 
-  virtual void do_print() const;
+const int REGION_SIZE = 2;
 
-  virtual void quantise_left_y (bool extend_b);
-  virtual Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
-  virtual void calculate_slope ();
-  virtual Real check_stemlengths_f (bool set_b);
-  virtual void solve_slope ();
-  virtual void quantise_dy ();
-  virtual Molecule*do_brew_molecule_p () const;
-};
+#define DEBUG_QUANTING 1
 
-#endif // BEAM_HH
+#endif /* BEAM_HH */