Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / part-combine-iterator.cc

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index 9ab0495ae14ce909838c5498e5421d28590fd5bf..eb1cca43e57092ed886f3166c6ae739d97c03970 100644 (file)
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Han-Wen Nienhuys
+  Copyright (C) 2004--2012 Han-Wen Nienhuys
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -159,7 +159,8 @@ Part_combine_iterator::derived_mark () const
   if (second_iter_)
     scm_gc_mark (second_iter_->self_scm ());
 
-  Stream_event *ptrs[] =
+  Stream_event *ptrs[]
+  =
   {
     unisono_event_,
     mmrest_event_,
@@ -421,7 +422,7 @@ Part_combine_iterator::construct_children ()
 
       if (scm_is_number (direction_))
         execute_pushpop_property (shared, sym,
-                                 ly_symbol2scm ("direction"), direction_);
+                                  ly_symbol2scm ("direction"), direction_);
     }
   /* Handle horizontal shifts for crossing notes */
   execute_pushpop_property (one, ly_symbol2scm ("NoteColumn"),