X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fskyline-pair.hh;h=0d37f794f4557d9e7dfb04a57d749afdabeb0585;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=08fe3c769e05a9c258b303b1840ca0669042e9bd;hpb=23093de8c16965c17ef06ada9949cfaa14933dff;p=lilypond.git

diff --git a/lily/include/skyline-pair.hh b/lily/include/skyline-pair.hh
index 08fe3c769e..0d37f794f4 100644
--- a/lily/include/skyline-pair.hh
+++ b/lily/include/skyline-pair.hh
@@ -1,10 +1,20 @@
-/* 
-  skyline-pair.hh -- declare Skyline_pair
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2008 Han-Wen Nienhuys <hanwen@lilypond.org>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2008--2014 Han-Wen Nienhuys <hanwen@lilypond.org>
+
+  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 SKYLINE_PAIR_HH
@@ -17,20 +27,28 @@ class Skyline_pair
 private:
   Drul_array<Skyline> skylines_;
 
-  DECLARE_SIMPLE_SMOBS(Skyline_pair);
+  DECLARE_SIMPLE_SMOBS (Skyline_pair);
 public:
   Skyline_pair ();
-  Skyline_pair (vector<Box> const &boxes, Real horizon_padding, Axis a);
-  Skyline_pair (Box const &, Real horizon_padding, Axis a);
+  Skyline_pair (vector<Box> const &boxes, Axis a);
+  Skyline_pair (vector<Drul_array<Offset> > const &buildings, Axis a);
+  Skyline_pair (vector<Skyline_pair> const &skypairs);
+  Skyline_pair (Box const &, Axis a);
+
+  Real left () const;
+  Real right () const;
   void raise (Real);
   void shift (Real);
-  void insert (Box const &, Real horizon_padding, Axis);
+  void deholify ();
+  void insert (Box const &, Axis);
   void merge (Skyline_pair const &other);
   Skyline &operator [] (Direction d);
   Skyline const &operator [] (Direction d) const;
   bool is_empty () const;
   void print () const;
   void print_points () const;
+
+  DECLARE_SCHEME_CALLBACK (skyline, (SCM, SCM));
 };
 
 #endif /* SKYLINE_PAIR_HH */