From 0c8900ebb927c893d684b2eecf8e46a2e3701d8a Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 17 Feb 1999 14:29:35 +0100
Subject: [PATCH] patch::: 1.1.31.jcn1: Re: LilyPond 1.1.30

pl 31.jcn1
	- bf: slur-follow-music
---
 NEWS         |  2 ++
 VERSION      |  2 +-
 lily/slur.cc | 15 ++++++---------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index a1ec9abbfb..3a4625f0a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+pl 31.jcn1
+	- bf: slur-follow-music
 
 pl 30.jcn1
 	- sm fixes, intl/ fixes
diff --git a/VERSION b/VERSION
index 54f1f0b60f..f8e84f7152 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=31
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/lily/slur.cc b/lily/slur.cc
index d0270a4fac..552c383738 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -122,6 +122,8 @@ Slur::do_post_processing ()
 
   Direction d=LEFT;
  
+#define BROKEN_SLUR_b(dir) \
+  (extrema[dir] != spanned_drul_[d])
 #define NORMAL_SLUR_b(dir) \
   (extrema[dir]->stem_l_ \
    && !extrema[dir]->stem_l_->transparent_b_  \
@@ -129,10 +131,7 @@ Slur::do_post_processing ()
 
   do 
     {
-      /*
-        broken slur
-       */
-      if (extrema[d] != spanned_drul_[d]) 
+      if (BROKEN_SLUR_b (d))
 	{
 	  // ugh -- check if needed
 	  dx_f_drul_[d] = -d 
@@ -180,10 +179,7 @@ Slur::do_post_processing ()
   // now that both are set, do dependent
   do 
     {
-      /*
-        broken slur
-       */
-      if (extrema[d] != spanned_drul_[d]) 
+      if (BROKEN_SLUR_b (d))
         {
 	  Direction u = d;
 	  flip(&u);
@@ -200,7 +196,8 @@ Slur::do_post_processing ()
   /*
     Slur should follow line of music
    */
-  if (NORMAL_SLUR_b (LEFT) && NORMAL_SLUR_b (RIGHT)
+  if (!BROKEN_SLUR_b (LEFT) && !BROKEN_SLUR_b (RIGHT)
+      && NORMAL_SLUR_b (LEFT) && NORMAL_SLUR_b (RIGHT)
       && (extrema[LEFT]->stem_l_ != extrema[RIGHT]->stem_l_))
     {
       Real note_dy = extrema[RIGHT]->stem_l_->head_positions ()[dir_]
-- 
2.39.5