Better shape control of arpeggio brackets.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 1b834a2e2d28c8fb007b1b3d7ed7ea3056551285..b89fc14757cde390830f60033eb8210f01e74dab 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -169,6 +169,7 @@
        (direction . ,LEFT)
        (padding . 0.5)
        (positions . ,ly:arpeggio::calc-positions)
+       (protrusion . 0.4)
        (script-priority . 0)
        (side-axis . ,X)
        (staff-position . 0.0)
@@ -373,11 +374,11 @@
        (clip-edges . #t)
        (collision-interfaces . (beam-interface
                                 clef-interface
+                                clef-modifier-interface
                                 flag-interface
                                 inline-accidental-interface
                                 key-signature-interface
                                 note-head-interface
-                                octavate-eight-interface
                                 stem-interface
                                 time-signature-interface))
        (cross-staff . ,ly:beam::calc-cross-staff)
@@ -566,6 +567,31 @@
                                pure-from-neighbor-interface
                                staff-symbol-referencer-interface))))))
 
+    (ClefModifier
+     . (
+       (break-visibility . ,(grob::inherit-parent-property
+                              X 'break-visibility))
+       (font-shape . italic)
+       (font-size . -4)
+       (self-alignment-X . ,CENTER)
+       (staff-padding . 0.2)
+       (stencil . ,ly:text-interface::print)
+       (X-offset . ,(ly:make-simple-closure
+                     `(,+
+                       ,(ly:make-simple-closure
+                         (list ly:self-alignment-interface::x-aligned-on-self))
+                       ,(ly:make-simple-closure
+                         (list ly:self-alignment-interface::centered-on-x-parent)))))
+       (Y-offset . ,side-position-interface::y-aligned-side)
+       (vertical-skylines . ,grob::always-vertical-skylines-from-stencil)
+       (Y-extent . ,grob::always-Y-extent-from-stencil)
+       (meta . ((class . Item)
+                (interfaces . (clef-modifier-interface
+                               font-interface
+                               self-alignment-interface
+                               side-position-interface
+                               text-interface))))))
+
     (ClusterSpanner
      . (
        (cross-staff . ,ly:cluster::calc-cross-staff)
@@ -1221,6 +1247,7 @@
    (LaissezVibrerTie
      . (
        (control-points . ,ly:semi-tie::calc-control-points)
+       (cross-staff . ,semi-tie::calc-cross-staff)
        (details . ((ratio . 0.333)
                    (height-limit . 1.0)))
        (direction . ,ly:tie::calc-direction)
@@ -1621,32 +1648,6 @@
                 (interfaces . (note-spacing-interface
                                spacing-interface))))))
 
-
-    (OctavateEight
-     . (
-       (break-visibility . ,(grob::inherit-parent-property
-                              X 'break-visibility))
-       (font-shape . italic)
-       (font-size . -4)
-       (self-alignment-X . ,CENTER)
-       (staff-padding . 0.2)
-       (stencil . ,ly:text-interface::print)
-       (X-offset . ,(ly:make-simple-closure
-                     `(,+
-                       ,(ly:make-simple-closure
-                         (list ly:self-alignment-interface::x-aligned-on-self))
-                       ,(ly:make-simple-closure
-                         (list ly:self-alignment-interface::centered-on-x-parent)))))
-       (Y-offset . ,side-position-interface::y-aligned-side)
-       (vertical-skylines . ,grob::always-vertical-skylines-from-stencil)
-       (Y-extent . ,grob::always-Y-extent-from-stencil)
-       (meta . ((class . Item)
-                (interfaces . (font-interface
-                               octavate-eight-interface
-                               self-alignment-interface
-                               side-position-interface
-                               text-interface))))))
-
     (OttavaBracket
      . (
        (dash-fraction . 0.3)
@@ -1827,6 +1828,7 @@
 
     (RepeatTie
      . (
+       (cross-staff . ,semi-tie::calc-cross-staff)
        (control-points . ,ly:semi-tie::calc-control-points)
        (details . ((ratio . 0.333)
                    (height-limit . 1.0)))