* lily/lexer.ll (Lily_lexer): bump version req to 2.3.22.

* lily/slur-scoring.cc (move_away_from_staffline): new function.
(get_base_attachments): move away attachment point for breaks
similar to attachment points on slurs (staffline collision, and
half a space of padding)

diff --git a/ChangeLog b/ChangeLog
index 9217b9645855b1aed8000dba93a9410c8a83ef53..08762cc1e5e0c1afb654d8bba9bf776f5294b393 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/lexer.ll (Lily_lexer): bump version req to 2.3.22.
+
        * lily/parser.yy (Prefix_composite_music): change no-transposition
        for mode_changing_head to figures too.
 

diff --git a/VERSION b/VERSION
index 57dd1c437fa602c67dbeb4072badec7710df4fb4..b897c9acb653c590a94da443c528312e15feb7da 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=3
 PATCH_LEVEL=22
-MY_PATCH_LEVEL=pre-jcn2
+MY_PATCH_LEVEL=
 

diff --git a/lily/lexer.ll b/lily/lexer.ll
index f89f7fa5af599abf250aa1a4a458ff1ea2751ef8..ccb3d77b678c766f4216805f533a3ce7bf83e082 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -801,7 +801,7 @@ strip_trailing_white (String&s)
 
 
 /* 2.1.2x something -> \property -> \set. */ 
-Lilypond_version oldest_version ("2.2.0");
+Lilypond_version oldest_version ("2.3.22");
 
 
 bool