release: 1.5.29

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 3fdc1a3f71e1495885e91f863e51a64332a2d2b9..e795c9e6770936aea866caf85b272fb33cf229a3 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -59,10 +59,10 @@ Text_engraver::acknowledge_grob (Grob_info inf)
            ugh.
           */
          if (Side_position_interface::get_axis (t) == X_AXIS
-             && !t->parent_l (Y_AXIS))
+             && !t->get_parent (Y_AXIS))
            t->set_parent (inf.grob_l_, Y_AXIS);
          else if (Side_position_interface::get_axis (t) == Y_AXIS
-             && !t->parent_l (X_AXIS))
+             && !t->get_parent (X_AXIS))
            t->set_parent (inf.grob_l_, X_AXIS);
        }
     }
@@ -145,7 +145,8 @@ Text_engraver::stop_translation_timestep ()
   for (int i=0; i < texts_.size (); i++)
     {
       Item *ti = texts_[i];
-      Side_position_interface::add_staff_support (ti);
+      if (!to_boolean (get_property ("scriptHorizontal")))
+       Side_position_interface::add_staff_support (ti);
       typeset_grob (ti);
     }
   texts_.clear ();