From: David Kastrup <dak@gnu.org>
Date: Tue, 12 Aug 2014 18:29:22 +0000 (+0200)
Subject: Issue 4065: Don't rescale \layout in \score markup when already scaled
X-Git-Tag: release/2.19.12-1~10^2~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4343d45b858e21f30e22a9d899163b35e4579dd1;p=lilypond.git

Issue 4065: Don't rescale \layout in \score markup when already scaled

This change modifies the fix for issue 677 to avoid scaling problems
when employing $(ly:grob-layout grob) in the \layout of a score markup.
---

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index fc6985e701..913cdc14c0 100644
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -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 ());