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 680f1598af68a6e07181e61d16b490e6e34c128d..3055af219bfb916547a7e1e1b9bad26fa48e2c4a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -930,11 +930,12 @@
     (Glissando
      . (
        (after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
-       (bound-details . ((right . ((attach-dir .  ,CENTER)
-                                   (padding . 1.5)
+       (bound-details . ((right . ((attach-dir .  ,LEFT)
+                                   (end-on-accidental . #t)
+                                   (padding . 0.5)
                                      ))
-                         (left . ((attach-dir .  ,CENTER)
-                                  (padding . 1.5)
+                         (left . ((attach-dir .  ,RIGHT)
+                                  (padding . 0.5)
                                      ))
                          ))
        (gap . 0.5)
@@ -1072,7 +1073,7 @@
                        (key-signature . (extra-space . 0.5))
                        (cue-clef . (extra-space . 0.5))
                        (right-edge . (extra-space . 0.5))
-                       (first-note . (fixed-space . 2.5))))
+                       (first-note . (semi-fixed-space . 2.5))))
        (stencil . ,ly:key-signature-interface::print)
        (extra-spacing-width . (0.0 . 0.5))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
@@ -1096,7 +1097,7 @@
                        (staff-bar . (extra-space . 1.1))
                        (cue-clef . (extra-space . 0.5))
                        (right-edge . (extra-space . 0.5))
-                       (first-note . (fixed-space . 2.5))))
+                       (first-note . (semi-fixed-space . 2.5))))
        (stencil . ,ly:key-signature-interface::print)
        (extra-spacing-width . (0.0 . 0.5))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
@@ -1715,6 +1716,7 @@
        (side-axis . ,Y)
 
        ;; padding set in script definitions.
+       (slur-padding . 0.2)
        (staff-padding . 0.25)
 
        (stencil . ,ly:script-interface::print)
@@ -2242,7 +2244,7 @@
        (non-musical . #t)
        (space-alist . (
                        (cue-clef . (extra-space . 1.5))
-                       (first-note . (fixed-space . 2.0))
+                       (first-note . (semi-fixed-space . 2.0))
                        (right-edge . (extra-space . 0.5))
                        (staff-bar . (minimum-space . 2.0))))
        (stencil . ,ly:time-signature::print)