From 84cf69f7c840700a83ca6a9ae9e6b6f2e9f9f1f9 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Mon, 31 Dec 2012 18:15:41 +0100 Subject: [PATCH] Issue 677: \score markup confuses paper settings I actually have no idea whether this is the right fix, but it seems to do something related to the TODO comments and the issue report. --- lily/score-scheme.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc index 7a306af442..98ff693ad2 100644 --- a/lily/score-scheme.cc +++ b/lily/score-scheme.cc @@ -130,16 +130,11 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format", if (!score_def) return SCM_BOOL_F; - score_def = score_def->clone (); - SCM prot = score_def->unprotect (); - - /* TODO: SCORE_DEF should be scaled according to OD->parent_ or OD - itself. */ + score_def = scale_output_def (score_def, output_scale (od)); score_def->parent_ = od; - SCM context = ly_run_translator (sc->get_music (), score_def->self_scm ()); + SCM context = ly_run_translator (sc->get_music (), score_def->unprotect ()); SCM output = ly_format_output (context); - scm_remember_upto_here_1 (prot); return output; } -- 2.39.5