* lily/tie.cc (print): idem.

[lilypond.git] / lily / stencil-scheme.cc

diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc
index e51fc41bcb8346d6112d4e28ef075b1158511b13..b69c9d70e3051b07951da315f92430d0321c3f0c 100644 (file)
--- a/lily/stencil-scheme.cc
+++ b/lily/stencil-scheme.cc
@@ -192,19 +192,26 @@ LY_DEFINE (ly_stencil_add, "ly:stencil-add",
 #define FUNC_NAME __FUNCTION__
   SCM_VALIDATE_REST_ARGUMENT (args);
 
-  Stencil result;
-
+  SCM expr = SCM_EOL;
+  SCM *tail = &expr; 
+  Box extent;
+  extent.set_empty ();
+  
   while (!SCM_NULLP (args))
     {
       Stencil *s = unsmob_stencil (scm_car (args));
       if (!s)
        SCM_ASSERT_TYPE (s, scm_car (args), SCM_ARGn, __FUNCTION__, "Stencil");
 
-      result.add_stencil (*s);
+
+      extent.unite (s->extent_box ());
+      *tail = scm_cons (s->expr (), SCM_EOL);
+      tail = SCM_CDRLOC (*tail);
       args = scm_cdr (args);
     }
 
-  return result.smobbed_copy ();
+  expr = scm_cons (ly_symbol2scm ("combine-stencil"), expr);
+  return Stencil (extent, expr).smobbed_copy ();
 }
 
 LY_DEFINE (ly_make_stencil, "ly:make-stencil",