X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsuper-elem.cc;h=fda20ea9eea3575a030a10816df14996ab0a42e6;hb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;hp=ca153eb5dab06e99cce8517cf6d8dc547b52dd1a;hpb=1e95a0be01466d1c98644f7705c8e07e41cc645c;p=lilypond.git

diff --git a/lily/super-elem.cc b/lily/super-elem.cc
index ca153eb5da..fda20ea9ee 100644
--- a/lily/super-elem.cc
+++ b/lily/super-elem.cc
@@ -3,14 +3,14 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "super-elem.hh"
-#include "scoreline.hh"
+#include "super-element.hh"
+#include "line-of-score.hh"
 #include "p-score.hh"
 #include "string.hh"
-#include "outputter.hh"
+#include "tex-outputter.hh"
 
 void
 Super_elem::handle_broken_dependencies()
@@ -22,10 +22,10 @@ Super_elem::handle_broken_dependencies()
   
 
 void
-Super_elem::do_substitute_dependency (Score_elem*o,Score_elem* n)
+Super_elem::do_substitute_dependency (Score_element*o,Score_element* n)
 {
-  if (line_of_score_l_ == o->spanner())
-    line_of_score_l_ = n? (Line_of_score*) n->spanner() : 0;
+  if (line_of_score_l_ == o->access_Spanner ())
+    line_of_score_l_ = n? (Line_of_score*) n->access_Spanner () : 0;
 }
 
 Super_elem::Super_elem()
@@ -40,13 +40,13 @@ Super_elem::do_add_processing()
   add_dependency (line_of_score_l_);
 }
 
-IMPLEMENT_IS_TYPE_B1(Super_elem,Score_elem);
+IMPLEMENT_IS_TYPE_B1(Super_elem,Score_element);
 
 
 /**
     for administration of what was done already
     */
-enum Score_elem_status {
+enum Score_element_status {
   ORPHAN=0,			// not yet added to pstaff
   VIRGIN,			// added to pstaff
   PREBROKEN,
@@ -66,34 +66,34 @@ enum Score_elem_status {
 void
 Super_elem::pre_processing ()
 {
-  calcalute_dependencies (PRECALCING, PRECALCED, &Score_elem::do_pre_processing);
+  calcalute_dependencies (PRECALCING, PRECALCED, &Score_element::do_pre_processing);
 }
 
 void
 Super_elem::space_processing ()
 {
-  calcalute_dependencies (SPACING, SPACED, &Score_elem::do_space_processing);
+  calcalute_dependencies (SPACING, SPACED, &Score_element::do_space_processing);
 }
 
 /* for break processing, use only one status, because copies have to
   have correct status. (Previously,
-  Score_elem::handle_[pre]broken_dependencies assigned to status_i_
+  Score_element::handle_[pre]broken_dependencies assigned to status_i_
   */
 void
 Super_elem::breakable_col_processing ()
 {
-  calcalute_dependencies (PREBROKEN, PREBROKEN, &Score_elem::do_breakable_col_processing);
+  calcalute_dependencies (PREBROKEN, PREBROKEN, &Score_element::do_breakable_col_processing);
 }
 
 void
 Super_elem::break_processing ()
 {
-  calcalute_dependencies (BROKEN, BROKEN, &Score_elem::do_break_processing);
+  calcalute_dependencies (BROKEN, BROKEN, &Score_element::do_break_processing);
 }
 void
 Super_elem::post_processing ()
 {
-  calcalute_dependencies (POSTCALCING, POSTCALCED, &Score_elem::do_post_processing);
+  calcalute_dependencies (POSTCALCING, POSTCALCED, &Score_element::do_post_processing);
 }
 
 void
@@ -102,7 +102,7 @@ Super_elem::output_all ()
   for (int i=0; i < lines_arr_.size(); i++)
     {
       pscore_l_->outputter_l_->start_line ();
-      lines_arr_[i]->calcalute_dependencies (BREWING, BREWED, &Score_elem::do_brew_molecule);
+      lines_arr_[i]->calcalute_dependencies (BREWING, BREWED, &Score_element::do_brew_molecule);
       pscore_l_->outputter_l_->stop_line ();
     }
 }
@@ -112,6 +112,6 @@ Super_elem::output_all ()
 void
 Super_elem::unlink_all ()
 {
-  calcalute_dependencies (UNLINKING, UNLINKED, &Score_elem::junk_links);
+  calcalute_dependencies (UNLINKING, UNLINKED, &Score_element::junk_links);
 }