partial: 1.0.1.jcn

[lilypond.git] / lily / scoreline.cc

diff --git a/lily/scoreline.cc b/lily/scoreline.cc
index f3324091527ee8bc34753d749d4050003068de87..77eeead39e080bb9762d7ce6387917fbc5430fd8 100644 (file)
--- a/lily/scoreline.cc
+++ b/lily/scoreline.cc
@@ -3,35 +3,18 @@
 
   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"
 
 
-/* To do:
-
-   take out hard coded TeX stuff.
-   */
-String
-Line_of_score::TeX_output_str () const
-{
-  String s ("\\hbox{%<- line of score\n");
-  if (error_mark_b_)
-    s+= "\\scorelineerrormark";
-  
-  s+= Score_elem::TeX_output_str();
-  s += "}";
-  return s;
-}
-
-
 Line_of_score::Line_of_score()
 {
   error_mark_b_ = 0;
@@ -90,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;
        }
     }
@@ -131,10 +114,27 @@ Line_of_score::do_width() const
   return Spanner::do_width();
 }
 
+Link_array<Score_elem>
+Line_of_score::get_extra_dependencies () const
+{
+  Link_array<Score_elem> r;
+  for (int i=0; i < cols.size (); i++)
+    r.push (cols[i]);
+  return r;
+}
+
 void
-Line_of_score::do_breakable_col_processing() 
+Line_of_score::do_unlink () 
 {
+  Spanner::do_unlink ();
   for (int i=0; i < cols.size (); i++)
-    cols[i]->breakable_col_processing();
-  Spanner::do_breakable_col_processing();
+    cols[i]->line_l_ =0;
+  cols.set_size (0);
+}
+
+
+void
+Line_of_score::do_junk_links () 
+{
+  cols.set_size (0);
 }