X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftuplet-spanner.hh;h=e20141319792a79f8b16e235319141cf5b9ca7c4;hb=a6193f6f613e0b2ff519b804d28f99fcd6ec9b92;hp=2faa3bcd489d1ccb2d97c09eda9eda6f0c616c25;hpb=0d17e9c759bd61c9b20a7c4d9941a412c2a53f5f;p=lilypond.git

diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh
index 2faa3bcd48..e201413197 100644
--- a/lily/include/tuplet-spanner.hh
+++ b/lily/include/tuplet-spanner.hh
@@ -1,14 +1,14 @@
 /*
   plet-spanner.hh -- part of GNU LilyPond
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef Tuplet_spanner_HH
 #define Tuplet_spanner_HH
 
 #include "pointer.hh"
-#include "directional-spanner.hh"
+#include "spanner.hh"
 
 /** supportable plet: triplets, eentweetjes, ottava, etc.
 
@@ -17,29 +17,22 @@
 
   todo: handle breaking elegantly.
 */
-class Tuplet_spanner : public Directional_spanner
+class Tuplet_spanner : public Spanner
 {
 public:
   Tuplet_spanner ();
  
   void add_column (Note_column*);
   void add_beam (Beam*);
-  
-
-  String  number_str_;
-
-  bool parallel_beam_b_;
-  
 protected:
-  Link_array<Beam> beam_l_arr_;
-  Link_array<Note_column> column_arr_;
-
+  void calc_dy (Real *) const;
+  void calc_position_and_height (Real*,Real *dy)const;
+  
   virtual Molecule* do_brew_molecule_p () const;
   VIRTUAL_COPY_CONS(Score_element);
   virtual void do_add_processing ();
   virtual void do_post_processing ();
   virtual Direction get_default_dir () const;
-  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
 };
 
 #endif // Tuplet_spanner_HH