release: 1.3.44

[lilypond.git] / lily / include / beam.hh

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index d3d3c71afd089c50f6567e5a5270393a4226f70c..768d07aaa75c311e71c229467b122fe6a115f417 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -1,31 +1,30 @@
 /*
   beam.hh -- part of GNU LilyPond
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2000 Han-Wen Nienhuys
 */
 
 #ifndef BEAM_HH
 #define BEAM_HH
 
 #include "lily-proto.hh"
-#include "directional-spanner.hh"
+#include "spanner.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
+  beam and that point in the correct direction (urg?)
 
-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
+   elt_properties:
+   y-position: real  (position of left edge)
+   height: real  (dy)
 
+   damping: amount of beam slope damping. (int)
+   should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams 
 */
-class Beam : public Directional_spanner  {
+class Beam : public Spanner
+{
 public:
 
   int stem_count () const;
@@ -35,53 +34,37 @@ public:
   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_;
-
-  /** 
-    highest number of beams present, for opening-up of beam-spacing
-    and calculation of stem lengths
-   */
-  int multiplicity_i_;
-
   Beam ();
   void add_stem (Stem*);
-
   void set_grouping (Rhythmic_grouping def, Rhythmic_grouping current);
   void set_beaming (Beaming_info_list *);
   void set_stemlens ();
   VIRTUAL_COPY_CONS(Score_element);
 
+  int get_multiplicity () const;
+
 protected:
-  Offset center () const;
-  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_add_processing ();
-  virtual void do_print() const;
-  virtual Molecule*do_brew_molecule_p () const;
+ 
+  virtual void before_line_breaking ();
+  virtual void after_line_breaking ();
+  virtual Molecule do_brew_molecule () 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 ();
-
+  Direction get_default_dir () const;
+  void set_stem_directions ();
+  void auto_knees ();
+  bool auto_knee (String gap_str, bool interstaff_b);
+  void set_stem_shorten ();
+  void calc_default_position_and_height (Real* y, Real* dy) const;
+  bool suspect_slope_b (Real y, Real dy) const;
+  Real calc_slope_damping_f (Real dy) const;
+  Real calc_stem_y_f (Stem* s, Real y, Real dy) const;
+  Real check_stem_length_f (Real y, Real dy) const;
+  void set_stem_length (Real y, Real dy);
+  Real quantise_dy_f (Real dy) const;
+  Real quantise_y_f (Real y, Real dy, int quant_dir);
+  int forced_stem_count () const;
 };
 
 #endif // BEAM_HH