From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 1 May 2008 20:09:11 +0000 (-0300)
Subject: Add Skyline_pair::print[_point](), add some minor cleanups.
X-Git-Tag: release/2.11.46-1~28^2~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=524bd19f7f02c87ce421cb7776f1894c973b2f7f;p=lilypond.git

Add Skyline_pair::print[_point](), add some minor cleanups.
---

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 186205195a..044a392851 100644
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -630,7 +630,6 @@ Axis_group_interface::calc_max_stretch (SCM smob)
   return scm_from_double (ret);
 }
 
-extern bool debug_skylines;
 MAKE_SCHEME_CALLBACK (Axis_group_interface, print, 1)
 SCM
 Axis_group_interface::print (SCM smob)
@@ -642,8 +641,10 @@ Axis_group_interface::print (SCM smob)
   Stencil ret;
   if (Skyline_pair *s = Skyline_pair::unsmob (me->get_property ("vertical-skylines")))
     {
-      ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[UP].to_points (X_AXIS)).in_color (255, 0, 255));
-      ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[DOWN].to_points (X_AXIS)).in_color (0, 255, 255));
+      ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[UP].to_points (X_AXIS))
+		       .in_color (255, 0, 255));
+      ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[DOWN].to_points (X_AXIS))
+		       .in_color (0, 255, 255));
     }
   return ret.smobbed_copy ();
 }
diff --git a/lily/include/skyline-pair.hh b/lily/include/skyline-pair.hh
index 4b57100159..08fe3c769e 100644
--- a/lily/include/skyline-pair.hh
+++ b/lily/include/skyline-pair.hh
@@ -30,6 +30,7 @@ public:
   Skyline const &operator [] (Direction d) const;
   bool is_empty () const;
   void print () const;
+  void print_points () const;
 };
 
 #endif /* SKYLINE_PAIR_HH */
diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index 312fae8265..569d01f9c9 100644
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -70,5 +70,7 @@ public:
   bool is_empty () const;
 };
 
+extern bool debug_skylines;
+
 #endif /* SKYLINE_HH */
 
diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 8e48cf5ccc..a567f3c6bd 100644
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -137,7 +137,6 @@ Separation_item::boxes (Grob *me, Grob *left)
   return out;      
 }
 
-extern bool debug_skylines;
 MAKE_SCHEME_CALLBACK (Separation_item, print, 1)
 SCM
 Separation_item::print (SCM smob)
diff --git a/lily/skyline-pair.cc b/lily/skyline-pair.cc
index 4ce44586d5..100061a19c 100644
--- a/lily/skyline-pair.cc
+++ b/lily/skyline-pair.cc
@@ -54,6 +54,20 @@ Skyline_pair::merge (Skyline_pair const &other)
   skylines_[DOWN].merge (other[DOWN]);
 }
 
+void
+Skyline_pair::print () const
+{
+  skylines_[UP].print ();
+  skylines_[DOWN].print ();
+}
+
+void
+Skyline_pair::print_points () const
+{
+  skylines_[UP].print ();
+  skylines_[DOWN].print ();
+}
+
 
 bool
 Skyline_pair::is_empty () const
@@ -78,8 +92,6 @@ IMPLEMENT_SIMPLE_SMOBS (Skyline_pair);
 IMPLEMENT_TYPE_P (Skyline_pair, "ly:skyline-pair?");
 IMPLEMENT_DEFAULT_EQUAL_P (Skyline_pair);
 
-
-
 SCM
 Skyline_pair::mark_smob (SCM)
 {
diff --git a/lily/system.cc b/lily/system.cc
index 6143d7acb0..f55b2673d1 100644
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -24,8 +24,6 @@
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
 
-extern bool debug_skylines;
-
 System::System (System const &src)
   : Spanner (src)
 {