Release: bump Welcome versions.

[lilypond.git] / lily / volta-bracket.cc

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index 65e57ea3b179c1d09878379e5cb3c3a98eaba0fd..e337a34b34320c6f4a1b18b95edb205688ac399a 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -18,6 +18,7 @@
 */
 
 #include <cstring>
+using namespace std;
 
 #include "warn.hh"
 #include "font-interface.hh"
@@ -30,11 +31,9 @@
 #include "side-position-interface.hh"
 #include "directional-element-interface.hh"
 #include "lookup.hh"
-#include "tuplet-bracket.hh"
+#include "bracket.hh"
 #include "lily-imports.hh"
 
-using std::string;
-
 /*
   this is too complicated. Yet another version of side-positioning,
   badly implemented.
@@ -95,12 +94,9 @@ Volta_bracket_interface::print (SCM smob)
   Offset start;
   start[X_AXIS] = me->spanner_length () - left;
 
-  /*
-    ugh, Tuplet_bracket should use Horizontal_bracket, not the other way around.
-  */
   Stencil total
-    = Tuplet_bracket::make_bracket (me, Y_AXIS, start,
-                                    edge_height, empty, flare, shorten);
+    = Bracket::make_bracket (me, Y_AXIS, start, edge_height, empty,
+                             flare, shorten);
 
   if (!orig_span || broken_first_bracket)
     {