2003 -> 2004

[lilypond.git] / lily / include / skyline.hh

diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index 0a477b8a7b7f04708d53cff9fb62e9e8cd3e20ae..ad5c43d963a422ae6cad1770bfa0e7b8d206e3e1 100644 (file)
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef SKYLINE_HH
@@ -20,14 +20,20 @@ struct Skyline_entry
   Skyline_entry (Interval, Real);
 };
 
+
+
 void
-insert_extent_into_skyline (Array<Skyline_entry> *line, Box b, Axis line_axis,
-                           Direction d);
+merge_skyline (Array<Skyline_entry> *a1, Array<Skyline_entry> const  & a2,
+              Direction);
+void insert_extent_into_skyline (Array<Skyline_entry> *line, Box b, Axis line_axis,
+                                Direction d);
 Array<Skyline_entry>
-extents_to_skyline (Array<Box> extents, Axis a, Direction d);
+extents_to_skyline (Array<Box> const & extents, Axis a, Direction d);
+Array<Skyline_entry> empty_skyline (Direction d);
+void heighten_skyline (Array<Skyline_entry> *buildings, Real ground);
 Real
-skyline_meshing_distance (Array<Skyline_entry> buildings,
-                         Array<Skyline_entry> clouds);
+skyline_meshing_distance (Array<Skyline_entry> const &buildings,
+                         Array<Skyline_entry> const &clouds);
 
 
 #endif /* SKYLINE_HH */