Fix 884.

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

diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh
index 23f9cd558684c92660f4eb55c942133bcd0f12b6..a1ba3d109a4adf4ae6b1ba4c3faec5a9f9da8413 100644 (file)
--- a/lily/include/slur-configuration.hh
+++ b/lily/include/slur-configuration.hh
@@ -1,42 +1,66 @@
-/* 
-  slur-configuration.hh -- declare Slur_configuration
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2004--2010 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 SLUR_CONFIGURATION_HH
 #define SLUR_CONFIGURATION_HH
 
 #include "bezier.hh"
-#include "parray.hh"
-#include "main.hh"
+#include "lily-proto.hh"
+#include "std-vector.hh"
+
+
+enum Configuration_tag
+  {
+    SLUR_STEM = 0x01,
+    SLUR_HEAD = 0x02,
+    SLUR_FREE = 0x04,
+    SLUR_FREE_HEAD = 0x08,
+    SLUR_FREE_STEM = 0x10,
+    SLUR_STEM_TIP = 0x10,
+  };
 
 class Slur_configuration
 {
+  Real score_;
+  string score_card_;
+
 public:
   Drul_array<Offset> attachment_;
-  Real score_;
   Bezier curve_;
   Real height_;
-  
+  unsigned tags_;
   int index_;
-  
-#if DEBUG_SLUR_SCORING
-  String score_card_;
-#endif
 
   Slur_configuration ();
 
-  void generate_curve (Slur_score_state const &state, Real r0, Real h_inf);
-  void score (Slur_score_state const&);
+  Real score () const { return score_; }
+  string card () const { return score_card_; } 
+  void add_score (Real, string);
+  
+  void generate_curve (Slur_score_state const &state, Real r0, Real h_inf,
+                      vector<Offset> const &);
+  void calculate_score (Slur_score_state const &);
 protected:
-  void score_extra_encompass (Slur_score_state const&);
-  void score_slopes  (Slur_score_state const&);
-  void score_edges (Slur_score_state const&);
-  void score_encompass (Slur_score_state const&);
+  void score_extra_encompass (Slur_score_state const &);
+  void score_slopes (Slur_score_state const &);
+  void score_edges (Slur_score_state const &);
+  void score_encompass (Slur_score_state const &);
 };
 
 #endif /* SLUR_CONFIGURATION_HH */