release: 1.3.1

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 9ecc46f43402a598e2565f94702b2014ca585dd7..a2bd01461227a8e05a3848f5c80e2d3802f477ec 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -98,21 +98,9 @@ Text_engraver::do_process_requests ()
 
       text->text_str_ = r->text_str_;
       
-      if (r->style_str_.empty_b ())
-       {
-         SCM p (get_property ("textStyle", 0));
-         if (gh_string_p (p))
-           text->style_str_ = ly_scm2string(p);
-       }
-      else
-       text->style_str_ = r->style_str_;
+      if (r->style_str_.length_i ())
+       text->set_elt_property (style_scm_sym, ly_ch_C_to_scm (r->style_str_.ch_C()));
       
-      SCM padding = get_property ("textScriptPadding", 0);
-      if (SCM_NUMBERP(padding))
-       {
-         ss->set_elt_property (padding_scm_sym, padding);
-       }
-
       SCM empty = get_property ("textEmptyDimension", 0);
       if (gh_boolean_p (empty) && gh_scm2bool (empty))
        {