X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=0cf49296f0b460f444eaad29b7941b2ab99d248e;hb=de9831ffbac6592724492a21b084726e370bd362;hp=34b68d9b3a38c6367c8b9fc80362523aad1d79fe;hpb=207f71b8b2ab9ca550e841615bedce393e652ca6;p=lilypond.git diff --git a/lily/stencil.cc b/lily/stencil.cc index 34b68d9b3a..0cf49296f0 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 () { @@ -45,7 +44,7 @@ Stencil::mark_smob () const return expr_; } -const char Stencil::type_p_name_[] = "ly:stencil?"; +const char * const Stencil::type_p_name_ = "ly:stencil?"; Interval Stencil::extent (Axis a) const @@ -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); }