From bccc9a859dd93279af62631263ccfae8542bba17 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 01:20:27 +0000
Subject: [PATCH] lilypond-1.5.2

---
 GNUmakefile.in       |  2 +-
 input/test/knee.ly   |  1 +
 lexer-gcc-3.0.patch  | 11 +++++++++++
 lily/beam.cc         |  7 ++++---
 ly/engraver-init.ly  |  2 +-
 ly/performer-init.ly |  7 ++++---
 6 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 lexer-gcc-3.0.patch

diff --git a/GNUmakefile.in b/GNUmakefile.in
index faadd6c792..6240b6bcc9 100644
--- 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 8ab530b85d..c2b1ef7400 100644
--- 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
index 0000000000..fedefc258c
--- /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 8086632514..d345e7de75 100644
--- 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 968fd4b11e..c8ec356f52 100644
--- 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 6ab401df96..97c6638c15 100644
--- 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
-- 
2.39.5