Merge with master

[lilypond.git] / lily / paper-column.cc

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 7d5009b957ef30115e6a223cb1add52b1006d6e8..4dba6bbbd58f08784b55e5cbef2e38e96edc8355 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
@@ -25,9 +25,9 @@
 #include "string-convert.hh"
 
 Grob *
-Paper_column::clone (int count) const
+Paper_column::clone () const
 {
-  return new Paper_column (*this, count);
+  return new Paper_column (*this);
 }
 
 void
@@ -60,15 +60,15 @@ Paper_column::get_column () const
   return (Paper_column *) (this);
 }
 
-Paper_column::Paper_column (SCM l, Object_key const *key)
-  : Item (l, key)              // guh.?
+Paper_column::Paper_column (SCM l)
+  : Item (l)
 {
   system_ = 0;
   rank_ = -1;
 }
 
-Paper_column::Paper_column (Paper_column const &src, int count)
-  : Item (src, count)
+Paper_column::Paper_column (Paper_column const &src)
+  : Item (src)
 {
   system_ = 0;
   rank_ = src.rank_;
@@ -160,14 +160,13 @@ Paper_column::print (SCM p)
                                                   properties,
                                                   ly_string2scm (when));
   Stencil t = *unsmob_stencil (scm_mol);
-  t.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (when_mol), 0.1, 0.1);
+  t.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (when_mol), 0.1);
   t.align_to (X_AXIS, CENTER);
   t.align_to (Y_AXIS, DOWN);
 
   Stencil l = Lookup::filled_box (Box (Interval (-0.01, 0.01),
                                       Interval (-2, -1)));
   
-  System * my_system = me->get_system ();
   SCM small_letters = scm_cons (scm_acons (ly_symbol2scm ("font-size"),
                                           scm_from_int (-6), SCM_EOL),
                                properties);
@@ -177,7 +176,10 @@ Paper_column::print (SCM p)
        scm_is_pair (s); s = scm_cdr (s))
     {
       Spring_smob *sp = unsmob_spring (scm_car (s));
+      if (!sp->other_->get_system ())
+       continue;
       
+      j++;
       Real y = -j * 1 -3;
       vector<Offset> pts;
       pts.push_back (Offset (0, y));
@@ -202,8 +204,13 @@ Paper_column::print (SCM p)
        scm_is_pair (s); s = scm_cdr (s))
     {
       Real dist = scm_to_double (scm_cdar (s));
+      Grob *other =  unsmob_grob (scm_caar (s));
+      if (!other || other->get_system () != me->get_system ())
+       continue;
 
-      Real y = -j * 0.1 -3.5;
+      j++;
+      
+      Real y = -j * 1.0 -3.5;
       vector<Offset> pts;
       pts.push_back (Offset (0, y));