(PATCH_LEVEL): bump version.

diff --git a/ChangeLog b/ChangeLog
index a1ec58a0ad3061a837a0b5e4151b380b0060020e..038eae064178378fb5271f38e5372c25c5416d5e 100644 (file)
--- 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 6d0a9aef61115a6121ee4b360647a8d2f851eafb..e5b2f9e1ced45d4657f58d8c54a39119f24a8df3 100644 (file)
--- 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 bdb7031fcf04ed5959bfca99eadbc134a461c4db..d11153aaab654981e13c48e1befd8bf2303e664c 100644 (file)
--- 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 5e8581ecfe26425defa7c5bffd8b9597f41ab258..0e68240bd3eb89b1ad40439c1d8d5deea6c9f27f 100644 (file)
--- 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))