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 eca597f8916a29b54184163507f9d818dd5ca543..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
@@ -47,7 +47,6 @@ struct Building
   void leading_part (Real chop);
   bool conceals (Building const &other, Real x) const;
   Real shift_to_intersect (Real x, Real y) const;
-  Interval overlapping_shift_interval (Building const &other) const;
 };
 
 class Skyline
@@ -57,7 +56,7 @@ private:
   Direction sky_;
 
   void internal_merge_skyline (list<Building> *, list<Building> *,
-                               list<Building> *const result) const;
+                               list<Building> *result) const;
   list<Building> internal_build_skyline (list<Building> *) const;
   Real internal_distance (Skyline const &, Real horizon_padding, Real *touch_point) const;
   Real internal_distance (Skyline const &, Real *touch_point) const;
@@ -67,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);
@@ -91,6 +89,9 @@ public:
   Real height (Real airplane) const;
   Real max_height () const;
   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;