X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=258c538d9db3a93f56fd4ab905d4f68b0ee9e9c0;hb=795708fdc77fccf592103e995d97ea5fda9e094f;hp=1b9710034c06b92664e819b6c5ae6fac121ecc40;hpb=1bdf3db27451a0873b2c97545f0beab2f5cce06a;p=lilypond.git

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 1b9710034c..258c538d9d 100644
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -1,62 +1,84 @@
 /*
   beam.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef BEAM_HH
 #define BEAM_HH
+
 #include "lily-proto.hh"
 #include "directional-spanner.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 {
+  beam and that point in the correct direction
+
+elt property:
+
+damping: amount of beam slope damping. (int)
+
+should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams 
+
+slope_quantisation: 'none, 'normal or 'traditional
+
+*/
+class Beam : public Directional_spanner  {
 public:
-  enum Pos { NONE, SIT = 1, STRADDLE = 2, HANG = 4, INTER = 8 };
-  // ugh, silly C++
-  enum Quantise { NUN, NORMAL, TRADITIONAL };
 
-  Link_array<Stem> stems_;
-  /// the slope of the beam in posns / point (dimension)   
+  int stem_count () const;
+  Stem* stem (int) const;
+  Stem* stem_top () const;
+  int visible_stem_count () const;
+  Stem* first_visible_stem () const;
+  Stem* last_visible_stem () const;
+
+  /**
+     the slope of the beam in (staffpositions) per (X-dimension, in PT).
+     UGH. standardise this for once and for all.
+   */
   Real 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
-  Quantise quantisation_;
-  /// maximum number of beams (for opening-up of beam-spacing)
-  int multiple_i_;
 
+  /** 
+   */
 
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Beam();
-  void add (Stem*);
+  Beam ();
+  void add_stem (Stem*);
 
   void set_grouping (Rhythmic_grouping def, Rhythmic_grouping current);
+  void set_beaming (Beaming_info_list *);
   void set_stemlens ();
-  SCORE_ELEM_CLONE (Beam);
+  VIRTUAL_COPY_CONS(Score_element);
+  int multiplicity_i () const;
 
 protected:
-  virtual Interval do_width () const;    
   Offset center () const;
-  void set_default_dir ();
+  Direction get_default_dir () const;
+  void set_direction (Direction);
+  void set_stem_shorten ();
+  bool auto_knee (SCM gap, bool interstaff_b);
+  bool auto_knees ();
+  
   virtual void do_pre_processing ();
   virtual void do_post_processing ();
-  virtual void do_substitute_dependent (Score_elem*, Score_elem*);
-
   virtual void do_print() const;
+  virtual Molecule*do_brew_molecule_p () const;
+
+  Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
+
+private:
+  void calculate_slope ();
+  Real check_stemlengths_f (bool set_b);
+  void solve_slope ();
+
+  void quantise_left_y (bool extend_b);
+  void quantise_dy ();
 
-  virtual void quantise_left_y (Beam::Pos pos, bool extend_b);
-  virtual Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
-  virtual void solve_slope ();
-  virtual void quantise_yspan ();
-  virtual Molecule*brew_molecule_p () const;
 };
 
 #endif // BEAM_HH