patch::: 1.3.151.jcn2

1.3.151.jcn2
============

* ly2dvi: changed headsep to 0pt, as old ly2dvi had.  Fixes mutopia
textheight setting.

diff --git a/CHANGES b/CHANGES
index 0a0786fd57d251a9817be5db8af4cd07d0b51260..eeada32b0e40f0438c1739ef893bba4a93aaf95c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+1.3.151.jcn2
+============
+
+* ly2dvi: changed headsep to 0pt, as old ly2dvi had.  Fixes mutopia
+textheight setting.
+
 1.3.151.jcn1
 ============
 

diff --git a/VERSION b/VERSION
index b8f0c8a93524e9e1e8e6d2c8cc786e91ea18aba1..68ad4d2cd7f619f2de8f0b9086e9849557bf8bf4 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=151
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly
index d7e3e0428cff0bfafbc33f3adbc2763a8b5f52bd..561b345fe1d9ca24a8a4a7a8e8ad37eb93d6aa48 100644 (file)
--- a/mutopia/F.Schubert/standchen.ly
+++ b/mutopia/F.Schubert/standchen.ly
@@ -31,7 +31,7 @@ instrument = "Piano"
   maintainer = "Jan Nieuwenhuizen"
   maintainerEmail = "janneke@gnu.org"
   lastupdated =         "2001/Apr/27"
-  mutopiapublicdomain = "\\parbox{\\hsize}{\\thefooter\\quad\\small
+  mutopiapublicdomain = "\\parbox[b]{\\hsize}{\\thefooter\\quad\\small
     \\\\This music is part of the Mutopia project,
     \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset
     and placed in the public domain by " + \maintainer +
@@ -452,15 +452,16 @@ grandStaff =  \context PianoStaff <
                \grandStaff
        >
        \paper {
-               % arg, if it weren't for the mutopia margins, this would
-               % fit on three a4 pages, like the original
-               % Mandatory Mutopia settings:
+               % Use
+               %   textheight = 280.\mm
+               %   linewidth = 190.\mm
+               % to get this on 3 pages of a4.
+               
+               % Mandatory Mutopia settings yield 4 pages :-(
                textheight = 270.0\mm
                linewidth = 180.0\mm
 
-               \translator {
-                       \HaraKiriStaffContext
-               }
+               \translator { \HaraKiriStaffContext }
        }
        \midi{
                \tempo 4 = 54

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 457a00f37aa4bd982810d9cd39c6e8c81d5ee47b..8934a8373290e4b0645fd53d81a1ba401b680303 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -503,10 +503,10 @@ lily output file in TFILES after that, and return the Latex file constructed.  '
        maxlw = max (extra['linewidth'] + [-1])
        if maxlw < 0:
                # who the hell is 597 ?
-               linewidth = 597
+               linewidth = '597'
        else:
                linewidth = maxlw
-       s = s + '\geometry{width=%spt%s,headheight=2mm,headsep=12pt,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
+       s = s + '\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
 
        if extra['latexoptions']:
                s = s + '\geometry{twosideshift=4mm}\n'