X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=7895e154a75eb536080c9034e0c1d1e469b54fc1;hb=1efdfdaed5cd51abfe5da5e4f5731fe9396c96f2;hp=e3fd0e08b2541f6cc8aa0272ae6f67047e9ac33a;hpb=1a112025ae1b44da63bfaf8c68c1b9d1b0da0bd4;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index e3fd0e08b2..7895e154a7 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,27 +1,24 @@
-/*   
-  lyric-combine-music.cc --  implement Lyric_combine_music
-  
+/*
+  lyric-combine-music.cc -- implement Lyric_combine_music
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "music.hh"
-#include "pitch.hh"
 
 struct Lyric_combine_music
 {
 public:
-  DECLARE_SCHEME_CALLBACK(length_callback,(SCM));
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
 };
 
-
-MAKE_SCHEME_CALLBACK(Lyric_combine_music,length_callback,1);
+MAKE_SCHEME_CALLBACK (Lyric_combine_music, length_callback, 1);
 SCM
 Lyric_combine_music::length_callback (SCM m)
 {
-  Music * me = unsmob_music (m);
+  Music *me = unsmob_music (m);
   Music *melody = unsmob_music (scm_car (me->get_property ("elements")));
   return melody->get_length ().smobbed_copy ();
 }