patch by Joe Neeman: "I have

[lilypond.git] / lily / spacing-spanner.cc

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index f56af93598cc577404b9690d27527a2a87922cb2..73fb9880f469a7e36d8ba1e9ea6e186701ea896c 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -3,31 +3,39 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <math.h>
+#include "spacing-spanner.hh"
 
+#include <math.h>
 #include <cstdio>
 using namespace std;
 
-#include "spacing-spanner.hh"
-#include "paper-column.hh"
-#include "output-def.hh"
-#include "paper-score.hh"
-#include "system.hh"
+#include "international.hh"
+#include "main.hh"
 #include "moment.hh"
 #include "note-spacing.hh"
-#include "main.hh"
-#include "warn.hh"
+#include "output-def.hh"
+#include "paper-column.hh"
+#include "paper-score.hh"
 #include "pointer-group-interface.hh"
 #include "spaceable-grob.hh"
-#include "staff-spacing.hh"
 #include "spacing-interface.hh"
+#include "staff-spacing.hh"
+#include "system.hh"
+#include "warn.hh"
+
+
+/*
+  TODO:
 
+  use callback instead?
+
+*/
 Rational
 Spacing_spanner::effective_shortest_duration (Grob *me,
-                                             Link_array<Grob> const &all)
+                                             vector<Grob*> const &all)
 {
   SCM preset_shortest = me->get_property ("common-shortest-duration");
   Rational global_shortest;
@@ -53,7 +61,7 @@ Spacing_spanner::set_springs (SCM smob)
   /*
     can't use get_system() ? --hwn.
   */
-  Link_array<Grob> all (get_root_system (me)->columns ());
+  vector<Grob*> all (get_root_system (me)->columns ());
 
   set_explicit_neighbor_columns (all);
 
@@ -78,18 +86,18 @@ Spacing_spanner::set_springs (SCM smob)
   stuff, then.
 */
 Rational
-Spacing_spanner::find_shortest (Grob *me, Link_array<Grob> const &cols)
+Spacing_spanner::find_shortest (Grob *me, vector<Grob*> const &cols)
 {
   /*
     ascending in duration
   */
-  Array<Rational> durations;
-  Array<int> counts;
+  vector<Rational> durations;
+  vector<int> counts;
 
   Rational shortest_in_measure;
   shortest_in_measure.set_infinite (1);
 
-  for (int i = 0; i < cols.size (); i++)
+  for (vsize i = 0; i < cols.size (); i++)
     {
       if (Paper_column::is_musical (cols[i]))
        {
@@ -109,13 +117,13 @@ Spacing_spanner::find_shortest (Grob *me, Link_array<Grob> const &cols)
       else if (!shortest_in_measure.is_infinity ()
               && Item::is_breakable (cols[i]))
        {
-         int j = 0;
+         vsize j = 0;
          for (; j < durations.size (); j++)
            {
              if (durations[j] > shortest_in_measure)
                {
-                 counts.insert (1, j);
-                 durations.insert (shortest_in_measure, j);
+                 counts.insert (counts.begin () + j, 1);
+                 durations.insert (durations.begin () + j, shortest_in_measure);
                  break;
                }
              else if (durations[j] == shortest_in_measure)
@@ -127,8 +135,8 @@ Spacing_spanner::find_shortest (Grob *me, Link_array<Grob> const &cols)
 
          if (durations.size () == j)
            {
-             durations.push (shortest_in_measure);
-             counts.push (1);
+             durations.push_back (shortest_in_measure);
+             counts.push_back (1);
            }
 
          shortest_in_measure.set_infinite (1);
@@ -137,7 +145,7 @@ Spacing_spanner::find_shortest (Grob *me, Link_array<Grob> const &cols)
 
   int max_idx = -1;
   int max_count = 0;
-  for (int i = durations.size (); i--;)
+  for (vsize i = durations.size (); i--;)
     {
       if (counts[i] >= max_count)
        {
@@ -217,12 +225,12 @@ Spacing_spanner::generate_pair_spacing (Grob *me,
 
 void
 Spacing_spanner::generate_springs (Grob *me,
-                                  Link_array<Grob> const &cols,
+                                  vector<Grob*> const &cols,
                                   Spacing_options const *options)
 {
   Paper_column *next = 0;
   Paper_column *next_next = 0;
-  for (int i = cols.size (); i--;)
+  for (vsize i = cols.size (); i--;)
     {
       Paper_column *col = dynamic_cast<Paper_column *> (cols[i]);
       if (next)
@@ -246,6 +254,8 @@ Spacing_spanner::musical_column_spacing (Grob *me,
   bool expand_only = false;
   Real base_note_space = note_spacing (me, left_col, right_col, options, &expand_only);
 
+  Real max_fixed = 0;
+  Real max_space = 0;
   Real compound_note_space = 0.0;
   Real compound_fixed_note_space = 0.0;
 
@@ -262,7 +272,7 @@ Spacing_spanner::musical_column_spacing (Grob *me,
        happens after the current note (this is set in the grob
        property SPACING-SEQUENCE.
       */
-      for (int i = 0; i < neighbors.size (); i++)
+      for (vsize i = 0; i < neighbors.size (); i++)
        {
          Grob *wish = neighbors[i];
 
@@ -281,8 +291,12 @@ Spacing_spanner::musical_column_spacing (Grob *me,
 
              Note_spacing::get_spacing (wish, right_col, base_note_space, options->increment_, &space, &fixed);
 
-             compound_note_space = compound_note_space + space;
-             compound_fixed_note_space = compound_fixed_note_space + fixed;
+
+             max_space = max (max_space, space);
+             max_fixed = max (max_fixed, fixed);
+             
+             compound_note_space += space;
+             compound_fixed_note_space += fixed;
              wish_count++;
            }
        }
@@ -301,11 +315,16 @@ Spacing_spanner::musical_column_spacing (Grob *me,
          compound_note_space = base_note_space;
          compound_fixed_note_space = options->increment_;
        }
-      else
+      else if (to_boolean (me->get_property ("average-spacing-wishes")))
        {
          compound_note_space /= wish_count;
          compound_fixed_note_space /= wish_count;
        }
+      else
+       {
+         compound_fixed_note_space = max_fixed;
+         compound_note_space = max_space;
+       }
 
       /*
        Whatever we do, the fixed space is smaller than the real
@@ -356,6 +375,9 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
 {
   Real compound_fixed = 0.0;
   Real compound_space = 0.0;
+  Real max_fixed = 0.0;
+  Real max_space = 0.0;
+  
   int wish_count = 0;
 
   Moment dt = Paper_column::when_mom (r) - Paper_column::when_mom (l);
@@ -364,7 +386,7 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
     {
       extract_grob_set (l, "spacing-wishes", wishes);
 
-      for (int i = 0; i < wishes.size (); i++)
+      for (vsize i = 0; i < wishes.size (); i++)
        {
          Item *spacing_grob = dynamic_cast<Item *> (wishes[i]);
 
@@ -394,6 +416,9 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
              space *= 0.8;
            }
 
+         max_space = max (max_space, space);
+         max_fixed = max (max_fixed, fixed_space);
+         
          compound_space += space;
          compound_fixed += fixed_space;
          wish_count++;
@@ -408,8 +433,17 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
     }
   else
     {
-      compound_space /= wish_count;
-      compound_fixed /= wish_count;
+      if (to_boolean (me->get_property ("average-spacing-wishes")))
+       {
+         compound_space /= wish_count;
+         compound_fixed /= wish_count;
+       }
+      else
+       {
+         compound_fixed = max_fixed;
+         compound_space = max_space;
+       }
+      
     }
 
   if (options->stretch_uniformly_ && l->break_status_dir () != RIGHT)
@@ -442,6 +476,7 @@ ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface",
               "head width) A 16th note is followed by 0.5 note head width. The\n"
               "quarter note is followed by  3 NHW, the half by 4 NHW, etc.\n",
 
+              "average-spacing-wishes "
               "grace-space-factor "
               "spacing-increment "
               "base-shortest-duration "