Midi: only output PORT if midiChannelMapping == #'voice.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 15a2695e5f2283a21839234fd5efd07dd63580c5..95fca72955be71c7848573b5b80ae64246998421 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -177,6 +177,8 @@
 
     (BalloonTextItem
      . (
+       (annotation-balloon . #t)
+       (annotation-line . #t)
        (stencil . ,ly:balloon-interface::print)
        (text . ,(grob::calc-property-by-copy 'text))
        (X-offset . ,(grob::calc-property-by-copy 'X-offset))
@@ -360,6 +362,8 @@
            (hint-direction-penalty . 20)
            (musical-direction-factor . 400)
            (ideal-slope-factor . 10)
+          (collision-penalty . 500)
+          (collision-padding . 0.35)
            (round-to-zero-slope . 0.02)))
        (direction . ,ly:beam::calc-direction)
 
@@ -861,6 +865,41 @@
                                text-interface
                                text-script-interface))))))
 
+    (FootnoteItem
+     . (
+       (annotation-balloon . #f)
+       (annotation-line . #t)
+       (break-visibility . ,inherit-y-parent-visibility)
+       (footnote-text . ,(grob::calc-property-by-copy 'footnote-text))
+       (stencil . ,ly:balloon-interface::print)
+       (text . ,(grob::calc-property-by-copy 'text))
+       (Y-extent . #f)
+       (X-offset . ,(grob::calc-property-by-copy 'X-offset))
+       (Y-offset . ,(grob::calc-property-by-copy 'Y-offset))
+       (meta . ((class . Item)
+                (interfaces . (balloon-interface
+                               footnote-interface
+                               font-interface
+                               text-interface))))))
+
+    (FootnoteSpanner
+     . (
+       (annotation-balloon . #f)
+       (annotation-line . #t)
+       (footnote-text . ,(grob::calc-property-by-copy 'footnote-text))
+       (spanner-placement . -1.0)
+       (stencil . ,ly:balloon-interface::print-spanner)
+       (text . ,(grob::calc-property-by-copy 'text))
+       (Y-extent . #f)
+       (X-offset . ,(grob::calc-property-by-copy 'X-offset))
+       (Y-offset . ,(grob::calc-property-by-copy 'Y-offset))
+       (meta . ((class . Spanner)
+                (interfaces . (balloon-interface
+                                footnote-interface
+                               footnote-spanner-interface
+                               font-interface
+                               text-interface))))))
+
     (FretBoard
      . (
        (after-line-breaking . ,ly:chord-name::after-line-breaking)
@@ -1324,6 +1363,7 @@
        (skyline-vertical-padding . 0.6)
        ;;                    (stencil . ,ly:paper-column::print)
 
+       (keep-inside-line . #t)
        (line-break-permission . allow)
        (non-musical . #t)
        (page-break-permission . allow)
@@ -1461,6 +1501,7 @@
        (axes . (,X))
        (before-line-breaking . ,ly:paper-column::before-line-breaking)
        (horizontal-skylines . ,ly:separation-item::calc-skylines)
+       (keep-inside-line . #t)
        ;; (stencil . ,ly:paper-column::print)
        (X-extent . ,ly:axis-group-interface::width)
 
@@ -1823,7 +1864,7 @@
         . (
            ;; 3.5 (or 3 measured from note head) is standard length
            ;; 32nd, 64th, 128th flagged stems should be longer
-           (lengths . (3.5 3.5 3.5 4.5 5.0 6.0))
+           (lengths . (3.5 3.5 3.5 4.25 5.0 6.0))
 
            ;; FIXME.  3.5 yields too long beams (according to Ross and
            ;; looking at Baerenreiter examples) for a number of common