Imported Upstream version 2.14.2

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

diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc
index d2b016b49625419ee6a4a7c1005242e7842aaa13..f7a0337a3b8e468eb70b6e87cf2610afa0c1aa69 100644 (file)
--- a/lily/horizontal-bracket.cc
+++ b/lily/horizontal-bracket.cc
@@ -1,9 +1,20 @@
 /*
-  horizontal-bracket.cc -- implement Horizontal_bracket
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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 "horizontal-bracket.hh"       
@@ -72,19 +83,25 @@ Horizontal_bracket::make_enclosing_bracket (Grob *me, Grob *refpoint,
   Grob *common = common_refpoint_of_array (grobs, refpoint, a);
   Interval ext = Axis_group_interface::relative_group_extent (grobs, common, a);
 
-  Stencil b = make_bracket (me, ext.length(), a, dir);
-  b.translate_axis (ext[LEFT] - refpoint->relative_coordinate (common, a), a);
+  if (ext.is_empty ())
+    {
+      me->programming_error ("Can't enclose empty extents with bracket");
+      return Stencil ();
+    }
+  else
+    {
+      Stencil b = make_bracket (me, ext.length (), a, dir);
+      b.translate_axis (ext[LEFT] - refpoint->relative_coordinate (common, a), a);
 
-  return b;
+      return b;
+    }
 }
 
-
 /*
   TODO:
 
   Support texts on the brackets?
 */
-
 MAKE_SCHEME_CALLBACK (Horizontal_bracket, print, 1);
 SCM
 Horizontal_bracket::print (SCM smob)
@@ -115,7 +132,7 @@ Horizontal_bracket::print (SCM smob)
 ADD_INTERFACE (Horizontal_bracket,
               "A horizontal bracket encompassing notes.",
 
-              /* props */                
+              /* properties */           
               "bracket-flare "
               "columns "
               "edge-height "