* stepmake/aclocal.m4 (depth): make sure $srcdir is absolute.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 0be194a4b3008f670d45371e8f90bd4a1528acd2..49baf4aa65e6a261a1aacf3461e044ed8c933e77 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -33,8 +33,10 @@
     (AccidentalSuggestion
      . (
        (stencil . ,Accidental_interface::print)
-       (X-offset . ,Self_alignment_interface::centered_on_x_parent)
-       (self-X-offset . Self_alignment_interface::x_aligned_on_self)
+       (X-offset . ,(ly:make-simple-closure
+                     `(,+
+                       ,(ly:make-simple-closure (list Self_alignment_interface::centered_on_x_parent))
+                       ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
        (self-alignment-X . ,CENTER)
        (cautionary . #t)
        (cautionary-style . smaller)
@@ -43,6 +45,7 @@
        (direction . ,UP)
        (staff-padding . 0.25)
        (script-priority . 0)
+       (side-axis . ,X)
        (meta . ((class . Item)
                 (interfaces . (side-position-interface
                                script-interface
@@ -105,6 +108,7 @@
 
        (stencil . ,Accidental_interface::print)
        (after-line-breaking . ,Accidental_interface::after_line_breaking)
+       (side-axis . ,X)
        
        (meta . ((class . Item)
                 (interfaces . (item-interface
@@ -139,6 +143,7 @@
        (X-offset . ,Side_position_interface::x_aligned_side)
        (direction . -1)
        (padding . 0.5)
+       (side-axis . ,X)
        (staff-position . 0.0)
        (meta . ((class . Item)
                 (interfaces . (arpeggio-interface
@@ -184,9 +189,7 @@
 
     (BarNumber
      . (
-
        (stencil . ,Text_interface::print)
-       ;
        (breakable . #t)
        (break-visibility . ,begin-of-line-visible)
        (padding . 1.0)
@@ -194,6 +197,7 @@
        (font-family . roman)
        (font-size . -2)
        (Y-offset . ,Side_position_interface::y_aligned_side)
+       (side-axis . ,Y)
        (X-offset . ,Self_alignment_interface::x_aligned_on_self)
        (self-alignment-X . 1)
 
@@ -290,9 +294,10 @@
                           Beam::slope_damping
                           Beam::shift_region_to_valid
                           Beam::quanting
-                          Beam::set_stem_lengths
                           ))))
-       
+
+       ;; this is a hack to set stem lengths, if positions is set.
+       (quantized-positions . ,Beam::set_stem_lengths)
        (concaveness . ,Beam::calc_concaveness)
        (direction . ,Beam::calc_direction)
        (stencil . ,Beam::print)
@@ -420,8 +425,8 @@
        (break-visibility . ,begin-of-line-visible)
        (space-alist . ((ambitus . (extra-space . 2.0))
                        (staff-bar . (extra-space . 0.7))
-                       (key-cancellation . (minimum-space . 4.0))
-                       (key-signature . (minimum-space . 4.0))
+                       (key-cancellation . (minimum-space . 3.5))
+                       (key-signature . (minimum-space . 3.5))
                        (time-signature . (minimum-space . 4.2))
                        (first-note . (minimum-fixed-space . 5.0))
                        (next-note . (extra-space . 0.5))
@@ -477,13 +482,14 @@
 
        (no-spacing-rods . #t)
        (Y-offset . ,Side_position_interface::y_aligned_side)
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
+       (X-offset . ,Self_alignment_interface::x_aligned_on_self)
        (direction . 1)
        (padding . 0.5)
        (staff-padding . 0.5)
        (script-priority . 200)
        ;; todo: add X self alignment?
        (baseline-skip . 2)
+       (side-axis . ,Y)
        (font-series . bold)
        (meta . ((class . Item)
                 (interfaces . (text-script-interface
@@ -538,9 +544,7 @@
 
     (DoublePercentRepeat
      . (
-
        (stencil . ,Percent_repeat_item_interface::double_percent)
-
        (breakable . #t)
        (slope . 1.0)
        (font-encoding . fetaMusic)
@@ -557,9 +561,8 @@
      . (
 
        (stencil . ,Text_interface::print)
-
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
-       (X-offset . ,Self_alignment_interface::centered_on_y_parent)
+       (X-offset . ,(ly:make-simple-closure `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::centered_on_y_parent))
+                                                 ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
        (Y-offset . ,Side_position_interface::y_aligned_side)
        (font-encoding . fetaNumber)
        (self-alignment-X . 0)
@@ -567,6 +570,7 @@
        (direction . 1)
        (padding . 0.2)
        (staff-padding . 0.25)
+       (side-axis . ,Y)
        (meta . ((class . Item)
                 (interfaces . (side-position-interface
                                self-alignment-interface
@@ -583,6 +587,7 @@
        (slur-padding . 0.3)
        (minimum-space . 1.2)
        (direction . -1)
+       (side-axis . ,Y)
 
        (Y-extent . ,Axis_group_interface::height)
        (X-extent . ,Axis_group_interface::width)
@@ -602,9 +607,9 @@
        (stencil . ,Text_interface::print)
        (direction . ,Script_interface::calc_direction)
 
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
+       (X-offset . ,Self_alignment_interface::x_aligned_on_self)
        (self-alignment-X . 0)
-       (self-Y-offset . ,Self_alignment_interface::y_aligned_on_self)
+       (Y-offset . ,Self_alignment_interface::y_aligned_on_self)
        (self-alignment-Y . 0)
        (font-series . bold)
        (font-encoding . fetaDynamic)
@@ -697,9 +702,9 @@
        (stencil . ,Grid_line_interface::print)
 
        (self-alignment-X . ,CENTER)
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
-       (X-offset . ,Self_alignment_interface::centered_on_x_parent)
-       
+       (X-offset . ,(ly:make-simple-closure
+                     `(,+  ,(ly:make-simple-closure (list Self_alignment_interface::centered_on_x_parent))
+                           ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
        (layer . 0)
        (meta . ((class . Item)
                 (interfaces . (self-alignment-interface
@@ -718,7 +723,7 @@
        (minimum-length . 2.0)
        (bound-padding . 1.0)
        (self-alignment-Y . 0)
-       (self-Y-offset . ,Self_alignment_interface::y_aligned_on_self)
+       (Y-offset . ,Self_alignment_interface::y_aligned_on_self)
        (meta . ((class . Spanner)
                 (interfaces . (hairpin-interface
                                line-interface
@@ -729,13 +734,12 @@
     (HorizontalBracket
      . (
        (thickness . 1.0)
-
        (stencil . ,Horizontal_bracket::print)
-
        (Y-offset . ,Side_position_interface::y_aligned_side)
        (padding . 0.2)
        (staff-padding . 0.2)
        (direction . -1)
+       (side-axis . ,Y)
        (bracket-flare . (0.5 . 0.5))
        (meta . ((class . Spanner)
                 (interfaces . (horizontal-bracket-interface
@@ -745,8 +749,9 @@
     (InstrumentName
      . (
        (breakable . #t)
-       (self-Y-offset . ,Self_alignment_interface::y_aligned_on_self)
-       (Y-offset . ,Side_position_interface::y_aligned_on_support_refpoints)
+       (Y-offset . ,(ly:make-simple-closure `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::y_aligned_on_self))
+                                                 ,(ly:make-simple-closure (list Side_position_interface::y_aligned_on_support_refpoints)))))
+       
        ;; This direction is for aligned_on_support_refpoints
        ;; (?) --hwn
        (direction . 0)
@@ -754,12 +759,11 @@
                        (left-edge . (extra-space . 1.0))))
 
        (self-alignment-Y . 0)
-
        (stencil . ,Text_interface::print)
-
        (break-align-symbol . instrument-name)
        (break-visibility . ,begin-of-line-visible)
        (baseline-skip . 2)
+       (side-axis . ,X)
        (meta . ((class . Item)
                 (interfaces . (font-interface
                                self-alignment-interface
@@ -793,7 +797,7 @@
        (stencil . ,Key_signature_interface::print)
 
        (space-alist . (
-                       (time-signature . (extra-space . 1.25))
+                       (time-signature . (extra-space . 1.15))
                        (staff-bar . (extra-space . 1.1))
                        (right-edge . (extra-space . 0.5))
                        (first-note . (fixed-space . 2.5))))
@@ -953,6 +957,7 @@
        (Y-offset . ,Side_position_interface::y_aligned_side)
        (direction . 1)
        (padding . 0.8)
+       (side-axis . ,Y)
        (meta . ((class . Item)
                 (interfaces . (text-interface
                                side-position-interface
@@ -962,6 +967,7 @@
     (MeasureGrouping
      . (
        (Y-offset . ,Side_position_interface::y_aligned_side)
+       (side-axis . ,Y)
 
        (stencil . ,Measure_grouping::print)
 
@@ -997,9 +1003,12 @@
      . (
        (springs-and-rods . ,Multi_measure_rest::set_spacing_rods)
        (stencil . ,Text_interface::print)
-       (self-X-offset . ,Self_alignment_interface::y_aligned_on_self)
-       (X-offset . ,Self_alignment_interface::centered_on_y_parent)
+       (X-offset . ,(ly:make-simple-closure
+                     `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self))
+                          ,(ly:make-simple-closure (list Self_alignment_interface::x_centered_on_y_parent)))))
        (Y-offset . ,Side_position_interface::y_aligned_side)
+       (side-axis . ,Y)
+
        (self-alignment-X . 0)
        (direction . 1)
        (padding . 0.4)
@@ -1013,12 +1022,12 @@
                                text-interface))))
              ))
 
-
     (MultiMeasureRestText
      . (
        (stencil . ,Text_interface::print)
-       (X-offset . ,Self_alignment_interface::centered_on_y_parent)
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
+       (X-offset . ,(ly:make-simple-closure
+                     `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::x_centered_on_y_parent))
+                          ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
        
        (Y-offset . ,Side_position_interface::y_aligned_side)
        (self-alignment-X . 0)
@@ -1096,8 +1105,10 @@
      . (
        (self-alignment-X . 0)
        (break-visibility . ,begin-of-line-visible)
-       (X-offset . ,Self_alignment_interface::centered_on_x_parent)
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
+       (X-offset . ,(ly:make-simple-closure
+                     `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self))
+                          ,(ly:make-simple-closure (list Self_alignment_interface::centered_on_x_parent)))))
+       
        (Y-offset . ,Side_position_interface::y_aligned_side)
 
        (stencil . ,Text_interface::print)
@@ -1203,11 +1214,10 @@
                                percent-repeat-interface))))))
     (PercentRepeatCounter
      . (
-
        (stencil . ,Text_interface::print)
-
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
-       (X-offset . ,Self_alignment_interface::centered_on_y_parent)
+       (X-offset . ,(ly:make-simple-closure
+                     `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::x_centered_on_y_parent))
+                          ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
        (Y-offset . ,Side_position_interface::y_aligned_side)
        (self-alignment-X . 0)
        (direction . 1)
@@ -1245,7 +1255,7 @@
 
        (stencil . ,Text_interface::print)
 
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
+       (X-offset . ,Self_alignment_interface::x_aligned_on_self)
        (Y-offset . ,Side_position_interface::y_aligned_side)
 
        (after-line-breaking . ,shift-right-at-line-begin)
@@ -1306,7 +1316,8 @@
        (padding . 0.20)
        (staff-padding . 0.25)
        ;; (script-priority . 0) priorities for scripts, see script.scm
-       (X-offset . ,Self_alignment_interface::centered_on_x_parent)
+       (X-offset . , Self_alignment_interface::centered_on_x_parent)
+       
 
        (stencil . ,Script_interface::print)
        (direction . ,Script_interface::calc_direction)
@@ -1364,7 +1375,7 @@
      . (
 
        (springs-and-rods . ,Spacing_spanner::set_springs)
-
+       (average-spacing-wishes . #t)
        (grace-space-factor . 0.6)
        (shortest-duration-space . 2.0)
        (spacing-increment . 1.2)
@@ -1407,6 +1418,7 @@
        (font-series . bold)
        (padding . 1.0)
        (X-offset . ,Side_position_interface::x_aligned_side)
+       (side-axis . ,X)
        (direction . ,LEFT)
        (meta . ((class . Item)
                 (interfaces . (side-position-interface
@@ -1449,7 +1461,7 @@
        (stencil . ,Text_interface::print)
 
        (direction . 1)
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
+       (X-offset . ,Self_alignment_interface::x_aligned_on_self)
        (no-spacing-rods . #t)
        (padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner
        (font-shape . italic)
@@ -1466,6 +1478,7 @@
        (X-extent . ,Axis_group_interface::height)
 
        (Y-offset . ,Side_position_interface::y_aligned_side)
+       (side-axis . ,Y)
 
        (padding . 1.2)
        (minimum-space . 1.0)
@@ -1557,7 +1570,7 @@
        (self-alignment-X . 0)
        (direction . 1)
        (padding . 0.0)  ;; padding relative to SustainPedalLineSpanner
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
+       (X-offset . ,Self_alignment_interface::x_aligned_on_self)
        (meta . ((class . Item)
                 (interfaces . (piano-pedal-interface
                                text-spanner-interface
@@ -1570,6 +1583,7 @@
        (axes . (1))
        (X-extent . ,Axis_group_interface::height)
        (Y-offset . ,Side_position_interface::y_aligned_side)
+       (side-axis . ,Y)
        (padding . 1.2)
        (staff-padding . 1.2)
        (minimum-space . 1.0)
@@ -1631,7 +1645,7 @@
        (meta . ((class . Item)
                 (interfaces
                  . (rhythmic-head-interface
-                    font-interface
+                    font-interface rhythmic-grob-interface
                     note-head-interface
                     staff-symbol-referencer-interface
                     text-interface))))))
@@ -1639,7 +1653,7 @@
     (TextScript
      . (
        (no-spacing-rods . #t)
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
+       (X-offset . ,Self_alignment_interface::x_aligned_on_self)
        (direction . -1)
 
        ;; sync with Fingering ?
@@ -1667,6 +1681,7 @@
        (staff-padding . 0.8)
        (dash-fraction . 0.2)
        (dash-period . 3.0)
+       (side-axis . ,Y)
        (direction . 1)
        (meta . ((class . Spanner)
                 (interfaces . (text-spanner-interface
@@ -1721,6 +1736,7 @@
        (padding . 0.5)
        (direction . 1)
        (Y-offset . ,Side_position_interface::y_aligned_side)
+       (side-axis . ,Y)
        (meta . ((class . Spanner)
                 (interfaces . (text-spanner-interface
                                side-position-interface
@@ -1731,6 +1747,7 @@
        (padding . 0.2)
        (direction . ,LEFT)
        (font-size . -4)
+       (side-axis . ,X)
        (stencil . ,Accidental_interface::print)
        (meta . ((class . Item)
                 (interfaces . (item-interface
@@ -1744,6 +1761,7 @@
        (font-size . -4)
        (stencil . ,parenthesize-elements)
        (direction . ,RIGHT)
+       (side-axis . ,X)
        (padding . 0.3)
        (meta . ((class . Item)
                 (interfaces . (side-position-interface
@@ -1792,7 +1810,7 @@
        (self-alignment-X . 0)
        (direction . 1)
        (padding . 0.0)  ;; padding relative to UnaCordaPedalLineSpanner
-       (self-X-offset . ,Self_alignment_interface::x_aligned_on_self)
+       (X-offset . ,Self_alignment_interface::x_aligned_on_self)
        (meta . ((class . Item)
                 (interfaces . (text-interface
                                self-alignment-interface
@@ -1803,6 +1821,7 @@
        (axes . (1))
        (X-extent . ,Axis_group_interface::height)
        (Y-offset . ,Side_position_interface::y_aligned_side)
+       (side-axis . ,Y)
        (padding . 1.2)
        (staff-padding . 1.2)
        (minimum-space . 1.0)
@@ -1840,6 +1859,7 @@
        (X-extent . ,Axis_group_interface::width)
        (meta . ((class . Spanner)
                 (interfaces . (axis-group-interface
+                               hara-kiri-group-interface
                                vertically-spaceable-interface))))))
 
     (VocalName
@@ -1853,6 +1873,7 @@
        (break-align-symbol . clef)
        (break-visibility . ,begin-of-line-visible)
        (baseline-skip . 2)
+       (side-axis . ,Y)
        (meta . ((class . Item)
                 (interfaces . (font-interface
                                self-alignment-interface
@@ -1868,6 +1889,7 @@
        (padding . 1)
        (font-encoding . fetaNumber)
        (Y-offset . ,Side_position_interface::y_aligned_side)
+       (side-axis . ,Y)
        (thickness . 1.6)  ;;  linethickness
        (edge-height . (2.0 . 2.0)) ;; staffspace;
        (minimum-space . 5)