From e8d70c0277a943558e309bea2604f310bac9ff2f Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Wed, 29 Sep 2004 22:42:03 +0000
Subject: [PATCH] * lily/slur.cc (outside_slur_callback): epsilon-delta
 management for slur edges.

* scm/framework-tex.scm (dump-page): put stencil height in dumped
page.
---
 ChangeLog             |  3 +++
 lily/slur.cc          | 10 ++++++++--
 scm/framework-tex.scm |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e0c230bc9e..feeb553770 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-30  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* lily/slur.cc (outside_slur_callback): epsilon-delta management
+	for slur edges.
+ 
 	* scm/framework-tex.scm (dump-page): put stencil height in dumped
 	page.
 
diff --git a/lily/slur.cc b/lily/slur.cc
index 7be89976d8..2f83d045a3 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -169,8 +169,14 @@ Slur::outside_slur_callback (SCM grob, SCM axis)
   
   if (!bezext.contains (x))
     return scm_make_real (0);
-
-  Real y = curve.get_other_coordinate (X_AXIS, x);
+  Real dist = fabs (x - bezext[LEFT]) <? fabs (x - bezext[RIGHT]);
+  
+  Real y = (dist >  1e-3)
+    ? curve.get_other_coordinate (X_AXIS, x)
+    : ((x < bezext.center())
+       ? curve.control_[0][Y_AXIS]
+       : curve.control_[3][Y_AXIS]);
+       
   if (yext.contains (y)) 
     {
       Direction dir = get_grob_direction (script); 
diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index d27785d75c..98dc39fc38 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -172,8 +172,8 @@
   (ly:outputter-dump-string
    putter
    (if last?
-       "}\\vss\n}\n\\vfill\n"
-       "}\\vss\n}\n\\vfill\\lilypondpagebreak\n")))
+       "}\\vss\n}\n\\vss\n"
+       "}\\vss\n}\n\\vss\\lilypondpagebreak\n")))
 
 (define-public (output-framework outputter book scopes fields basename )
   (let* ((bookpaper (ly:paper-book-book-paper book))
-- 
2.39.5