* 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 31df76944e3ae1acc5c4cae4b20117209e20c758..f934b3bb42b06ac754530e4237e9ea44a4406cc1 100644 (file)
--- 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 d1605cc8b708f3435c841293af61c0ea922183e6..c3354a67000e6ad7bc17613eeb332f0b1580b438 100644 (file)
--- 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 1dd9947476d3038547c71398cde0756f404704c5..bf1dfbd81182dd731d4d7caca5035db8759f13ce 100644 (file)
--- 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 f54664c87d73e4d074470f4c1a5f982fcc854027..6899237dc333da91d34fa462489cc91b8f0f5548 100644 (file)
--- 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 ?