From: matsb <matsb>
Date: Wed, 28 Jan 2004 15:25:53 +0000 (+0000)
Subject: 	* scripts/lilypond.py (ly_paper_to_latexpaper): Regain
X-Git-Tag: release/2.1.17^2~21
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3f746128b538ac9271896ed003ddf4634e009552;p=lilypond.git

	* scripts/lilypond.py (ly_paper_to_latexpaper): Regain
	compatibility with old versions of geometry.sty (compat2
	already implied includehead).
	Change the page layout slightly so bottom + footskip = top +
	headheight + headsep = 16mm, the remaining paperheight-32mm
	are used for the music. Increase footskip to 5mm, so the top of
	the footer text doesn't touch the music.
---

diff --git a/ChangeLog b/ChangeLog
index ea6c0459c6..cf797870ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-28  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+	* scripts/lilypond.py (ly_paper_to_latexpaper): Regain
+	compatibility with old versions of geometry.sty (compat2
+	already implied includehead).
+	Change the page layout slightly so bottom + footskip = top +
+	headheight + headsep = 16mm, the remaining paperheight-32mm
+	are used for the music. Increase footskip to 5mm, so the top of
+	the footer text doesn't touch the music.
+
 2004-01-28  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* scm/music-functions.scm (determine-split-list): bugfix: only use
diff --git a/scripts/lilypond.py b/scripts/lilypond.py
index 861c6c66af..15af60e526 100644
--- a/scripts/lilypond.py
+++ b/scripts/lilypond.py
@@ -438,7 +438,7 @@ def global_latex_preamble (extra):
 		linewidth = '597pt'
 	else:
 		linewidth = '%d%s' % (maxlw, unit)
-	s = s + '\geometry{%swidth=%s%s,includehead,bottom=20mm,headsep=2mm,top=12mm,headheight=2mm,footskip=2mm,%s}\n' % (papersize, linewidth, textheight, orientation)
+	s = s + '\geometry{%swidth=%s%s,bottom=11mm,headsep=2mm,top=12mm,headheight=2mm,footskip=5mm,%s}\n' % (papersize, linewidth, textheight, orientation)
 
 
 	if 'twoside' in  extra['latexoptions'] :