X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvolta-bracket.cc;h=c135e525682b877a77b4b4fa826fbeaa7d3407db;hb=0052082fd05c21b95cdd5f20c2a11d14e3ce2d1f;hp=fb3cb12fc604341342dfe847e77189fbb08bf07e;hpb=e9a308e9c6002900fc336733950a0175bcbcc333;p=lilypond.git

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index fb3cb12fc6..c135e52568 100644
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -1,9 +1,20 @@
 /*
-  volta-bracket.cc -- implement Volta_bracket_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  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/>.
 */
 
 #include <cstring>
@@ -119,7 +130,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 +143,8 @@ Volta_bracket_interface::modify_edge_height (Spanner *me)
 	&& str != "|:"
 	&& str != "|."
 	&& str != ":|:"
+	&& str != ":|.|:"
+	&& str != ":|.:"
 	&& str != ".|");
 
   if (no_vertical_end || no_vertical_start)
@@ -156,15 +169,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);
 }
 
 ADD_INTERFACE (Volta_bracket_interface,
-	       "Volta bracket with number",
+	       "Volta bracket with number.",
 
 	       /* properties */
 	       "bars "
 	       "thickness "
-	       "height");
+	       "height "
+	       );