From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 20 Mar 2006 15:50:14 +0000 (+0000)
Subject: (PATCH_LEVEL): bump version.
X-Git-Tag: release/2.7.40~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=43ae5e9a69e4f4f4f82eaccc4d8c47d7af5fe610;p=lilypond.git

(PATCH_LEVEL): bump version.
---

diff --git a/ChangeLog b/ChangeLog
index a1ec58a0ad..038eae0641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-03-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* VERSION (PATCH_LEVEL): bump version.
+
 	* input/test/instrument-name-align.ly: new file.
 
 	* scm/define-markup-commands.scm (hcenter-in): add hcenter-in.
diff --git a/VERSION b/VERSION
index 6d0a9aef61..e5b2f9e1ce 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
-PATCH_LEVEL=39
+PATCH_LEVEL=40
 MY_PATCH_LEVEL=
 
diff --git a/lily/tie.cc b/lily/tie.cc
index bdb7031fcf..d11153aaab 100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -122,7 +122,9 @@ Tie::get_default_dir (Grob *me)
       Grob *s = stems[LEFT] ? stems[LEFT] : stems[RIGHT];
       return -get_grob_direction (s);
     }
-
+  else if (int p = get_position (me))
+    return Direction (sign (p));
+  
   return UP;
 }
 
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 5e8581ecfe..0e68240bd3 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -469,9 +469,11 @@
     (let* ((scale (ly:output-def-lookup paper 'output-scale))
 	   (box (map
 		 (lambda (x)
-		   (inexact->exact
-		    (round (/ (* x scale) (ly:bp 1))))) mmbox)))
-
+		   (if (or (nan? x) (inf? x))
+		       0
+		       (inexact->exact
+			(round (/ (* x scale) (ly:bp 1)))))) mmbox)))
+      
     (list (car box)
 	  (cadr box)
 	  (max (1+ (car box)) (caddr box))