* scm/define-music-types.scm (music-descriptions): use

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 6c91ae31592530df22df76d2f6933600645acf35..bc3aee5e9359e7082468cb764c03c45f586ed737 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -142,6 +142,7 @@
      . (
        (break-align-symbol . staff-bar)
        (glyph . "|")
+       (gap . 0.4)
        (layer . 0)
        (break-visibility . ,all-visible)
        (non-musical . #t)
@@ -320,7 +321,7 @@
        (thickness . 2.0)
        (meta . ((class . Spanner)
                 (interfaces . (spanner-interface
-                               fall-interface))))))
+                               bend-after-interface))))))
 
     (BreakAlignment
      . (
@@ -652,6 +653,16 @@
                 (interfaces . (line-interface
                                line-spanner-interface))))))
 
+    (GraceSpacing
+     . (
+       (common-shortest-duration . ,grace-spacing::calc-shortest-duration)
+       (spacing-increment . 0.8)
+       (shortest-duration-space . 1.6)
+       (meta . ((class . Spanner)
+                (interfaces . (grace-spacing-interface
+                               spacing-interface
+                               spacing-options-interface
+                               spanner-interface))))))
     (GridPoint
      . (
        (X-extent . (0 . 0))
@@ -720,6 +731,20 @@
                                side-position-interface
                                font-interface))))))
 
+    (InstrumentSwitch
+     . (
+       (padding . 0.3)
+       (stencil . ,ly:text-interface::print)
+       (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
+       (staff-padding . 2)
+       (direction . ,UP)
+       (self-alignment-X . ,CENTER)
+       (meta . ((class . Item)
+                (interfaces . (system-start-text-interface
+                               side-position-interface
+                               font-interface))))))
+    
     (KeyCancellation
      . (
        (stencil . ,ly:key-signature-interface::print)
@@ -1130,6 +1155,7 @@
        
        (non-musical . #t)
        (line-break-permission . allow)
+       (page-break-permission . allow)
 
        ;; debugging stuff: print column number.
        ;;               (font-size . -6) (font-name . "sans")  (Y-extent . #f)
@@ -1355,13 +1381,15 @@
     (SpacingSpanner
      . (
        (springs-and-rods . ,ly:spacing-spanner::set-springs)
+       (common-shortest-duration . ,ly:spacing-spanner::calc-common-shortest-duration)
        (average-spacing-wishes . #t)
-       (grace-space-factor . 0.6)
        (shortest-duration-space . 2.0)
        (spacing-increment . 1.2)
+       
        (base-shortest-duration . ,(ly:make-moment 3 16))
        (meta . ((class . Spanner)
                 (interfaces . (spacing-interface
+                               spacing-options-interface                               
                                spacing-spanner-interface))))))
 
     (SpanBar
@@ -1741,7 +1769,6 @@
        (stencil . ,ly:accidental-interface::print)
        (meta . ((class . Item)
                 (interfaces . (item-interface
-                               accidental-interface
                                side-position-interface
                                font-interface))))))