Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 3e7aa266bd7c5cd214f8e3ba5f10adfeaa9c8e2e..31f7df6c8e72fba6e118f9dd2e0f4bf945cbe109 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -10,8 +10,10 @@
 
 #include <math.h>
 #include <cstdio>
+
 using namespace std;
 
+#include "spacing-options.hh"
 #include "international.hh"
 #include "main.hh"
 #include "moment.hh"
@@ -268,7 +270,7 @@ Spacing_spanner::musical_column_spacing (Grob *me,
   else
     {
       int wish_count = 0;
-
+      
       extract_grob_set (left_col, "right-neighbors", neighbors);
 
       /*
@@ -316,21 +318,33 @@ Spacing_spanner::musical_column_spacing (Grob *me,
 
       if (compound_note_space < 0 || wish_count == 0)
        {
-         /*
-           Fixed should be 0.0. If there are no spacing wishes, we're
-           likely dealing with polyphonic spacing of hemiolas.
+
+         if (!Paper_column::is_musical (right_col))
+           {
+             Real left_col_stick_out = robust_relative_extent (left_col, left_col,  X_AXIS)[RIGHT];
+             compound_fixed_note_space = max (left_col_stick_out, options->increment_);
+
+             compound_note_space = max (base_note_space,
+                                        base_note_space - options->increment_ + left_col_stick_out);
+           }
+         else
+           {
+             /*
+               Fixed should be 0.0. If there are no spacing wishes, we're
+               likely dealing with polyphonic spacing of hemiolas.
            
-           We used to have compound_fixed_note_space = options->increment_
+               We used to have compound_fixed_note_space = options->increment_
 
-           but this can lead to numeric instability problems when we
-           do
+               but this can lead to numeric instability problems when we
+               do
            
-              inverse_strength = (compound_note_space - compound_fixed_note_space)
+               inverse_strength = (compound_note_space - compound_fixed_note_space)
       
-         */
-         
-         compound_note_space = base_note_space;
-         compound_fixed_note_space = 0.0;
+             */
+
+             compound_note_space = base_note_space;
+             compound_fixed_note_space = 0.0;
+           }
        }
       else if (to_boolean (me->get_property ("average-spacing-wishes")))
        {
@@ -481,7 +495,7 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
   Spaceable_grob::add_spring (l, r, distance, inverse_strength);
 }
 
-ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface",
+ADD_INTERFACE (Spacing_spanner,
               "The space taken by a note is dependent on its duration. Doubling a\n"
               "duration adds spacing-increment to the space. The most common shortest\n"
               "note gets @code{shortest-duration-space}. Notes that are even shorter are\n"
@@ -506,7 +520,7 @@ ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface",
               
               );
 
-ADD_INTERFACE (Spacing_interface, "spacing-interface",
+ADD_INTERFACE (Spacing_interface,
               "Something to do with line breaking and spacing. "
               "Kill this one after determining line breaks.",