X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=3da186954132a5cfc3940471e116671bac07faf0;hb=d81922707a26999de9da8e5dd21aef3d7f8367d0;hp=7c1c918655c1d05b87aae6b0c3f682d508323c18;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 7c1c918655..3da1869541 100644
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -25,7 +25,6 @@
 #include "string-convert.hh"
 #include "warn.hh"
 
-using std::vector;
 
 Stencil::Stencil ()
 {
@@ -105,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
@@ -168,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);
 }
 
@@ -249,7 +248,7 @@ Stencil::align_to (Axis a, Real x)
 /*  See scheme Function.  */
 
 // Any stencil that is empty in the orthogonal axis is spacing.
-// Spacing is not subjected to the std::max (0) rule and can thus be
+// Spacing is not subjected to the max (0) rule and can thus be
 // negative.
 
 void