Merge branch 'master' into lilypond/translation

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index a9b200177245cca87e28f9134faf35b68f64c3a8..177ebafc847426248949e66dc7d4d4c02b697415 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -349,6 +349,13 @@
 
        (beaming . ,ly:beam::calc-beaming)
        (clip-edges . #t)
+       (collision-interfaces . (beam-interface
+                                clef-interface
+                                inline-accidental-interface
+                                key-signature-interface
+                                note-head-interface
+                                stem-interface
+                                time-signature-interface))
        (concaveness . ,ly:beam::calc-concaveness)
        (cross-staff . ,ly:beam::calc-cross-staff)
        (damping . 1)
@@ -797,10 +804,12 @@
 
        (left-bound-info . ,ly:line-spanner::calc-left-bound-info-and-text)
 
+       (minimum-length . 2.0)
        ;; make sure the spanner doesn't get too close to notes
        (minimum-Y-extent . (-1 . 1))
 
        (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
+       (springs-and-rods . ,ly:spanner::set-spacing-rods)
        (stencil . ,ly:line-spanner::print)
        (style . dashed-line)
        (meta . ((class . Spanner)
@@ -889,7 +898,7 @@
        (annotation-balloon . #f)
        (annotation-line . #t)
        (footnote-text . ,(grob::calc-property-by-copy 'footnote-text))
-       (spanner-placement . LEFT)
+       (spanner-placement . ,LEFT)
        (stencil . ,ly:balloon-interface::print-spanner)
        (text . ,(grob::calc-property-by-copy 'text))
        (Y-extent . #f)
@@ -927,7 +936,9 @@
                          ))
        (gap . 0.5)
        (left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+       (normalized-endpoints . ,ly:spanner::calc-normalized-endpoints)
        (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
+       (simple-Y . #t)
        (stencil . ,ly:line-spanner::print)
        (style . line)
        (X-extent . #f)
@@ -1183,6 +1194,7 @@
 
     (LyricHyphen
      . (
+       (after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
        (dash-period . 10.0)
        (height . 0.42)
        (length . 0.66)
@@ -1298,6 +1310,8 @@
        (staff-position . 0)
        (stencil . ,ly:multi-measure-rest::print)
        (thick-thickness . 6.6)
+       ;; See Wanske pp. 125
+       (usable-duration-logs . (0 -1 -2 -3))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Spanner)
                 (interfaces . (font-interface
@@ -1425,6 +1439,7 @@
                 (interfaces . (font-interface
                                gregorian-ligature-interface
                                ledgered-interface
+                                ligature-head-interface
                                mensural-ligature-interface
                                note-head-interface
                                rhythmic-grob-interface
@@ -1574,6 +1589,7 @@
        (height-limit . 2.0)
        (minimum-length . 1.5)
        (ratio . 0.333)
+       (spanner-id . "")
        (springs-and-rods . ,ly:spanner::set-spacing-rods)
        (stencil . ,ly:slur::print)
        (thickness . 1.1)
@@ -1728,6 +1744,7 @@
        (line-thickness . 0.8)
        (minimum-length . 1.5)
        (ratio . 0.25)
+       (spanner-id . "")
        (springs-and-rods . ,ly:spanner::set-spacing-rods)
        (stencil . ,ly:slur::print)
        (thickness . 1.2)
@@ -2244,6 +2261,7 @@
        (meta . ((class . Item)
                 (interfaces . (accidental-interface
                                font-interface
+                               inline-accidental-interface
                                side-position-interface
                                trill-pitch-accidental-interface))))))
 
@@ -2329,6 +2347,7 @@
      . (
        (avoid-slur . inside)
        (cross-staff . ,ly:tuplet-number::calc-cross-staff)
+       (direction . ,tuplet-number::calc-direction)
        (font-shape . italic)
        (font-size . -2)
        (stencil . ,ly:tuplet-number::print)