* lily/parser.yy (Prefix_composite_music):

oops. Chords should be unrelativable, not bass figures untransposable.

* VERSION: 2.3.26 released.

diff --git a/ChangeLog b/ChangeLog
index 9f862c44d20ab8e2a24c3f60f02f5c91394d8532..a2555461d0e49f898860800eeb234ab2b220427b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-10-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/parser.yy (Prefix_composite_music): 
+       oops. Chords should be unrelativable, not bass figures untransposable.
+
+       * VERSION: 2.3.26 released.
+       
        * lily/completion-note-heads-engraver.cc (try_music): only return
        something when is_first_ is true. Fixes lyrics with completion_heads. 
 

diff --git a/THANKS b/THANKS
index 6b14f906ec2186b7a8f9ef08c54d933a8351003d..9bbfc1ff24c22c2d6a13462dd85d156e6f9bc32f 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -8,7 +8,7 @@ Han-Wen Nienhuys  - Core development
 Jan Nieuwenhuizen - Core development
 Erik Sandberg     - Bug Meister
 Pedro Kroger      - Build Meister
-Graham Parcival   - Documentation Editor
+Graham Percival   - Documentation Editor
 
 
 CONTRIBUTORS
@@ -137,7 +137,7 @@ Erik Ronstroem
 Fabio dos Santos
 Fodor Bertalan 
 Frederic Bron
-Graham Parcival
+Graham Percival
 Ian Bailey-Mortimer
 John Williams
 Josza Marton

diff --git a/VERSION b/VERSION
index 217cde28660579bca2e0cb5b9fdc52fcdc1d7624..463eb82b18cd2033e0a3f4cd79604b524be28efc 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=3
-PATCH_LEVEL=25
+PATCH_LEVEL=26
 MY_PATCH_LEVEL=
 

diff --git a/input/regression/new-slur.ly b/input/regression/new-slur.ly
index e0117d3054c9819e5d391d3701af550cc2eb9e4c..9cb636b15ef9541486e34326c8345f198f04cf38 100644 (file)
--- a/input/regression/new-slur.ly
+++ b/input/regression/new-slur.ly
@@ -53,7 +53,8 @@
     e4( dis4)
     e4( dis4) 
     g='16( b d fis)
-    \clef bass a=8[ e16(f] g[ a bes d,)]  s4 | \break
+    \clef bass a=8[ e16(f] g[ a b d,)]  s4 | \break
+    e=8( f] g[ a b d,)]  s4 | \break
     
     \clef treble
     \new Voice \relative c'' {

diff --git a/lily/parser.yy b/lily/parser.yy
index 8c910598eb90481349e6e172c55f66b9b8e72ec7..1c33a0108270762c88c3199fbd5a005e994d4fc2 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1138,9 +1138,9 @@ Prefix_composite_music:
                scm_gc_unprotect_object (p->self_scm ());
        }
        | mode_changing_head Grouped_music_list {
-               if ($1 == ly_symbol2scm ("figures"))
+               if ($1 == ly_symbol2scm ("chords"))
                {
-                 Music *chm = MY_MAKE_MUSIC ("UntransposableMusic");
+                 Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
                  chm->set_property ("element", $2->self_scm ());
                  $$ = chm;
                  scm_gc_unprotect_object ($2->self_scm ());
@@ -1154,9 +1154,9 @@ Prefix_composite_music:
        | mode_changing_head_with_context optional_context_mod Grouped_music_list {
                $$ = context_spec_music ($1, get_next_unique_context (),
                                         $3, $2);
-               if ($1 == ly_symbol2scm ("FiguredBass"))
+               if ($1 == ly_symbol2scm ("ChordNames"))
                {
-                 Music *chm = MY_MAKE_MUSIC ("UntransposableMusic");
+                 Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
                  chm->set_property ("element", $$->self_scm ());
                  scm_gc_unprotect_object ($$->self_scm ());
                  $$ = chm;

diff --git a/make/lilypond.fedora.spec.in b/make/lilypond.fedora.spec.in
index b51f0a6de6e9a391844c3ab64f34a148864e6c8d..1a793a31b443798fcf0074a60c4b114325c13311 100644 (file)
--- a/make/lilypond.fedora.spec.in
+++ b/make/lilypond.fedora.spec.in
@@ -155,6 +155,7 @@ scrollkeeper-update
 %{_bindir}/midi2ly
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
+%{_bindir}/ps2png
 
 %doc THANKS
 %doc COPYING
@@ -176,6 +177,7 @@ scrollkeeper-update
 %{_mandir}/man1/midi2ly.1.gz
 %{_mandir}/man1/lilypond-book.1.gz
 %{_mandir}/man1/mup2ly.1.gz
+%{_mandir}/man1/ps2png.1.gz
 
 %{_datadir}/lilypond/@TOPLEVEL_VERSION@/
 %{_datadir}/locale/*/LC_MESSAGES/lilypond.mo

diff --git a/scm/slur.scm b/scm/slur.scm
index 772b5b28a4e804a33355b8e7fad68e178ad6f005..51cd0f3c4b67df66d5a5cb354ba1049aa6e84fa7 100644 (file)
--- a/scm/slur.scm
+++ b/scm/slur.scm
@@ -26,5 +26,5 @@
     (head-slur-distance-max-ratio . 3)
     (head-slur-distance-factor . 10)
     (absolute-closeness-measure . 0.3)
-    (edge-slope-exponent . 2)
+    (edge-slope-exponent . 1.7)
     ))