2003 -> 2004

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

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index b441bdf8c94aab95e37bccdd5fc31e67f1d715c3..86387458f95ff6a457b2a58ff1274d795f16ad0b 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Revised over good by Han-Wen. 
 */
@@ -40,14 +40,13 @@ Text_spanner::brew_molecule (SCM smob)
   Spanner *spanner = dynamic_cast<Spanner*> (me);
   
   /* Ugh, must be same as Hairpin::brew_molecule.  */
-  Real padding = 0.0;
-  SCM itp= me->get_grob_property ("if-text-padding");
-  if (gh_number_p (itp))
-    padding = gh_scm2double (itp);
 
   Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);
   Paper_def * paper = me->get_paper();
-  
+
+  SCM flare = me->get_grob_property ("bracket-flare");
+  SCM shorten = me->get_grob_property ("shorten-pair");
+
   Interval span_points;
   Drul_array<bool> broken;
   Direction d = LEFT;
@@ -58,16 +57,22 @@ Text_spanner::brew_molecule (SCM smob)
 
       if (broken[d])
        {
-       if (d == LEFT)
-         span_points[d] = spanner->get_broken_left_end_align ();
-       else
-         span_points[d] = b->relative_coordinate (common, X_AXIS);
+         if (d == LEFT)
+           span_points[d] = spanner->get_broken_left_end_align ();
+         else
+           span_points[d] = b->relative_coordinate (common, X_AXIS);
        }
       else
          {
-           bool encl = to_boolean (me->get_grob_property ("enclose-bounds"));
-           span_points[d] = b->extent (common, X_AXIS)[encl ? d : -d];
+           Real encl = robust_scm2double (me->get_grob_property ("enclose-bounds"), 0.0);
+           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));
          }
+      
+      if (is_number_pair (flare))
+       span_points -= d * gh_scm2double (index_get_cell (flare, d));
     }
   while (flip (&d) != LEFT);
 
@@ -80,8 +85,8 @@ Text_spanner::brew_molecule (SCM smob)
       Direction d = LEFT;
       do
        {
-         /*  Don't repeat edge text for broken end */
-         if (broken[d])
+         if (!to_boolean (me->get_grob_property ("text-repeat-if-broken"))
+             && broken[d])
            continue;
          
          SCM text = index_get_cell (edge_text, d);
@@ -94,35 +99,10 @@ Text_spanner::brew_molecule (SCM smob)
        }
       while (flip (&d) != LEFT);
     }
-
-
-  Drul_array<Real> shorten;
-  shorten[LEFT] = 0;
-  shorten[RIGHT] = 0;
-
-  SCM ew = me->get_grob_property ("bracket-flare");
-  SCM s = me->get_grob_property ("shorten-pair");
-  if (gh_pair_p (s))
-    {
-      span_points[LEFT] += gh_scm2double (ly_car (s));
-      span_points[RIGHT] -= gh_scm2double (ly_cdr (s));
-    }
-  if (gh_pair_p (ew))
-    {
-      span_points[LEFT] += gh_scm2double (ly_car (ew));
-      span_points[RIGHT] -= gh_scm2double (ly_cdr (ew));
-    }
-
-  Real thick = paper->get_realvar (ly_symbol2scm ("linethickness"));  
-  SCM st = me->get_grob_property ("thickness");
-  if (gh_number_p (st))
-    {
-      thick *=  gh_scm2double (st);
-    }
   
+  Drul_array<Real> edge_height = robust_scm2interval (me->get_grob_property ("edge-height"),
+                                                     Interval (0.0, 0.0));
   Drul_array<Molecule> edge_line;
-  s = me->get_grob_property ("edge-height");
-  if (gh_pair_p (s))
     {
       Direction d = LEFT;
       int dir = to_dir (me->get_grob_property ("direction"));
@@ -132,13 +112,12 @@ Text_spanner::brew_molecule (SCM smob)
            continue;
          
          Real dx = 0.0;
-         if (gh_pair_p (ew))
-           dx = gh_scm2double (index_get_cell (ew, d)) * d;
+         if (is_number_pair (flare))
+           dx = gh_scm2double (index_get_cell (flare, d)) * d;
 
-         Real dy = gh_scm2double (index_get_cell (s, d)) * - dir;
+         Real dy = - dir * edge_height[d] ;
          if (dy)
-           edge_line[d] = Line_spanner::line_molecule (me, thick, Offset(0,0),
-                                                       Offset (dx, dy));
+           edge_line[d] = Line_spanner::line_molecule (me, Offset(0,0), Offset (dx, dy));
        }
       while (flip (&d) != LEFT);
     }
@@ -147,29 +126,35 @@ Text_spanner::brew_molecule (SCM smob)
   do
     {
       Interval ext = edge[d].extent (X_AXIS);
-
-      edge[d].translate_axis (span_points[d], X_AXIS);
-      m.add_molecule (edge[d]);
-      edge_line[d].translate_axis (span_points[d], X_AXIS);
-      m.add_molecule (edge_line[d]);
       if (!ext.is_empty ())
-       span_points[d] += -d *  ext[-d];
+       {
+         edge[d].translate_axis (span_points[d], X_AXIS);
+         m.add_molecule (edge[d]);
+         span_points[d] += -d *  ext[-d];
+       }
+    }
+  while (flip (&d) != LEFT);
+  do
+    {
+      if (d* span_points[d] > d * edge[-d].extent(X_AXIS)[d])
+       {
+         edge_line[d].translate_axis (span_points[d], X_AXIS);
+         m.add_molecule (edge_line[d]);
+       }
     }
   while (flip (&d) != LEFT);
 
-  Molecule l =Line_spanner::line_molecule (me, thick,
-                                          Offset (span_points[LEFT], 0),
-                                          Offset (span_points[RIGHT], 0));
-  m.add_molecule (l);
-
+  if (!span_points.is_empty ())
+    {
+      Molecule l =Line_spanner::line_molecule (me, Offset (span_points[LEFT], 0),
+                                              Offset (span_points[RIGHT], 0));
+      m.add_molecule (l);
+    }
   m.translate_axis (- me->relative_coordinate (common, X_AXIS), X_AXIS);
   return m.smobbed_copy ();
 }
 
-
-
-
 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 width-correct");
+              "text-repeat-if-broken dash-period if-text-padding dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");