*** empty log message ***

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

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 77321cbf6e44a6ae8835dfd040cbc854da524f44..82c2475cba4a1102185926fece20ee616a44d61e 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -8,14 +8,14 @@
   Revised over good by Han-Wen. 
 */
 
-#include "stencil.hh"
-#include "text-item.hh"
 #include "text-spanner.hh"
+
+#include "text-item.hh"
 #include "line-spanner.hh"
 #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"
@@ -36,13 +36,13 @@ MAKE_SCHEME_CALLBACK (Text_spanner, print, 1);
 SCM
 Text_spanner::print (SCM smob) 
 {
-  Grob *me= unsmob_grob (smob);
+  Grob *me = unsmob_grob (smob);
   Spanner *spanner = dynamic_cast<Spanner*> (me);
   
   /* 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 * layout = me->get_layout ();
 
   SCM flare = me->get_property ("bracket-flare");
   SCM shorten = me->get_property ("shorten-pair");
@@ -65,22 +65,25 @@ Text_spanner::print (SCM smob)
       else
          {
            Real encl = robust_scm2double (me->get_property ("enclose-bounds"), 0.0);
-           span_points[d] = b->extent (common, X_AXIS).linear_combination (d * encl);
+           Interval ext = b->extent (common, X_AXIS);
+           
+           span_points[d] =
+             robust_relative_extent (b, 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 * scm_to_double (index_get_cell (shorten, d));
          }
       
       if (is_number_pair (flare))
-       span_points -= d * gh_scm2double (index_get_cell (flare, d));
+       span_points -= d * scm_to_double (index_get_cell (flare, d));
     }
   while (flip (&d) != LEFT);
 
 
-  SCM properties = Font_interface::font_alist_chain (me);
+  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 (scm_is_pair (edge_text))
     {
       Direction d = LEFT;
       do
@@ -90,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);
@@ -112,7 +115,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 = scm_to_double (index_get_cell (flare, d)) * d;
 
          Real dy = - dir * edge_height[d] ;
          if (dy)
@@ -145,7 +148,7 @@ Text_spanner::print (SCM smob)
 
   if (!span_points.is_empty ())
     {
-      Stencil l =Line_spanner::line_stencil (me, Offset (span_points[LEFT], 0),
+      Stencil l = Line_spanner::line_stencil (me, Offset (span_points[LEFT], 0),
                                               Offset (span_points[RIGHT], 0));
       m.add_stencil (l);
     }
@@ -155,5 +158,5 @@ Text_spanner::print (SCM smob)
 
 ADD_INTERFACE (Text_spanner,"text-spanner-interface",
               "generic text spanner",
-              "dash-period if-text-padding dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");
+              "dash-period dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");