Merge remote-tracking branch 'origin/translation'

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

diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index 23aaba30bfe9f61f028ecb12c8681019ebfac6fd..bdb8be78131f448921c1459413dae4b2417635c9 100644 (file)
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2012 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2006--2014 Joe Neeman <joeneeman@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ struct Building
 {
   Real start_;
   Real end_;
-  Real start_height_;
+  Real y_intercept_;
   Real slope_;
 
   void precompute (Real start, Real start_height, Real end_height, Real end);
@@ -46,6 +46,7 @@ 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
@@ -65,7 +66,6 @@ private:
 
 public:
   Skyline ();
-  Skyline (Skyline const &src);
   Skyline (Direction sky);
   Skyline (vector<Box> const &bldgs, Axis a, Direction sky);
   Skyline (vector<Drul_array<Offset> > const &bldgs, Axis a, Direction sky);