Merge remote-tracking branch 'origin/translation'

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

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 51ae51319d2f37d342cfeb9b936ff135b61a2b02..2f2724689d6e99cf1493fd3259694d2eec34547b 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -237,14 +237,14 @@ set_column_rods (vector<Grob *> const &cols, Real padding)
       if (Separation_item::is_empty (r) && (!rb || Separation_item::is_empty (rb)))
         continue;
 
-      Interval r_ext = r->extent (r, X_AXIS);
-      overhangs[i] = r_ext[RIGHT];
+      Skyline_pair *skys = Skyline_pair::unsmob (r->get_property ("horizontal-skylines"));
+      overhangs[i] = skys ? (*skys)[RIGHT].max_height () : 0.0;
 
       if (0 == i) continue;
 
       /* min rather than max because stickout will be negative if the right-hand column
          sticks out a lot to the left */
-      Real stickout = min (r_ext[LEFT],
+      Real stickout = min (skys ? (*skys)[LEFT].max_height () : 0.0,
                            Separation_item::conditional_skyline (r, cols[i - 1]).max_height ());
 
       Real prev_distances = 0.0;
@@ -315,11 +315,13 @@ Spacing_spanner::musical_column_spacing (Grob *me,
                                          Item *right_col,
                                          Spacing_options const *options)
 {
-  Real base_note_space = note_spacing (me, left_col, right_col, options);
-  Spring spring;
+  Spring spring = note_spacing (me, left_col, right_col, options);
 
   if (options->stretch_uniformly_)
-    spring = Spring (base_note_space, 0.0);
+    {
+      spring.set_min_distance (0.0);
+      spring.set_default_strength ();
+    }
   else
     {
       vector<Spring> springs;
@@ -359,32 +361,20 @@ Spacing_spanner::musical_column_spacing (Grob *me,
                   grace_opts.init_from_grob (gsp);
                   inc = grace_opts.increment_;
                 }
-              springs.push_back (Note_spacing::get_spacing (wish, right_col, base_note_space, inc));
+              springs.push_back (Note_spacing::get_spacing (wish, right_col, spring, inc));
             }
         }
 
       if (springs.empty ())
         {
-
-          if (!Paper_column::is_musical (right_col))
-            {
-              /*
-                There used to be code that examined left_col->extent
-                (X_AXIS), but this is resulted in unexpected wide
-                spacing, because the width of s^"text" output is also
-                taken into account here.
-               */
-              spring = Spring (max (base_note_space, options->increment_),
-                               options->increment_);
-            }
-          else
+          if (Paper_column::is_musical (right_col))
             {
               /*
                 Min distance should be 0.0. If there are no spacing
                 wishes, we're probably dealing with polyphonic spacing
                 of hemiolas.
               */
-              spring = Spring (base_note_space, 0.0);
+              spring.set_min_distance (0.0);
             }
         }
       else