Thu Oct 19 15:37:24 IST 2006  Joe Neeman <address@hidden>
  * For Script and TextScript, set the side-position axis in define-grobs.scm instead of in the engravers.
diff -rN -u old-lilypond/lily/script-engraver.cc new-lilypond/lily/script-engraver.cc
--- old-lilypond/lily/script-engraver.cc	2006-10-20 18:18:50.000000000 +0200
+++ new-lilypond/lily/script-engraver.cc	2006-10-20 18:18:50.000000000 +0200
@@ -141,8 +141,6 @@
       p->set_property ("script-priority",
 		       scm_from_int (index));
     }
-
-  Side_position_interface::set_axis (p, Y_AXIS);
 }
 
 void
diff -rN -u old-lilypond/lily/text-engraver.cc new-lilypond/lily/text-engraver.cc
--- old-lilypond/lily/text-engraver.cc	2006-10-20 18:18:50.000000000 +0200
+++ new-lilypond/lily/text-engraver.cc	2006-10-20 18:18:50.000000000 +0200
@@ -88,14 +88,8 @@
       // URG: Text vs TextScript
       Item *text = make_item ("TextScript", r->self_scm ());
 
-      Axis ax = Y_AXIS;
-      Side_position_interface::set_axis (text, ax);
-
-      // Hmm
-      int priority = 200;
-      SCM s = text->get_property ("script-priority");
-      if (scm_is_number (s))
-	priority = scm_to_int (s);
+      int priority = robust_scm2int (text->get_property ("script-priority"),
+				     200);
 
       /* see script-engraver.cc */
       priority += i;
diff -rN -u old-lilypond/scm/define-grobs.scm new-lilypond/scm/define-grobs.scm
--- old-lilypond/scm/define-grobs.scm	2006-10-20 18:18:50.000000000 +0200
+++ new-lilypond/scm/define-grobs.scm	2006-10-20 18:18:50.000000000 +0200
@@ -1316,7 +1316,9 @@
 	;; padding set in script definitions.
 	(staff-padding . 0.25)
 	;; (script-priority . 0) priorities for scripts, see script.scm
-	(X-offset . , ly:self-alignment-interface::centered-on-x-parent)
+	(X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
 
 	(stencil . ,ly:script-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
@@ -1698,6 +1700,8 @@
      . (
 	(no-spacing-rods . #t)
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
 	(direction . ,DOWN)
 
 	;; sync with Fingering ?