X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-quanting.cc;h=ae8730dabaea58642da6a027d06c0b2c859106c2;hb=b782f68f927fa02b3ea895dd1bd801082e5bda6e;hp=00375335a8dfd4d4c0e01f8cec7388b9d7912f29;hpb=1f8e2327f25d602dd8bf308150136a3cb2424d33;p=lilypond.git

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index 00375335a8..ae8730daba 100644
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -15,7 +15,6 @@
 #include <math.h>
 
 #include "warn.hh"
-#include "grob.hh"
 #include "staff-symbol-referencer.hh"
 #include "beam.hh"
 #include "stem.hh"
@@ -101,8 +100,8 @@ Beam::quanting (SCM smob)
   Grob *me = unsmob_grob (smob);
 
   SCM s = me->get_property ("positions");
-  Real yl = scm_to_double (ly_car (s));
-  Real yr = scm_to_double (ly_cdr (s));
+  Real yl = scm_to_double (scm_car (s));
+  Real yr = scm_to_double (scm_cdr (s));
 
 
   /*
@@ -285,8 +284,8 @@ Beam::quanting (SCM smob)
 
 #if DEBUG_QUANTING
   SCM inspect_quants = me->get_property ("inspect-quants");
-  if (to_boolean (me->get_paper ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))
-      && ly_c_pair_p (inspect_quants))
+  if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))
+      && scm_is_pair (inspect_quants))
     {
       Drul_array<Real> ins = ly_scm2interval (inspect_quants);
 
@@ -311,7 +310,7 @@ Beam::quanting (SCM smob)
 		    ly_interval2scm (Drul_array<Real> (qscores[best_idx].yl,
 						       qscores[best_idx].yr)));
 #if DEBUG_QUANTING
-  if (to_boolean (me->get_paper ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))))
+  if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))))
     {
       qscores[best_idx].score_card_ += to_string ("i%d", best_idx);