Cleanup: sort header order, use explicit std:: prefix rather than

[lilypond.git] / lily / balloon.cc

diff --git a/lily/balloon.cc b/lily/balloon.cc
index afaaad8e3713140a71835985f30cfd670c4244a6..1921bcb9ef1435fb08128eed6e72ce81fa86f921 100644 (file)
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -1,9 +1,20 @@
 /*
-  balloon.cc -- implement Balloon
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2007 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 "text-interface.hh"
@@ -31,7 +42,7 @@ Balloon_interface::print (SCM smob)
   Grob *p = me->get_parent (X_AXIS);
   
   Offset off (me->relative_coordinate (p, X_AXIS),
-            me->relative_coordinate (p, Y_AXIS));
+             me->relative_coordinate (p, Y_AXIS));
 
   Box b (p->extent (p, X_AXIS),
         p->extent (p, Y_AXIS));
@@ -46,7 +57,7 @@ Balloon_interface::print (SCM smob)
   SCM chain = Font_interface::text_font_alist_chain (me);
 
   SCM stencil = Text_interface::interpret_markup (me->layout ()->self_scm (),
-                                              chain, bt);
+                                                 chain, bt);
 
   Stencil *text_stil = unsmob_stencil (stencil);
 
@@ -70,7 +81,8 @@ Balloon_interface::print (SCM smob)
 }
 
 ADD_INTERFACE (Balloon_interface,
-              "A collection of routines to put text balloons around an object.",
+              "A collection of routines to put text balloons around an"
+              " object.",
 
               /* properties */
               "padding "