Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 555403033926f26f479ca674858921480344e0fe..975d42582ffbd2544bcba886724cbe5dbf63f8f3 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1625,6 +1625,7 @@
        (length . ,ly:stem::calc-length)
        (thickness . 1.3)
        (cross-staff . ,ly:stem::calc-cross-staff)
+       (flag . ,ly:stem::calc-flag)
        (details
         . (
            ;; 3.5 (or 3 measured from note head) is standard length
@@ -1683,7 +1684,7 @@
        (self-alignment-X . ,CENTER)
        (self-alignment-Y . ,CENTER)
        (script-priority . 100)
-       (avoid-slur . outside)
+       (avoid-slur . around)
        (font-encoding . fetaNumber)
        (font-size . -5)                ; don't overlap when next to heads.
        (meta . ((class . Item)
@@ -1860,6 +1861,7 @@
        (meta . ((class . Item)
                 (interfaces . (text-script-interface
                                text-interface
+                               instrument-specific-markup-interface
                                side-position-interface
                                font-interface))))))