X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=931ef3b04144fd56d660d964172dbd6c15328245;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=2775f7acab3367b99548ee1c05424a605826374e;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 2775f7acab..931ef3b041 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,27 +1,26 @@
-/*   
-  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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "music.hh"
 #include "pitch.hh"
+#include "moment.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 ();
 }