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

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 186205195a609543ac02d4c40896fe74d7819837..044a392851df4ee626f48e6852b655e6762cd4a3 100644 (file)
--- 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 4b5710015984c788ff2c00208168e35bb98f745e..08fe3c769e05a9c258b303b1840ca0669042e9bd 100644 (file)
--- 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 312fae8265c8e9eda869aaaa83dde122f89ef4e6..569d01f9c9ca11d59334845e0fe14858e5766713 100644 (file)
--- 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 8e48cf5cccc137f26b09626ee764fef7b53681bc..a567f3c6bd50c336e56773b14209efeb2d81eb45 100644 (file)
--- 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 4ce44586d59f9bfd4f2885a03c8485167e61af3b..100061a19c01aeb1c59d1eb5e826c70fbafefa41 100644 (file)
--- 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 6143d7acb051f2380762c61dc5bdc2a229d259dd..f55b2673d1f54836dc82adf8bdde7ea6f33629bf 100644 (file)
--- 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)
 {