X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=436aa9ebfdfabdf1a550c460c444657cb9f0d013;hb=8c00ef0a0eb95417f6db5056c0c03b7cfa2e7571;hp=eefc76fe1343181c821de59f2792f3e4dc52b0c1;hpb=e9a308e9c6002900fc336733950a0175bcbcc333;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index eefc76fe13..436aa9ebfd 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in line-thickness (thicknesses) and
@@ -24,6 +24,7 @@
 	(alteration . ,accidental-interface::calc-alteration) 
 	(stencil . ,ly:accidental-interface::print)
 	(Y-extent . ,ly:accidental-interface::height)
+	(X-extent . ,ly:accidental-interface::width)
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
 				font-interface))))))
@@ -153,6 +154,7 @@
 	(script-priority . 0)
 	(side-axis . ,X)
 	(staff-position . 0.0)
+	(Y-extent . ,ly:arpeggio::height)
 	(meta . ((class . Item)
 		 (interfaces . (arpeggio-interface
 				staff-symbol-referencer-interface
@@ -170,10 +172,11 @@
     (BarLine
      . (
 	(break-align-symbol . staff-bar)
+	(break-align-anchor . ,ly:bar-line::calc-anchor)
 	(glyph . "|")
 	(gap . 0.4)
 	(layer . 0)
-	(break-visibility . ,all-visible)
+	(break-visibility . ,bar-line::calc-break-visibility)
 	(non-musical . #t)
 	(stencil . ,ly:bar-line::print)
 	(glyph-name . ,bar-line::calc-glyph-name)
@@ -225,7 +228,7 @@
 	(self-alignment-X . 1)
 
 	;; want the bar number before the clef at line start. 
-	(break-align-symbol . left-edge)
+	(break-align-symbols . (left-edge staff-bar))
 	(meta .
 	      ((class . Item)
 	       (interfaces . (side-position-interface
@@ -290,7 +293,8 @@
      . (
 	(axes . (,Y))
 	(Y-extent . ,ly:axis-group-interface::height)
-	(skylines . ,ly:axis-group-interface::calc-skylines)
+	(vertical-skylines . ,ly:axis-group-interface::calc-skylines)
+	(adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
 				))))))
@@ -319,7 +323,7 @@
 	(beaming . ,ly:beam::calc-beaming)
 	(stencil . ,ly:beam::print)
 	(clip-edges . #t)
-	(cross-staff . ,ly:beam::cross-staff)
+	(cross-staff . ,ly:beam::calc-cross-staff)
 
 	(details .  ((hint-direction-penalty . 20)))
 	;; TODO: should be in SLT.
@@ -410,6 +414,8 @@
      . (
 	(axes . (0))
 	(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)
 	(meta . ((class . Item)
 		 (interfaces . (break-aligned-interface
 				axis-group-interface))))))
@@ -445,6 +451,7 @@
 	(avoid-slur . inside)
 	(font-family . music)
 	(break-align-symbol . clef)
+	(break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
 	(break-visibility . ,begin-of-line-visible)
 	(space-alist . ((ambitus . (extra-space . 2.0))
 			(staff-bar . (extra-space . 0.7))
@@ -537,7 +544,6 @@
 	(direction . ,RIGHT)
 	(positioning-done . ,ly:dot-column::calc-positioning-done) 
 	(X-extent . ,ly:axis-group-interface::width)
-	(X-offset . ,ly:dot-column::side-position)
 	(meta . ((class . Item)
 		 (interfaces . (dot-column-interface
 				axis-group-interface))))))
@@ -599,6 +605,7 @@
 	(outside-staff-priority . 250)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(X-extent . ,ly:axis-group-interface::width)
+	(cross-staff . ,ly:side-position-interface::calc-cross-staff)
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
 				dynamic-interface
@@ -612,6 +619,7 @@
 
 	(stencil . ,ly:text-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
+	(positioning-done . ,ly:script-interface::calc-positioning-done)
 
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(self-alignment-X . 0)
@@ -686,6 +694,8 @@
 	(script-priority . 100)
 	(stencil . ,ly:text-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
+	(positioning-done . ,ly:script-interface::calc-positioning-done)
+
 	(text . ,fingering::calc-text) 
 	(font-encoding . fetaNumber)
 	(font-size . -5) 		; don't overlap when next to heads.
@@ -818,8 +828,7 @@
 	(direction . ,UP)
 	(self-alignment-X . ,CENTER)
 	(meta . ((class . Item)
-		 (interfaces . (system-start-text-interface
-				side-position-interface
+		 (interfaces . (side-position-interface
 				font-interface))))))
     
     (KeyCancellation
@@ -853,6 +862,7 @@
 			(first-note . (fixed-space . 2.5))))
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(break-align-symbol . key-signature)
+	(break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
 	(break-visibility . ,begin-of-line-visible)
 	(non-musical . #t)
 	(meta . ((class . Item)
@@ -901,6 +911,7 @@
     (LeftEdge
      . (
 	(break-align-symbol . left-edge)
+	(break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
 	(X-extent . (0 . 0))
 	(non-musical . #t)
 	(break-visibility . ,center-invisible)
@@ -988,6 +999,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
@@ -1105,6 +1117,7 @@
 	(axes . (0))
 	(before-line-breaking . ,ly:paper-column::before-line-breaking)
 	(X-extent . ,ly:axis-group-interface::width)
+	(horizontal-skylines . ,ly:separation-item::calc-skylines)
 	;;		      (stencil . ,ly:paper-column::print)
 	
 	(non-musical . #t)
@@ -1117,6 +1130,7 @@
 	(meta . ((class . Paper_column)
 		 (interfaces . (paper-column-interface
 				axis-group-interface
+				separation-item-interface
 				spaceable-grob-interface))))))
     
     (NoteCollision
@@ -1134,8 +1148,10 @@
 	(axes . (0 1))
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
+	(horizontal-skylines . ,ly:separation-item::calc-skylines)
 	(meta . ((class . Item)
 		 (interfaces . (axis-group-interface
+				separation-item-interface
 				note-column-interface))))))
 
     (NoteHead
@@ -1162,7 +1178,7 @@
 	;; If you ever change this back, please document! --hwn
 	(knee-spacing-correction . 1.0)
 	(meta . ((class . Item)
-		 (interfaces . (
+		 (interfaces . (spacing-interface
 				note-spacing-interface))))))
 
     (NoteName
@@ -1218,6 +1234,7 @@
 	(axes . (0))
 	(allow-loose-spacing . #t)
 	(before-line-breaking . ,ly:paper-column::before-line-breaking)
+	(horizontal-skylines . ,ly:separation-item::calc-skylines)
 	;; (stencil . ,ly:paper-column::print)
 	(X-extent . ,ly:axis-group-interface::width)
 	
@@ -1225,6 +1242,7 @@
 	;;		         (font-size . -6) (font-name . "sans") (Y-extent . #f)
 	(meta . ((class . Paper_column)
 		 (interfaces . (paper-column-interface
+				separation-item-interface
 				axis-group-interface
 				spaceable-grob-interface))))))
 
@@ -1256,7 +1274,7 @@
 	(minimum-length . 1.5)
 	(height-limit . 2.0)
 	(ratio . 0.333)
-	(cross-staff . ,ly:slur::cross-staff)
+	(cross-staff . ,ly:slur::calc-cross-staff)
 	(meta . ((class . Spanner)
 		 (interfaces . (slur-interface))))))
 
@@ -1320,13 +1338,14 @@
 			  (list ly:self-alignment-interface::x-aligned-on-self)))))
 
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(extra-spacing-width . (+inf.0 . -inf.0))
 	(self-alignment-X . 0)
 	(direction . ,UP)
 	(non-musical . #t)
 	(font-size . 2)
 	(baseline-skip . 2)
 	(break-visibility . ,end-of-line-invisible)
-	(break-align-symbol . clef)
+	(break-align-symbols . (staff-bar clef))
 	(padding . 0.8)
 	(outside-staff-priority . 1500)
 	(meta . ((class . Item)
@@ -1365,7 +1384,7 @@
 	(X-extent . #f)
 	(Y-extent . #f)
 	(direction . ,ly:tie::calc-direction)
-	(head-direction . ,RIGHT)
+	(head-direction . ,ly:semi-tie-column::calc-head-direction)
 	
 	(positioning-done . ,ly:semi-tie-column::calc-positioning-done)
 	(meta . ((class . Item)
@@ -1401,13 +1420,15 @@
 
 	;; padding set in script definitions.
 	(staff-padding . 0.25)
-	(X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
+	(X-offset . ,script-interface::calc-x-offset)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 
 	(stencil . ,ly:script-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
+	(positioning-done . ,ly:script-interface::calc-positioning-done)
 	(font-encoding . fetaMusic)
+	(cross-staff . ,ly:script-interface::calc-cross-staff)
 	(meta . ((class . Item)
 		 (interfaces . (script-interface
 				side-position-interface
@@ -1429,19 +1450,12 @@
 	(avoid-slur . inside)
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
-	(skylines . ,ly:separation-item::calc-skylines)
+	(horizontal-skylines . ,ly:separation-item::calc-skylines)
+	(stencil . ,ly:separation-item::print)
 	(meta . ((class . Item)
 		 (interfaces . (
 				separation-item-interface))))))
 
-    (SeparatingGroupSpanner
-     . (
-	(springs-and-rods . ,ly:separating-group-spanner::set-spacing-rods)
-	(meta . ((class . Spanner)
-		 (interfaces . (only-prebreak-interface
-				
-				separating-group-spanner-interface))))))
-
     (Slur
      . ((details . ,default-slur-details)
 	(control-points . ,ly:slur::calc-control-points)
@@ -1455,7 +1469,7 @@
 	(height-limit . 2.0)
 	(ratio . 0.25)
 	(avoid-slur . inside)
-	(cross-staff . ,ly:slur::cross-staff)
+	(cross-staff . ,ly:slur::calc-cross-staff)
 	(meta . ((class . Spanner)
 		 (interfaces . (slur-interface))))))
 
@@ -1548,7 +1562,8 @@
 	(non-musical . #t)
 	(stem-spacing-correction . 0.4)
 	(meta . ((class . Item)
-		 (interfaces . (staff-spacing-interface))))))
+		 (interfaces . (spacing-interface
+				staff-spacing-interface))))))
 
    
     (StaffSymbol
@@ -1576,7 +1591,7 @@
 	(Y-extent . ,ly:stem::height)
 	(length . ,ly:stem::calc-length)
 	(thickness . 1.3)
-	(cross-staff . ,ly:stem::cross-staff)
+	(cross-staff . ,ly:stem::calc-cross-staff)
 	(details
 	 . (
 	    ;; 3.5 (or 3 measured from note head) is standard length
@@ -1617,8 +1632,8 @@
     (StemTremolo
      . (
 	(Y-extent . ,ly:stem-tremolo::height)
+	(X-extent . ,ly:stem-tremolo::width)
 	(stencil . ,ly:stem-tremolo::print)
-	(X-extent . #f)
 	(slope . ,ly:stem-tremolo::calc-slope)
 	(beam-width . ,ly:stem-tremolo::calc-width) ; staff-space
         (style . ,ly:stem-tremolo::calc-style)
@@ -1703,9 +1718,8 @@
 	(axes . (0 1))
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
-	(skylines . ,ly:axis-group-interface::calc-skylines)
+	(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))))))
@@ -1799,6 +1813,7 @@
 
 	(stencil . ,ly:text-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
+	(positioning-done . ,ly:script-interface::calc-positioning-done)
 
 	(outside-staff-priority . 450)
 	(avoid-slur . around)
@@ -1889,6 +1904,7 @@
      . (
 	(stencil . ,ly:time-signature::print)
 	(break-align-symbol . time-signature)
+	(break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
 	(break-visibility . ,all-visible)
 	(avoid-slur . inside)
 	(space-alist . (
@@ -1990,6 +2006,7 @@
 	(connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
 	(control-points . ,ly:tuplet-bracket::calc-control-points)
 	(stencil . ,ly:tuplet-bracket::print)
+	(cross-staff . ,ly:tuplet-bracket::calc-cross-staff)
 	
 	(meta . ((class . Spanner)
 		 (interfaces . (line-interface
@@ -2002,6 +2019,7 @@
 	(font-shape . italic)
 	(font-size . -2)
 	(avoid-slur . inside)
+	(cross-staff . ,ly:tuplet-number::calc-cross-staff)
 	(meta . ((class . Spanner)
 		 (interfaces . (text-interface tuplet-number-interface
 				font-interface))))))
@@ -2054,7 +2072,7 @@
 	(X-extent . ,ly:axis-group-interface::width)
 	(stacking-dir . -1)
 	(padding . 0.5)
-	(skylines . ,ly:axis-group-interface::combine-skylines)
+	(vertical-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)))
@@ -2066,8 +2084,10 @@
 	(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)
+	(vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines)
 	(max-stretch . ,ly:axis-group-interface::calc-max-stretch)
+	(stencil . ,ly:axis-group-interface::print)
+	(adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
 	(meta . ((class . Spanner)
 		 (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common)))
 		 (interfaces . (axis-group-interface
@@ -2078,16 +2098,11 @@
     (VoltaBracket
      . (
 	(stencil . ,ly:volta-bracket-interface::print)
-	(direction . ,UP)
-	(padding . 1)
 	(font-encoding . fetaNumber)
-	(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				
@@ -2097,6 +2112,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
      . (
@@ -2174,6 +2204,10 @@
 
 (define pure-print-callbacks
   (list
+   print-circled-text-callback
+   lyric-text::print
+   ly:arpeggio::print
+   ly:arpeggio::brew-chord-bracket
    ly:bar-line::print
    ly:note-head::print
    ly:dots::print
@@ -2193,6 +2227,7 @@
 (define pure-conversions-alist
   `(
     (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height)
+    (,ly:arpeggio::height . ,ly:arpeggio::pure-height)
     (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
     (,ly:stem::height . ,ly:stem::pure-height)
     (,ly:rest::height . ,ly:rest::pure-height)