X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner.cc;h=6f07666a6878b44afb79744a6cddc2fad3896ee3;hb=14ca3493aab1a1f4f837f1b483ad9ea1d1e444ad;hp=aa5ac971e6ba89f19835c75cf462cfb262b2e0ed;hpb=3a64c1f4b7a0e880244a7369fa83d9c92ae8a184;p=lilypond.git

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index aa5ac971e6..6f07666a68 100644
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -3,12 +3,12 @@
 
   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. 
 */
 
-#include "molecule.hh"
+#include "stencil.hh"
 #include "text-item.hh"
 #include "text-spanner.hh"
 #include "line-spanner.hh"
@@ -28,24 +28,24 @@
   - more texts/positions
 */
 
-MAKE_SCHEME_CALLBACK (Text_spanner, brew_molecule, 1);
+MAKE_SCHEME_CALLBACK (Text_spanner, print, 1);
 
 /*
   TODO: this function is too long
 */
 SCM
-Text_spanner::brew_molecule (SCM smob) 
+Text_spanner::print (SCM smob) 
 {
   Grob *me= unsmob_grob (smob);
   Spanner *spanner = dynamic_cast<Spanner*> (me);
   
-  /* Ugh, must be same as Hairpin::brew_molecule.  */
+  /* 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();
+  Paper_def * paper = me->get_paper ();
 
-  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,34 @@ Text_spanner::brew_molecule (SCM smob)
 	}
       else
 	  {
-	    Real encl = robust_scm2double (me->get_grob_property ("enclose-bounds"), 0.0);
+	    Real encl = robust_scm2double (me->get_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));
+	      span_points -= d * ly_scm2double (index_get_cell (shorten, d));
 	  }
       
       if (is_number_pair (flare))
-	span_points -= d * gh_scm2double (index_get_cell (flare, d));
+	span_points -= d * ly_scm2double (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 (ly_c_pair_p (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));
+	    edge[d] = *unsmob_stencil (Text_item::interpret_markup (paper->self_scm (), properties, text));
 	  
 	  if (!edge[d].is_empty ())
 	    edge[d].align_to (Y_AXIS, CENTER);
@@ -100,12 +99,12 @@ Text_spanner::brew_molecule (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 +112,42 @@ Text_spanner::brew_molecule (SCM smob)
 	  
 	  Real dx = 0.0;
 	  if (is_number_pair (flare))
-	    dx = gh_scm2double (index_get_cell (flare, d)) * d;
+	    dx = ly_scm2double (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 +155,5 @@ Text_spanner::brew_molecule (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 if-text-padding dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");