X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftie-column-format.hh;h=8a2a16a9077925036732ae4e81ecc2aa41a78abf;hb=3b84da64116a14f6329b8a3b1d981163c61efbde;hp=a6cb8df5eb8b50bea2b649045cdc426f9bd6690b;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/include/tie-column-format.hh b/lily/include/tie-column-format.hh
index a6cb8df5eb..8a2a16a907 100644
--- a/lily/include/tie-column-format.hh
+++ b/lily/include/tie-column-format.hh
@@ -1,10 +1,20 @@
 /*
-  tie-column-format.hh -- declare Tie column format routines.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 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/>.
 */
 
 #ifndef TIE_COLUMN_FORMAT_HH
@@ -13,27 +23,26 @@
 #include "lily-proto.hh"
 #include "tie-configuration.hh"
 
-void set_chord_outline (std::vector<Skyline_entry> *skyline,
-			Link_array<Item> bounds,
-			Grob *common,
-			Direction d);
+void set_chord_outline (Skyline *skyline,
+                        vector<Item *> bounds,
+                        Grob *common,
+                        Direction d);
 void set_tie_config_directions (Ties_configuration *tie_configs_ptr);
 void shift_small_ties (Ties_configuration *tie_configs,
-		       Grob *staff_referencer,
-		       Tie_details const &details);
+                       Grob *staff_referencer,
+                       Tie_details const &details);
 void final_shape_adjustment (Tie_configuration &conf,
-			     Tie_formatting_problem const&,
-			     Grob *staff_referencer);
+                             Tie_formatting_problem const &,
+                             Grob *staff_referencer);
 void
-set_chord_outlines (Drul_array< std::vector<Skyline_entry> > *skyline_drul,
-		    Link_array<Grob> ties,
-		    Grob *common);
+set_chord_outlines (Drul_array<Skyline> *skyline_drul,
+                    vector<Grob *> ties,
+                    Grob *common);
 
 void
 set_manual_tie_configuration (Ties_configuration *tie_configs,
-			      bool *manual_override,
-			      SCM manual_configs
-			      );
-
+                              bool *manual_override,
+                              SCM manual_configs
+                             );
 
 #endif /* TIE_COLUMN_FORMAT_HH */