* scm/lily.scm (ly:all-stencil-expressions):

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 3d16fc7f5c5b3225e09c46045a80d858b8738848..910c240a6aa221f9448d84ef9ef2ab92033bb16b 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -12,7 +12,7 @@
 #include "script.hh"
 #include "font-interface.hh"
 #include "side-position-interface.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "item.hh"
 #include "stencil.hh"
 #include "lookup.hh"
@@ -23,14 +23,14 @@ Stencil
 Script_interface::get_stencil (Grob * me, Direction d)
 {
   SCM s = me->get_property ("script-stencil");
-  assert (is_pair (s));
+  assert (ly_c_pair_p (s));
 
   SCM key = ly_car (s);
   if (key == ly_symbol2scm ("feta"))
     {
       SCM name_entry = ly_cdr (s);
 
-      SCM str = (is_pair (name_entry)) ? index_get_cell (name_entry, d) :  name_entry;
+      SCM str = (ly_c_pair_p (name_entry)) ? index_get_cell (name_entry, d) :  name_entry;
       return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
                                                                  ly_scm2string (str));
     }