Update texinfo.tex from Texinfo CVS

[lilypond.git] / lily / system.cc

diff --git a/lily/system.cc b/lily/system.cc
index e700615523045a4882030f00cf08e8bf73e56d45..e8af537be179b4c3c607de37972aaa004800344c 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -19,7 +19,6 @@
 #include "paper-score.hh"
 #include "paper-system.hh"
 #include "pointer-group-interface.hh"
-#include "spacing-interface.hh"
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
 #include "lookup.hh"
@@ -227,11 +226,17 @@ System::break_into_pieces (vector<Column_x_positions> const &breaking)
 
       system->set_bound (LEFT, c[0]);
       system->set_bound (RIGHT, c.back ());
+      SCM system_labels = SCM_EOL;
       for (vsize j = 0; j < c.size (); j++)
        {
          c[j]->translate_axis (breaking[i].config_[j], X_AXIS);
          dynamic_cast<Paper_column *> (c[j])->system_ = system;
+         /* collect the column labels */
+         SCM col_labels = c[j]->get_property ("labels");
+         if (scm_is_pair (col_labels))
+           system_labels = scm_append (scm_list_2 (col_labels, system_labels));
        }
+      system->set_property ("labels", system_labels);
       
       set_loose_columns (system, &breaking[i]);
       broken_intos_.push_back (system);
@@ -513,6 +518,7 @@ ADD_INTERFACE (System,
               /* properties */
               "all-elements "
               "columns "
+              "labels "
               "pure-Y-extent "
               "spaceable-staves "
               "skyline-distance "