From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 31 Jan 2007 17:07:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.15-1~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3f8485925e8c879fe4c9ae86acef9804126c3b91;p=lilypond.git

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

Conflicts:

	lily/constrained-breaking.cc
---

3f8485925e8c879fe4c9ae86acef9804126c3b91
diff --cc lily/align-interface.cc
index 4d0c6eb324,286a896829..786e91010b
--- a/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/constrained-breaking.cc
index 1c2d5287c0,33426c0b3f..714f8ce6ee
--- a/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)
  {