From: David Kastrup <dak@gnu.org>
Date: Sun, 4 Aug 2013 22:57:54 +0000 (+0200)
Subject: Don't let interpret_stencil_expression call no-origin if grob-cause returned #f
X-Git-Tag: release/2.17.24-1~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9fdcba0de020528bbf617ffe31e1f792760c8fe7;p=lilypond.git

Don't let interpret_stencil_expression call no-origin if grob-cause returned #f
---

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"))