* tex/lilyponddefs.tex (\lyitem): Don't use \topalign to make

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

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 4795e5bb0ad86c33770312943f25c23f8ea68b64..41d7bd3cc625a9fd19a7114841e2f7dc149c0360 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -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);
-  Output_def * paper = me->get_paper ();
+  Output_def * layout = me->get_layout ();
 
   SCM flare = me->get_property ("bracket-flare");
   SCM shorten = me->get_property ("shorten-pair");
@@ -68,16 +68,14 @@ Text_spanner::print (SCM smob)
            Interval ext = b->extent (common, X_AXIS);
            
            span_points[d] =
-             (ext.is_empty())
-             ? b->relative_coordinate (common, X_AXIS)
-             : ext.linear_combination (d * encl);
+             robust_relative_extent (b, common, X_AXIS).linear_combination (d * encl);
 
            if (is_number_pair (shorten))
-             span_points -= d * ly_scm2double (index_get_cell (shorten, d));
+             span_points -= d * scm_to_double (index_get_cell (shorten, d));
          }
       
       if (is_number_pair (flare))
-       span_points -= d * ly_scm2double (index_get_cell (flare, d));
+       span_points -= d * scm_to_double (index_get_cell (flare, d));
     }
   while (flip (&d) != LEFT);
 
@@ -85,7 +83,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 (ly_c_pair_p (edge_text))
+  if (scm_is_pair (edge_text))
     {
       Direction d = LEFT;
       do
@@ -95,8 +93,8 @@ Text_spanner::print (SCM smob)
          
          SCM text = index_get_cell (edge_text, d);
 
-         if (Text_item::markup_p (text)) 
-           edge[d] = *unsmob_stencil (Text_item::interpret_markup (paper->self_scm (), properties, text));
+         if (Text_interface::markup_p (text)) 
+           edge[d] = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, text));
          
          if (!edge[d].is_empty ())
            edge[d].align_to (Y_AXIS, CENTER);
@@ -117,7 +115,7 @@ Text_spanner::print (SCM smob)
          
          Real dx = 0.0;
          if (is_number_pair (flare))
-           dx = ly_scm2double (index_get_cell (flare, d)) * d;
+           dx = scm_to_double (index_get_cell (flare, d)) * d;
 
          Real dy = - dir * edge_height[d] ;
          if (dy)