From 3a222c318071d27980df7a550c318957c9b2b104 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 29 Apr 2001 14:25:39 +0200
Subject: [PATCH] patch::: 1.3.151.jcn2

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

* ly2dvi: changed headsep to 0pt, as old ly2dvi had.  Fixes mutopia
textheight setting.
---
 CHANGES                         |  6 ++++++
 VERSION                         |  2 +-
 mutopia/F.Schubert/standchen.ly | 15 ++++++++-------
 scripts/ly2dvi.py               |  4 ++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0a0786fd57..eeada32b0e 100644
--- 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 b8f0c8a935..68ad4d2cd7 100644
--- 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 d7e3e0428c..561b345fe1 100644
--- 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 457a00f37a..8934a83732 100644
--- 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'
-- 
2.39.5