Imported Upstream version 2.14.2

[lilypond.git] / lily / include / tie-column-format.hh

diff --git a/lily/include/tie-column-format.hh b/lily/include/tie-column-format.hh
index 500ac5882a1ee8a6189bab36995dc66f72c6a043..0a5ca6cacf5a7359a9860fe8dfdbb0062b074a6b 100644 (file)
--- a/lily/include/tie-column-format.hh
+++ b/lily/include/tie-column-format.hh
@@ -1,19 +1,30 @@
 /*
-  tie-column-format.hh -- declare
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 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
 #define TIE_COLUMN_FORMAT_HH
 
+#include "lily-proto.hh"
+#include "tie-configuration.hh"
 
-
-void set_chord_outline (Array<Skyline_entry> *skyline,
-                       Link_array<Item> bounds,
+void set_chord_outline (Skyline *skyline,
+                       vector<Item*> bounds,
                        Grob *common,
                        Direction d);
 void set_tie_config_directions (Ties_configuration *tie_configs_ptr);
@@ -22,11 +33,10 @@ void shift_small_ties (Ties_configuration *tie_configs,
                       Tie_details const &details);
 void final_shape_adjustment (Tie_configuration &conf,
                             Tie_formatting_problem const&,
-                            Grob *staff_referencer,
-                            Tie_details const &details);
+                            Grob *staff_referencer);
 void
-set_chord_outlines (Drul_array< Array<Skyline_entry> > *skyline_drul,
-                   Link_array<Grob> ties,
+set_chord_outlines (Drul_array<Skyline> *skyline_drul,
+                   vector<Grob*> ties,
                    Grob *common);
 
 void