release: 1.3.10

[lilypond.git] / lily / include / tuplet-spanner.hh

diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh
index 224d88b17cd67253994d26e11f7cd8c989cf68c1..2fd0a5ff16efd2660d1edd9acfc81ab673682179 100644 (file)
--- a/lily/include/tuplet-spanner.hh
+++ b/lily/include/tuplet-spanner.hh
@@ -6,34 +6,36 @@
 
 #ifndef Tuplet_spanner_HH
 #define Tuplet_spanner_HH
-#include "text-def.hh"
+
 #include "pointer.hh"
 #include "directional-spanner.hh"
 
-/** supportable plet: triplets, eentweetjes, ottava, etc.  */
+/** supportable plet: triplets, eentweetjes, ottava, etc.
+
+    TODO: quantise, we don't want to collide with staff lines.
+    (or should we be above staff?)
 
+  todo: handle breaking elegantly.
+*/
 class Tuplet_spanner : public Directional_spanner
 {
 public:
   Tuplet_spanner ();
  
   void add_column (Note_column*);
-  void set_beam (Beam*);
-  P<Text_def>  tdef_p_;
-  bool bracket_visibility_b_;
-  bool num_visibility_b_;
+  void add_beam (Beam*);
   
-protected:
-  Beam *beam_l_;
-  Link_array<Note_column> column_arr_;
 
+  String  number_str_;
+
+  bool parallel_beam_b_;
+  
+protected:
   virtual Molecule* do_brew_molecule_p () const;
   VIRTUAL_COPY_CONS(Score_element);
-
   virtual void do_add_processing ();
   virtual void do_post_processing ();
-  virtual void set_default_dir ();
-  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
+  virtual Direction get_default_dir () const;
 };
 
 #endif // Tuplet_spanner_HH