From: Joe Neeman <joeneeman@gmail.com>
Date: Fri, 20 Oct 2006 17:37:37 +0000 (+0000)
Subject: * scm/define-grobs.scm (all-grob-descriptions): set side-axis and
X-Git-Tag: release/2.10.0-2~125
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=14bd2cde3da16ad4c0f45a678603675704aa67ba;p=lilypond.git

* scm/define-grobs.scm (all-grob-descriptions): set side-axis and
Y-offset for TextScript and Script

* lily/text-engraver.cc (make_item):
* lily/script-engraver.cc (make_script_from_event):
remove call to Side_position_interface::set_axis since all scripts
now have this set by default
---

diff --git a/ChangeLog b/ChangeLog
index 31df76944e..f934b3bb42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-10-20  Joe Neeman  <joeneeman@gmail.com>
 
+	* scm/define-grobs.scm (all-grob-descriptions): set side-axis and
+	Y-offset for TextScript and Script
+
+	* lily/text-engraver.cc (make_item): 
+	* lily/script-engraver.cc (make_script_from_event):
+	remove call to Side_position_interface::set_axis since all scripts
+	now have this set by default
+
 	* lily/context.cc: 
 	* lily/prob.cc: use variables
 
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index d1605cc8b7..c3354a6700 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -141,8 +141,6 @@ make_script_from_event (Grob *p,  Context *tg,
       p->set_property ("script-priority",
 		       scm_from_int (index));
     }
-
-  Side_position_interface::set_axis (p, Y_AXIS);
 }
 
 void
diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 1dd9947476..bf1dfbd811 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -88,14 +88,8 @@ Text_engraver::process_acknowledged ()
       // 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 --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index f54664c87d..6899237dc3 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -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 ?