X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner.cc;h=207c9f2087460130c3c571d7bbcc1004d1b3bc58;hb=428909a52eedefe201a8cd89876336f76e29fa28;hp=4795e5bb0ad86c33770312943f25c23f8ea68b64;hpb=de9d02b75f7f6f3c915d40256874bbe22ad7b5a7;p=lilypond.git

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 4795e5bb0a..207c9f2087 100644
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  Revised over good by Han-Wen. 
+  Revised over good by Han-Wen.
 */
 
-#include "stencil.hh"
-#include "text-item.hh"
 #include "text-spanner.hh"
+
+#include "text-interface.hh"
 #include "line-spanner.hh"
 #include "spanner.hh"
 #include "font-interface.hh"
@@ -34,15 +34,15 @@ MAKE_SCHEME_CALLBACK (Text_spanner, print, 1);
   TODO: this function is too long
 */
 SCM
-Text_spanner::print (SCM smob) 
+Text_spanner::print (SCM smob)
 {
-  Grob *me= unsmob_grob (smob);
-  Spanner *spanner = dynamic_cast<Spanner*> (me);
-  
+  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);
-  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");
@@ -63,84 +63,83 @@ Text_spanner::print (SCM smob)
 	    span_points[d] = b->relative_coordinate (common, X_AXIS);
 	}
       else
-	  {
-	    Real encl = robust_scm2double (me->get_property ("enclose-bounds"), 0.0);
-	    Interval ext = b->extent (common, X_AXIS);
-	    
-	    span_points[d] =
-	      (ext.is_empty())
-	      ? b->relative_coordinate (common, X_AXIS)
-	      : ext.linear_combination (d * encl);
-
-	    if (is_number_pair (shorten))
-	      span_points -= d * ly_scm2double (index_get_cell (shorten, d));
-	  }
-      
+	{
+	  Real encl = robust_scm2double (me->get_property ("enclose-bounds"), 0.0);
+	  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 * 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);
 
-
   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
 	{
 	  if (broken[d])
 	    continue;
-	  
+
 	  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);
 	}
       while (flip (&d) != LEFT);
     }
-  
+
   Drul_array<Real> edge_height = robust_scm2interval (me->get_property ("edge-height"),
 						      Interval (0.0, 0.0));
   Drul_array<Stencil> edge_line;
-    {
-      Direction d = LEFT;
-      int dir = to_dir (me->get_property ("direction"));
-      do
-	{
-	  if (broken[d])
-	    continue;
-	  
-	  Real dx = 0.0;
-	  if (is_number_pair (flare))
-	    dx = ly_scm2double (index_get_cell (flare, d)) * d;
-
-	  Real dy = - dir * edge_height[d] ;
-	  if (dy)
-	    edge_line[d] = Line_spanner::line_stencil (me, Offset (0,0), Offset (dx, dy));
-	}
-      while (flip (&d) != LEFT);
-    }
-  
+  {
+    Direction d = LEFT;
+    int dir = to_dir (me->get_property ("direction"));
+    do
+      {
+	if (broken[d])
+	  continue;
+
+	Real dx = 0.0;
+	if (is_number_pair (flare))
+	  dx = scm_to_double (index_get_cell (flare, d)) * d;
+
+	Real dy = -dir * edge_height[d];
+	if (dy)
+	  edge_line[d] = Line_spanner::line_stencil (me, Offset (0, 0), Offset (dx, dy));
+      }
+    while (flip (&d) != LEFT);
+  }
+
   Stencil m;
   do
     {
       Interval ext = edge[d].extent (X_AXIS);
       if (!ext.is_empty ())
 	{
+	  Real pad = robust_scm2double (me->get_property ("bound-padding"), 0.0);
 	  edge[d].translate_axis (span_points[d], X_AXIS);
 	  m.add_stencil (edge[d]);
-	  span_points[d] += -d *  ext[-d];
+	  span_points[d] += -d * (ext[-d] + pad);
 	}
     }
   while (flip (&d) != LEFT);
+
   do
     {
-      if (d* span_points[d] > d * edge[-d].extent (X_AXIS)[d])
+      if (d * span_points[d] > d * edge[-d].extent (X_AXIS)[d])
 	{
 	  edge_line[d].translate_axis (span_points[d], X_AXIS);
 	  m.add_stencil (edge_line[d]);
@@ -150,15 +149,16 @@ Text_spanner::print (SCM smob)
 
   if (!span_points.is_empty ())
     {
-      Stencil l =Line_spanner::line_stencil (me, Offset (span_points[LEFT], 0),
-					       Offset (span_points[RIGHT], 0));
+      Stencil l = Line_spanner::line_stencil (me,
+					      Offset (span_points[LEFT], 0),
+					      Offset (span_points[RIGHT], 0));
       m.add_stencil (l);
     }
   m.translate_axis (- me->relative_coordinate (common, X_AXIS), X_AXIS);
   return m.smobbed_copy ();
 }
 
-ADD_INTERFACE (Text_spanner,"text-spanner-interface",
+ADD_INTERFACE (Text_spanner, "text-spanner-interface",
 	       "generic text spanner",
-	       "dash-period dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");
+	       "bound-padding dash-period dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");