lilypond-1.5.2

diff --git a/GNUmakefile.in b/GNUmakefile.in
index faadd6c792e47fac62c6806da633c2d0cf0f8926..6240b6bcc96cad8536063a124de32f8f3e0f00c8 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -20,7 +20,7 @@ SCRIPTS = configure aclocal.m4
 README_FILES =  DEDICATION COPYING NEWS CHANGES ROADMAP
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el lilypond-init.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch mktexnam.patch
+EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el lilypond-init.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch mktexnam.patch lexer-gcc-3.0.patch
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(datadir)
 INSTALLATION_FILES=$(configuration) VERSION

diff --git a/input/test/knee.ly b/input/test/knee.ly
index 8ab530b85dc2a73c6f12e4389e58d8c132c79ae4..c2b1ef74009b0c82d42fc95a5aab1fc698a855dc 100644 (file)
--- a/input/test/knee.ly
+++ b/input/test/knee.ly
@@ -2,6 +2,7 @@
 
 \score{
        \notes\relative c'{
+               \property Voice.Beam \override #'auto-knee-gap = ##f
                [c16 \stemDown c'' \stemBoth c,, d]
                \stemDown [d'' a \stemBoth c,, g,]
                \stemUp [g c' \stemBoth a'' d']

diff --git a/lexer-gcc-3.0.patch b/lexer-gcc-3.0.patch
new file mode 100644 (file)
index 0000000..fedefc2
--- /dev/null
+++ b/lexer-gcc-3.0.patch
@@ -0,0 +1,11 @@
+--- ./lily/out-gcc-3.0/lexer.cc~       Tue Jun 26 13:12:26 2001
++++ ./lily/out-gcc-3.0/lexer.cc        Tue Jun 26 13:11:56 2001
+@@ -21,7 +21,7 @@
+ #ifdef __cplusplus
+ 
+ #include <stdlib.h>
+-class istream;
++#include <iostream.h>
+ #include <unistd.h>
+ 
+ /* Use prototypes in function declarations. */

diff --git a/lily/beam.cc b/lily/beam.cc
index 80866325146b3537eff9fbda1e91fcf18f5bb50a..d345e7de75ce6c34c44288e6114d534fa057428a 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -669,9 +669,10 @@ Beam::set_stem_lengths (Grob *me)
        continue;
 
       Real stem_y = calc_stem_y_f (me, s, y, dy);
-
-      stem_y += Stem::get_direction (s)
-       * gh_scm2double (me->get_grob_property ("thickness")) / 2;
+      //stem_y += Stem::get_direction (s)
+      if (Stem::get_direction (s) == Directional_element_interface::get (me))
+       stem_y += Stem::get_direction (s)
+         * gh_scm2double (me->get_grob_property ("thickness")) / 2;
 
       /* caution: stem measures in staff-positions */
       Real id = me->relative_coordinate (common, Y_AXIS)

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 968fd4b11e078f4b1e3c87ff46a62ba089793ab9..c8ec356f527378c7b01178266a02a6dd6f873ce0 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -407,7 +407,7 @@ EasyNotation =  \translator {
        easyPlay = ##t
 }
 
-% retain for compatibility reasons.
+% retain for compatibility reasons (FIXME: convert-ly)
 GraceContext = \translator {
        \type "Engraver_group_engraver"
 }

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 6ab401df96ee3ff8b1350200e8f6f48f4651f631..97c6638c153950a50972125e0493874c0870d3f0 100644 (file)
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -21,21 +21,22 @@ StaffContext = \translator {
 VoiceContext = \translator {
        \type "Performer_group_performer"
        \name Voice
-% All notes fall to Grace if you leave Thread out (huh?)
        \consists "Dynamic_performer"
        \consists "Span_dynamic_performer"
        \consists "Piano_pedal_performer"
-       \consists "Note_performer"
-       \consists "Tie_performer"
+       \accepts "Thread"
 }
 \translator { \VoiceContext }
 
 ThreadContext = \translator {
        \type "Performer_group_performer"
        \name Thread
+       \consists "Note_performer"
+       \consists "Tie_performer"
 }
 \translator { \ThreadContext }
 
+% retain for compatibility reasons (FIXME: convert-ly)
 \translator {
        \type "Performer_group_performer"
        \name Grace