resolve merge

[lilypond.git] / lily / include / tuplet-bracket.hh

diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh
index 794ac9524eb8554ed219add7b8369f675cb64371..17285a09178107cbde3c90cb74c0e61a7d1ca214 100644 (file)
--- a/lily/include/tuplet-bracket.hh
+++ b/lily/include/tuplet-bracket.hh
@@ -1,7 +1,20 @@
 /*
-  tuplet-bracket.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2011 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/>.
 */
 
 #ifndef Tuplet_bracket_HH
@@ -27,9 +40,10 @@ public:
   static void get_bounds (Grob *, Grob **, Grob **);
   static void add_column (Grob *me, Item *);
   static void add_beam (Grob *me, Grob *);
-  static Grob *parallel_beam (Grob *me, vector<Grob*> const &cols, bool *equally_long);
+  static Grob *parallel_beam (Grob *me, vector<Grob*> const &cols,
+                             bool *equally_long);
   static void calc_position_and_height (Grob *, Real *, Real *dy);
-  static Stencil make_bracket (Grob *me, Axis protusion_axis,
+  static Stencil make_bracket (Grob *me, Axis protrusion_axis,
                               Offset dz, Drul_array<Real> height,
                               Interval gap, Drul_array<Real> widen,
                               Drul_array<Real> shorten);