Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

Conflicts:

	lily/constrained-breaking.cc

diff --cc lily/align-interface.cc
index 4d0c6eb3241bee02a574a42762c106f08c2d32f5,286a8968290a24ed4caaefa2fb5a1255127c0a5e..786e91010bf00c10c9958306893a4caf72ab0588
--- 1/lily/align-interface.cc
--- 2/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@@ -46,9 -42,9 +42,9 @@@ Align_interface::calc_positioning_done 
  }
  
  /*
-   merge with align-to-extents?
+   TODO: This belongs to the old two-pass spacing. Delete me.
  */
 -MAKE_SCHEME_CALLBACK(Align_interface, stretch_after_break, 1)
 +MAKE_SCHEME_CALLBACK (Align_interface, stretch_after_break, 1)
  SCM
  Align_interface::stretch_after_break (SCM grob)
  {

diff --cc lily/axis-group-interface.cc
Simple merge

diff --cc lily/bar-number-engraver.cc
Simple merge

diff --cc lily/beam.cc
Simple merge

diff --cc lily/constrained-breaking.cc
index 1c2d5287c0cfa4f3a29ef9ea279cabce4ba2f8e5,33426c0b3f3b0ca5bcd24bd5f38263431b9013fe..714f8ce6eed9dc5332489d3513918fe03f591121
--- 1/lily/constrained-breaking.cc
--- 2/lily/constrained-breaking.cc
+++ b/lily/constrained-breaking.cc
@@@ -109,16 -109,6 +109,7 @@@ Constrained_breaking::calc_subproblem (
    return found_something;
  }
  
- vector<Column_x_positions>
- Constrained_breaking::solve ()
- {
-   if (!systems_)
-     return get_best_solution (0, VPOS);
- 
-   resize (systems_);
-   return get_solution (0, VPOS, systems_);
- }
 +
  Column_x_positions
  Constrained_breaking::space_line (vsize i, vsize j)
  {

diff --cc lily/grob.cc
Simple merge

diff --cc lily/prob-scheme.cc
Simple merge

diff --cc lily/skyline.cc
Simple merge

diff --cc lily/slur.cc
Simple merge

diff --cc lily/stem.cc
Simple merge

diff --cc lily/system.cc
Simple merge

diff --cc lily/tie-formatting-problem.cc
Simple merge