new file, move from

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

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 10c63b9fff24f98bf77d17c46ddf441528ee1c07..9dc4562539484b949974bd9be0f065eedf08079d 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -12,7 +12,7 @@
 #include "item.hh"
 #include "spanner.hh"
 #include "line-spanner.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "paper-column.hh"
 #include "staff-symbol-referencer.hh"
 #include "font-interface.hh"
@@ -98,7 +98,7 @@ Line_spanner::line_stencil (Grob *me,
 {
   Offset dz = to -from ; 
   SCM type = me->get_property ("style");
-  if (is_symbol (type)
+  if (ly_c_symbol_p (type)
       && (type == ly_symbol2scm ("line")
          || type == ly_symbol2scm ("dashed-line")
          || type == ly_symbol2scm ("dotted-line")
@@ -109,12 +109,12 @@ Line_spanner::line_stencil (Grob *me,
        ? zigzag_stencil (me, from, to)
        : Line_interface::line (me, from, to);
     }
-  else if (is_symbol (type)
+  else if (ly_c_symbol_p (type)
           && type == ly_symbol2scm ("trill"))
     {
       SCM alist_chain = Font_interface::text_font_alist_chain (me);
       SCM style_alist = scm_list_n (scm_cons (ly_symbol2scm ("font-encoding"),
-                                            ly_symbol2scm ("music")),
+                                            ly_symbol2scm ("fetaMusic")),
                                    SCM_UNDEFINED);
       
       Font_metric *fm = select_font (me->get_paper (),