X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftie-configuration.hh;h=62b6a15a725ffdb9526a4369f7cd1895a21b4780;hb=058370efc7e9710f149d0f444328bb1fcd7bdec1;hp=1e48922d68c2159767f2b058adfaf6c76e870082;hpb=849ed54c1a272dac222d975e3c8d3e532aaa8f27;p=lilypond.git

diff --git a/lily/include/tie-configuration.hh b/lily/include/tie-configuration.hh
index 1e48922d68..62b6a15a72 100644
--- a/lily/include/tie-configuration.hh
+++ b/lily/include/tie-configuration.hh
@@ -1,21 +1,29 @@
 /*
-  tie-configuration.hh -- declare Tie_configuration
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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
 {
@@ -25,6 +33,7 @@ class Tie_configuration
   Real score_;
   bool scored_;
   friend class Tie_formatting_problem;
+
 public:
   Real score () const { return score_; }
   string card () const { return score_card_; }
@@ -32,21 +41,23 @@ public:
   int position_;
   Direction dir_;
   Real delta_y_;
+  Drul_array<int> column_ranks_;
 
   /* computed. */
   Interval attachment_x_;
 
-  void add_score (Real, string);
+  void add_score (Real, const string&);
   Tie_configuration ();
   void center_tie_vertically (Tie_details const &);
   Bezier get_transformed_bezier (Tie_details const &) const;
   Bezier get_untransformed_bezier (Tie_details const &) const;
-  Real height (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);
+                      Tie_configuration const &b);
   static Real distance (Tie_configuration const &a,
-		       Tie_configuration const &b);
+                        Tie_configuration const &b);
 };
 
 INSTANTIATE_COMPARE (Tie_configuration, Tie_configuration::compare);
@@ -61,15 +72,15 @@ class Ties_configuration : public vector<Tie_configuration>
   friend class Tie_formatting_problem;
 public:
   Ties_configuration ();
-  void add_score (Real amount, string description);
-  void add_tie_score (Real amount, int i, string description);
+  void add_score (Real amount, const string &description);
+  void add_tie_score (Real amount, int i, const string &description);
   Real score () const;
   void reset_score ();
-  string card () const; 
+  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 */
 
-
-