X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=54f1beb8c8025f51cf72a06b093db771e852a301;hb=6981f610082ad44e8d876b2fb1cb737b927a6478;hp=189d9bdf9c2b038bbf4ee78c3f67d39ace68b795;hpb=516394fdf611ef44f521e2b3a49e7c340b67e672;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 189d9bdf9c..54f1beb8c8 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,11 +2,11 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
-;;;; distances are given in linethickness (thicknesses) and
-;;;; staffspace (distances)
+;;;; distances are given in line-thickness (thicknesses) and
+;;;; staff-space (distances)
 
 ;;;; WARNING: the meta field should be the last one.
 ;;;; WARNING: don't use anonymous functions for initialization.
@@ -22,29 +22,30 @@
 	(avoid-slur . inside)
 	(cautionary-style . parentheses)
 
-	(stencil . ,Accidental_interface::print)
+	(stencil . ,ly:accidental-interface::print)
 	(after-line-breaking
-	 . ,Accidental_interface::after_line_breaking)
+	 . ,ly:accidental-interface::after-line-breaking)
 					
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
 				font-interface))))))
-
+    
     (AccidentalSuggestion
      . (
-
-	(stencil . ,Accidental_interface::print)
-					
-	(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent
-			       ,Self_alignment_interface::aligned_on_self))
+	(stencil . ,ly:accidental-interface::print)
+	(X-offset . ,(ly:make-simple-closure
+		      `(,+
+			,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent))
+			,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
 	(self-alignment-X . ,CENTER)
 	(cautionary . #t)
 	(cautionary-style . smaller)
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(cautionary-style . parentheses)
 	(direction . ,UP)
 	(staff-padding . 0.25)
 	(script-priority . 0)
+	(side-axis . ,X)
 	(meta . ((class . Item)
 		 (interfaces . (side-position-interface
 				script-interface
@@ -56,8 +57,8 @@
      . (
 	(left-padding . 0.2)
 
-	(positioning-done . ,Accidental_placement::calc_positioning_done)
-	(X-extent . ,Axis_group_interface::width)		      
+	(positioning-done . ,ly:accidental-placement::calc-positioning-done)
+	(X-extent . ,ly:axis-group-interface::width)		      
 	
 	;; this is quite small, but it is very ugly to have
 	;; accs closer to the previous note than to the next one.
@@ -67,9 +68,8 @@
     (Ambitus
      . (
 	(axes . (0 1))
-
-	(X-extent . ,Axis_group_interface::width)
-	(X-extent . ,Axis_group_interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
+	(X-extent . ,ly:axis-group-interface::height)
 
 	(space-alist . (
 			(clef . (extra-space . 0.5))
@@ -88,11 +88,11 @@
     (AmbitusLine
      . (
 
-	(stencil . ,Ambitus::print)
+	(stencil . ,ly:ambitus::print)
 
 	(join-heads . #t)
 	(thickness . 2)
-	(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent))
+	(X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
 
 	(meta . ((class . Item)
 		 (interfaces . (ambitus-interface
@@ -102,12 +102,13 @@
      . (
 	(font-family . music)
 	(padding . 0.5)
-	(X-offset-callbacks . (,Side_position_interface::aligned_side))
-	(direction . -1)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
+	(direction . ,LEFT)
 	(cautionary-style . parentheses)
 
-	(stencil . ,Accidental_interface::print)
-	(after-line-breaking . ,Accidental_interface::after_line_breaking)
+	(stencil . ,ly:accidental-interface::print)
+	(after-line-breaking . ,ly:accidental-interface::after-line-breaking)
+	(side-axis . ,X)
 	
 	(meta . ((class . Item)
 		 (interfaces . (item-interface
@@ -120,10 +121,10 @@
      . (
 	(duration-log . 2)
 
-	(stencil . ,Note_head::print)
+	(stencil . ,ly:note-head::print)
 	(glyph-name . ,note-head::calc-glyph-name)
 	
-	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
 				note-head-interface
@@ -133,15 +134,13 @@
 				ledgered-interface))))))
 
     (Arpeggio
-     . (
-
-	(X-extent . ,Arpeggio::width)
-	(stencil . ,Arpeggio::print)
-
-	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
-	(X-offset-callbacks . (,Side_position_interface::aligned_side))
-	(direction . -1)
+     . ((X-extent . ,ly:arpeggio::width)
+	(stencil . ,ly:arpeggio::print)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
+	(direction . ,LEFT)
 	(padding . 0.5)
+	(side-axis . ,X)
 	(staff-position . 0.0)
 	(meta . ((class . Item)
 		 (interfaces . (arpeggio-interface
@@ -157,9 +156,9 @@
 	(break-visibility . ,all-visible)
 	(breakable . #t)
 
-	(stencil . ,Bar_line::print)
+	(stencil . ,ly:bar-line::print)
 	(glyph-name . ,bar-line::calc-glyph-name)
-	(bar-size .  ,Bar_line::calc_bar_size)
+	(bar-size .  ,ly:bar-line::calc-bar-size)
 	
 	(space-alist . (
 			(time-signature . (extra-space . 0.75))
@@ -175,7 +174,7 @@
 	;; Ross. page 151 lists other values, we opt for a leaner look
 	;;
 	;; TODO:
-	;; kern should scale with linethickness too.
+	;; kern should scale with line-thickness too.
 	(kern . 3.0)
 	(thin-kern . 3.0)
 	(hair-thickness . 1.9)
@@ -187,17 +186,16 @@
 
     (BarNumber
      . (
-
-	(stencil . ,Text_interface::print)
-	;
+	(stencil . ,ly:text-interface::print)
 	(breakable . #t)
 	(break-visibility . ,begin-of-line-visible)
 	(padding . 1.0)
-	(direction . 1)
+	(direction . ,UP)
 	(font-family . roman)
 	(font-size . -2)
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(self-alignment-X . 1)
 
 	(meta .
@@ -210,29 +208,9 @@
 	))
 
     (BassFigure
-     . (
-
-	(stencil . ,Text_interface::print)
-
-	(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
-	(direction . 1)
-	(font-family . number)
-
-	;; We must do this, other BFs in
-	;; layout16 become too small.
-	(font-size . -4)
-	(kern . 0.2)
-	(meta . ((class . Item)
-		 (interfaces . (text-interface
-				rhythmic-grob-interface
-				bass-figure-interface
-				self-alignment-interface
-				font-interface))))))
-
-    (NewBassFigure
      . (
 	;
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
@@ -242,7 +220,7 @@
     (BassFigureBracket
      . (
 	;
-	(stencil . ,Enclosing_bracket::print)
+	(stencil . ,ly:enclosing-bracket::print)
 
 	(edge-height . (0.2 . 0.2))
 	(meta . ((class . Item)
@@ -251,9 +229,9 @@
     (BassFigureContinuation
      . (
 
-	(stencil . ,Figured_bass_continuation::print)
+	(stencil . ,ly:figured-bass-continuation::print)
 
-	(Y-offset-callbacks . (,Figured_bass_continuation::center_on_figures))
+	(Y-offset . ,ly:figured-bass-continuation::center-on-figures)
 	(meta . ((class . Spanner)
 		 (interfaces . (figured-bass-continuation-interface))
 		 ))))
@@ -261,7 +239,7 @@
      . (
 	(axes . (,Y))
 
-	(Y-extent . ,Axis_group_interface::height)
+	(Y-extent . ,ly:axis-group-interface::height)
 
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
@@ -272,8 +250,8 @@
 	(axes . (,Y))
 	(threshold . (2 . 1000))
 
-	(positioning-done . ,Align_interface::calc_positioning_done)
-	(Y-extent . ,Axis_group_interface::height)
+	(positioning-done . ,ly:align-interface::calc-positioning-done)
+	(Y-extent . ,ly:axis-group-interface::height)
 					
 	(stacking-dir . -1)
 	(meta . ((class . Spanner)
@@ -285,24 +263,31 @@
 	;; todo: clean this up a bit: the list is getting
 	;; rather long.
 	(gap . 0.8)
-	
-	(position-callbacks . (,Beam::slope_damping
-			       ,Beam::shift_region_to_valid
-			       ,Beam::quanting))
-	(least-squares-dy . ,Beam::calc_least_squares_dy)
-	(concaveness . ,Beam::calc_concaveness)
-	(positions . ,Beam::calc_positions)
-	(direction . ,Beam::calc_direction)
-	(stencil . ,Beam::print)
-					
+	(positions .  ,(ly:make-simple-closure
+			(ly:make-simple-closure
+			 (list chain-grob-member-functions
+			   `(,cons 0 0)
+			   ly:beam::calc-least-squares-positions
+			   ly:beam::slope-damping
+			   ly:beam::shift-region-to-valid
+			   ly:beam::quanting
+			   ))))
+
+	;; this is a hack to set stem lengths, if positions is set.
+	(quantized-positions . ,ly:beam::set-stem-lengths)
+	(concaveness . ,ly:beam::calc-concaveness)
+	(direction . ,ly:beam::calc-direction)
+	(shorten . ,ly:beam::calc-stem-shorten)
+	(beaming . ,ly:beam::calc-beaming)
+	(stencil . ,ly:beam::print)
 
 	;; TODO: should be in SLT.
 	(thickness . 0.48) ; in staff-space
-	(neutral-direction . -1)
+	(neutral-direction . ,DOWN)
 
 	;; Whe have some unreferenced problems here.
 	;;
-	;; If we shorten beamed stems less than normal stems (1 staffspace),
+	;; If we shorten beamed stems less than normal stems (1 staff-space),
 	;; or high order less than 8th beams, patterns like
 	;;     c''4 [c''8 c''] c''4 [c''16 c]
 	;; are ugly (different stem lengths).
@@ -328,12 +313,10 @@
      . (
 	(breakable . #t)
 	(stacking-dir . 1)
-
-	(positioning-done . ,Break_align_interface::calc_positioning_done)
-	(X-extent . ,Axis_group_interface::width)
-					
+	(positioning-done . ,ly:break-align-interface::calc-positioning-done)
+	(X-extent . ,ly:axis-group-interface::width)
 	(break-align-orders . ;; end of line
-			    #((instrument-name
+			    #((
 			       left-edge
 			       ambitus
 			       breathing-sign
@@ -345,7 +328,7 @@
 			       custos)
 
 			      ;; unbroken
-			      (instrument-name
+			      (
 			       left-edge
 			       ambitus
 			       breathing-sign
@@ -357,7 +340,7 @@
 			       time-signature custos)
 
 			      ;; begin of line
-			      (instrument-name
+			      (
 			       left-edge
 			       ambitus
 			       breathing-sign
@@ -375,9 +358,7 @@
     (BreakAlignGroup
      . (
 	(axes . (0))
-
-	(X-extent . ,Axis_group_interface::width)
-
+	(X-extent . ,ly:axis-group-interface::width)
 	(meta . ((class . Item)
 		 (interfaces . (break-aligned-interface
 				axis-group-interface))))))
@@ -390,15 +371,16 @@
 			(ambitus . (extra-space . 2.0))
 			(custos . (minimum-space . 1.0))
 			(key-signature . (minimum-space . 1.5))
+			(time-signature . (minimum-space . 1.5))
 			(staff-bar . (minimum-space . 1.5))
 			(clef . (minimum-space . 2.0))
 			(first-note . (fixed-space . 1.0)) ;huh?
 			(right-edge . (extra-space . 0.1))))
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 	(text . ,(make-musicglyph-markup "scripts.rcomma"))
-	(Y-offset-callbacks . (,Breathing_sign::offset_callback))
+	(Y-offset . ,ly:breathing-sign::offset-callback)
 	(break-visibility . ,begin-of-line-invisible)
 	(meta . ((class . Item)
 		 (interfaces . (break-aligned-interface
@@ -409,8 +391,8 @@
     (Clef
      . (
 
-	(stencil . ,Clef::print)
-	(glyph-name . ,Clef::calc_glyph_name)
+	(stencil . ,ly:clef::print)
+	(glyph-name . ,ly:clef::calc-glyph-name)
 					
 	(breakable . #t)
 	(font-family . music)
@@ -418,13 +400,13 @@
 	(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))
 			(right-edge . (extra-space . 0.5))))
-	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Item)
 		 (interfaces . (clef-interface
 				staff-symbol-referencer-interface
@@ -434,7 +416,7 @@
     (ClusterSpannerBeacon
      . (
 
-	(Y-extent . ,Cluster_beacon::height)
+	(Y-extent . ,ly:cluster-beacon::height)
 
 	(meta . ((class . Item)
 		 (interfaces . (cluster-beacon-interface))))))
@@ -442,8 +424,8 @@
     (ClusterSpanner
      . (
 
-	(springs-and-rods . ,Spanner::set_spacing_rods)
-	(stencil . ,Cluster::print)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
+	(stencil . ,ly:cluster::print)
 
 
 	(minimum-length . 0.0)
@@ -455,8 +437,8 @@
     (ChordName
      . (
 
-	(stencil . ,Text_interface::print)
-	(after-line-breaking . ,Chord_name::after_line_breaking)
+	(stencil . ,ly:text-interface::print)
+	(after-line-breaking . ,ly:chord-name::after-line-breaking)
 	
 	(word-space . 0.0)
 	(font-family . sans)
@@ -471,17 +453,18 @@
     (CombineTextScript
      . (
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly: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)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
+	(direction . ,UP)
 	(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
@@ -494,12 +477,12 @@
 	(break-align-symbol . custos)
 	(breakable . #t)
 
-	(stencil . ,Custos::print)
+	(stencil . ,ly:custos::print)
 
 	(break-visibility . ,end-of-line-visible)
 	(style . vaticana)
-	(neutral-direction . -1)
-	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+	(neutral-direction . ,DOWN)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(space-alist . (
 			(first-note . (minimum-fixed-space . 0.0))
 			(right-edge . (extra-space . 0.1))))
@@ -515,10 +498,10 @@
 	(axes . (0))
 	(direction . ,RIGHT)
 
-	(positioning-done . ,Dot_column::calc_positioning_done) 
-	(X-extent . ,Axis_group_interface::width)
+	(positioning-done . ,ly:dot-column::calc-positioning-done) 
+	(X-extent . ,ly:axis-group-interface::width)
 	
-	(X-offset-callbacks . (,Dot_column::side_position))
+	(X-offset . ,ly:dot-column::side-position)
 	(meta . ((class . Item)
 		 (interfaces . (dot-column-interface
 				axis-group-interface))))))
@@ -526,7 +509,7 @@
     (Dots
      . (
 
-	(stencil . ,Dots::print)
+	(stencil . ,ly:dots::print)
 
 	(dot-count . 1)
 	(meta . ((class . Item)
@@ -536,9 +519,7 @@
 
     (DoublePercentRepeat
      . (
-
-	(stencil . ,Percent_repeat_item_interface::double_percent)
-
+	(stencil . ,ly:percent-repeat-item-interface::double-percent)
 	(breakable . #t)
 	(slope . 1.0)
 	(font-encoding . fetaMusic)
@@ -554,17 +535,17 @@
     (DoublePercentRepeatCounter
      . (
 
-	(stencil . ,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))
+	(stencil . ,ly:text-interface::print)
+	(X-offset . ,(ly:make-simple-closure `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-y-parent))
+						  ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(font-encoding . fetaNumber)
 	(self-alignment-X . 0)
 	(font-size . -2) 
-	(direction . 1)
+	(direction . ,UP)
 	(padding . 0.2)
 	(staff-padding . 0.25)
+	(side-axis . ,Y)
 	(meta . ((class . Item)
 		 (interfaces . (side-position-interface
 				self-alignment-interface
@@ -574,16 +555,17 @@
     (DynamicLineSpanner
      . (
 	(axes . (1))
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(staff-padding . 0.1)
 	(padding . 0.6)
 	(avoid-slur . outside)
 	(slur-padding . 0.3)
 	(minimum-space . 1.2)
-	(direction . -1)
+	(direction . ,DOWN)
+	(side-axis . ,Y)
 
-	(Y-extent . ,Axis_group_interface::height)
-	(X-extent . ,Axis_group_interface::width)
+	(Y-extent . ,ly:axis-group-interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
 
 
 	(meta . ((class . Spanner)
@@ -597,16 +579,17 @@
 
 	;; todo.
 
-	(stencil . ,Text_interface::print)
-	(direction . ,Script_interface::calc_direction)
+	(stencil . ,ly:text-interface::print)
+	(direction . ,ly:script-interface::calc-direction)
 
-	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(self-alignment-X . 0)
-	(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
+	(Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
 	(self-alignment-Y . 0)
 	(font-series . bold)
 	(font-encoding . fetaDynamic)
 	(font-shape . italic)
+	(avoid-slur . around)
 	(no-spacing-rods . #t)
 	(script-priority . 100)
 	(meta . ((class . Item)
@@ -619,7 +602,7 @@
     (DynamicTextSpanner
      . (
 
-	(stencil . ,Dynamic_text_spanner::print)
+	(stencil . ,ly:dynamic-text-spanner::print)
 
 	;; rather ugh with NCSB
 	;; (font-series . bold)
@@ -651,8 +634,8 @@
 	(self-alignment-Y . 0)
 	(script-priority . 100)
 
-	(stencil . ,Text_interface::print)
-	(direction . ,Script_interface::calc_direction)
+	(stencil . ,ly:text-interface::print)
+	(direction . ,ly:script-interface::calc-direction)
 
 	(font-encoding . fetaNumber)
 	(font-size . -5) 		; don't overlap when next to heads.
@@ -673,8 +656,8 @@
 	(X-extent . #f)
 	(Y-extent . #f)
 
-	(stencil . ,Line_spanner::print)
-	(after-line-breaking . ,Line_spanner::after_line_breaking)
+	(stencil . ,ly:line-spanner::print)
+	(after-line-breaking . ,ly:line-spanner::after-line-breaking)
 	
 
 	(meta . ((class . Spanner)
@@ -691,12 +674,13 @@
     (GridLine
      . (
 
-	(X-extent  . ,Grid_line_interface::width)
-	(stencil . ,Grid_line_interface::print)
+	(X-extent  . ,ly:grid-line-interface::width)
+	(stencil . ,ly:grid-line-interface::print)
 
 	(self-alignment-X . ,CENTER)
-	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
-			       ,Self_alignment_interface::centered_on_parent))
+	(X-offset . ,(ly:make-simple-closure
+		      `(,+  ,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent))
+			    ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
 	(layer . 0)
 	(meta . ((class . Item)
 		 (interfaces . (self-alignment-interface
@@ -706,16 +690,16 @@
      . (
 
 
-	(stencil . ,Hairpin::print)
-	(springs-and-rods . ,Spanner::set_spacing_rods)
-	(after-line-breaking . ,Hairpin::after_line_breaking)
+	(stencil . ,ly:hairpin::print)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
+	(after-line-breaking . ,ly:hairpin::after-line-breaking)
 
 	(thickness . 1.0)
 	(height . 0.6666)
 	(minimum-length . 2.0)
 	(bound-padding . 1.0)
 	(self-alignment-Y . 0)
-	(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
+	(Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
 	(meta . ((class . Spanner)
 		 (interfaces . (hairpin-interface
 				line-interface
@@ -726,13 +710,12 @@
     (HorizontalBracket
      . (
 	(thickness . 1.0)
-
-	(stencil . ,Horizontal_bracket::print)
-
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(stencil . ,ly:horizontal-bracket::print)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(padding . 0.2)
 	(staff-padding . 0.2)
-	(direction . -1)
+	(direction . ,DOWN)
+	(side-axis . ,Y)
 	(bracket-flare . (0.5 . 0.5))
 	(meta . ((class . Spanner)
 		 (interfaces . (horizontal-bracket-interface
@@ -741,33 +724,23 @@
 				spanner-interface))))))
     (InstrumentName
      . (
-	(breakable . #t)
-	(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self
-			       ,Side_position_interface::aligned_on_support_refpoints))
-	;; This direction is for aligned_on_support_refpoints
-	;; (?) --hwn
-	(direction . 0)
-	(space-alist . (
-			(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)
-	(meta . ((class . Item)
-		 (interfaces . (font-interface
-				self-alignment-interface
+	(style . text)
+	(padding . 0.3)
+	(stencil . ,ly:system-start-delimiter::print)
+	(collapse-height . 5.0)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
+	(direction . ,LEFT)
+	(Y-offset . -0.75)
+	(Y-extent . #f)
+	(meta . ((class . Spanner)
+		 (interfaces . (system-start-text-interface
 				side-position-interface
-				text-interface
-				break-aligned-interface))))))
+				font-interface))))))
 
     (KeyCancellation
      . (
 
-	(stencil . ,Key_signature_interface::print)
+	(stencil . ,ly:key-signature-interface::print)
 
 	(space-alist . (
 			(time-signature . (extra-space . 1.25))
@@ -775,7 +748,7 @@
 			(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))
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(break-align-symbol . key-cancellation)
 	(break-visibility . ,begin-of-line-invisible)
 	(breakable . #t)
@@ -787,14 +760,14 @@
     (KeySignature
      . (
 
-	(stencil . ,Key_signature_interface::print)
+	(stencil . ,ly: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))))
-	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(break-align-symbol . key-signature)
 	(break-visibility . ,begin-of-line-visible)
 	(breakable . #t)
@@ -806,9 +779,9 @@
     (LaissezVibrerTie
      . (
 
-	(stencil  . ,Tie::print)
-	(control-points . ,Laissez_vibrer_tie::calc_control_points)
-	(direction . ,Laissez_vibrer_tie::calc_direction)
+	(stencil  . ,ly:tie::print)
+	(control-points . ,ly:laissez-vibrer-tie::calc-control-points)
+	(direction . ,ly:laissez-vibrer-tie::calc-direction)
 	
 	(details . ((ratio . 0.333)
 		    (height-limit . 1.0)))
@@ -822,9 +795,7 @@
      . (
 	(X-extent . #f)
 	(Y-extent . #f)
-
-	(positioning-done . ,Laissez_vibrer_tie_column::calc_positioning_done)
-	
+	(positioning-done . ,ly:laissez-vibrer-tie-column::calc-positioning-done)
 	(meta . ((class . Item)
 		 (interfaces . (laissez-vibrer-tie-column-interface))
 		 ))
@@ -833,9 +804,9 @@
     (LedgerLineSpanner
      . (
 
-	(springs-and-rods . ,Ledger_line_spanner::set_spacing_rods)
+	(springs-and-rods . ,ly:ledger-line-spanner::set-spacing-rods)
 
-	(stencil . ,Ledger_line_spanner::print)
+	(stencil . ,ly:ledger-line-spanner::print)
 
 	(X-extent . #f)
 	(Y-extent . #f)
@@ -871,16 +842,14 @@
 	;; ugh.  A ligature bracket is totally different from
 	;; a tuplet bracket.
 
-	(direction  . ,Tuplet_bracket::calc_direction)
-	(positions . ,Tuplet_bracket::calc_positions)
-	(stencil . ,Tuplet_bracket::print)
-	
-	(direction . 1)
-	(gap . 0.0)
 	(padding . 2.0)
 	(thickness . 1.6)
 	(edge-height . (0.7 . 0.7))
 	(shorten-pair . (-0.2 . -0.2))
+	(direction . ,UP)
+	(positions . ,ly:tuplet-bracket::calc-positions)
+	(stencil . ,ly:tuplet-bracket::print)
+	
 	(meta . ((class . Spanner)
 		 (interfaces . (tuplet-bracket-interface
 				line-interface))))))
@@ -892,35 +861,46 @@
 	(dash-period . 10.0)
 	(length . 0.66)
 	(minimum-length . 0.3)
+	(minimum-distance . 0.1)
 	(padding . 0.07)
-					;	(springs-and-rods . ,Hyphen_spanner::set_spacing_rods)
-
-	(stencil . ,Hyphen_spanner::print)
+	(springs-and-rods . ,ly:hyphen-spanner::set-spacing-rods)
+	
+	(stencil . ,ly:hyphen-spanner::print)
 
 	(Y-extent . (0 . 0))
 	(meta . ((class . Spanner)
 		 (interfaces . (lyric-interface
+				font-interface
 				lyric-hyphen-interface
 				spanner-interface))))))
 
     (LyricExtender
      . (
 
-	(stencil . ,Lyric_extender::print)
+	(stencil . ,ly:lyric-extender::print)
 
-	(thickness . 0.8) ; linethickness
+	(thickness . 0.8) ; line-thickness
 	(minimum-length . 1.5)
 	(Y-extent . (0 . 0))
 	(meta . ((class . Spanner)
 		 (interfaces . (lyric-interface
 				lyric-extender-interface))))))
 
+    (LyricSpace
+     . ((minimum-distance . 0.3)
+	(springs-and-rods . ,ly:hyphen-spanner::set-spacing-rods)
+	(padding . 0.0)
+	(Y-extent . #f)
+	(X-extent . #f)
+	(meta . ((class . Spanner)
+		 (interfaces . (spanner-interface
+				lyric-hyphen-interface spacing-interface))
+		 ))
+	))
     (LyricText
      . (
-
-	(stencil . ,Text_interface::print)
-
-	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_parent))
+	(stencil . ,ly:text-interface::print)
+	(X-offset . ,ly:self-alignment-interface::aligned-on-x-parent)
 	(self-alignment-X . 0)
 	(word-space . 0.6)
 	(font-series . bold-narrow)
@@ -932,11 +912,33 @@
 				text-interface
 				font-interface))))))
 
+
+    (MeasureGrouping
+     . (
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
+
+	(stencil . ,ly:measure-grouping::print)
+
+	(padding . 2)
+	(direction . ,UP)
+	(thickness . 1)
+	(height . 2.0)
+	(staff-padding . 3)
+	(meta . ((class . Spanner)
+		 (interfaces . (side-position-interface
+				measure-grouping-interface))))))
+
+    (MelodyItem
+     . (
+	(neutral-direction . ,DOWN)
+	(meta . ((class . Item)
+		 (interfaces . (melody-spanner-interface spacing-interface))))))
     (MensuralLigature
      . (
 	(thickness . 1.4)
 	(flexa-width . 2.0)
-	(stencil . ,Mensural_ligature::print)
+	(stencil . ,ly:mensural-ligature::print)
 
 	(meta . ((class . Spanner)
 		 (interfaces . (mensural-ligature-interface
@@ -944,39 +946,23 @@
 
     (MetronomeMark
      . (
-
-	(stencil . ,Text_interface::print)
-
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-	(direction . 1)
+	(stencil . ,ly:text-interface::print)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(direction . ,UP)
 	(padding . 0.8)
+	(side-axis . ,Y)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
 				side-position-interface
 				font-interface
 				metronome-mark-interface))))))
 
-    (MeasureGrouping
-     . (
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-
-	(stencil . ,Measure_grouping::print)
-
-	(padding . 2)
-	(direction . 1)
-	(thickness . 1)
-	(height . 2.0)
-	(staff-padding . 3)
-	(meta . ((class . Spanner)
-		 (interfaces . (side-position-interface
-				measure-grouping-interface))))))
 
     (MultiMeasureRest
      . (
-
-	(stencil . ,Multi_measure_rest::print)
-
-	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+	(stencil . ,ly:multi-measure-rest::print)
+	(springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(staff-position . 0)
 	(expand-limit . 10)
 	(thick-thickness . 6.6)
@@ -992,13 +978,16 @@
 
     (MultiMeasureRestNumber
      . (
-	(springs-and-rods . ,Multi_measure_rest::set_spacing_rods)
-	(stencil . ,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))
+	(springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
+	(stencil . ,ly:text-interface::print)
+	(X-offset . ,(ly:make-simple-closure
+		      `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self))
+			   ,(ly:make-simple-closure (list ly:self-alignment-interface::x-centered-on-y-parent)))))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
+
 	(self-alignment-X . 0)
-	(direction . 1)
+	(direction . ,UP)
 	(padding . 0.4)
 	(staff-padding . 0.4)
 	(font-encoding . fetaNumber)
@@ -1010,17 +999,16 @@
 				text-interface))))
 	      ))
 
-
     (MultiMeasureRestText
      . (
-
-	(stencil . ,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))
+	(stencil . ,ly:text-interface::print)
+	(X-offset . ,(ly:make-simple-closure
+		      `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::x-centered-on-y-parent))
+			   ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
+	
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(self-alignment-X . 0)
-	(direction . 1)
+	(direction . ,UP)
 	(padding . 0.2)
 	(staff-padding . 0.25)
 	(meta . ((class . Spanner)
@@ -1034,9 +1022,9 @@
      . (
 	(axes . (0 1))
 
-	(X-extent . ,Axis_group_interface::width)
-	(Y-extent . ,Axis_group_interface::height)
-	(positioning-done . ,Note_collision_interface::calc_positioning_done)
+	(X-extent . ,ly:axis-group-interface::width)
+	(Y-extent . ,ly:axis-group-interface::height)
+	(positioning-done . ,ly:note-collision-interface::calc-positioning-done)
 	
 	(meta . ((class . Item)
 		 (interfaces . (note-collision-interface
@@ -1045,8 +1033,8 @@
     (NoteColumn
      . (
 	(axes . (0 1))
-	(X-extent . ,Axis_group_interface::width)
-	(Y-extent . ,Axis_group_interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
+	(Y-extent . ,ly:axis-group-interface::height)
 
 	(meta . ((class . Item)
 		 (interfaces . (axis-group-interface
@@ -1055,11 +1043,11 @@
     (NoteHead
      . (
 
-	(stencil . ,Note_head::print)
-	(stem-attachment . ,Note_head::calc_stem_attachment)
+	(stencil . ,ly:note-head::print)
+	(stem-attachment . ,ly:note-head::calc-stem-attachment)
 	(glyph-name . ,note-head::calc-glyph-name) 
-	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
-	(X-offset-callbacks . (,Note_head::stem_x_shift))
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
+	(X-offset . ,ly:note-head::stem-x-shift)
 	(meta . ((class . Item)
 		 (interfaces . (rhythmic-grob-interface
 				rhythmic-head-interface
@@ -1083,7 +1071,7 @@
     (NoteName
      . (
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 	(meta . ((class . Item)
 		 (interfaces . (note-name-interface
@@ -1094,11 +1082,13 @@
      . (
 	(self-alignment-X . 0)
 	(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))
+	(X-offset . ,(ly:make-simple-closure
+		      `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self))
+			   ,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent)))))
+	
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 
 	;; no Y dimensions, because of lyrics under tenor clef.
@@ -1115,9 +1105,9 @@
 
     (OttavaBracket
      . (
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 
-	(stencil . ,Ottava_bracket::print)
+	(stencil . ,ly:ottava-bracket::print)
 
 	(font-shape . italic)
 	(shorten-pair . (0.0 . -0.6))
@@ -1126,7 +1116,7 @@
 	(minimum-length . 1.0)
 	(dash-fraction . 0.3)
 	(edge-height . (0 . 1.2))
-	(direction . 1)
+	(direction . ,UP)
 	(meta . ((class . Spanner)
 		 (interfaces . (ottava-bracket-interface
 				horizontal-bracket-interface
@@ -1139,9 +1129,9 @@
      . (
 	(axes . (0))
 
-	(before-line-breaking . ,Paper_column::before_line_breaking)
-	;; (stencil . ,Paper_column::print)
-	(X-extent . ,Axis_group_interface::width)
+	(before-line-breaking . ,ly:paper-column::before-line-breaking)
+	;; (stencil . ,ly:paper-column::print)
+	(X-extent . ,ly:axis-group-interface::width)
 	
 
 	;; debugging
@@ -1151,14 +1141,23 @@
 				axis-group-interface
 				spaceable-grob-interface))))))
 
+    (ParenthesesItem
+     . (
+	(stencil . ,parentheses-item::print)
+	(font-size . -6)
+	(padding . 0.2)
+	(meta . ((class . Item)
+		 (interfaces . (parentheses-interface font-interface))))
+	
+	      ))
     (PhrasingSlur
-     . ((slur-details . ,default-slur-details)
+     . ((details . ,default-slur-details)
 
-	(control-points . ,Slur::calc_control_points)
-	(direction . ,Slur::calc_direction)
-	(springs-and-rods . ,Spanner::set_spacing_rods)
-	(Y-extent . ,Slur::height)
-	(stencil . ,Slur::print)		      
+	(control-points . ,ly:slur::calc-control-points)
+	(direction . ,ly:slur::calc-direction)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
+	(Y-extent . ,ly:slur::height)
+	(stencil . ,ly:slur::print)		      
 	
 
 	(thickness . 1.1)
@@ -1172,9 +1171,9 @@
      . (
 	(axes . (0))
 
-	(before-line-breaking . ,Paper_column::before_line_breaking)
-	(X-extent . ,Axis_group_interface::width)
-	;;		      (stencil . ,Paper_column::print)
+	(before-line-breaking . ,ly:paper-column::before-line-breaking)
+	(X-extent . ,ly:axis-group-interface::width)
+	;;		      (stencil . ,ly:paper-column::print)
 	
 	(breakable . #t)
 
@@ -1189,8 +1188,8 @@
     (PercentRepeat
      . (
 
-	(springs-and-rods . ,Multi_measure_rest::set_spacing_rods)
-	(stencil . ,Multi_measure_rest::percent)
+	(springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
+	(stencil . ,ly:multi-measure-rest::percent)
 
 	(slope . 1.0)
 	(thickness . 0.48)
@@ -1201,14 +1200,13 @@
 				percent-repeat-interface))))))
     (PercentRepeatCounter
      . (
-
-	(stencil . ,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))
+	(stencil . ,ly:text-interface::print)
+	(X-offset . ,(ly:make-simple-closure
+		      `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::x-centered-on-y-parent))
+			   ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(self-alignment-X . 0)
-	(direction . 1)
+	(direction . ,UP)
 	(padding . 0.2)
 	(staff-padding . 0.25)
 	(font-size . -2) 
@@ -1224,11 +1222,11 @@
     (PianoPedalBracket
      . (
 
-	(stencil . ,Piano_pedal_bracket::print)
+	(stencil . ,ly:piano-pedal-bracket::print)
 
 	(style . line)
 	(bound-padding . 1.0)
-	(direction . -1)
+	(direction . ,DOWN)
 	(bracket-flare . (0.5 . 0.5))
 	(edge-height . (1.0 . 1.0))
 	(shorten-pair . (0.0 . 0.0))
@@ -1240,16 +1238,16 @@
 
     (RehearsalMark
      . (
-
-	(stencil . ,Text_interface::print)
-
-	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-
-	(after-line-breaking . ,shift-right-at-line-begin)
-
+	(stencil . ,ly:text-interface::print)
+	(X-offset . ,(ly:make-simple-closure
+		      `(,+ ,(ly:make-simple-closure
+			     `(,ly:self-alignment-interface::x-aligned-on-self))
+			   ,(ly:make-simple-closure
+			     `(,ly:self-alignment-interface::centered-on-x-parent)))
+		      ))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(self-alignment-X . 0)
-	(direction . 1)
+	(direction . ,UP)
 	(breakable . #t)
 	(font-size . 2)
 	(baseline-skip . 2)
@@ -1265,25 +1263,17 @@
 
     (RepeatSlash
      . (
-
-	(stencil . ,Percent_repeat_item_interface::beat_slash)
-
+	(stencil . ,ly:percent-repeat-item-interface::beat-slash)
 	(thickness . 0.48)
 	(slope . 1.7)
 	(meta . ((class . Item)
 		 (interfaces . (percent-repeat-interface))))))
     (Rest
      . (
-
-	(stencil . ,Rest::print)
-	(X-extent . ,Rest::width)
-	(Y-extent . ,Rest::height)
-
-	(Y-offset-callbacks . (
-			       ,Staff_symbol_referencer::callback
-			       ,Rest::polyphonic_offset_callback
-			       ,Rest::y_offset_callback
-			       ))
+	(stencil . ,ly:rest::print)
+	(X-extent . ,ly:rest::width)
+	(Y-extent . ,ly:rest::height)
+	(Y-offset . ,ly:rest::y-offset-callback)
 	(minimum-distance . 0.25)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
@@ -1295,7 +1285,7 @@
     (RestCollision
      . (
 	(minimum-distance . 0.75)
-	(positioning-done . ,Rest_collision::calc_positioning_done)
+	(positioning-done . ,ly:rest-collision::calc-positioning-done)
 					
 	(meta . ((class . Item)
 		 (interfaces . (rest-collision-interface))))))
@@ -1309,10 +1299,11 @@
 	(padding . 0.20)
 	(staff-padding . 0.25)
 	;; (script-priority . 0) priorities for scripts, see script.scm
-	(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent))
+	(X-offset . , ly:self-alignment-interface::centered-on-x-parent)
+	
 
-	(stencil . ,Script_interface::print)
-	(direction . ,Script_interface::calc_direction)
+	(stencil . ,ly:script-interface::print)
+	(direction . ,ly:script-interface::calc-direction)
 
 	(font-encoding . fetaMusic)
 	(meta . ((class . Item)
@@ -1323,7 +1314,7 @@
     (ScriptColumn
      . (
 
-	(before-line-breaking . ,Script_column::before_line_breaking)
+	(before-line-breaking . ,ly:script-column::before-line-breaking)
 
 	(meta . ((class . Item)
 		 (interfaces . (script-column-interface))))))
@@ -1339,7 +1330,7 @@
     (SeparatingGroupSpanner
      . (
 
-	(springs-and-rods . ,Separating_group_spanner::set_spacing_rods)
+	(springs-and-rods . ,ly:separating-group-spanner::set-spacing-rods)
 
 	(meta . ((class . Spanner)
 		 (interfaces . (only-prebreak-interface
@@ -1347,17 +1338,17 @@
 				separation-spanner-interface))))))
 
     (Slur
-     . ((slur-details . ,default-slur-details)
+     . ((details . ,default-slur-details)
 
-	(control-points . ,Slur::calc_control_points)
-	(direction . ,Slur::calc_direction)
-	(springs-and-rods . ,Spanner::set_spacing_rods)
-	(Y-extent . ,Slur::height)
-	(stencil . ,Slur::print)
+	(control-points . ,ly:slur::calc-control-points)
+	(direction . ,ly:slur::calc-direction)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
+	(Y-extent . ,ly:slur::height)
+	(stencil . ,ly:slur::print)
 	
 	(thickness . 1.0)
 	(minimum-length . 1.5)
-					; Slur::height)
+					; ly:slur::height)
 	(height-limit . 2.0)
 	(ratio . 0.25)
 	(meta . ((class . Spanner)
@@ -1366,8 +1357,8 @@
     (SpacingSpanner
      . (
 
-	(springs-and-rods . ,Spacing_spanner::set_springs)
-
+	(springs-and-rods . ,ly:spacing-spanner::set-springs)
+	(average-spacing-wishes . #t)
 	(grace-space-factor . 0.6)
 	(shortest-duration-space . 2.0)
 	(spacing-increment . 1.2)
@@ -1383,11 +1374,11 @@
 	(layer . 0)
 	(breakable . #t)
 
-	(stencil . ,Span_bar::print)
-	(bar-size . ,Span_bar::calc_bar_size)
-	(X-extent . ,Span_bar::width)
-	(glyph-name . ,Span_bar::calc_glyph_name)
-	(before-line-breaking . ,Span_bar::before_line_breaking)
+	(stencil . ,ly:span-bar::print)
+	(bar-size . ,ly:span-bar::calc-bar-size)
+	(X-extent . ,ly:span-bar::width)
+	(glyph-name . ,ly:span-bar::calc-glyph-name)
+	(before-line-breaking . ,ly:span-bar::before-line-breaking)
 
 	;; ugh duplication!
 
@@ -1405,11 +1396,12 @@
 
     (StanzaNumber
      . (
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 	(font-series . bold)
 	(padding . 1.0)
-	(X-offset-callbacks . (,Side_position_interface::aligned_side))
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
+	(side-axis . ,X)
 	(direction . ,LEFT)
 	(meta . ((class . Item)
 		 (interfaces . (side-position-interface
@@ -1449,10 +1441,10 @@
     (SostenutoPedal
      . (
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
-	(direction . 1)
-	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
+	(direction . ,RIGHT)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(no-spacing-rods . #t)
 	(padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner
 	(font-shape . italic)
@@ -1466,13 +1458,14 @@
      . (
 	(axes . (1))
 
-	(X-extent . ,Axis_group_interface::height)
+	(X-extent . ,ly:axis-group-interface::height)
 
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
 
 	(padding . 1.2)
 	(minimum-space . 1.0)
-	(direction . -1)
+	(direction . ,DOWN)
 	(meta . ((class . Spanner)
 		 (interfaces . (piano-pedal-interface
 				axis-group-interface
@@ -1480,9 +1473,8 @@
 
     (StaffSymbol
      . (
-
-	(stencil . ,Staff_symbol::print)
-
+	(Y-extent . ,ly:staff-symbol::height)
+	(stencil . ,ly:staff-symbol::print)
 	(line-count . 5)
 	(ledger-line-thickness . (1.0 . 0.1))
 	(layer . 0)
@@ -1491,14 +1483,15 @@
 
     (Stem
      . (
-	(direction . ,Stem::calc_direction)
-	(stem-end-position . ,Stem::calc_stem_end_position)
-	(stem-info . ,Stem::calc_stem_info)
-	(positioning-done . ,Stem::calc_positioning_done)
-	(stencil . ,Stem::print)
-	(X-extent . ,Stem::width)
-	(Y-extent . ,Stem::height)
-	(length . ,Stem::calc_length)
+	(direction . ,ly:stem::calc-direction)
+	(default-direction . ,ly:stem::calc-default-direction)
+	(stem-end-position . ,ly:stem::calc-stem-end-position)
+	(stem-info . ,ly:stem::calc-stem-info)
+	(positioning-done . ,ly:stem::calc-positioning-done)
+	(stencil . ,ly:stem::print)
+	(X-extent . ,ly:stem::width)
+	(Y-extent . ,ly:stem::height)
+	(length . ,ly:stem::calc-length)
 	
 	(thickness . 1.3)
 
@@ -1532,21 +1525,21 @@
 
 
 	;; default stem direction for note on middle line
-	(neutral-direction . -1)
+	(neutral-direction . ,DOWN)
 
 	;; We use the normal minima as minimum for the ideal lengths,
 	;; and the extreme minima as abolute minimum length.
 
-	(X-offset-callbacks . (,Stem::offset_callback))
-	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+	(X-offset . ,ly:stem::offset-callback)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Item)
 		 (interfaces . (stem-interface
 				font-interface))))))
 
     (StemTremolo
      . (
-	(Y-extent . ,Stem_tremolo::height)
-	(stencil . ,Stem_tremolo::print)
+	(Y-extent . ,ly:stem-tremolo::height)
+	(stencil . ,ly:stem-tremolo::print)
 	(X-extent . #f)
 	(beam-width . 1.6) ; staff-space
 	(beam-thickness . 0.48) ; staff-space
@@ -1556,11 +1549,11 @@
     (SustainPedal
      . (
 	(no-spacing-rods . #t)
-	(stencil . ,Sustain_pedal::print)
+	(stencil . ,ly:sustain-pedal::print)
 	(self-alignment-X . 0)
-	(direction . 1)
+	(direction . ,RIGHT)
 	(padding . 0.0)  ;; padding relative to SustainPedalLineSpanner
-	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(meta . ((class . Item)
 		 (interfaces . (piano-pedal-interface
 				text-spanner-interface
@@ -1571,12 +1564,13 @@
     (SustainPedalLineSpanner
      . (
 	(axes . (1))
-	(X-extent . ,Axis_group_interface::height)
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(X-extent . ,ly:axis-group-interface::height)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
 	(padding . 1.2)
 	(staff-padding . 1.2)
 	(minimum-space . 1.0)
-	(direction . -1)
+	(direction . ,DOWN)
 	(meta . ((class . Spanner)
 		 (interfaces . (piano-pedal-interface
 				axis-group-interface
@@ -1585,56 +1579,81 @@
     (System
      . (
 	(axes . (0 1))
-	(X-extent . ,Axis_group_interface::width)
-	(Y-extent . ,Axis_group_interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
+	(Y-extent . ,ly:axis-group-interface::height)
 	(meta . ((class . System)
 		 (interfaces . (system-interface
 				axis-group-interface))))))
 
     (SystemStartBrace
      . (
-	(glyph . "brace")
-	(stencil . ,System_start_delimiter::print)
+	(style . brace)
+	(padding . 0.3)
+	(stencil . ,ly:system-start-delimiter::print)
 	(collapse-height . 5.0)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
+	(direction . ,LEFT)
 	(font-encoding . fetaBraces)
 	(Y-extent . #f)
 	(meta . ((class . Spanner)
 		 (interfaces . (system-start-delimiter-interface
+				side-position-interface
 				font-interface))))))
 
+
+    (SystemStartSquare
+     . (
+	(Y-extent . #f)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
+	(direction . ,LEFT)
+	(stencil . ,ly:system-start-delimiter::print)
+	(style . line-bracket)
+	(thickness . 1.0)
+	(meta . ((class . Spanner)
+		 (interfaces . (font-interface
+				side-position-interface
+				system-start-delimiter-interface))))))
     (SystemStartBracket
      . (
 	(Y-extent . #f)
-	(X-offset-callbacks . (,(lambda (g a) -0.8)))
-	(stencil . ,System_start_delimiter::print)
-	(glyph . "bracket")
+	(padding . 0.8)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
+	(direction . ,LEFT)
+	(stencil . ,ly:system-start-delimiter::print)
+	(style . bracket)
 	(collapse-height . 5.0)
 	(thickness . 0.45)
 	(meta . ((class . Spanner)
 		 (interfaces . (font-interface
+				side-position-interface
 				system-start-delimiter-interface))))))
 
     (SystemStartBar
      . (
 	(Y-extent . #f)
-	(glyph . "bar-line")
+	(padding . 0.0)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
+	(direction . ,LEFT)
+	(style . bar-line)
 	(thickness . 1.6)
-	(stencil . ,System_start_delimiter::print)
+	(stencil . ,ly:system-start-delimiter::print)
 	(meta . ((class . Spanner)
-		 (interfaces . (system-start-delimiter-interface))))))
+		 (interfaces . (side-position-interface
+				system-start-delimiter-interface))))))
+
 
     (TabNoteHead
      . (
 
-	(stencil . ,Text_interface::print)
-	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+	(stencil . ,ly:text-interface::print)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(font-size . -2)
 	(stem-attachment . (1.0 . 1.35))
 	(font-series . bold)
 	(meta . ((class . Item)
 		 (interfaces
 		  . (rhythmic-head-interface
-		     font-interface
+		     font-interface rhythmic-grob-interface
 		     note-head-interface
 		     staff-symbol-referencer-interface
 		     text-interface))))))
@@ -1642,15 +1661,15 @@
     (TextScript
      . (
 	(no-spacing-rods . #t)
-	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
-	(direction . -1)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
+	(direction . ,DOWN)
 
 	;; sync with Fingering ?
 	(padding . 0.5)
 	(staff-padding . 0.5)
 
-	(stencil . ,Text_interface::print)
-	(direction . ,Script_interface::calc_direction)
+	(stencil . ,ly:text-interface::print)
+	(direction . ,ly:script-interface::calc-direction)
 
 	(avoid-slur . around)
 	(slur-padding . 0.5)
@@ -1664,13 +1683,15 @@
 
     (TextSpanner
      . (
-	(stencil . ,Text_spanner::print)
+	(stencil . ,ly:text-spanner::print)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(font-shape . italic)
 	(style . dashed-line)
 	(staff-padding . 0.8)
 	(dash-fraction . 0.2)
 	(dash-period . 3.0)
-	(direction . 1)
+	(side-axis . ,Y)
+	(direction . ,UP)
 	(meta . ((class . Spanner)
 		 (interfaces . (text-spanner-interface
 				side-position-interface
@@ -1678,11 +1699,24 @@
 
     (Tie
      . (
-	(control-points . ,Tie::calc_control_points)
-	(direction . ,Tie::calc_direction)
-	(stencil . ,Tie::print)
-	(details . ((ratio . 0.333)
+	(control-points . ,ly:tie::calc-control-points)
+	(avoid-slur . inside)
+	(direction . ,ly:tie::calc-direction)
+	(stencil . ,ly:tie::print)
+	(details . (
+		    ;; for a full list, see tie-helper.cc
+		    (ratio . 0.333)
+		    (center-staff-line-clearance . 0.6)
+		    (tip-staff-line-clearance . 0.45)
+		    (note-head-gap . 0.2)
+		    (stem-gap . 0.35)
 		    (height-limit . 1.0)
+		    (horizontal-distance-penalty-factor . 10)
+		    (tie-tie-collision-distance . 0.45) 
+		    (tie-tie-collision-penalty . 25.0)
+		    (intra-space-threshold . 1.25)
+		    (outer-tie-vertical-distance-symmetry-penalty-factor . 10)
+		    (outer-tie-length-symmetry-penalty-factor . 10)
 		    (between-length-limit . 1.0)))
 	(thickness . 1.0)
 	(meta . ((class . Spanner)
@@ -1691,8 +1725,8 @@
 
     (TieColumn
      . (
-	(positioning-done . ,Tie_column::calc_positioning_done)
-	(before-line-breaking . ,Tie_column::before_line_breaking)
+	(positioning-done . ,ly:tie-column::calc-positioning-done)
+	(before-line-breaking . ,ly:tie-column::before-line-breaking)
 	(X-extent . #f)
 	(Y-extent . #f)
 	(meta . ((class . Spanner)
@@ -1700,7 +1734,7 @@
 
     (TimeSignature
      . (
-	(stencil . ,Time_signature::print)
+	(stencil . ,ly:time-signature::print)
 	(break-align-symbol . time-signature)
 	(break-visibility . ,all-visible)
 	(space-alist . (
@@ -1716,25 +1750,27 @@
 
     (TrillSpanner
      . (
-	(stencil . ,Dynamic_text_spanner::print)
+	(stencil . ,ly: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))
+	(direction . ,UP)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
 	(meta . ((class . Spanner)
 		 (interfaces . (text-spanner-interface
 				side-position-interface
 				font-interface))))))
 
     (TrillPitchAccidental
-     . ((X-offset-callbacks . (,Side_position_interface::aligned_side))
+     . ((X-offset . ,ly:side-position-interface::x-aligned-side)
 	(padding . 0.2)
 	(direction . ,LEFT)
 	(font-size . -4)
-	(stencil . ,Accidental_interface::print)
+	(side-axis . ,X)
+	(stencil . ,ly:accidental-interface::print)
 	(meta . ((class . Item)
 		 (interfaces . (item-interface
 				accidental-interface
@@ -1742,11 +1778,12 @@
 				font-interface))))))
 
     (TrillPitchGroup
-     . ((X-offset-callbacks . (,Side_position_interface::aligned_side))
+     . ((X-offset . ,ly:side-position-interface::x-aligned-side)
 	(axes . (,X))
 	(font-size . -4)
 	(stencil . ,parenthesize-elements)
 	(direction . ,RIGHT)
+	(side-axis . ,X)
 	(padding . 0.3)
 	(meta . ((class . Item)
 		 (interfaces . (side-position-interface
@@ -1758,9 +1795,9 @@
 
     (TrillPitchHead
      . (
-	(stencil . ,Note_head::print)
+	(stencil . ,ly:note-head::print)
 	(duration-log . 2)
-	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(font-size . -4)
 	(meta . ((class . Item)
 		 (interfaces . (item-interface
@@ -1776,26 +1813,37 @@
 	(thickness . 1.6)
 	(edge-height . (0.7 . 0.7))
 	(shorten-pair . (-0.2 . -0.2))
-	(direction  . ,Tuplet_bracket::calc_direction)
-	(positions . ,Tuplet_bracket::calc_positions)
-	(stencil . ,Tuplet_bracket::print)
+	(staff-padding . 0.25)
+	
+	(direction  . ,ly:tuplet-bracket::calc-direction)
+	(positions . ,ly:tuplet-bracket::calc-positions)
+	(connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
+	(control-points . ,ly:tuplet-bracket::calc-control-points)
+	(stencil . ,ly:tuplet-bracket::print)
+	
+	(meta . ((class . Spanner)
+		 (interfaces . (line-interface
+				tuplet-bracket-interface))))))
+
+    (TupletNumber
+     . (
+	(stencil . ,ly:tuplet-number::print)
 	(font-shape . italic)
 	(font-size . -2)
+	(avoid-slur . inside)
 	(meta . ((class . Spanner)
-		 (interfaces . (text-interface
-				line-interface
-				tuplet-bracket-interface
+		 (interfaces . (text-interface tuplet-number-interface
 				font-interface))))))
-
+    
     (UnaCordaPedal
      . (
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 	(font-shape . italic)
 	(no-spacing-rods . #t)
 	(self-alignment-X . 0)
-	(direction . 1)
+	(direction . ,RIGHT)
 	(padding . 0.0)  ;; padding relative to UnaCordaPedalLineSpanner
-	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
 				self-alignment-interface
@@ -1804,12 +1852,13 @@
     (UnaCordaPedalLineSpanner
      . (
 	(axes . (1))
-	(X-extent . ,Axis_group_interface::height)
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(X-extent . ,ly:axis-group-interface::height)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
 	(padding . 1.2)
 	(staff-padding . 1.2)
 	(minimum-space . 1.0)
-	(direction . -1)
+	(direction . ,DOWN)
 	(meta . ((class . Spanner)
 		 (interfaces . (piano-pedal-interface
 				axis-group-interface
@@ -1819,7 +1868,7 @@
      . (
 	(thickness . 0.6)
 	(flexa-width . 2.0)
-	(stencil . ,Vaticana_ligature::print)
+	(stencil . ,ly:vaticana-ligature::print)
 	(meta . ((class . Spanner)
 		 (interfaces . (vaticana-ligature-interface
 				font-interface))))))
@@ -1827,10 +1876,10 @@
     (VerticalAlignment
      . (
 	(axes . (1))
-	(positioning-done . ,Align_interface::calc_positioning_done)
-	(after-line-breaking . ,Align_interface::stretch_after_break)
-	(Y-extent . ,Axis_group_interface::height)
-	(X-extent . ,Axis_group_interface::width)
+	(positioning-done . ,ly:align-interface::calc-positioning-done)
+	(after-line-breaking . ,ly:align-interface::stretch-after-break)
+	(Y-extent . ,ly:axis-group-interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
 	(stacking-dir . -1)
 	(meta . ((class . Spanner)
 		 (interfaces . (align-interface
@@ -1838,42 +1887,27 @@
     (VerticalAxisGroup
      . (
 	(axes . (1))
-	(Y-offset-callbacks . (,Hara_kiri_group_spanner::force_hara_kiri_callback))
+	(Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
 
-	(Y-extent . ,Hara_kiri_group_spanner::y_extent)
-	(X-extent . ,Axis_group_interface::width)
+	(Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
+	(X-extent . ,ly:axis-group-interface::width)
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
+				hara-kiri-group-interface
 				vertically-spaceable-interface))))))
 
-    (VocalName
-     . (
-	(breakable . #t)
-	(Y-offset-callbacks . (,Side_position_interface::aligned_on_support_refpoints))
-	(direction . 0)
-	(space-alist . ((left-edge . (extra-space . 1.0))))
-	(break-align-symbol . instrument-name)
-	(stencil . ,Text_interface::print)
-	(break-align-symbol . clef)
-	(break-visibility . ,begin-of-line-visible)
-	(baseline-skip . 2)
-	(meta . ((class . Item)
-		 (interfaces . (font-interface
-				self-alignment-interface
-				side-position-interface
-				text-interface
-				break-aligned-interface))))))
 
     (VoltaBracket
      . (
-	(stencil . ,Volta_bracket_interface::print)
-	(after-line-breaking . ,Volta_bracket_interface::after_line_breaking)
+	(stencil . ,ly:volta-bracket-interface::print)
+	(after-line-breaking . ,ly:volta-bracket-interface::after-line-breaking)
 	(direction . ,UP)
 	(padding . 1)
 	(font-encoding . fetaNumber)
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-	(thickness . 1.6)  ;;  linethickness
-	(edge-height . (2.0 . 2.0)) ;; staffspace;
+	(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)
 	(meta . ((class . Spanner)
@@ -1893,8 +1927,8 @@
 	(breakable . #t)
 	(X-extent . #f)
 	(Y-extent . #f)
-	(stencil . ,Line_spanner::print)
-	(after-line-breaking . ,Line_spanner::after_line_breaking)
+	(stencil . ,ly:line-spanner::print)
+	(after-line-breaking . ,ly:line-spanner::after-line-breaking)
 	(meta . ((class . Spanner)
 		 (interfaces . (line-spanner-interface
 				line-interface))))