Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / spacing-loose-columns.cc

diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc
index 13a37071c04e69af72df52a1b5f2439241f5085e..0570741117b0a4e36b2bb4f08113fccfc5329d65 100644 (file)
--- a/lily/spacing-loose-columns.cc
+++ b/lily/spacing-loose-columns.cc
@@ -13,7 +13,7 @@
 #include "staff-spacing.hh"
 #include "note-spacing.hh"
 #include "spacing-spanner.hh"
-#include "warn.hh"
+
 #include "moment.hh"
 
 /* Find the loose columns in POSNS, and drape them around the columns
@@ -25,6 +25,7 @@ set_loose_columns (System *which, Column_x_positions const *posns)
   if (!loose_col_count)
     return;
 
+  Real default_padding = 1.0;
   for (int i = 0; i < loose_col_count; i++)
     {
       int divide_over = 1;
@@ -68,81 +69,73 @@ set_loose_columns (System *which, Column_x_positions const *posns)
       if (!right->get_system ())
        right = right->find_prebroken_piece (LEFT);
 
-      Grob *common = right->common_refpoint (left, X_AXIS);
-
       clique.push_back (right);
 
-      vector<Real> clique_spacing;
-      clique_spacing.push_back (0.0);
-      for (vsize j = 1; j < clique.size () - 1; j ++)
-       {
-         Grob *clique_col = clique[j];
+      Grob *common = right->common_refpoint (left, X_AXIS);
+      Item *finished_right_column = clique.back ();
 
-         Paper_column *loose_col = dynamic_cast<Paper_column *> (clique[j]);
-         Paper_column *next_col = dynamic_cast<Paper_column *> (clique[j + 1]);
+      for (vsize j = clique.size () - 2; j > 0; j--)
+       {
+         int count = 0;
+         Real total_space = 0.0;
+         Real total_fixed = 0.0;
 
-         Grob *spacing = unsmob_grob (clique_col->get_object ("spacing"));
-         if (Grob *grace_spacing = unsmob_grob (clique_col->get_object ("grace-spacing")))
+         extract_grob_set (col, "spacing-wishes", wishes);
+         for (vsize i = 0; i < wishes.size (); i++)
            {
-             spacing = grace_spacing;
+             Grob *spacing = wishes[i];
+             Real space = 0.0;
+             Real fixed = 0.0;
+
+             if (Staff_spacing::has_interface (spacing))
+               Staff_spacing::get_spacing_params (spacing, &space, &fixed);
+             else if (Note_spacing::has_interface (spacing))
+               {
+                 Spacing_options options;
+                 options.init ();
+
+                 fixed = robust_relative_extent (col, col, X_AXIS)[RIGHT];
+
+                 Moment dt = Paper_column::when_mom (right) - Paper_column::when_mom (col);
+                 bool expand;
+                 space = options.get_duration_space (dt, &expand);
+                 Note_spacing::get_spacing (spacing, right, space, options.increment_,
+                                            &space, &fixed);
+               }
+             else
+               continue;
+
+             count++;
+
+             total_space += space;
+             total_fixed += fixed;
            }
-         
-         Spacing_options options;
-         if (spacing)
-           options.init_from_grob (spacing);
-         else
-           programming_error ("Column without spacing object");
 
-         bool expand_only = false;
-         Real base_note_space = 0.0;
+         Real distance_to_next = 0.0;
+         Real right_point = 0.0;
+         if (count)
+           {
+             total_space /= count;
+             total_fixed /= count;
 
-         if (Paper_column::is_musical (next_col)
-             && Paper_column::is_musical (loose_col))
-           base_note_space = Spacing_spanner::note_spacing (spacing, loose_col, next_col, 
-                                                            &options, &expand_only);
+             distance_to_next = total_space;
+             right_point
+               = finished_right_column->relative_coordinate (common, X_AXIS);
+           }
          else
            {
-             Real fixed, space;
-             
-             Spacing_spanner::standard_breakable_column_spacing (spacing, 
-                                                                 loose_col, next_col,
-                                                                 &fixed, &space,
-                                                                 &options);
-
-             base_note_space = space;
+             Interval my_extent = robust_relative_extent (col, col, X_AXIS);
+             distance_to_next = my_extent[RIGHT] + default_padding;
+             right_point = robust_relative_extent (finished_right_column, common, X_AXIS)[LEFT];
            }
 
-         base_note_space = max (base_note_space,
-                                robust_relative_extent (loose_col, loose_col, X_AXIS)[RIGHT]
-                                - robust_relative_extent (next_col, next_col, X_AXIS)[LEFT]);
-         
-         clique_spacing.push_back (base_note_space);
-       }
-
-      Real default_padding = 1.0;
-      clique_spacing.push_back (default_padding);
-
-      Real right_point = robust_relative_extent (clique.back (), common, X_AXIS)[LEFT];
-      
-         
-      Grob *finished_right_column = clique.back ();
-      
-      for (vsize j = clique.size () - 2; j > 0; j--)
-       {
-         Paper_column *clique_col = dynamic_cast<Paper_column *> (clique[j]);
-         
-         right_point = finished_right_column->relative_coordinate (common, X_AXIS);
-
-         Real distance_to_next = clique_spacing[j];
-         
          Real my_offset = right_point - distance_to_next;
 
-         clique_col->set_system (which);
-         clique_col->translate_axis (my_offset - clique_col->relative_coordinate (common, X_AXIS), X_AXIS);      
+         col->system_ = which;
+         col->translate_axis (my_offset - col->relative_coordinate (common, X_AXIS), X_AXIS);
 
-         finished_right_column = clique_col;
+         finished_right_column = col;
        }
- 
     }
 }