(default_rendering): scale outputdef before

starting.

diff --git a/ChangeLog b/ChangeLog
index 312fedf22bcb2ed88c0d3680666a7e4693848e14..7637f7a92f79a97775a66b87c420796c67168bb5 100644 (file)
--- 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 e35e8b5573c17cacbeac64605df3dbdb5d88fbd7..58f4e97e394120b44f1c604680714bc74167924d 100644 (file)
--- 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 cfe24015c97248943e8c7c03397c0011de5ae548..2a45a682d40bc063a36ec827e6c1f177aee56c90 100644 (file)
--- 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'