* The grand 2005-2006 replace.

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

diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index ad5c43d963a422ae6cad1770bfa0e7b8d206e3e1..3ca05e0ff2cc4866c536648b2c2fe6d347c573ac 100644 (file)
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -1,9 +1,9 @@
-/*   
+/*
   skyline.hh -- declare Skyline_entry and funcbs.
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SKYLINE_HH
@@ -16,25 +16,26 @@ struct Skyline_entry
 {
   Interval width_;
   Real height_;
-  Skyline_entry();
+  Skyline_entry ();
   Skyline_entry (Interval, Real);
 };
 
-
-
 void
-merge_skyline (Array<Skyline_entry> *a1, Array<Skyline_entry> const  & a2,
+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> const & 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> const &buildings,
                          Array<Skyline_entry> const &clouds);
 
+Real
+skyline_height (Array<Skyline_entry> const &buildings,
+               Real airplane, Direction sky_dir);
 
 #endif /* SKYLINE_HH */