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 4009f6ebdf10c208d280d8f6b923a1597e28997a..1a03e9df5bbafc26ce2edbf7edfc94d3a02021c9 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in line-thickness (thicknesses) and
@@ -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
@@ -723,9 +734,12 @@
 
     (FretBoard
      . ((stencil . ,fret-board::calc-stencil)
+       (after-line-breaking . ,ly:chord-name::after-line-breaking)
        (fret-diagram-details . ((finger-code . below-string)))
        (meta . ((class . Item)
                 (interfaces . (fret-diagram-interface
+                               rhythmic-grob-interface
+                                chord-name-interface
                                font-interface))))))
 
 
@@ -743,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)
@@ -789,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)
@@ -799,6 +814,7 @@
        (bound-padding . 1.0)
        (self-alignment-Y . ,CENTER)
        (Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
+       (Y-extent . ,ly:hairpin::height)
        (meta . ((class . Spanner)
                 (interfaces . (hairpin-interface
                                line-interface
@@ -1152,6 +1168,7 @@
        (non-musical . #t)
        (line-break-permission . allow)
        (page-break-permission . allow)
+       (full-measure-extra-space . 1.0)
 
        ;; debugging stuff: print column number.
        ;;               (font-size . -6) (font-name . "sans")  (Y-extent . #f)
@@ -1638,11 +1655,13 @@
        (thickness . 1.3)
        (cross-staff . ,ly:stem::calc-cross-staff)
        (flag . ,ly:stem::calc-flag)
+       (beamlet-default-length . (1.1 . 1.1))
+       (beamlet-max-length-proportion . (0.75 . 0.75))
        (details
         . (
            ;; 3.5 (or 3 measured from note head) is standard length
-           ;; 32nd, 64th flagged stems should be longer
-           (lengths . (3.5 3.5 3.5 4.5 5.0))
+           ;; 32nd, 64th, 128th flagged stems should be longer
+           (lengths . (3.5 3.5 3.5 4.5 5.0 6.0))
 
            ;; FIXME.  3.5 yields too long beams (according to Ross and
            ;; looking at Baerenreiter examples) for a number of common
@@ -1995,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)
@@ -2206,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)
@@ -2273,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
@@ -2293,9 +2314,11 @@
     (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height)
     (,ly:arpeggio::height . ,ly:arpeggio::pure-height)
     (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
+    (,ly:hairpin::height . ,ly:hairpin::pure-height)
     (,ly:stem::height . ,ly:stem::pure-height)
     (,ly:rest::height . ,ly:rest::pure-height)
     (,ly:grob::stencil-height . ,pure-stencil-height)
+    (,ly:self-alignment-interface::y-aligned-on-self . ,ly:self-alignment-interface::pure-y-aligned-on-self)
     (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
     (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
     (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)