Merge branch 'master' into translation

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

diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index c300895fee11bed4e109a896bb3989529b2b59c1..23aaba30bfe9f61f028ecb12c8681019ebfac6fd 100644 (file)
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -34,7 +34,7 @@ struct Building
 {
   Real start_;
   Real end_;
-  Real y_intercept_;
+  Real start_height_;
   Real slope_;
 
   void precompute (Real start, Real start_height, Real end_height, Real end);
@@ -46,7 +46,6 @@ struct Building
   Real intersection_x (Building const &other) const;
   void leading_part (Real chop);
   bool conceals (Building const &other, Real x) const;
-  Real shift_to_intersect (Real x, Real y) const;
 };
 
 class Skyline
@@ -92,6 +91,7 @@ public:
   Real max_height_position () const;
   Real left () const;
   Real right () const;
+  Direction direction () const;
   void set_minimum_height (Real height);
   void clear ();
   bool is_empty () const;