Merge branch 'master' into nested-bookparts

[lilypond.git] / lily / include / tie-configuration.hh

diff --git a/lily/include/tie-configuration.hh b/lily/include/tie-configuration.hh
index 0594de6eaf8eb4d9bc27573f9a80ad7c2b7c4b6e..d65604c1dc195f34264eeceebca5229db629fbe9 100644 (file)
--- a/lily/include/tie-configuration.hh
+++ b/lily/include/tie-configuration.hh
@@ -3,19 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
 #ifndef TIE_CONFIGURATION_HH
 #define TIE_CONFIGURATION_HH
 
-#include "main.hh"
-#include "lily-proto.hh"
 #include "direction.hh"
 #include "interval.hh"
-#include "compare.hh"
 #include "std-vector.hh"
+#include "main.hh" // DEBUG_SLUR_SCORING
 
 class Tie_configuration
 {
@@ -44,6 +42,7 @@ public:
   Bezier get_transformed_bezier (Tie_details const &) const;
   Bezier get_untransformed_bezier (Tie_details const &) const;
   Real height (Tie_details const&) const;
+  int column_span_length () const;
   
   static int compare (Tie_configuration const &a,
                      Tie_configuration const &b);
@@ -69,6 +68,8 @@ public:
   void reset_score ();
   string card () const; 
   string tie_card (int i) const { return tie_score_cards_[i]; }
+  string complete_tie_card (vsize i) const;
+  string complete_score_card () const; 
 };
 
 #endif /* TIE_CONFIGURATION_HH */