* scripts/lilypond.py (ly_paper_to_latexpaper): Only set the

	height of head and foot if textheight is not set, otherwise let
	the geometry package make evenly sized head and foot.

diff --git a/ChangeLog b/ChangeLog
index 3d67d128f7e2514368af1e7aa377fe31844292bb..e3a828c03fa49314ca3dd2bfde4089181b8fb27e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-20  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * scripts/lilypond.py (ly_paper_to_latexpaper): Only set the
+       height of head and foot if textheight is not set, otherwise let
+       the geometry package make evenly sized head and foot.
+
 2004-08-18  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * lily/clef-engraver.cc: Add forceClef to list of read properties.

diff --git a/scripts/lilypond.py b/scripts/lilypond.py
index fb71ee72d43263652cb260c5ff408f8bce8ba592..f426f1a2a0dfcf3a536e96251fe49d8b9836c6c2 100644 (file)
--- a/scripts/lilypond.py
+++ b/scripts/lilypond.py
@@ -437,7 +437,8 @@ def global_latex_preamble (extra):
                        ly.warning (_ ("invalid value: `%s'") % `extra['papersize'][0]`)
                        pass
 
-       textheight = ''
+       # Default setting: textheight is determined implicitly:
+       textheight = ',bottom=11mm,top=12mm'
        if extra['textheight']:
                textheight = ',textheight=%f%s' % (extra['textheight'][0], unit)
 
@@ -452,7 +453,7 @@ def global_latex_preamble (extra):
                linewidth = '597pt'
        else:
                linewidth = '%d%s' % (maxlw, unit)
-       s += '\geometry{%swidth=%s%s,bottom=11mm,headsep=2mm,top=12mm,headheight=2mm,footskip=5mm,%s}\n' % (papersize, linewidth, textheight, orientation)
+       s += '\geometry{%swidth=%s%s,headsep=2mm,headheight=2mm,footskip=5mm,%s}\n' % (papersize, linewidth, textheight, orientation)
 
 
        if 'twoside' in  extra['latexoptions'] :