Added texidoc template.

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

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 9526e36dd88eca9c1ddadcfac44e91ad9e7b500b..e6b73143fea5770213d3627c05789003ed88f857 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -38,14 +38,14 @@ Staff_symbol::print (SCM smob)
 
     --hwn.
    */
-  Real t = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real t = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
   t *= robust_scm2double (me->get_property ("thickness"), 1.0);
   
   Direction d = LEFT;
   do
     {
       SCM width_scm = me->get_property ("width");
-      if (d == RIGHT && ly_c_number_p (width_scm))
+      if (d == RIGHT && scm_is_number (width_scm))
        {
          /*
            don't multiply by Staff_symbol_referencer::staff_space (me),
@@ -97,7 +97,7 @@ int
 Staff_symbol::line_count (Grob*me) 
 {
   SCM c = me->get_property ("line-count");
-  if (ly_c_number_p (c))
+  if (scm_is_number (c))
     return scm_to_int (c);
   else
     return 0;
@@ -112,7 +112,7 @@ Staff_symbol::staff_space (Grob*me)
 Real
 Staff_symbol::get_line_thickness (Grob* me)
 {
-  Real lt =  me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt =  me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
 
   return robust_scm2double (me->get_property ("thickness"), 1.0) * lt;
 }