* scm/page-layout.scm (plain-header): add printpagenumber boolean

[lilypond.git] / lily / staff-symbol.cc

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 744beabe602243af8d8ab39ede3fb835b61a33a5..691f86a577c96bd06363122f7fc826fd24e120f1 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -8,7 +8,7 @@
 
 #include "lookup.hh"
 #include "dimensions.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "stencil.hh"
 #include "warn.hh"
 #include "item.hh"
@@ -42,14 +42,14 @@ Staff_symbol::print (SCM smob)
   do
     {
       SCM width_scm = me->get_property ("width");
-      if (d == RIGHT && gh_number_p (width_scm))
+      if (d == RIGHT && ly_c_number_p (width_scm))
        {
          /*
            don't multiply by Staff_symbol_referencer::staff_space (me),
            since that would make aligning staff symbols of different sizes to
            one right margin hell.
          */      
-         span_points[RIGHT] = gh_scm2double (width_scm);
+         span_points[RIGHT] = ly_scm2double (width_scm);
        }
       else
        {
@@ -95,8 +95,8 @@ int
 Staff_symbol::line_count (Grob*me) 
 {
   SCM c = me->get_property ("line-count");
-  if (gh_number_p (c))
-    return gh_scm2int (c);
+  if (ly_c_number_p (c))
+    return ly_scm2int (c);
   else
     return 0;
 }
@@ -104,7 +104,7 @@ Staff_symbol::line_count (Grob*me)
 Real
 Staff_symbol::staff_space (Grob*me)
 {
-  return robust_scm2double ( me->get_property ("staff-space"), 1.0);
+  return robust_scm2double (me->get_property ("staff-space"), 1.0);
 }
 
 Real