Ensure that we find a constraint in set_column_rods.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 7371cbbf10896ad89dca1b9f40c30aee0e726ce4..2115355f03279d495da34122dd434a986cf5da4d 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -24,8 +24,7 @@
        (alteration . ,accidental-interface::calc-alteration) 
        (stencil . ,ly:accidental-interface::print)
        (Y-extent . ,ly:accidental-interface::height)
-       (after-line-breaking
-        . ,ly:accidental-interface::after-line-breaking)
+       (X-extent . ,ly:accidental-interface::width)
        (meta . ((class . Item)
                 (interfaces . (accidental-interface
                                font-interface))))))
@@ -37,8 +36,6 @@
        (alteration . ,accidental-interface::calc-alteration) 
        (stencil . ,ly:accidental-interface::print)
        (Y-extent . ,ly:accidental-interface::height)
-       (after-line-breaking
-        . ,ly:accidental-interface::after-line-breaking)
        (meta . ((class . Item)
                 (interfaces . (accidental-interface
                                font-interface))))))
@@ -125,7 +122,6 @@
        (stencil . ,ly:accidental-interface::print)
        (Y-extent . ,ly:accidental-interface::height)
        (glyph-name-alist . ,standard-alteration-glyph-name-alist)      
-       (after-line-breaking . ,ly:accidental-interface::after-line-breaking)
        (side-axis . ,X)
        (meta . ((class . Item)
                 (interfaces . (
@@ -221,6 +217,7 @@
        (font-size . -2)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (side-axis . ,Y)
+       (outside-staff-priority . 100)
        (X-offset . ,(ly:make-simple-closure
                      `(,+
                        ,(ly:make-simple-closure
@@ -1001,6 +998,7 @@
        (word-space . 0.6)
        (font-series . bold-narrow)
        (font-size . 1.0)
+       (extra-spacing-width . (0.0 . 0.0))
        (meta . ((class . Item)
                 (interfaces . (rhythmic-grob-interface
                                lyric-syllable-interface
@@ -1721,7 +1719,6 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (vertical-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
                                axis-group-interface))))))
@@ -2100,17 +2097,11 @@
     (VoltaBracket
      . (
        (stencil . ,ly:volta-bracket-interface::print)
-       (direction . ,UP)
-       (padding . 1)
        (font-encoding . fetaNumber)
-       (minimum-Y-extent . (0 . 2))
-       (Y-offset . ,ly:side-position-interface::y-aligned-side)
-       (side-axis . ,Y)
        (thickness . 1.6)  ;;  line-thickness
        (edge-height . (2.0 . 2.0)) ;; staff-space;
-       (minimum-space . 5)
        (font-size . -4)
-       (outside-staff-priority . 100)
+       (direction . ,UP)
        (meta . ((class . Spanner)
                 (interfaces . (volta-bracket-interface
                                horizontal-bracket-interface                            
@@ -2120,6 +2111,21 @@
                                font-interface)))
              )))
 
+    (VoltaBracketSpanner
+     . (       
+       (axes . (1))
+       (side-axis . ,Y)
+       (direction . ,UP)
+       (padding . 1)
+       (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (outside-staff-priority . 100)
+       (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::width)
+       (no-alignment . ,#t)
+       (meta . ((class . Spanner)
+                (interfaces . (side-position-interface
+                               axis-group-interface)))
+             )))
 
     (VoiceFollower
      . (