Run grand replace for 2015.

[lilypond.git] / lily / score-scheme.cc

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index fc6985e701f218ee9d13ce7fa582cc498dfad9e7..ed930d5fa0eaabaece18055cbc3783d50e6a72d4 100644 (file)
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -130,7 +130,12 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
   if (!score_def)
     return SCM_BOOL_F;
 
-  score_def = scale_output_def (score_def, output_scale (od));
+  /* Don't rescale if the layout has already been scaled */
+  if (to_boolean (score_def->c_variable ("cloned")))
+    score_def = score_def->clone ();
+  else
+    score_def = scale_output_def (score_def, output_scale (od));
+
   score_def->parent_ = od;
 
   SCM context = ly_run_translator (sc->get_music (), score_def->unprotect ());