X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=3da186954132a5cfc3940471e116671bac07faf0;hb=a26d69cbc5f9bdc3064d97223bc8f8f8936a9938;hp=41eb2f1e852498c7fc0cf454f9c9c892b124b307;hpb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;p=lilypond.git

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 41eb2f1e85..3da1869541 100644
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -39,7 +39,7 @@ Stencil::Stencil (Box b, SCM func)
 }
 
 SCM
-Stencil::mark_smob ()
+Stencil::mark_smob () const
 {
   return expr_;
 }
@@ -55,7 +55,7 @@ Stencil::extent (Axis a) const
 bool
 Stencil::is_empty () const
 {
-  return (expr_ == SCM_EOL
+  return (scm_is_null (expr_)
           || dim_.is_empty ());
 }
 
@@ -104,10 +104,10 @@ Stencil::rotate_degrees_absolute (Real a, Offset absolute_off)
    *         *this = rotated()
    */
 
-  expr_ = scm_list_n (ly_symbol2scm ("rotate-stencil"),
+  expr_ = scm_list_3 (ly_symbol2scm ("rotate-stencil"),
                       scm_list_2 (scm_from_double (a),
                                   scm_cons (scm_from_double (x), scm_from_double (y))),
-                      expr_, SCM_UNDEFINED);
+                      expr_);
 
   /*
    * Calculate the new bounding box
@@ -167,9 +167,9 @@ Stencil::translate (Offset o)
     }
 
   if (!scm_is_null (expr_))
-    expr_ = scm_list_n (ly_symbol2scm ("translate-stencil"),
+    expr_ = scm_list_3 (ly_symbol2scm ("translate-stencil"),
                         ly_offset2scm (o),
-                        expr_, SCM_UNDEFINED);
+                        expr_);
   dim_.translate (o);
 }