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 dae6bdc8a870258a5314efc1253b8895d20d4dfb..1a03e9df5bbafc26ce2edbf7edfc94d3a02021c9 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -327,8 +327,18 @@
        (stencil . ,ly:beam::print)
        (clip-edges . #t)
        (cross-staff . ,ly:beam::calc-cross-staff)
-
-       (details .  ((hint-direction-penalty . 20)))
+       (details 
+         .(
+           (secondary-beam-demerit . 10)
+           (stem-length-demerit-factor . 5)
+           (region-size . 2)
+           (beam-eps . 0.001)
+           (stem-length-limit-penalty . 5000)
+           (damping-direction-penalty . 800)
+           (hint-direction-penalty . 20)
+           (musical-direction-factor . 400)
+           (ideal-slope-factor . 10)
+           (round-to-zero-slope . 0.02)))
        ;; TODO: should be in SLT.
        (thickness . 0.48) ; in staff-space
        (neutral-direction . ,DOWN)
@@ -363,6 +373,7 @@
     (BendAfter
      . (
        (stencil . ,bend::print)
+       (minimum-length . 0.5)
        (thickness . 2.0)
        (meta . ((class . Spanner)
                 (interfaces . (spanner-interface
@@ -395,8 +406,8 @@
                               staff-bar
                               key-cancellation
                               key-signature
-                              staff
-                              time-signature custos)
+                              time-signature
+                              custos)
 
                              ;; begin of line
                              (
@@ -516,7 +527,7 @@
        ;; todo: add X self alignment?
        (baseline-skip . 2)
        (side-axis . ,Y)
-       (avoid-slur . outside )
+       (avoid-slur . outside)
        (font-series . bold)
        (meta . ((class . Item)
                 (interfaces . (text-script-interface
@@ -746,6 +757,7 @@
                                   (padding . 1.5)
                                      ))
                          ))
+       (after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
        (stencil . ,ly:line-spanner::print)
        (left-bound-info . ,ly:line-spanner::calc-left-bound-info)
        (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
@@ -792,7 +804,7 @@
      . (
        (stencil . ,ly:hairpin::print)
        (springs-and-rods . ,ly:spanner::set-spacing-rods)
-       (after-line-breaking . ,ly:hairpin::after-line-breaking)
+       (after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
        (grow-direction . ,hairpin::calc-grow-direction)
        (circled-tip . #f)
        (to-barline . #t)
@@ -2002,7 +2014,7 @@
                          ))
        
        (stencil . ,ly:line-spanner::print)
-
+       (after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
        (style . trill)
        (staff-padding . 1.0)
        (padding . 0.5)
@@ -2213,6 +2225,7 @@
                                   (padding . 1.5)
                                      ))
                          ))
+       (after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
        (stencil . ,ly:line-spanner::print)
        (left-bound-info . ,ly:line-spanner::calc-left-bound-info)
        (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
@@ -2280,6 +2293,7 @@
    ly:arpeggio::print
    ly:arpeggio::brew-chord-bracket
    ly:bar-line::print
+   ly:mensural-ligature::brew-ligature-primitive
    ly:note-head::print
    ly:dots::print
    ly:clef::print