release: 1.3.93

[lilypond.git] / lily / paper-def.cc

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 698daf4585f39c01089ca15f10203fe7492463ba..7300edd6a60553c66ffca95412ec0df76634e7e0 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -56,12 +56,13 @@ Paper_def::get_scmvar (String s) const
 Real
 Paper_def::get_realvar (SCM s) const
 {
-  if (!scope_p_->elem_b (s))
+  SCM val ;
+  if (!scope_p_->try_retrieve (s, &val))
     {
       programming_error ("unknown paper variable: " +  ly_symbol2string (s));
       return 0.0;
     }
-  SCM val = scope_p_->scm_elem (s);
+
   if (gh_number_p (val))
     {
       return gh_scm2double (val);
@@ -93,30 +94,6 @@ Paper_def::set_lookup (int i, SCM l)
   lookup_alist_ = scm_assq_set_x(lookup_alist_, gh_int2scm (i), l);
 }
 
-
-/*
-  junkme.
- */
-Real
-Paper_def::interbeam_f (int multiplicity_i) const
-{
-  if (multiplicity_i <= 3)
-    return get_var ("interbeam");
-  else
-    return get_var ("interbeam4");
-}
-
-
-void
-Paper_def::print () const
-{
-#ifndef NPRINT
-  Music_output_def::print ();
-  if (flower_dstream)
-    gh_display (lookup_alist_);
-#endif
-}
-
 Lookup const *
 Paper_def::lookup_l (int i) const
 {