* 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 ea6c0459c62d2e069e61804a895cdc8a7a0d95c9..cf797870eeb64ddb6b23eeb34136b40429b150c9 100644 (file)
--- 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 861c6c66af209704247e076cc048499542489c47..15af60e526198f5af795c7bb72b7898c74a16f4f 100644 (file)
--- 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'] :