* lily/lookup.cc (triangle): rewrite, obviating symmetric_x_triangle().

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

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index f88df1098562ef7f10ec950398ea8a17069b3595..41d7bd3cc625a9fd19a7114841e2f7dc149c0360 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -8,14 +8,14 @@
   Revised over good by Han-Wen. 
 */
 
-#include "molecule.hh"
+#include "stencil.hh"
 #include "text-item.hh"
 #include "text-spanner.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"
@@ -42,10 +42,10 @@ 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 * layout = me->get_layout ();
 
-  SCM flare = me->get_grob_property ("bracket-flare");
-  SCM shorten = me->get_grob_property ("shorten-pair");
+  SCM flare = me->get_property ("bracket-flare");
+  SCM shorten = me->get_property ("shorten-pair");
 
   Interval span_points;
   Drul_array<bool> broken;
@@ -64,35 +64,37 @@ Text_spanner::print (SCM smob)
        }
       else
          {
-           Real encl = robust_scm2double (me->get_grob_property ("enclose-bounds"), 0.0);
-           span_points[d] = b->extent (common, X_AXIS).linear_combination (d * encl);
+           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 * 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 edge_text = me->get_grob_property ("edge-text");
-  Drul_array<Molecule> edge;
-  if (gh_pair_p (edge_text))
+  SCM properties = Font_interface::text_font_alist_chain (me);
+  SCM edge_text = me->get_property ("edge-text");
+  Drul_array<Stencil> edge;
+  if (scm_is_pair (edge_text))
     {
       Direction d = LEFT;
       do
        {
-         if (!to_boolean (me->get_grob_property ("text-repeat-if-broken"))
-             && broken[d])
+         if (broken[d])
            continue;
          
          SCM text = index_get_cell (edge_text, d);
 
-         if (Text_item::markup_p (text)) 
-           edge[d] = *unsmob_molecule (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);
@@ -100,12 +102,12 @@ Text_spanner::print (SCM smob)
       while (flip (&d) != LEFT);
     }
   
-  Drul_array<Real> edge_height = robust_scm2interval (me->get_grob_property ("edge-height"),
+  Drul_array<Real> edge_height = robust_scm2interval (me->get_property ("edge-height"),
                                                      Interval (0.0, 0.0));
-  Drul_array<Molecule> edge_line;
+  Drul_array<Stencil> edge_line;
     {
       Direction d = LEFT;
-      int dir = to_dir (me->get_grob_property ("direction"));
+      int dir = to_dir (me->get_property ("direction"));
       do
        {
          if (broken[d])
@@ -113,42 +115,42 @@ 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)
-           edge_line[d] = Line_spanner::line_molecule (me, Offset(0,0), Offset (dx, dy));
+           edge_line[d] = Line_spanner::line_stencil (me, Offset (0,0), Offset (dx, dy));
        }
       while (flip (&d) != LEFT);
     }
   
-  Molecule m;
+  Stencil m;
   do
     {
       Interval ext = edge[d].extent (X_AXIS);
       if (!ext.is_empty ())
        {
          edge[d].translate_axis (span_points[d], X_AXIS);
-         m.add_molecule (edge[d]);
+         m.add_stencil (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])
+      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]);
+         m.add_stencil (edge_line[d]);
        }
     }
   while (flip (&d) != LEFT);
 
   if (!span_points.is_empty ())
     {
-      Molecule l =Line_spanner::line_molecule (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_molecule (l);
+      m.add_stencil (l);
     }
   m.translate_axis (- me->relative_coordinate (common, X_AXIS), X_AXIS);
   return m.smobbed_copy ();
@@ -156,5 +158,5 @@ Text_spanner::print (SCM smob)
 
 ADD_INTERFACE (Text_spanner,"text-spanner-interface",
               "generic text spanner",
-              "text-repeat-if-broken 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");