* python/lilylib.py (make_ps_images): only compute bbox when needed.

[lilypond.git] / lily / text-spanner.cc

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index e7e75c3351c4bf29bbde4469b921046dd0a1eae4..b2254b14517cd4f331f5d42dc51038403cab48f2 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -15,7 +15,7 @@
 #include "spanner.hh"
 #include "font-interface.hh"
 #include "dimensions.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "warn.hh"
 #include "paper-column.hh"
 #include "staff-symbol-referencer.hh"
@@ -42,7 +42,7 @@ Text_spanner::print (SCM smob)
   /* Ugh, must be same as Hairpin::print.  */
 
   Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);
-  Paper_def * paper = me->get_paper ();
+  Output_def * paper = me->get_paper ();
 
   SCM flare = me->get_property ("bracket-flare");
   SCM shorten = me->get_property ("shorten-pair");
@@ -68,11 +68,11 @@ Text_spanner::print (SCM smob)
            span_points[d] = b->extent (common, X_AXIS).linear_combination (d * encl);
 
            if (is_number_pair (shorten))
-             span_points -= d * gh_scm2double (index_get_cell (shorten, d));
+             span_points -= d * ly_scm2double (index_get_cell (shorten, d));
          }
       
       if (is_number_pair (flare))
-       span_points -= d * gh_scm2double (index_get_cell (flare, d));
+       span_points -= d * ly_scm2double (index_get_cell (flare, d));
     }
   while (flip (&d) != LEFT);
 
@@ -80,7 +80,7 @@ Text_spanner::print (SCM smob)
   SCM properties = Font_interface::text_font_alist_chain (me);
   SCM edge_text = me->get_property ("edge-text");
   Drul_array<Stencil> edge;
-  if (gh_pair_p (edge_text))
+  if (ly_c_pair_p (edge_text))
     {
       Direction d = LEFT;
       do
@@ -112,7 +112,7 @@ Text_spanner::print (SCM smob)
          
          Real dx = 0.0;
          if (is_number_pair (flare))
-           dx = gh_scm2double (index_get_cell (flare, d)) * d;
+           dx = ly_scm2double (index_get_cell (flare, d)) * d;
 
          Real dy = - dir * edge_height[d] ;
          if (dy)