Fix 1300.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3055af219bfb916547a7e1e1b9bad26fa48e2c4a..f132b2aa1076f63f1f6ebd754a74a8cef28169ab 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -351,6 +351,7 @@
        (clip-edges . #t)
        (collision-interfaces . (beam-interface
                                 clef-interface
+                                flag-interface
                                 inline-accidental-interface
                                 key-signature-interface
                                 note-head-interface
@@ -855,7 +856,7 @@
        ;; sync with TextScript (?)
 
        (avoid-slur . around)
-       (cross-staff . ,ly:side-position-interface::calc-cross-staff)
+       (cross-staff . ,script-or-side-position-cross-staff)
        (direction . ,ly:script-interface::calc-direction)
        (font-encoding . fetaText)
        (font-size . -5)                ; don't overlap when next to heads.
@@ -876,6 +877,16 @@
                                text-interface
                                text-script-interface))))))
 
+    (Flag
+     . (
+       (stencil . ,ly:flag::print)
+       (X-extent . ,ly:flag::width)
+       (X-offset . ,ly:flag::calc-x-offset)
+       (Y-offset . ,ly:flag::calc-y-offset)
+       (meta . ((class . Item)
+                (interfaces . (flag-interface
+                                font-interface))))))
+
     (FootnoteItem
      . (
        (annotation-balloon . #f)
@@ -1918,12 +1929,8 @@
 
        (direction . ,ly:stem::calc-direction)
        (duration-log . ,stem::calc-duration-log)
-       (flag . ,ly:stem::calc-flag)
-       (length . ,ly:stem::calc-length)
        (neutral-direction . ,DOWN)
        (positioning-done . ,ly:stem::calc-positioning-done)
-       (stem-begin-position . ,ly:stem::calc-stem-begin-position)
-       (stem-end-position . ,ly:stem::calc-stem-end-position)
        (stem-info . ,ly:stem::calc-stem-info)
        (stencil . ,ly:stem::print)
        (thickness . 1.3)
@@ -1932,8 +1939,7 @@
        (Y-extent . ,ly:stem::height)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
-                (interfaces . (font-interface
-                               stem-interface))))))
+                (interfaces . (stem-interface))))))
 
     (StemTremolo
      . (
@@ -1949,6 +1955,7 @@
     (StringNumber
      . (
        (avoid-slur . around)
+       (cross-staff . ,script-or-side-position-cross-staff)
        (font-encoding . fetaText)
        (font-size . -5)                ; don't overlap when next to heads.
        (padding . 0.5)
@@ -2133,7 +2140,7 @@
     (TextScript
      . (
        (avoid-slur . around)
-       (cross-staff . ,ly:script-interface::calc-cross-staff)
+       (cross-staff . ,script-or-side-position-cross-staff)
        (direction . ,DOWN)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 450)
@@ -2577,6 +2584,13 @@
    ly:note-head::print
    ly:dots::print
    ly:clef::print
+   ly:flag::print
+   default-flag
+   normal-flag
+   mensural-flag
+   no-flag
+   modern-straight-flag
+   old-straight-flag
    ly:key-signature-interface::print
    ly:percent-repeat-item-interface::beat-slash
    ly:text-interface::print
@@ -2627,6 +2641,7 @@
     (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
     (,ly:slur::height . ,ly:slur::pure-height)
     (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
+    (,ly:stem::calc-stem-end-position . ,ly:stem::pure-calc-stem-end-position)
     (,ly:stem::height . ,ly:stem::pure-height)
     (,ly:system::height . ,ly:system::calc-pure-height)))
 
@@ -2634,6 +2649,7 @@
   (list
    parenthesize-elements
    laissez-vibrer::print
+   ly:flag::calc-y-offset
    ly:rest::y-offset-callback
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))