release commit

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index e73e449985ace49b43eba6ac42a5000576e8e759..35e9bf046da442db2590e25c05e1cb975be22d7f 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -8,6 +8,12 @@
 @chapter New features in 2.1 since 2.0
 
 @itemize
+@item
+Spacing following barlines was improved for widely stretched lines.
+
+@item
+Lyric hyphens now conform to standard typesetting practice.
+
 @item
 Lyrics are now aligned under note heads conforming engraving
 standards. The responsible code has been rewritten, and is drastically

diff --git a/VERSION b/VERSION
index 70e82d4388d17271a47ae7b44076dde39cb8aace..e44d858efc074870b121fbfa5c63105b73b11dd0 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
-PATCH_LEVEL=5
-MY_PATCH_LEVEL=hwn1
+PATCH_LEVEL=6
+MY_PATCH_LEVEL=
 

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 23f2bd46409a7c45e0fffd4bb116108daec5d19b..17915f5442f9274662d14ca317e1cd6d05ca9ff3 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -785,7 +785,7 @@ Spacing_spanner::breakable_column_spacing (Grob*me, Item* l, Item *r,Moment shor
     }
 
   assert (!isinf (compound_space));
-
+  compound_space = compound_space >? compound_fixed;
 
   
   /*