From 9fdcba0de020528bbf617ffe31e1f792760c8fe7 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Mon, 5 Aug 2013 00:57:54 +0200 Subject: [PATCH] Don't let interpret_stencil_expression call no-origin if grob-cause returned #f --- lily/stencil-interpret.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lily/stencil-interpret.cc b/lily/stencil-interpret.cc index d3966c94af..ee5dce0b00 100644 --- a/lily/stencil-interpret.cc +++ b/lily/stencil-interpret.cc @@ -55,10 +55,12 @@ interpret_stencil_expression (SCM expr, { SCM grob = scm_cadr (expr); - (*func) (func_arg, scm_list_3 (head, - ly_quote_scm (ly_offset2scm (o)), grob)); + SCM link = + (*func) (func_arg, + scm_list_3 (head, ly_quote_scm (ly_offset2scm (o)), grob)); interpret_stencil_expression (scm_caddr (expr), func, func_arg, o); - (*func) (func_arg, scm_list_1 (ly_symbol2scm ("no-origin"))); + if (scm_is_true (link)) + (*func) (func_arg, scm_list_1 (ly_symbol2scm ("no-origin"))); return; } else if (head == ly_symbol2scm ("color")) -- 2.39.5