X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=c7680bd3881405a0ce262a5ed3976f580043f445;hb=91e7cbaa6e54e004365d28e0f10c9362a7f13320;hp=3f096cb215c72900bf7a5239d6a21af720ca9b6b;hpb=50aadb5e51f951a922b818cf93ccb5a5d626101f;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3f096cb215..c7680bd388 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1,15 +1,15 @@
-;;;; define-grobs.scm -- 
+;;;; define-grobs.scm --
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c)  1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;
+;;;; (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in linethickness (thicknesses) and
 ;;;; staffspace (distances)
 
 ;;;; WARNING: the meta field should be the last one.
-;;;; WARNING: don't use anonymous functions for initialization. 
+;;;; WARNING: don't use anonymous functions for initialization.
 
 ;; TODO: junk the meta field in favor of something more compact?
 (define-public all-grob-descriptions
@@ -17,14 +17,14 @@
     (Accidental
      . (
 	(print-function . ,Accidental_interface::print)
-	(font-family . music)
+	(inside-slur . #t)
 	(cautionary-style . parentheses)
-	(after-line-breaking-callback . ,Accidental_interface::after_line_breaking)		(meta . ((interfaces . (item-interface accidental-interface font-interface))))
+	(after-line-breaking-callback . ,Accidental_interface::after_line_breaking)		(meta . ((interfaces . (item-interface accidental-interface
+																       font-interface))))
 	))
-    
+
     (AccidentalPlacement
-     . (
-	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
+     . ((X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(left-padding . 0.2)
 
 	;; this is quite small, but it is very ugly to have
@@ -32,35 +32,68 @@
 	(right-padding . 0.15)
 	(meta . ((interfaces . (item-interface accidental-placement-interface))))
 	))
-
     (Ambitus
      . (
-       (breakable . #t)
-       (break-align-symbol . ambitus)
+	(axes . (0 1))
+	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
+	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+	(space-alist . (
+			(clef . (extra-space . 0.5))
+			(key-signature . (extra-space . 0.0))
+			(staff-bar . (extra-space . 0.0))
+			(time-signature . (extra-space . 0.0))
+			(first-note . (fixed-space . 0.0))
+			))
+	(breakable . #t)
+	(break-align-symbol . ambitus)
+	(break-visibility . ,begin-of-line-visible)
+	(meta . ((interfaces . (axis-group-interface break-aligned-interface ambitus-interface item-interface))))
+	))
+
+    (AmbitusLine
+     . (
        (print-function . ,Ambitus::print)
-       (font-family . music)
-       (note-head-style . "noteheads-2")
-       (break-visibility . ,begin-of-line-visible)
        (join-heads . #t)
-       (space-alist . (
-		       (clef . (extra-space . 0.0))
-		       (key-signature . (extra-space . 0.0))
-		       (staff-bar . (extra-space . 0.0))
-		       (time-signature . (extra-space . 0.0)) 
-		       (first-note . (fixed-space . 0.0))
-		       ))
-       (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface break-aligned-interface item-interface  font-interface))))
+       (thickness . 2)
+       (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent))
+
+       (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface item-interface font-interface))))
        ))
+    (AmbitusAccidental
+     . (
+	(print-function . ,Accidental_interface::print)
+	(font-family . music)
+	(padding . 0.5)
+	(X-offset-callbacks . (,Side_position_interface::aligned_side))
+	(direction . -1)
+	(cautionary-style . parentheses)
+	(after-line-breaking-callback . ,Accidental_interface::after_line_breaking)		(meta . ((interfaces . (item-interface accidental-interface break-aligned-interface side-position-interface font-interface))))
+	))
+
+    (AmbitusNoteHead
+     . (
+	(duration-log . 2)
+	(style . default)
+	(print-function . ,Note_head::print)
+	(glyph-name-procedure . ,find-notehead-symbol)
+	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+	(meta . ((interfaces . (font-interface note-head-interface
+					       ambitus-interface
+					       staff-symbol-referencer-interface
+					       rhythmic-head-interface
+					       ledgered-interface
+					       item-interface ))))
+	))
 
     (Arpeggio
      . (
 	(X-extent-callback . ,Arpeggio::width_callback)
-	(Y-extent-callback . #f)	       
+	(Y-extent-callback . #f)	
 	(print-function . ,Arpeggio::print)
 	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(X-offset-callbacks . (,Side_position_interface::aligned_side))
 	(direction . -1)
-	(padding . 0.5)  
+	(padding . 0.5)
 	(staff-position . 0.0)
 	(meta . ((interfaces . (arpeggio-interface staff-symbol-referencer-interface side-position-interface item-interface font-interface))))
 	))
@@ -71,15 +104,16 @@
 	(glyph . "|")
 	(break-glyph-function . ,default-break-barline)
 	(bar-size-procedure . ,Bar_line::get_staff_bar_size)
-	(print-function . ,Bar_line::print)	   
+	(print-function . ,Bar_line::print)	
 	(break-visibility . ,all-visible)
 	(breakable . #t)
 	(before-line-breaking-callback . ,Bar_line::before_line_breaking)
 	(space-alist . (
-			(time-signature . (extra-space . 0.75)) 
+			(time-signature . (extra-space . 0.75))
 			(custos . (minimum-space . 2.0))
-			(clef .   (minimum-space . 1.0))
+			(clef . (minimum-space . 1.0))
 			(key-signature . (extra-space . 1.0))
+			(key-cancellation . (extra-space . 1.0))
 			(first-note . (fixed-space . 1.3))
 			(next-note . (semi-fixed-space . 1.3))
 			(right-edge . (extra-space . 0.0))
@@ -87,18 +121,20 @@
 
 	;;
 	;; Ross. page 151 lists other values, we opt for a leaner look
-	;; 
+	;;
+	;; TODO:
+	;; kern should scale with linethickness too.
 	(kern . 3.0)
 	(thin-kern . 3.0)
-	(hair-thickness . 1.6)
+	(hair-thickness . 1.9)
 	(thick-thickness . 6.0)
-	(meta . ((interfaces . (bar-line-interface item-interface   break-aligned-interface font-interface))))
+	(meta . ((interfaces . (bar-line-interface item-interface break-aligned-interface font-interface))))
 	))
 
-    
+
     (BarNumber
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(breakable . #t)
 	(break-visibility . ,begin-of-line-visible)
 	(padding . 1.0)
@@ -109,25 +145,23 @@
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(self-alignment-X . 1)
 
-	;; hmm. why did we do this: ? 
-	(extra-offset . (1.3 . 0))
 	(meta .
 	      ((interfaces . (side-position-interface
 			      text-interface
 			      self-alignment-interface
-			      font-interface item-interface  break-aligned-interface))))
+			      font-interface item-interface break-aligned-interface))))
 
 	     ))
 
     (BassFigure
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(direction . 1)
 	(font-family . number)
 
 	;; We must do this, other BFs in
-	;; paper16 become too small.
+	;; layout16 become too small.
 	(font-size . -4)
 	(kern . 0.2)
 	(meta . ((interfaces . (text-interface 							rhythmic-grob-interface
@@ -139,8 +173,6 @@
 	;; todo: clean this up a bit: the list is getting
 	;; rather long.
 	(print-function . ,Beam::print)
-	(concaveness-gap . 1.85)
-	(concaveness-threshold . 0.26)
 	(gap . 0.8)
 	(positions . (#f . #f))
 	(position-callbacks . (,Beam::least_squares
@@ -173,7 +205,6 @@
 	;; sadly possibly breaking patterns with high order beams.
 	(beamed-stem-shorten . (1.0 0.5 0.25))
 	
-	(slope-limit . 0.2)
 	(flag-width-function . ,beam-flag-width-function)
 	(damping . 1)
 	(auto-knee-gap . 5.5)
@@ -190,18 +221,19 @@
 	(breakable . #t)
 	(stacking-dir . 1)
 	(break-align-orders . #(; end-of-line:
-				(instrument-name left-edge ambitus breathing-sign
-						 clef  staff-bar key-signature
-						 time-signature custos)
+				(instrument-name
+				 left-edge ambitus breathing-sign
+				 clef staff-bar key-cancellation key-signature
+				 time-signature custos)
 
 				; unbroken
 				(instrument-name left-edge ambitus breathing-sign
-						 clef  staff-bar key-signature
+						 clef staff-bar key-cancellation key-signature
 						 staff
 						 time-signature custos)
 				; begin of line
 				(instrument-name left-edge ambitus breathing-sign
-						 clef key-signature staff-bar
+						 clef key-cancellation key-signature staff-bar
 						 time-signature custos)
 
 				))
@@ -212,7 +244,7 @@
 
     (BreakAlignGroup
      . (
-	(axes  . (0))
+	(axes . (0))
 	(X-offset-callbacks . (,Break_align_interface::alignment_callback))
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(meta . ((interfaces . (break-aligned-interface item-interface axis-group-interface item-interface ))))
@@ -228,11 +260,11 @@
 			(key-signature . (minimum-space . 1.5))
 			(staff-bar . (minimum-space . 1.5))
 			(clef . (minimum-space . 2.0))
-			(first-note . (fixed-space . 1.0)) ;huh? 
+			(first-note . (fixed-space . 1.0)) ;huh?
 			(right-edge . (extra-space . 0.1))
 			))
-	(print-function . ,Text_item::print)
-	(text . ,(make-musicglyph-markup "scripts-rcomma"))
+	(print-function . ,Text_interface::print)
+	(text . ,(make-musicglyph-markup "scripts.rcomma"))
 	(Y-offset-callbacks . (,Breathing_sign::offset_callback))
 	(break-visibility . ,begin-of-line-invisible)
 	(meta . ((interfaces . (break-aligned-interface breathing-sign-interface text-interface font-interface item-interface ))))
@@ -243,27 +275,29 @@
 	(print-function . ,Clef::print)
 	(before-line-breaking-callback . ,Clef::before_line_breaking)
 	(breakable . #t)
-	(font-family . music)	   
+	(font-family . music)	
 	(break-align-symbol . clef)
 	(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))
 			(time-signature . (minimum-space . 4.2))
 			(first-note . (minimum-fixed-space . 5.0))
 			(next-note . (extra-space . 0.5))
 			(right-edge . (extra-space . 0.5))
 			))
-	(Y-offset-callbacks  . (,Staff_symbol_referencer::callback)) 
+	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(meta . ((interfaces . (clef-interface staff-symbol-referencer-interface font-interface break-aligned-interface item-interface ))))
 	))
-    
+
     (ClusterSpannerBeacon
      . (
 	(print-function . #f)
+	(Y-extent-callback . ,Cluster_beacon::height)
 	(meta . ((interfaces . (cluster-beacon-interface item-interface))))
 	))
-    
+
     (ClusterSpanner
      . (
 	(print-function . ,Cluster::print)
@@ -276,7 +310,7 @@
 
     (ChordName
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(after-line-breaking-callback . ,Chord_name::after_line_breaking)
 	(word-space . 0.0)
 	(font-family . sans)
@@ -304,7 +338,6 @@
 				      break-aligned-interface item-interface ))))
 	))
 
-
     (DotColumn
      . (
 	(axes . (0))
@@ -321,36 +354,52 @@
 	(meta . ((interfaces . (font-interface staff-symbol-referencer-interface dots-interface item-interface ))))
 	))
 
-    (DoublePercentRepeat .
-			 (
-			  (print-function . ,Percent_repeat_item_interface::double_percent)
-			  (breakable . #t)
-			  (slope . 1.0)
-			  (font-encoding . music)
-			  (width . 2.0)
-			  (thickness . 0.48)
-			  (break-align-symbol . staff-bar)
-			  (break-visibility . ,begin-of-line-invisible)
-			  (meta . ((interfaces . (font-interface
-						  break-aligned-interface
-						  percent-repeat-interface item-interface ))))
-			 ))
-
+    (DoublePercentRepeat
+     . (
+	(print-function . ,Percent_repeat_item_interface::double_percent)
+	(breakable . #t)
+	(slope . 1.0)
+	(font-encoding . fetaMusic)
+	(width . 2.0)
+	(thickness . 0.48)
+	(break-align-symbol . staff-bar)
+	(break-visibility . ,begin-of-line-invisible)
+	(meta . ((interfaces . (font-interface
+				break-aligned-interface
+				percent-repeat-interface item-interface ))))
+	))
     (DynamicText
      . (
 	(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
 			       ,Self_alignment_interface::centered_on_parent))
 	(self-alignment-X . 0)
 	(no-spacing-rods . #t)
 	(script-priority . 100)
 	(font-series . bold)
-	(font-encoding . dynamic)
+	(font-encoding . fetaDynamic)
 	(font-shape . italic)
 	(self-alignment-Y . 0)
-	(meta . ((interfaces . (font-interface text-interface self-alignment-interface  dynamic-interface script-interface item-interface))))
+	(meta . ((interfaces . (font-interface text-interface self-alignment-interface
+					       dynamic-interface script-interface item-interface))))
 	))
+    (DynamicTextSpanner
+     . ((print-function . ,Dynamic_text_spanner::print)
+	(font-series . bold)
+	(font-shape . italic)
+	(style . dashed-line)
+
+	; need to blend with dynamic texts.
+	(font-size . 2)
+	(bound-padding . 0.75)
+	(dash-fraction . 0.2)
+	(dash-period . 3.0)
+	(meta . ((interfaces . (font-interface
+				text-interface
+				dynamic-interface dynamic-text-spanner-interface
+				item-interface))))
+	 ))
 
     (DynamicLineSpanner
      . (
@@ -361,39 +410,47 @@
 	(padding . 0.6)
 	(minimum-space . 1.2)
 	(direction . -1)
-	(meta . ((interfaces . (dynamic-interface axis-group-interface side-position-interface spanner-interface))))
-	))
+	
+	(meta . ((interfaces . (dynamic-interface axis-group-interface
+						  side-position-interface spanner-interface))))))
 
     (LeftEdge
      . (
 	(break-align-symbol . left-edge)
-	(X-extent .  (0 . 0))
+	(X-extent . (0 . 0))
 	(breakable . #t)
 	(space-alist . (
 			(custos . (extra-space . 0.0))
 			(ambitus . (extra-space . 2.0))
-			(time-signature . (extra-space . 0.0)) 
+			(time-signature . (extra-space . 0.0))
 			(staff-bar . (extra-space . 0.0))
-			(breathing-sign . (minimum-space  . 0.0))
+			(breathing-sign . (minimum-space . 0.0))
 			(clef . (extra-space . 0.85))
 			(first-note . (fixed-space . 1.0))
 			(right-edge . (extra-space . 0.0))
 			(key-signature . (extra-space . 0.0))
+			(key-cancellation . (extra-space . 0.0))
+			
 			))
 	(meta . ((interfaces . (break-aligned-interface item-interface ))))
 	))
 
     (Fingering
      . (
-	(print-function . ,Text_item::print)
-	(padding . 0.6)
-	(staff-padding . 0.6)
+	(print-function . ,Text_interface::print)
+
+	; sync with TextScript (?)
+	(padding . 0.5)
+	(staff-padding . 0.5)
 	(self-alignment-X . 0)
 	(self-alignment-Y . 0)
 	(script-priority . 100)
-	(font-encoding . number)
+	(font-encoding . fetaNumber)
 	(font-size . -5) 		; don't overlap when next to heads.
-	(meta . ((interfaces . (finger-interface font-interface text-script-interface text-interface side-position-interface self-alignment-interface item-interface ))))
+	(meta . ((interfaces . (finger-interface
+				font-interface text-script-interface text-interface
+				side-position-interface self-alignment-interface
+				item-interface))))
 	))
 
     (Glissando
@@ -403,10 +460,10 @@
 	(zigzag-width . 0.75)
 	(breakable . #t)
 	(X-extent-callback . #f)
-	(Y-extent-callback . #f)			 
+	(Y-extent-callback . #f)			
 	(after-line-breaking-callback . ,Line_spanner::after_line_breaking)
 	(print-function . ,Line_spanner::print)
-	(meta . ((interfaces . (line-spanner-interface spanner-interface))))
+	(meta . ((interfaces . (line-interface line-spanner-interface spanner-interface))))
 	))
 
     (Hairpin
@@ -416,7 +473,7 @@
 	(height . 0.6666)
 	(spacing-procedure . ,Spanner::set_spacing_rods)
 	(minimum-length . 2.0)
-	(if-text-padding . 1.0)
+	(bound-padding . 1.0)
 	(self-alignment-Y . 0)
 	(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(meta . ((interfaces . (hairpin-interface line-interface self-alignment-interface dynamic-interface spanner-interface))))
@@ -429,7 +486,11 @@
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(padding . 0.2)
 	(direction . -1)
-	(meta . ((interfaces . (horizontal-bracket-interface side-position-interface spanner-interface))))
+	(bracket-flare . (0.5 . 0.5))
+	(meta . ((interfaces . (horizontal-bracket-interface
+				side-position-interface
+				line-interface
+				spanner-interface))))
 	))
     (InstrumentName
      . (
@@ -444,13 +505,13 @@
 			))
 
 	(self-alignment-Y . 0)
-	(print-function . ,Text_item::print)		
+	(print-function . ,Text_interface::print)		
 	(break-align-symbol . instrument-name)
 	(break-visibility . ,begin-of-line-visible)
 	(baseline-skip . 2)
 	(meta . ((interfaces . (font-interface self-alignment-interface side-position-interface text-interface break-aligned-interface item-interface ))))
 	))
-    
+
     (VocalName
      . (
 	(breakable . #t)
@@ -458,7 +519,8 @@
 	(direction . 0)
 	(space-alist . ((left-edge . (extra-space . 1.0))
 			))
-	(print-function . ,Text_item::print)		
+	(break-align-symbol . instrument-name)
+	(print-function . ,Text_interface::print)		
 	(break-align-symbol . clef)
 	(break-visibility . ,begin-of-line-visible)
 	(baseline-skip . 2)
@@ -467,13 +529,30 @@
 				side-position-interface text-interface
 				break-aligned-interface item-interface ))))
 	))
-
+    (KeyCancellation
+     . (
+	(print-function . ,Key_signature_interface::print)
+	(space-alist . (
+			(time-signature . (extra-space . 1.25))
+			(staff-bar . (extra-space . 0.6))
+			(key-signature . (extra-space . 0.5))
+			(right-edge . (extra-space . 0.5))
+			(first-note . (fixed-space . 2.5))
+			))
+	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+	(break-align-symbol . key-cancellation)
+	(break-visibility . ,begin-of-line-invisible)
+	(breakable . #t)
+	
+	(meta . ((interfaces . (key-signature-interface font-interface
+							break-aligned-interface item-interface ))))
+	))
     (KeySignature
      . (
 	(print-function . ,Key_signature_interface::print)
 	(space-alist . (
 			(time-signature . (extra-space . 1.25))
-			(staff-bar .  (extra-space . 1.1))
+			(staff-bar . (extra-space . 1.1))
 			(right-edge . (extra-space . 0.5))
 			(first-note . (fixed-space . 2.5))
 			))
@@ -481,7 +560,17 @@
 	(break-align-symbol . key-signature)
 	(break-visibility . ,begin-of-line-visible)
 	(breakable . #t)
-	(meta . ((interfaces . (key-signature-interface  font-interface  break-aligned-interface item-interface ))))
+	
+	(meta . ((interfaces . (key-signature-interface font-interface
+							break-aligned-interface item-interface ))))
+	))
+    (LedgerLineSpanner
+     . (
+	(print-function . ,Ledger_line_spanner::print)
+	(X-extent-callback . #f)
+	(Y-extent-callback . #f)
+	(print-function . ,Ledger_line_spanner::print)
+	(meta . ((interfaces . (spanner-interface ledger-line-interface))))
 	))
 
     (LigatureBracket
@@ -496,7 +585,7 @@
 	(before-line-breaking-callback . ,Tuplet_bracket::before_line_breaking)
 	(after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking)
 	(print-function . ,Tuplet_bracket::print)
-	(meta .  ((interfaces . (tuplet-bracket-interface spanner-interface))))
+	(meta . ((interfaces . (tuplet-bracket-interface line-interface spanner-interface))))
 	))
 
     (LyricHyphen
@@ -507,7 +596,7 @@
 	(length . 0.66)
 	(spacing-procedure . ,Hyphen_spanner::set_spacing_rods)
 	(print-function . ,Hyphen_spanner::print)
-	(Y-extent  . (0 . 0))
+	(Y-extent . (0 . 0))
 	(meta . ((interfaces . (lyric-interface lyric-hyphen-interface
 						spanner-interface))))
 	))
@@ -523,7 +612,7 @@
 	))
 
     (LyricText
-     . ((print-function . ,Text_item::print)
+     . ((print-function . ,Text_interface::print)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_parent))
 	(self-alignment-X . 0)
 	(word-space . 0.6)
@@ -543,7 +632,7 @@
 
     (RehearsalMark
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(after-line-breaking-callback . ,shift-right-at-line-begin)
@@ -554,17 +643,19 @@
 	(baseline-skip . 2)
 	(break-visibility . ,end-of-line-invisible)
 	(padding . 0.8)
-	(meta . ((interfaces . (text-interface side-position-interface font-interface mark-interface self-alignment-interface item-interface ))))
+	(meta . ((interfaces . (text-interface
+				side-position-interface font-interface mark-interface
+				self-alignment-interface item-interface ))))
 	))
      (MetronomeMark
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))	
 	(direction . 1)
-	(breakable . #t)
-	(break-visibility . ,end-of-line-invisible)
 	(padding . 0.8)
-	(meta . ((interfaces . (text-interface side-position-interface font-interface metronome-mark-interface item-interface))))
+	(meta . ((interfaces . (text-interface
+				side-position-interface font-interface
+				metronome-mark-interface item-interface))))
 	))
     (MeasureGrouping
      . (
@@ -587,36 +678,36 @@
 	(thick-thickness . 6.6)
 	(hair-thickness . 2.0)
 	(padding . 1)
-	(font-encoding . music)
 	(meta . ((interfaces . (multi-measure-rest-interface multi-measure-interface rest-interface font-interface staff-symbol-referencer-interface))))
 	))
-    
+
     (MultiMeasureRestNumber
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
 			       ,Self_alignment_interface::centered_on_other_axis_parent))
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(self-alignment-X . 0)
 	(direction . 1)
-	(padding . 1.3)
-	(staff-padding . 1.3)
-	(font-encoding . number)
+	(padding . 0.4)
+	(staff-padding . 0.4)
+	(font-encoding . fetaNumber)
 	(meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
 	))
     (MultiMeasureRestText
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
 			       ,Self_alignment_interface::centered_on_other_axis_parent))
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(self-alignment-X . 0)
 	(direction . 1)
-	(padding . 1.5)
-	(staff-padding . 1.5)
+	(padding . 0.2)
+	(staff-padding . 0.25)
 	(meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
 	))
- (NoteCollision
+
+    (NoteCollision
      . (
 	(axes . (0 1))
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
@@ -638,11 +729,12 @@
 	(print-function . ,Note_head::print)
 	(ligature-primitive-callback . ,Note_head::print)
 	(glyph-name-procedure . ,find-notehead-symbol)
-	(X-extent-callback . ,Note_head::extent)
-	(Y-extent-callback . ,Note_head::extent)
-	(Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
+	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(stem-attachment-function . ,note-head-style->attachment-coordinates)
-	(meta . ((interfaces . (rhythmic-grob-interface rhythmic-head-interface font-interface note-head-interface staff-symbol-referencer-interface item-interface ))))
+	(meta . ((interfaces . (rhythmic-grob-interface
+				rhythmic-head-interface font-interface note-head-interface
+				ledgered-interface
+				staff-symbol-referencer-interface item-interface ))))
 	))
 
     (NoteSpacing
@@ -662,15 +754,15 @@
 	(gap . 0.5)
 	(breakable . #t)
 	(X-extent-callback . #f)
-	(Y-extent-callback . #f)			 
+	(Y-extent-callback . #f)			
 	(print-function . ,Line_spanner::print)
 	(after-line-breaking-callback . ,Line_spanner::after_line_breaking)
-	(meta . ((interfaces . (line-spanner-interface spanner-interface))))
+	(meta . ((interfaces . (line-spanner-interface line-interface spanner-interface))))
 	))
 
     (NoteName
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(meta . ((interfaces . (note-name-interface
 				text-interface font-interface item-interface ))))
 	))
@@ -681,9 +773,12 @@
 	(break-visibility . ,begin-of-line-visible)
 	(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent ,Self_alignment_interface::aligned_on_self))
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
+
+	;; no Y dimensions, because of lyrics under tenor clef.
+	(Y-extent . (0 . 0))
 	(font-shape . italic)
-	(padding . 0.4)
+	(padding . 0.6)
 	(staff-padding . 0.2)
 	(font-size . -4)
 	(meta . ((interfaces . (text-interface self-alignment-interface side-position-interface font-interface item-interface ))))
@@ -695,32 +790,20 @@
 	(before-line-breaking-callback . ,Paper_column::before_line_breaking)
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 
-;ppp	        (print-function . ,Paper_column::print) (font-name . "cmr8") (Y-extent-callback . #f)
+;	        (print-function . ,Paper_column::print) (font-name . "ecrm8") (Y-extent-callback . #f)
 	(meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface ))))
 	))
 
     (PhrasingSlur
-     . (
+     . ((slur-details . ,default-slur-details)
 	(print-function . ,Slur::print)
 	(thickness . 1.2)		
 	(spacing-procedure . ,Spanner::set_spacing_rods)		
 	(minimum-length . 1.5)
 	(after-line-breaking-callback . ,Slur::after_line_breaking)
-	(extremity-function . ,calc-slur-extremity)
-	(extremity-offset-alist . ,default-phrasing-slur-extremity-offset-alist)
-	(de-uglify-parameters . (1.5  0.8  -2.0))
 	(Y-extent-callback . ,Slur::height)
 	(height-limit . 2.0)
 	(ratio . 0.333)
-	(beautiful . 0.5)
-	(y-free . 0.75)
-	(attachment . (#f . #f))
-	(attachment-offset . ((0 . 0) . (0 . 0)))
-	(slope-limit . 0.8)
-	(details . ((force-blowfit . 0.5)
-		    (bezier-pct-c0 . -0.2) (bezier-pct-c3 . 0.000006)
-		    (bezier-pct-out-max . 0.8) (bezier-pct-in-max . 1.2)
-		    (bezier-area-steps . 1.0)))
 	(meta . ((interfaces . (slur-interface spanner-interface))))
 	))
 
@@ -731,10 +814,10 @@
 	(before-line-breaking-callback . ,Paper_column::before_line_breaking)
 	(breakable . #t)
 	;; debugging stuff: print column number.
-;	(print-function . ,Paper_column::print) (font-name . "cmr8")	(Y-extent-callback . #f)
+;	(print-function . ,Paper_column::print) (font-name . "ecrm8")	(Y-extent-callback . #f)
 
 
-	(meta .  ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface ))))
+	(meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface ))))
 	))
 
     (PercentRepeat
@@ -743,15 +826,16 @@
 	(print-function . ,Multi_measure_rest::percent)
 	(slope . 1.0)
 	(thickness . 0.48)
-	(font-encoding . music)
-	(meta . ((interfaces . (multi-measure-rest-interface  spanner-interface font-interface percent-repeat-interface))))
+	(font-encoding . fetaMusic)
+	(meta . ((interfaces . (multi-measure-rest-interface spanner-interface font-interface percent-repeat-interface))))
 	))
 
-    (PianoPedalBracket   ;; an example of a text spanner
+    ;; an example of a text spanner
+    (PianoPedalBracket
      . (
 	(print-function . ,Piano_pedal_bracket::print)
 	(style . line)
-	(if-text-padding . 1.0)
+	(bound-padding . 1.0)
 	(direction . -1)
 	(bracket-flare . (0.5 . 0.5))
 	(edge-height . (1.0 . 1.0))
@@ -767,7 +851,7 @@
 	(Y-extent-callback . ,Hara_kiri_group_spanner::y_extent)
 	(remove-first . #t)
 	(axes . (1))
-	(meta . ((interfaces . (axis-group-interface hara-kiri-group-interface item-interface  spanner-interface))))
+	(meta . ((interfaces . (axis-group-interface vertically-spaceable-interface hara-kiri-group-interface item-interface spanner-interface))))
 	))
 
     (RepeatSlash
@@ -813,7 +897,7 @@
 	;; (script-priority . 0) priorities for scripts, see script.scm
 	(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent))
 	(before-line-breaking-callback . ,Script_interface::before_line_breaking)
-	(font-encoding . music)
+	(font-encoding . fetaMusic)
 	(meta . ((interfaces . (script-interface side-position-interface font-interface item-interface ))))
 	))
 
@@ -824,55 +908,43 @@
 	))
 
     (Slur
-     . (
+     . ((slur-details . ,default-slur-details)
 	(print-function . ,Slur::print)
 	(thickness . 1.2)		
 	(spacing-procedure . ,Spanner::set_spacing_rods)		
 	(minimum-length . 1.5)
 	(after-line-breaking-callback . ,Slur::after_line_breaking)
-	(extremity-function . ,calc-slur-extremity)
-	(extremity-offset-alist . ,default-slur-extremity-offset-alist)
-	(de-uglify-parameters . (1.5  0.8  -2.0))
 	(Y-extent-callback . ,Slur::height)
+					; Slur::height)
 	(height-limit . 2.0)
-	(ratio . 0.333)
-	(beautiful . 0.5)
-	(y-free . 0.75)
-	(attachment . (#f . #f))
-	(attachment-offset . ((0 . 0) . (0 . 0)))
-	(slope-limit . 0.8)
-	(details . ((force-blowfit . 0.5)
-		    (bezier-pct-c0 . -0.2) (bezier-pct-c3 . 0.000006)
-		    (bezier-pct-out-max . 0.8) (bezier-pct-in-max . 1.2)
-		    (bezier-area-steps . 1.0)))
+	(ratio . 0.25)
 	(meta . ((interfaces . (slur-interface spanner-interface))))
 	))
 
     (SpacingSpanner
      . (
-	(spacing-procedure .  ,Spacing_spanner::set_springs)
+	(spacing-procedure . ,Spacing_spanner::set_springs)
 	(grace-space-factor . 0.6)
 	(shortest-duration-space . 2.0)
 	(spacing-increment . 1.2)
-	(base-shortest-duration . ,(ly:make-moment 1 8))
+	(base-shortest-duration . ,(ly:make-moment 3 16))
 	(meta . ((interfaces . (spacing-interface spacing-spanner-interface spanner-interface))))
 	))
 
     (SpanBar
      . (
 	(break-align-symbol . staff-bar)
-	(bar-size-procedure . ,Span_bar::get_bar_size) 
+	(bar-size-procedure . ,Span_bar::get_bar_size)
 	(print-function . ,Span_bar::print)
-	(break-visibility . ,begin-of-line-invisible)
 	(X-extent-callback . ,Span_bar::width_callback)
 	(Y-extent-callback . ())
 	(breakable . #t)
 	(before-line-breaking-callback . ,Span_bar::before_line_breaking)
-	;; ugh duplication! 
+	;; ugh duplication!
 
 	;;
 	;; Ross. page 151 lists other values, we opt for a leaner look
-	;; 
+	;;
 	(kern . 3.0)
 	(thin-kern . 3.0)
 	(hair-thickness . 1.6)
@@ -882,11 +954,11 @@
 	))
 
     (StanzaNumber
-     . ((print-function . ,Text_item::print)		
+     . ((print-function . ,Text_interface::print)		
 	(font-series . bold)
 	(padding . 1.0)
 	(X-offset-callbacks . (,Side_position_interface::aligned_side))
-	(direction . ,LEFT) 
+	(direction . ,LEFT)
 	(meta . ((interfaces . (side-position-interface stanza-number-interface text-interface font-interface item-interface ))))		
 	))
 
@@ -900,17 +972,17 @@
 
     (SostenutoPedal
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(direction . 1)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(no-spacing-rods . #t)
 	(padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner
 	(font-shape . italic)
 	(self-alignment-X . 0)
-	(meta . ((interfaces . (text-interface  self-alignment-interface font-interface item-interface))))
+	(meta . ((interfaces . (text-interface self-alignment-interface font-interface item-interface))))
 	))
 
-    (SostenutoPedalLineSpanner 
+    (SostenutoPedalLineSpanner
      . (
 	(axes . (1))
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)	
@@ -920,14 +992,14 @@
 	(padding . 1.2)
 	(minimum-space . 1.0)
 	(direction . -1)
-	(meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface  spanner-interface))))
+	(meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface))))
 	))
 
     (StaffSymbol
      . (
 	(print-function . ,Staff_symbol::print)
 	(line-count . 5)
-	(ledger-line-thickness  . (1.0 . 0.1))
+	(ledger-line-thickness . (1.0 . 0.1))
 	(layer . 0)
 	(meta . ((interfaces . (staff-symbol-interface spanner-interface))))
 	))
@@ -960,20 +1032,20 @@
 
 	;; FIXME this should come from 'lengths
 
-;	(beamed-lengths . (3.26 3.26 1.5))
-	(beamed-lengths . (3.5 3.5 3.5 4.5 5.0))
+	(beamed-lengths . (3.26 3.5 3.6))
 	
 	;; We use the normal minima as minimum for the ideal lengths,
 	;; and the extreme minima as abolute minimum length.
 	
 	;; The 'normal' minima
 	(beamed-minimum-free-lengths . (1.83 1.5 1.25))
+	;(beamed-minimum-free-lengths . (2.0 1.83 1.25))
 	
 	;; The 'extreme case' minima
 	(beamed-extreme-minimum-free-lengths . (2.0 1.25))
 
-	(X-offset-callbacks . (,Stem::off_callback))
-	(X-extent-callback . ,Stem::dim_callback)	
+	(X-offset-callbacks . (,Stem::offset_callback))
+	(X-extent-callback . ,Stem::width_callback)	
 	(Y-extent-callback . ,Stem::height)
 	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(meta . ((interfaces . (stem-interface font-interface item-interface ))))
@@ -1014,7 +1086,7 @@
 	(meta . ((interfaces . (piano-pedal-interface text-spanner-interface text-interface self-alignment-interface font-interface item-interface))))
 	))
 
-    (SustainPedalLineSpanner 
+    (SustainPedalLineSpanner
      . (
 	(axes . (1))
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
@@ -1040,7 +1112,7 @@
 	(glyph . "brace")
 	(print-function . ,System_start_delimiter::print)
 	(collapse-height . 5.0)
-	(font-encoding . braces)
+	(font-encoding . fetaBraces)
 	(Y-extent-callback . #f)
 	(meta . ((interfaces . (system-start-delimiter-interface font-interface))))
 	))
@@ -1071,10 +1143,12 @@
 
     (TextScript
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(no-spacing-rods . #t)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(direction . -1)
+
+	; sync with Fingering ?
 	(padding . 0.5)
 	(staff-padding . 0.5)
 	(script-priority . 200)
@@ -1083,19 +1157,18 @@
 	))
     (CombineTextScript
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(no-spacing-rods . #t)
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(direction . 1)
-	(extra-offset . (-1 . 0)) 
 	(padding . 0.5)
 	(staff-padding . 0.5)
 	(script-priority . 200)
 	;; todo: add X self alignment?
 	(baseline-skip . 2)
 	(font-series . bold)
-	(meta . ((interfaces . (text-script-interface text-interface  side-position-interface font-interface item-interface ))))
+	(meta . ((interfaces . (text-script-interface text-interface side-position-interface font-interface item-interface ))))
 	))
     (TextSpanner
      . (
@@ -1103,15 +1176,24 @@
 	(font-shape . italic)
 	(style . dashed-line)
 	(staff-padding . 0.1)
-	
-	;; urg, only for (de)cresc. text spanners
-	(if-text-padding . 1.0)
 	(dash-fraction . 0.2)
 	(dash-period . 3.0)
 	(direction . 1)
 	(meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface))))		
 	))
-    
+    (TrillSpanner
+     . (
+	(print-function . ,Dynamic_text_spanner::print)
+	(edge-text . ,(cons (make-musicglyph-markup "scripts.trill")
+			    ""))
+	(style . trill)
+	(staff-padding . 1.0)
+	(padding . 0.5)
+	(direction . 1)
+	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface))))		
+	))
+
     (OttavaBracket
      . (
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
@@ -1119,7 +1201,7 @@
 	(font-shape . italic)
 	(shorten-pair . (0.0 . -0.6))
 	(staff-padding . 1.0)
-	(padding  . 0.5)
+	(padding . 0.5)
 	(minimum-length . 1.0)
 	(dash-fraction . 0.3)
 	(edge-height . (0 . 1.2))
@@ -1128,14 +1210,14 @@
 				line-interface side-position-interface
 				font-interface text-interface spanner-interface))))		
 	))
-    
+
     (TabNoteHead
      . (
 	(style . default)
-	(print-function . ,Text_item::print)
-	(Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
-	(extra-offset . (0 . -0.65)) ;; UGH! TODO: Clean this up!
+	(print-function . ,Text_interface::print)
+	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(stem-attachment-function . ,tablature-stem-attachment-function)
+	(font-series . bold)
 	(meta . ((interfaces
 		  . (rhythmic-head-interface
 		     font-interface
@@ -1153,7 +1235,7 @@
 	(thickness . 1.2)
 	(x-gap . -0.1)
 	(y-offset . 0.6)
-	(minimum-length  . 2.5)
+	(minimum-length . 2.5)
 	(meta . ((interfaces . (tie-interface spanner-interface))))
 	))
 
@@ -1168,17 +1250,17 @@
     (TimeSignature
      . (
 	(print-function . ,Time_signature::print)
-;	(print-function . ,Text_item::print)	
+;	(print-function . ,Text_interface::print)	
 	(break-align-symbol . time-signature)
 	(break-visibility . ,all-visible)
 	(space-alist . (
 			(first-note . (fixed-space . 2.0))
 			(right-edge . (extra-space . 0.5))
-			(staff-bar .  (minimum-space . 2.0))
+			(staff-bar . (minimum-space . 2.0))
 			))
 	(breakable . #t)
 	(style . C)
-;	(text . (,time-signature-glue-markup)) 
+;	(text . (,time-signature-glue-markup))
 	(meta . ((interfaces . (time-signature-interface break-aligned-interface font-interface item-interface ))))
 	))
 
@@ -1195,12 +1277,12 @@
 	(font-series . bold)
 
 	(font-size . -2)
-	(meta .  ((interfaces . (text-interface line-interface tuplet-bracket-interface font-interface spanner-interface))))
+	(meta . ((interfaces . (text-interface line-interface tuplet-bracket-interface font-interface spanner-interface))))
 	))
 
     (UnaCordaPedal
      . (
-	(print-function . ,Text_item::print)
+	(print-function . ,Text_interface::print)
 	(font-shape . italic)
 	(no-spacing-rods . #t)
 	(self-alignment-X . 0)
@@ -1210,7 +1292,7 @@
 	(meta . ((interfaces . (text-interface self-alignment-interface font-interface item-interface ))))
 	))
 
-    (UnaCordaPedalLineSpanner 
+    (UnaCordaPedalLineSpanner
      . (
 	(axes . (1))
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)	
@@ -1236,21 +1318,22 @@
 	(print-function . ,Volta_bracket_interface::print)
 	(direction . 1)
 	(padding . 1)
-	(font-encoding . number)
+	(font-encoding . fetaNumber)
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-	(thickness . 1.6)  ;  linethickness
-	(height . 2.0) ; staffspace;
+	(thickness . 1.6)  ;;  linethickness
+	(height . 2.0) ;; staffspace;
 	(minimum-space . 5)
 	(font-size . -4)
 	(meta . ((interfaces . (volta-bracket-interface line-interface text-interface side-position-interface font-interface spanner-interface))))
 	))
-    
+
     (VerticalAlignment
      . (
 	(axes . (1))
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(stacking-dir . -1)
+	;; (threshold . (6 . 1000))
 	(meta . ((interfaces . (align-interface axis-group-interface spanner-interface))))
 	))
 
@@ -1260,7 +1343,7 @@
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)	
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	
-	(meta . ((interfaces . (axis-group-interface spanner-interface))))
+	(meta . ((interfaces . (axis-group-interface vertically-spaceable-interface spanner-interface))))
 	))
    )
  )
@@ -1287,18 +1370,15 @@
 (set! all-grob-descriptions (map completize-grob-entry all-grob-descriptions))
 
 
-
-					;  (display  (map pair? all-grob-descriptions))
-
+;;  (display (map pair? all-grob-descriptions))
 
 ;; make sure that \property Foo.Bar =\turnOff doesn't complain
 
 (map (lambda (x)
-					; (display (car x)) (newline)
+       ;; (display (car x)) (newline)
 
        (set-object-property! (car x) 'translation-type? list?)
        (set-object-property! (car x) 'is-grob? #t))
      all-grob-descriptions)
 
-
 (set! all-grob-descriptions (sort all-grob-descriptions alist<?))