Run `make grand-replace'.

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

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index d601e476e6b711286a536795c09f631afcfc2d11..494cbfb1c336ec74d2d62e56abbe92bee02f5402 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cstring>
@@ -74,6 +74,8 @@ Volta_bracket_interface::print (SCM smob)
   Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
                                                  Interval (0, 0));
 
+
+  
   scale_drul (&edge_height, - Real (get_grob_direction (me)));
 
   Interval empty;
@@ -97,7 +99,7 @@ Volta_bracket_interface::print (SCM smob)
       num.align_to (Y_AXIS, UP);
       num.translate_axis (-0.5, Y_AXIS);
       total.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
-                        - 1.0, 0);
+                        - 1.0);
     }
   
   total.translate_axis (left, X_AXIS);
@@ -117,7 +119,7 @@ Volta_bracket_interface::modify_edge_height (Spanner *me)
 
   extract_grob_set (me, "bars", bars);
   Grob *endbar = bars.size () ? bars.back () : 0;
-  SCM glyph = endbar ? endbar->get_property ("glyph") : SCM_EOL;
+  SCM glyph = endbar ? endbar->get_property ("glyph-name") : SCM_EOL;
 
   string str;
   if (scm_is_string (glyph))
@@ -130,6 +132,8 @@ Volta_bracket_interface::modify_edge_height (Spanner *me)
        && str != "|:"
        && str != "|."
        && str != ":|:"
+       && str != ":|.|:"
+       && str != ":|.:"
        && str != ".|");
 
   if (no_vertical_end || no_vertical_start)
@@ -154,21 +158,15 @@ void
 Volta_bracket_interface::add_bar (Grob *me, Item *b)
 {
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("bars"), b);
-  Side_position_interface::add_support (me, b);
   add_bound_item (dynamic_cast<Spanner *> (me), b);
 }
 
-void
-Volta_bracket_interface::add_column (Grob *me, Grob *c)
-{
-  Side_position_interface::add_support (me, c);
-}
-
-ADD_INTERFACE (Volta_bracket_interface, "volta-bracket-interface",
-              "Volta bracket with number",
+ADD_INTERFACE (Volta_bracket_interface,
+              "Volta bracket with number.",
 
               /* properties */
               "bars "
               "thickness "
-              "height");
+              "height "
+              );