Clean up DynamicText horizontal alignment.

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index fa013a9bbff4582d5032aba11bd1489257708a0d..9d894be3e358a5df1f66f41c3c813169a0c27369 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -787,7 +787,7 @@
         (X-offset . ,(ly:make-simple-closure
                       `(,+
                         ,(ly:make-simple-closure
-                          (list ly:self-alignment-interface::centered-on-y-parent))
+                          (list ly:self-alignment-interface::centered-on-x-parent))
                         ,(ly:make-simple-closure
                           (list ly:self-alignment-interface::x-aligned-on-self)))))
         (Y-offset . ,side-position-interface::y-aligned-side)
@@ -857,7 +857,7 @@
         (stencil . ,ly:text-interface::print)
         (vertical-skylines . ,grob::always-vertical-skylines-from-stencil)
         (Y-extent . ,grob::always-Y-extent-from-stencil)
-        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
+        (X-offset . ,ly:self-alignment-interface::aligned-on-x-parent)
         (Y-offset . ,(scale-by-font-size -0.6)) ; center on an 'm'
         (meta . ((class . Item)
                  (interfaces . (dynamic-interface
@@ -1320,9 +1320,8 @@
      . (
         (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
         (break-align-symbol . left-edge)
-        (break-visibility . ,center-invisible)
+        (break-visibility . ,begin-of-line-visible)
         (non-musical . #t)
-        (extra-spacing-height . (+inf.0 . -inf.0))
         (space-alist . (
                         (ambitus . (extra-space . 2.0))
                         (breathing-sign . (minimum-space . 0.0))
@@ -1338,6 +1337,7 @@
                         (right-edge . (extra-space . 0.0))
                         ))
         (X-extent . (0 . 0))
+        (Y-extent . (0 . 0))
         (meta . ((class . Item)
                  (interfaces . (break-aligned-interface))))))
 
@@ -1546,7 +1546,7 @@
                         ,(ly:make-simple-closure
                           (list ly:self-alignment-interface::x-aligned-on-self))
                         ,(ly:make-simple-closure
-                          (list ly:self-alignment-interface::x-centered-on-y-parent)))))
+                          (list ly:self-alignment-interface::centered-on-x-parent)))))
         (Y-offset . ,side-position-interface::y-aligned-side)
         (vertical-skylines . ,grob::unpure-vertical-skylines-from-stencil)
         (Y-extent . ,grob::always-Y-extent-from-stencil)
@@ -1570,7 +1570,7 @@
         (X-offset . ,(ly:make-simple-closure
                       `(,+
                         ,(ly:make-simple-closure
-                          (list ly:self-alignment-interface::x-centered-on-y-parent))
+                          (list ly:self-alignment-interface::centered-on-x-parent))
                         ,(ly:make-simple-closure
                           (list ly:self-alignment-interface::x-aligned-on-self)))))
         (Y-offset . ,side-position-interface::y-aligned-side)
@@ -1777,7 +1777,7 @@
         (X-offset . ,(ly:make-simple-closure
                       `(,+
                         ,(ly:make-simple-closure
-                          (list ly:self-alignment-interface::x-centered-on-y-parent))
+                          (list ly:self-alignment-interface::centered-on-x-parent))
                         ,(ly:make-simple-closure
                           (list ly:self-alignment-interface::x-aligned-on-self)))))
         (Y-offset . ,side-position-interface::y-aligned-side)
@@ -2631,6 +2631,7 @@
         (direction . ,tuplet-number::calc-direction)
         (font-shape . italic)
         (font-size . -2)
+        (knee-to-beam . #t)
         (stencil . ,ly:tuplet-number::print)
         (text . ,tuplet-number::calc-denominator-text)
         (X-offset . ,ly:tuplet-number::calc-x-offset)