From 03aebf886ff0ea0e402cb0029d67e530d5e3ac23 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sun, 4 Jan 2004 07:46:59 +0000
Subject: [PATCH] release commit

---
 Documentation/topdocs/NEWS.texi | 6 ++++++
 VERSION                         | 4 ++--
 lily/spacing-spanner.cc         | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index e73e449985..35e9bf046d 100644
--- 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 70e82d4388..e44d858efc 100644
--- 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 23f2bd4640..17915f5442 100644
--- 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;
 
   
   /*
-- 
2.39.5