From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 25 May 2004 21:29:32 +0000 (+0000)
Subject: (default_rendering): scale outputdef before
X-Git-Tag: release/2.3.2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=683b861562fdf6be6c7296247ab4f8e4f1d42fb4;p=lilypond.git

(default_rendering): scale outputdef before
starting.
---

diff --git a/ChangeLog b/ChangeLog
index 312fedf22b..7637f7a92f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-25  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* lily/score.cc (default_rendering): scale outputdef before
+	starting.
+
 2004-05-25  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* scm/fret-diagrams.scm: Add header.
diff --git a/lily/score.cc b/lily/score.cc
index e35e8b5573..58f4e97e39 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -160,13 +160,13 @@ default_rendering (SCM music, SCM outdef,
 		   SCM book_outputdef,
 		   SCM header, SCM outname)
 {
-  SCM context = ly_run_translator (music, outdef);
-
   Book_paper_def *bpd = unsmob_book_paper_def (book_outputdef);
   if (bpd && unsmob_paper (outdef))
     /* FIXME:  memory leak */
     outdef = bpd->scale_paper (unsmob_paper (outdef))->self_scm ();
   
+  SCM context = ly_run_translator (music, outdef);
+
   if (Global_context *g = dynamic_cast<Global_context*>
       (unsmob_context (context)))
     {
diff --git a/scripts/lilypond.py b/scripts/lilypond.py
index cfe24015c9..2a45a682d4 100644
--- a/scripts/lilypond.py
+++ b/scripts/lilypond.py
@@ -489,6 +489,7 @@ leaving a PS file in OUTBASE.ps
 
 	if extra['papersize']:
 		opts = ' -t%s' % extra['papersize'][0]
+		
 	if extra['orientation'] and extra['orientation'][0] == 'landscape':
 		opts = opts + ' -tlandscape'