Re: Collected small patches

[Mats Bengtsson]

Here comes some more patches. This time for 1.5.46.

   /Mats

Generated by (address unknown),
>From = lilypond-1.5.46, To = lilypond-1.5.46.mb1

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.46.mb1.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure

diff -purN ../lilypond-1.5.46/ChangeLog ./ChangeLog
--- ../lilypond-1.5.46/ChangeLog        Sat Mar 23 03:36:37 2002
+++ ./ChangeLog Sat Mar 23 19:56:34 2002
@@ -1,3 +1,10 @@
+2002-03-23  Mats Bengtsson  <address@hidden>
+
+       * scripts/ly2dvi.py (ly_paper_to_latexpaper): Use the correct unit
+       also for textheight
+
+        * ly/grace-init.ly: remove deprecated property space-function
+
 2002-03-23  Han-Wen  <address@hidden>
 
        * VERSION: 1.5.46
diff -purN ../lilypond-1.5.46/VERSION ./VERSION
--- ../lilypond-1.5.46/VERSION  Sat Mar 23 03:34:17 2002
+++ ./VERSION   Sat Mar 23 19:55:34 2002
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=46
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff -purN ../lilypond-1.5.46/ly/grace-init.ly ./ly/grace-init.ly
--- ../lilypond-1.5.46/ly/grace-init.ly Fri Mar 22 01:28:43 2002
+++ ./ly/grace-init.ly  Sat Mar 23 19:55:34 2002
@@ -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 -purN ../lilypond-1.5.46/scripts/ly2dvi.py ./scripts/ly2dvi.py
--- ../lilypond-1.5.46/scripts/ly2dvi.py        Sat Mar 23 02:43:29 2002
+++ ./scripts/ly2dvi.py Sat Mar 23 18:17:12 2002
@@ -552,15 +552,16 @@ lily output file in TFILES after that, a
                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: