(triangle): add s to 0triangle.

[lilypond.git] / lily / line-spanner.cc

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 36e35ef6eb6159a5690ea623387b73655fde0617..415df6c1506024dcce2e67a886b7296ddcf8fa0b 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -6,12 +6,11 @@
   (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "line-spanner.hh"
+
 #include <math.h>
 
-#include "stencil.hh"
-#include "item.hh"
 #include "spanner.hh"
-#include "line-spanner.hh"
 #include "output-def.hh"
 #include "paper-column.hh"
 #include "staff-symbol-referencer.hh"
@@ -117,10 +116,10 @@ Line_spanner::line_stencil (Grob *me,
                                             ly_symbol2scm ("fetaMusic")),
                                    SCM_UNDEFINED);
       
-      Font_metric *fm = select_font (me->get_paper (),
+      Font_metric *fm = select_font (me->get_layout (),
                                     scm_cons (style_alist,
                                              alist_chain));
-      Stencil m = fm->find_by_name ("scripts-trill-element");
+      Stencil m = fm->find_by_name ("scripts.trill_element");
       Stencil mol;
 
       do
@@ -275,7 +274,7 @@ Line_spanner::print (SCM smob)
            + bound[RIGHT]->extent (common[X_AXIS], ax).center ()
            - bound[LEFT]->extent (common[X_AXIS], ax).center ();
 
-         my_off[ax] =me->relative_coordinate (common[a], ax);
+         my_off[ax] = me->relative_coordinate (common[a], ax);
          his_off[ax] = bound[LEFT]->relative_coordinate (common[a], ax);
          
        }