Run `make grand-replace'.

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

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index 49018d8adb1692f4a3913bde223974ad6813a73f..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--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cstring>
@@ -119,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))
@@ -132,6 +132,8 @@ Volta_bracket_interface::modify_edge_height (Spanner *me)
        && str != "|:"
        && str != "|."
        && str != ":|:"
+       && str != ":|.|:"
+       && str != ":|.:"
        && str != ".|");
 
   if (no_vertical_end || no_vertical_start)
@@ -156,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 with number",
+              "Volta bracket with number.",
 
               /* properties */
               "bars "
               "thickness "
-              "height");
+              "height "
+              );