lilypond-1.0.9

diff --git a/lily/include/score-element.hh b/lily/include/score-element.hh
index bc4b64fe752464a8fa80f7824dcc56503d825ebe..e9ea8aff9910f52a9bfd76e7365ac934474d6e9d 100644 (file)
--- a/lily/include/score-element.hh
+++ b/lily/include/score-element.hh
@@ -72,7 +72,7 @@ public:
   int size_i_;
   
   // ugh: no protection. Denk na, Vrij Veilig
-  void calcalute_dependencies (int final, int busy, Score_element_method_pointer funcptr);
+  void calculate_dependencies (int final, int busy, Score_element_method_pointer funcptr);
 
 protected:
   /**

diff --git a/lily/score-element.cc b/lily/score-element.cc
index 5eaff4dad8eaf399b4357b2936e9f14e6409f12e..64b0a422da205914f8273c6d9e46c6fa49db6790 100644 (file)
--- a/lily/score-element.cc
+++ b/lily/score-element.cc
@@ -150,7 +150,7 @@ Score_element::add_processing()
 
 
 void
-Score_element::calcalute_dependencies (int final, int busy,
+Score_element::calculate_dependencies (int final, int busy,
                                    Score_element_method_pointer funcptr)
 {
   if (status_i_ >= final)
@@ -160,11 +160,11 @@ Score_element::calcalute_dependencies (int final, int busy,
   status_i_= busy;
 
   for (int i=0; i < dependency_size(); i++)
-    dependency (i)->calcalute_dependencies (final, busy, funcptr);
+    dependency (i)->calculate_dependencies (final, busy, funcptr);
 
   Link_array<Score_element> extra (get_extra_dependencies());
   for (int i=0; i < extra.size(); i++)
-    extra[i]->calcalute_dependencies (final, busy, funcptr);
+    extra[i]->calculate_dependencies (final, busy, funcptr);
   
   invalidate_cache (X_AXIS);
   invalidate_cache (Y_AXIS);

diff --git a/lily/super-element.cc b/lily/super-element.cc
index e3b3ffbfc12b2e678efadf095c1bf6bf516261b3..419618ed4cb126fbbf8e6e9e547b9d392b8070e7 100644 (file)
--- a/lily/super-element.cc
+++ b/lily/super-element.cc
@@ -43,13 +43,13 @@ enum Score_element_status {
 void
 Super_element::pre_processing ()
 {
-  calcalute_dependencies (PRECALCING, PRECALCED, &Score_element::do_pre_processing);
+  calculate_dependencies (PRECALCING, PRECALCED, &Score_element::do_pre_processing);
 }
 
 void
 Super_element::space_processing ()
 {
-  calcalute_dependencies (SPACING, SPACED, &Score_element::do_space_processing);
+  calculate_dependencies (SPACING, SPACED, &Score_element::do_space_processing);
 }
 
 /* for break processing, use only one status, because copies have to
@@ -59,25 +59,25 @@ Super_element::space_processing ()
 void
 Super_element::breakable_col_processing ()
 {
-  calcalute_dependencies (PREBROKEN, PREBROKEN, &Score_element::do_breakable_col_processing);
+  calculate_dependencies (PREBROKEN, PREBROKEN, &Score_element::do_breakable_col_processing);
 }
 
 void
 Super_element::break_processing ()
 {
-  calcalute_dependencies (BROKEN, BROKEN, &Score_element::do_break_processing);
+  calculate_dependencies (BROKEN, BROKEN, &Score_element::do_break_processing);
 }
 void
 Super_element::post_processing ()
 {
-  calcalute_dependencies (POSTCALCING, POSTCALCED, &Score_element::do_post_processing);
+  calculate_dependencies (POSTCALCING, POSTCALCED, &Score_element::do_post_processing);
 }
 
 void
 Super_element::output_all () 
 {
   pscore_l_->outputter_l_->start_line ();
-  calcalute_dependencies (BREWING, BREWED, &Score_element::do_brew_molecule);
+  calculate_dependencies (BREWING, BREWED, &Score_element::do_brew_molecule);
   pscore_l_->outputter_l_->stop_line ();
 }
 
@@ -86,6 +86,6 @@ Super_element::output_all ()
 void
 Super_element::unlink_all ()
 {
-  calcalute_dependencies (UNLINKING, UNLINKED, &Score_element::junk_links);
+  calculate_dependencies (UNLINKING, UNLINKED, &Score_element::junk_links);
 }