* lily/auto-beam-engraver.cc (process_music): end/junk beam if

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

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index e96afc33d10266921c946245b2c3aa9eb3751aea..4d59d1f763b464eafebef2dd5640672f36409d3c 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -22,7 +22,6 @@
 #include "paper-outputter.hh"
 #include "ly-modules.hh"
 
-
 /*
   This is an almost empty thing. The only substantial thing this class
   handles, is scaling up and down to real-world dimensions (internally
@@ -43,11 +42,6 @@ Paper_def::Paper_def (Paper_def const&src)
 }
 
 
-Real
-Paper_def::get_var (String s) const
-{
-  return get_realvar (ly_symbol2scm (s.to_str0 ()));
-}
 
 Real
 Paper_def::get_realvar (SCM s) const
@@ -66,14 +60,13 @@ Paper_def::get_realvar (SCM s) const
 Interval
 Paper_def::line_dimensions_int (int n) const
 {
-  Real lw =  get_var ("linewidth");
-  Real ind = n? 0.0:get_var ("indent");
+  Real lw =  get_realvar (ly_symbol2scm ("linewidth"));
+  Real ind = n? 0.0:get_realvar (ly_symbol2scm ("indent"));
 
   return Interval (ind, lw);
 }
 
 
-
 int Paper_def::score_count_ = 0;
 
 int
@@ -107,8 +100,6 @@ Paper_def::get_paper_outputter ()
 
 /*
   todo: use symbols and hashtable idx?
-
-
 */
 Font_metric *
 Paper_def::find_font (SCM fn, Real m)
@@ -130,8 +121,9 @@ Paper_def::find_font (SCM fn, Real m)
     }
   else
     {
-      SCM var =   ly_module_lookup (scope_, ly_symbol2scm ("outputscale"));
-      m /= gh_scm2double (scm_variable_ref (var));
+      SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale"));
+
+      m /= gh_scm2double (scm_variable_ref (scale_var));
 
       f = all_fonts_global->find_font (ly_scm2string (fn));
       SCM val = Scaled_font_metric::make_scaled_font_metric (f, m);
@@ -160,3 +152,11 @@ Paper_def::font_descriptions ()const
     }
   return l;
 }
+
+Paper_def* 
+unsmob_paper (SCM x)
+{
+  return dynamic_cast<Paper_def*> (unsmob_music_output_def (x));
+}
+
+