lilypond-0.0.50

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 8eb2f148b557b2af4a50357362d6f473aa1ea9b8..a85858bad82c9c62d78ca0b0056c2778c9a61118 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -25,7 +25,7 @@ struct Beam:  public Directional_spanner {
     /* *************** */
 NAME_MEMBERS(Beam);
     
-    virtual Interval width()const;    
+    virtual Interval do_width()const;    
     Offset center() const;
     Spanner *do_break_at(PCol *,  PCol *) const;
     Beam();

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 34776ea49cec6b45965221871b18e516d3d28f0a..e64aafdd6958cd6ca5e4f0c6b9626732ae478f95 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -51,7 +51,7 @@ struct Stem : Item {
        -1 stem points down, +1: stem points up
        */
 
-    int dir;
+    int dir_i_;
     Real stem_xoffset;
     
     Array<Notehead*> heads;
@@ -74,7 +74,7 @@ struct Stem : Item {
     void set_noteheads();
     void do_pre_processing();
 
-    Interval width() const;
+    virtual Interval do_width() const;
 
     Molecule* brew_molecule_p() const;
 };