lilypond-0.1.52

diff --git a/lily/include/score-elem.hh b/lily/include/score-elem.hh
index 64ec7fcbe19899d8cf40257ef6fcd22b6b0024fe..5757d074e80e20a43a00209b51c49bfa768c8784 100644 (file)
--- a/lily/include/score-elem.hh
+++ b/lily/include/score-elem.hh
@@ -97,6 +97,9 @@ protected:
   /// do calculations before determining horizontal spacing
   virtual void do_pre_processing();
 
+  /// generate rods & springs
+  virtual void do_space_processing ();
+
   virtual void do_breakable_col_processing();
   /// do calculations after determining horizontal spacing
   virtual void do_post_processing();

diff --git a/lily/p-score.cc b/lily/p-score.cc
index 437efdc694073b51358dc32fb31db12b47e56fca..e53985fa4e6ada010850302abe8c29069887d481 100644 (file)
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -25,8 +25,8 @@
 #include "outputter.hh"
 
 // sucking Cygnus egcs - w32
-#include "plist.tcc"
-#include "pcursor.tcc"
+#include "list.tcc"
+#include "cursor.tcc"
 
 Paper_score::Paper_score ()
 {
@@ -185,7 +185,9 @@ Paper_score::process ()
   *mlog << _("Preprocessing elements... ") <<flush;
   super_elem_l_->breakable_col_processing ();
   super_elem_l_->pre_processing ();
+  
   *mlog << _("\nCalculating column positions ... ") <<flush;
+  super_elem_l_->space_processing ();
   calc_breaking ();
   *mlog << _("\nPostprocessing elements...") << endl;
   super_elem_l_->post_processing ();

diff --git a/lily/score-elem.cc b/lily/score-elem.cc
index 1a6ec4105ef78f8975e9cff4eb42e8009145000d..e81d7e0563e8609d7f44b034afdaafa493b5ab77 100644 (file)
--- a/lily/score-elem.cc
+++ b/lily/score-elem.cc
@@ -191,6 +191,11 @@ Score_elem::do_pre_processing()
 {
 }
 
+void
+Score_elem::do_space_processing ()
+{
+}
+
 void
 Score_elem::do_add_processing()
 {

diff --git a/lily/super-elem.cc b/lily/super-elem.cc
index 0cc425198ca0726dc7e30bb582c8391d6cb7cd86..3e9d8d0f70a439b95dc4348a03e8ee235a420171 100644 (file)
--- a/lily/super-elem.cc
+++ b/lily/super-elem.cc
@@ -52,6 +52,8 @@ enum Score_elem_status {
   PREBROKEN,
   PRECALCING,
   PRECALCED,           // calcs before spacing done
+  SPACING,
+  SPACED,
   BROKEN,
   POSTCALCING,         // busy calculating. This is used to trap cyclic deps.
   POSTCALCED,          // after spacing calcs done
@@ -67,6 +69,12 @@ Super_elem::pre_processing ()
   calcalute_dependencies (PRECALCING, PRECALCED, &Score_elem::do_pre_processing);
 }
 
+void
+Super_elem::space_processing ()
+{
+  calcalute_dependencies (SPACING, SPACED, &Score_elem::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_