From 3266576ad6ac6b99852eebb6e81b27fb4686586d Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 02:47:35 +0000
Subject: [PATCH] lilypond-1.5.47

---
 VERSION           | 2 +-
 ly/grace-init.ly  | 5 -----
 scripts/ly2dvi.py | 5 +++--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/VERSION b/VERSION
index 500f43c91c..e6d9e5925e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
-PATCH_LEVEL=46
+PATCH_LEVEL=47
 MY_PATCH_LEVEL=
 
 
diff --git a/ly/grace-init.ly b/ly/grace-init.ly
index b139a85bff..c03ea803d4 100644
--- a/ly/grace-init.ly
+++ b/ly/grace-init.ly
@@ -1,8 +1,4 @@
 
-#(define (grace-beam-space-function multiplicity)
-  (* (if (<= multiplicity 3) 0.816 0.844) 0.8))
-
-
 startGraceMusic = {
     \property Voice.Stem \override  #'direction = #1
     \property Voice.Stem \override #'length = #6
@@ -26,7 +22,6 @@ startGraceMusic = {
 
 stopGraceMusic = {
     \property Staff.Accidentals \revert #'font-relative-size
-    \property Voice.Beam \revert #'space-function
     \property Voice.Beam \revert #'thickness
 
     \property Voice.Stem \revert #'flag-style
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index da78c42198..75d80b0657 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -552,15 +552,16 @@ lily output file in TFILES after that, and return the Latex file constructed.  '
 		s = s + '\\include{%s}\n' \
 			% string.join (extra['latexheaders'], '}\n\\include{')
 
+ 	unit = extra['unit'][-1]
+
 	textheight = ''
 	if extra['textheight']:
-		textheight = ',textheight=%fpt' % extra['textheight'][0]
+		textheight = ',textheight=%f%s' % (extra['textheight'][0], unit)
 
 	orientation = 'portrait'
 	if extra['orientation']:
 		orientation = extra['orientation'][0]
 
- 	unit = extra['unit'][-1]
  	# set sane geometry width (a4-width) for linewidth = -1.
 	maxlw = max (extra['linewidth'] + [-1])
 	if maxlw < 0:
-- 
2.39.5