Fix merging problem

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 50e984034e0167e8aac74e03e5a6bbe0985d04eb..5acb4fc1c6bd3972ce69681f0d43abb0d52720c1 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -319,6 +319,7 @@
        (beaming . ,ly:beam::calc-beaming)
        (stencil . ,ly:beam::print)
        (clip-edges . #t)
+       (cross-staff . ,ly:beam::cross-staff)
 
        (details .  ((hint-direction-penalty . 20)))
        ;; TODO: should be in SLT.
@@ -591,7 +592,6 @@
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (staff-padding . 0.1)
        (padding . 0.6)
-       (avoid-slur . outside)
        (slur-padding . 0.3)
        (minimum-space . 1.2)
        (direction . ,DOWN)
@@ -620,7 +620,6 @@
        (font-series . bold)
        (font-encoding . fetaDynamic)
        (font-shape . italic)
-       (avoid-slur . around)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 250)
        (meta . ((class . Item)
@@ -642,17 +641,15 @@
                                    (padding . 0.75)
                                    ))
                          (right-broken . ((attach-dir .  ,RIGHT)
-                                   (Y . 0)
                                    (padding . 0.0)
                                    ))
+                         
                          (left . ((attach-dir .  ,LEFT)
                                   (Y . 0)
                                   (stencil-offset . (0 . -0.5))
                                   (padding . 0.5)
                                   ))
                          (left-broken . ((attach-dir .  ,RIGHT)
-                                         (padding . 0.5)
-                                         (Y . 0)
                                          
                                          ;; make sure the - - - stays at reasonable
                                          ;; distance from staff.
@@ -671,6 +668,7 @@
                 (interfaces . (font-interface
                                text-interface
                                new-line-spanner-interface
+                               line-interface
                                dynamic-interface
                                dynamic-text-spanner-interface
                                spanner-interface))))))
@@ -1260,6 +1258,7 @@
        (minimum-length . 1.5)
        (height-limit . 2.0)
        (ratio . 0.333)
+       (cross-staff . ,ly:slur::cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1458,6 +1457,7 @@
        (height-limit . 2.0)
        (ratio . 0.25)
        (avoid-slur . inside)
+       (cross-staff . ,ly:slur::cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1578,6 +1578,7 @@
        (Y-extent . ,ly:stem::height)
        (length . ,ly:stem::calc-length)
        (thickness . 1.3)
+       (cross-staff . ,ly:stem::cross-staff)
        (details
         . (
            ;; 3.5 (or 3 measured from note head) is standard length
@@ -1707,6 +1708,7 @@
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (skylines . ,ly:axis-group-interface::calc-skylines)
+       (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
        (skyline-horizontal-padding . 1.0)
        (meta . ((class . System)
                 (interfaces . (system-interface
@@ -1899,10 +1901,11 @@
        (right-bound-info . ,ly:new-line-spanner::calc-right-bound-info)
 
        (bound-details . ((left . ((text . ,(make-translate-scaled-markup
-                                            '(0 . -0.6)
+                                            '(0.5 . -0.6)
                                             (make-musicglyph-markup "scripts.trill")))
                                   (Y . 0)
                                   (padding . 0.25)
+                                  (attach-dir . ,LEFT)
                                   ))
                          (right . ((Y . 0)))
                          ))
@@ -2044,6 +2047,7 @@
        (stacking-dir . -1)
        (padding . 0.5)
        (skylines . ,ly:axis-group-interface::combine-skylines)
+       (max-stretch . ,ly:align-interface::calc-max-stretch)
        (meta . ((class . Spanner)
                 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
                 (interfaces . (align-interface
@@ -2054,7 +2058,8 @@
        (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
        (Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
        (X-extent . ,ly:axis-group-interface::width)
-       (skylines . ,ly:axis-group-interface::calc-skylines);
+       (skylines . ,ly:axis-group-interface::calc-skylines)
+       (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
        (meta . ((class . Spanner)
                 (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common)))
                 (interfaces . (axis-group-interface
@@ -2103,7 +2108,7 @@
        (left-bound-info . ,ly:new-line-spanner::calc-left-bound-info)
        (right-bound-info . ,ly:new-line-spanner::calc-right-bound-info)
        (meta . ((class . Spanner)
-                (interfaces . (line-spanner-interface
+                (interfaces . (new-line-spanner-interface
                                line-interface))))
        ))