* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 23220c7559ef615f2d9ac542c806985e35f5cdc2..8a7efdc6d3b46f7cdb6f25516da3aa0d7aed5ce9 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -15,7 +15,7 @@ source file of the GNU LilyPond music typesetter
 #include "font-interface.hh"
 #include "dimensions.hh"
 #include "paper-def.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-column.hh"
 #include "staff-symbol-referencer.hh"
 
@@ -101,7 +101,7 @@ Text_spanner::brew_molecule (SCM smob)
          /*  Don't repeat edge text for broken end */
          if (!broken[d])
            {
-             SCM text = index_cell (edge_text, d);
+             SCM text = index_get_cell (edge_text, d);
              edge[d] = Text_item::text2molecule (me, text, properties);
              if (!edge[d].empty_b ())
                edge[d].align_to (Y_AXIS, CENTER);
@@ -133,7 +133,7 @@ Text_spanner::brew_molecule (SCM smob)
 
   /* ugh */
   
-  Real thick = me->paper_l ()->get_var ("linethickness");  
+  Real thick = me->get_paper ()->get_var ("linethickness");  
   SCM st = me->get_grob_property ("thickness");
   if (gh_number_p (st))
     {
@@ -144,7 +144,7 @@ Text_spanner::brew_molecule (SCM smob)
   
   Drul_array<Molecule> edge_line;
   s = me->get_grob_property ("edge-height");
-  SCM ew = me->get_grob_property ("edge-width");
+  SCM ew = me->get_grob_property ("edge-widen");
   if (gh_pair_p (s))
     {
       Direction d = LEFT;
@@ -152,9 +152,9 @@ Text_spanner::brew_molecule (SCM smob)
       do
        {
          Real dx = ( gh_pair_p (ew)  ? 
-                     gh_scm2double (index_cell (ew, d)) * - dir  :  
+                     gh_scm2double (index_get_cell (ew, d)) * d :  
                      0 );
-         Real dy = gh_scm2double (index_cell (s, d)) * - dir;
+         Real dy = gh_scm2double (index_get_cell (s, d)) * - dir;
          if (dy)
            {
              edge_line[d] = Line_spanner::line_molecule (me, thick, dx, dy);
@@ -195,7 +195,7 @@ void
 Text_spanner::setup_pedal_bracket(Spanner *me)
 {
 
-  Real thick = me->paper_l ()->get_var ("linethickness");  
+  Real thick = me->get_paper ()->get_var ("linethickness");  
   SCM st = me->get_grob_property ("thickness");
   if (gh_number_p (st))
     {
@@ -206,7 +206,7 @@ Text_spanner::setup_pedal_bracket(Spanner *me)
   Drul_array<Real> height, width, shorten, r;
 
   SCM pa = me->get_grob_property ("if-text-padding");
-  SCM ew = me->get_grob_property ("edge-width");
+  SCM ew = me->get_grob_property ("edge-widen");
   SCM eh = me->get_grob_property ("edge-height");
   SCM sp = me->get_grob_property ("shorten-pair");
   
@@ -229,12 +229,12 @@ Text_spanner::setup_pedal_bracket(Spanner *me)
       width[d]  =  0;
       height[d] =  0;
       shorten[d] = 0;
-      if ( gh_pair_p (ew) )
-       width[d] +=  gh_scm2double (index_cell (ew, d)) * d;
-      if ( !broken[d] && (gh_pair_p (eh) ) )
-       height[d] += gh_scm2double (index_cell (eh, d));
-      if ( gh_pair_p (sp) )
-       shorten[d] +=  gh_scm2double (index_cell (sp, d));
+      if ( ly_number_pair_p (ew) )
+       width[d] +=  gh_scm2double (index_get_cell (ew, d));
+      if ( !broken[d] && (ly_number_pair_p (eh) ) )
+       height[d] += gh_scm2double (index_get_cell (eh, d));
+      if ( ly_number_pair_p (sp) )
+       shorten[d] +=  gh_scm2double (index_get_cell (sp, d));
     }
   while (flip (&d) != LEFT);
   
@@ -244,17 +244,19 @@ Text_spanner::setup_pedal_bracket(Spanner *me)
   if ( to_boolean (me->get_grob_property ("text-start")) )
     {
       height[LEFT] = 0;
-      Grob * textbit = me->get_parent(Y_AXIS);
       extra_short = padding;
-      if (textbit->internal_has_interface(ly_symbol2scm("text-interface"))) 
-       // for plain text, e.g., Sost. Ped.
+      if (Grob *textbit = unsmob_grob (me->get_grob_property("pedal-text")))
        {
-         SCM text  =  textbit->get_grob_property("text"); 
-         if (gh_string_p (text)) {
-           SCM properties = Font_interface::font_alist_chain (me);
-           Molecule mol = Text_item::text2molecule (me, text, properties);
-           extra_short += mol.extent(X_AXIS).length() / 2;
-         }
+         if (textbit->internal_has_interface(ly_symbol2scm("text-interface")))
+           // for plain text, e.g., Sost. Ped.
+           {
+             SCM text  =  textbit->get_grob_property("text"); 
+             if (gh_string_p (text)) {
+               SCM properties = Font_interface::font_alist_chain (me);
+               Molecule mol = Text_item::text2molecule (me, text, properties);
+               extra_short += mol.extent(X_AXIS).length() / 2;
+             }
+           }
        }
       shorten[RIGHT] -= thick;
     }
@@ -276,7 +278,7 @@ Text_spanner::setup_pedal_bracket(Spanner *me)
     }
 
   me->set_grob_property ("edge-height", ly_interval2scm (height));
-  me->set_grob_property ("edge-width",  ly_interval2scm(width));
+  me->set_grob_property ("edge-widen",  ly_interval2scm(width));
   me->set_grob_property ("shorten-pair", ly_interval2scm (shorten));
 }
 
@@ -287,9 +289,9 @@ struct Pianopedal
 };
 ADD_INTERFACE (Pianopedal,"piano-pedal-interface",
               "",
-              "pedal-type edge-width edge-height shorten-pair text-start left-widen right-widen");
+              "pedal-type edge-widen edge-height shorten-pair text-start left-widen right-widen pedal-text");
 
 ADD_INTERFACE (Text_spanner,"text-spanner-interface",
               "generic text spanner",
-              "dash-period if-text-padding dash-length edge-height edge-width edge-text shorten-pair type");
+              "dash-period if-text-padding dash-length edge-height edge-widen edge-text shorten-pair type thickness outer width-correct");