release: 1.3.67

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

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 99eac088af3a3482a4090bb07614e468c337f40b..9a85134d641b1f1795c17888365f0536f5ca24f2 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -26,7 +26,7 @@
 class Beam : public Spanner
 {
 public:
-  static SCM scheme_molecule (SCM);
+  static SCM brew_molecule (SCM);
   
 
   int stem_count () const;
@@ -35,7 +35,7 @@ public:
   int visible_stem_count () const;
   Stem* first_visible_stem () const;
   Stem* last_visible_stem () const;
-
+  static Real rest_collision_callback (Score_element const*,Axis);
   Beam (SCM);
   void add_stem (Stem*);
   void set_grouping (Rhythmic_grouping def, Rhythmic_grouping current);
@@ -45,11 +45,13 @@ public:
 
   int get_multiplicity () const;
 
-protected:
+public:
  
-  virtual void before_line_breaking ();
-  virtual void after_line_breaking ();
-  virtual Molecule do_brew_molecule () const;
+  SCM member_before_line_breaking ();
+  static SCM before_line_breaking (SCM);
+  SCM member_after_line_breaking ();
+  static SCM after_line_breaking (SCM);
+  SCM member_brew_molecule () const;
 
   Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
 private: