Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index b445a190f2f4816d2d16235fb5a0d1227a79acdb..f75e454de048e40daef9b669f49aba08f0ac596a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -88,7 +88,7 @@
     
     (Ambitus
      . (
-       (axes . (0 1))
+       (axes . (,X ,Y))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (space-alist . (
@@ -410,14 +410,14 @@
                               staff-bar
                               time-signature
                               custos)))
-       (axes . (0))
+       (axes . (,X))
        (meta . ((class . Item)
                 (interfaces . (break-alignment-interface
                                axis-group-interface))))))
 
     (BreakAlignGroup
      . (
-       (axes . (0))
+       (axes . (,X))
        (X-extent . ,ly:axis-group-interface::width)
        (break-align-anchor . ,ly:break-aligned-interface::calc-average-anchor)
        (break-visibility . ,ly:break-aligned-interface::calc-break-visibility)
@@ -518,6 +518,7 @@
        ;; todo: add X self alignment?
        (baseline-skip . 2)
        (side-axis . ,Y)
+       (avoid-slur . outside )
        (font-series . bold)
        (meta . ((class . Item)
                 (interfaces . (text-script-interface
@@ -546,7 +547,7 @@
 
     (DotColumn
      . (
-       (axes . (0))
+       (axes . (,X))
        (direction . ,RIGHT)
        (positioning-done . ,ly:dot-column::calc-positioning-done) 
        (X-extent . ,ly:axis-group-interface::width)
@@ -600,7 +601,7 @@
                                text-interface))))))
     (DynamicLineSpanner
      . (
-       (axes . (1))
+       (axes . (,Y))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (staff-padding . 0.1)
        (padding . 0.6)
@@ -701,6 +702,7 @@
        (stencil . ,ly:text-interface::print)
        (direction . ,ly:script-interface::calc-direction)
        (positioning-done . ,ly:script-interface::calc-positioning-done)
+       (cross-staff . ,ly:side-position-interface::calc-cross-staff)
 
        (text . ,fingering::calc-text) 
        (font-encoding . fetaNumber)
@@ -819,6 +821,7 @@
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (direction . ,LEFT)
        (self-alignment-Y . ,CENTER)
+       (self-alignment-X . ,CENTER)
        (meta . ((class . Spanner)
                 (interfaces . (system-start-text-interface
                                side-position-interface
@@ -832,6 +835,7 @@
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (staff-padding . 2)
        (direction . ,UP)
+       (side-axis . ,Y)
        (self-alignment-X . ,CENTER)
        (meta . ((class . Item)
                 (interfaces . (side-position-interface
@@ -1122,7 +1126,7 @@
     (NonMusicalPaperColumn
      . (
        (allow-loose-spacing . #t)
-       (axes . (0))
+       (axes . (,X))
        (before-line-breaking . ,ly:paper-column::before-line-breaking)
        (X-extent . ,ly:axis-group-interface::width)
        (horizontal-skylines . ,ly:separation-item::calc-skylines)
@@ -1143,9 +1147,10 @@
     
     (NoteCollision
      . (
-       (axes . (0 1))
+       (axes . (,X ,Y))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
+       (prefer-dotted-right . #t)
        (positioning-done . ,ly:note-collision-interface::calc-positioning-done)
        (meta . ((class . Item)
                 (interfaces . (note-collision-interface
@@ -1153,7 +1158,7 @@
 
     (NoteColumn
      . (
-       (axes . (0 1))
+       (axes . (,X ,Y))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (horizontal-skylines . ,ly:separation-item::calc-skylines)
@@ -1241,7 +1246,7 @@
 
     (PaperColumn
      . (
-       (axes . (0))
+       (axes . (,X))
        (allow-loose-spacing . #t)
        (before-line-breaking . ,ly:paper-column::before-line-breaking)
        (horizontal-skylines . ,ly:separation-item::calc-skylines)
@@ -1500,9 +1505,11 @@
 
     (SostenutoPedalLineSpanner
      . (
-       (axes . (1))
+       (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::width)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (outside-staff-priority . 1000)
        (side-axis . ,Y)
        (staff-padding . 1.0)
        (padding . 1.2)
@@ -1713,9 +1720,11 @@
 
     (SustainPedalLineSpanner
      . (
-       (axes . (1))
+       (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::width)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (outside-staff-priority . 1000)
        (side-axis . ,Y)
        (padding . 1.2)
        (staff-padding . 1.2)
@@ -1728,7 +1737,7 @@
 
     (System
      . (
-       (axes . (0 1))
+       (axes . (,X ,Y))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
@@ -1945,7 +1954,11 @@
                                   (Y . 0)
                                   (stencil-offset . (-0.5 . 0))
                                   (padding . 1.5)
-                                  (attach-dir . ,LEFT)
+                                  (attach-dir . ,CENTER)
+                                  ;; this isn't CENTER because the trill glyph's origin
+                                  ;; is not centered in its extent; to have the trill
+                                  ;; spanner aligned the same as a trill, we need a slight offset
+                                  (anchor-alignment . 0.15)
                                   ))
                          (left-broken . ((end-on-note . #t)))
                          (right . ((Y . 0)))
@@ -2059,9 +2072,11 @@
 
     (UnaCordaPedalLineSpanner
      . (
-       (axes . (1))
+       (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::width)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (outside-staff-priority . 1000)
        (side-axis . ,Y)
        (padding . 1.2)
        (staff-padding . 1.2)
@@ -2083,7 +2098,7 @@
 
     (VerticalAlignment
      . (
-       (axes . (1))
+       (axes . (,Y))
        (positioning-done . ,ly:align-interface::calc-positioning-done)
        (after-line-breaking . ,ly:align-interface::stretch-after-break)
        (Y-extent . ,ly:axis-group-interface::height)
@@ -2098,7 +2113,7 @@
                                axis-group-interface))))))
     (VerticalAxisGroup
      . (
-       (axes . (1))
+       (axes . (,Y))
        (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)
@@ -2132,7 +2147,7 @@
 
     (VoltaBracketSpanner
      . (       
-       (axes . (1))
+       (axes . (,Y))
        (side-axis . ,Y)
        (direction . ,UP)
        (padding . 1)
@@ -2259,6 +2274,7 @@
 (define pure-functions
   (list
    parenthesize-elements
+   ly:rest::y-offset-callback
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))