From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 14 Nov 2006 13:50:00 +0000 (+0100)
Subject: Merge branch 'origin' into master-hanwen
X-Git-Tag: release/2.11.0-1~36
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=730c54a571ab3b6c30e02be5f93c876abee0f9a7;hp=169a91c8514e3dcea29d1aa01653a684fb60457d;p=lilypond.git

Merge branch 'origin' into master-hanwen
---

diff --git a/Documentation/user/non-music.itely b/Documentation/user/non-music.itely
index bd2596410d..f477d882be 100644
--- a/Documentation/user/non-music.itely
+++ b/Documentation/user/non-music.itely
@@ -686,7 +686,7 @@ field).
 @item oddFooterMarkup
   This is the page footer for odd-numbered pages.
 
-@funindex evenFotterMarkup
+@funindex evenFooterMarkup
 @item evenFooterMarkup
   This is the page footer for even-numbered pages.  If unspecified,
   the odd header is used instead.
diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 115c2a7337..ffc4bfcbfc 100644
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -468,7 +468,7 @@ get_line_forces (vector<Grob*> const &columns,
 	      if (!cols[i].keep_inside_line_.is_empty ())
 		{
 		  spacer.add_rod (i - st, end - st, cols[i].keep_inside_line_[RIGHT]);
-		  spacer.add_rod (0, i - st, cols[i].keep_inside_line_[LEFT]);
+		  spacer.add_rod (0, i - st, -cols[i].keep_inside_line_[LEFT]);
 		}
 	    }
 	  spacer.solve ((b == 0) ? line_len - indent : line_len, ragged);
@@ -531,7 +531,7 @@ get_line_configuration (vector<Grob*> const &columns,
       if (!cols[i].keep_inside_line_.is_empty ())
 	{
 	  spacer.add_rod (i, cols.size (), cols[i].keep_inside_line_[RIGHT]);
-	  spacer.add_rod (0, i, cols[i].keep_inside_line_[LEFT]);
+	  spacer.add_rod (0, i, -cols[i].keep_inside_line_[LEFT]);
 	}
     }