Merge branch 'origin' into master-hanwen

diff --git a/Documentation/user/non-music.itely b/Documentation/user/non-music.itely
index bd2596410da33547f5b726c5a883c625376d0a66..f477d882be488cc07f3681bfac677557bcbe4629 100644 (file)
--- 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 115c2a73376acb5cc5894173259c77e97405d407..ffc4bfcbfce26bad151ab0240007c89602ed26bd 100644 (file)
--- 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]);
        }
     }