From 4343d45b858e21f30e22a9d899163b35e4579dd1 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Tue, 12 Aug 2014 20:29:22 +0200 Subject: [PATCH] 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. --- lily/score-scheme.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 ()); -- 2.39.5