partial: 1.0.1.jcn

[lilypond.git] / lily / scoreline.cc

diff --git a/lily/scoreline.cc b/lily/scoreline.cc
index 2bd4f870b48b6996d98f8835eca86401680f8662..77eeead39e080bb9762d7ce6387917fbc5430fd8 100644 (file)
--- a/lily/scoreline.cc
+++ b/lily/scoreline.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #include "scoreline.hh"
 #include "dimen.hh"
 #include "spanner.hh"
-#include "symbol.hh"
+#include "atom.hh"
 #include "paper-def.hh"
 #include "p-col.hh"
 #include "p-score.hh"
@@ -73,7 +73,7 @@ Line_of_score::set_breaking (Array<Col_hpositions> const &breaking)
 
       for (int i=0; i < curline.size(); i++)
        {
-         curline[i]->translate(config[i],X_AXIS);
+         curline[i]->translate_axis (config[i],X_AXIS);
          curline[i]->line_l_ = (Line_of_score*)line_l;
        }
     }
@@ -126,6 +126,7 @@ Line_of_score::get_extra_dependencies () const
 void
 Line_of_score::do_unlink () 
 {
+  Spanner::do_unlink ();
   for (int i=0; i < cols.size (); i++)
     cols[i]->line_l_ =0;
   cols.set_size (0);