Run grand-replace (issue 3765)

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

diff --git a/lily/include/skyline-pair.hh b/lily/include/skyline-pair.hh
index b32bd13815a522a01717f2e582630354eb0d5003..0d37f794f4557d9e7dfb04a57d749afdabeb0585 100644 (file)
--- a/lily/include/skyline-pair.hh
+++ b/lily/include/skyline-pair.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2008--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
+  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
@@ -27,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 */