Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh
index b1b9f9a6e55033009f86c9f6b63a63252a2ce5d7..1db127238ac82aa1a1d09eeb595cec6f7732fb4b 100644 (file)
--- a/lily/include/slur-configuration.hh
+++ b/lily/include/slur-configuration.hh
@@ -10,8 +10,19 @@
 #define SLUR_CONFIGURATION_HH
 
 #include "bezier.hh"
+#include "lily-proto.hh"
 #include "std-vector.hh"
-#include "main.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
 {
@@ -22,7 +33,7 @@ public:
   Drul_array<Offset> attachment_;
   Bezier curve_;
   Real height_;
-
+  unsigned tags_;
   int index_;
 
   Slur_configuration ();