X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fgrob-description.scm;h=c47c7c9d82eb114120c3b2816a1518a898b01f01;hb=0817e0513d1016ff22a633b6fee20ddba2a062f2;hp=c7fd1745b03b582aa2179d0b434733b35b66e827;hpb=9af4ebb47d947aeb8875b5bd1cce9d3a652d4c4d;p=lilypond.git

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index c7fd1745b0..c47c7c9d82 100644
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -1,32 +1,54 @@
+
 ;;;; grob-description.scm -- part of generated backend documentation
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2001  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--20.301  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ; distances are given in stafflinethickness (thicknesses) and
 ; staffspace (distances)
 
+(define default-alteration-alist
+  '(
+    (0 . ((raise . 0.5) (music "accidentals-0")))
+    (-1 . ((raise . 0.5) (music "accidentals--1")))
+    (-2 . ((raise . 0.5) (music "accidentals--2")))
+    (1 . ((raise . 0.5) (music  "accidentals-1")))
+    (2 . ((raise . 0.5) (music "accidentals-2")))
+    ))
+
+
+;;; WARNING: the meta field should be the last one. 
 (define all-grob-descriptions
-  `((Arpeggio . (
+  `(
+    (Accidentals . (
+		(molecule-callback . ,Local_key_item::brew_molecule)
+		(X-offset-callbacks . (,Side_position_interface::aligned_side))
+		(after-line-breaking-callback . ,Local_key_item::after_line_breaking)
+		(direction . -1)
+		(left-padding . 0.2)
+		(right-padding . 0.4)
+		(paren-cautionaries . #t)
+		(meta . ,(grob-description accidentals-interface font-interface side-position-interface))
+	))
+
+    (Arpeggio . (
 	       (X-extent-callback . ,Arpeggio::width_callback)
 	       (Y-extent-callback . #f)	       
 	       (molecule-callback . ,Arpeggio::brew_molecule)
 	       (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
-	       (X-offset-callbacks . (,Side_position::aligned_side))
+	       (X-offset-callbacks . (,Side_position_interface::aligned_side))
 	       (direction . -1)
 	       (staff-position . 0.0)
-	       (meta . ,(grob-description "Arpeggio" arpeggio-interface side-position-interface font-interface))
+	       (meta . ,(grob-description arpeggio-interface side-position-interface font-interface))
 	       ))
 
-    (autoBeamSettings . ,auto-beam-settings)
-
     (BarLine . (
 		(break-align-symbol . Staff_bar)
 		(glyph . "|")
 		(break-glyph-function . ,default-break-barline)
-		(barsize-procedure . ,Bar::get_staff_bar_size)
+		(bar-size-procedure . ,Bar::get_staff_bar_size)
 		(molecule-callback . ,Bar::brew_molecule)	   
 		(visibility-lambda . ,all-visible)
 		(breakable . #t)
@@ -38,7 +60,7 @@
 		(thin-kern . 3.0)
 		(hair-thickness . 1.6)
 		(thick-thickness . 6.0)
-		(meta . ,(grob-description  "BarLine" bar-line-interface font-interface))
+		(meta . ,(grob-description bar-line-interface font-interface))
 	))
 
 	(BarNumber . (
@@ -49,12 +71,21 @@
 		(direction . 1)
                 (font-family . roman)
 		(font-relative-size . -1)
-		(Y-offset-callbacks . (,Side_position::aligned_side))
-		(meta . ,(grob-description "BarNumber"
+		(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+		(meta . ,(grob-description
 					   side-position-interface
 			text-interface  font-interface break-aligned-interface))
 	))
 
+	(BassFigure . (
+		       (molecule-callback . ,Text_item::brew_molecule)
+		       (Y-offset-callbacks . (,Side_position_interface::aligned_on_self))
+		       (direction . 0)
+		       (accidental-alist . ,default-alteration-alist)
+		       (font-family . number)
+		       (font-relative-size . -1)
+		       (meta . ,(grob-description text-interface font-interface ))
+	))
 	(Beam . (
 		 ;; todo: clean this up a bit: the list is getting
 		 ;; rather long.
@@ -69,7 +100,7 @@
 		 (thickness . 0.48) ; in staff-space
 		 (before-line-breaking-callback . ,Beam::before_line_breaking)
 		 (after-line-breaking-callback . ,Beam::after_line_breaking)
-		 (default-neutral-direction . 1)
+		 (neutral-direction . -1)
 		 (dir-function . ,beam-dir-majority)
 		 (height-quants .  ,default-beam-dy-quants)
 		 (vertical-position-quant-function . ,default-beam-y-quants)
@@ -80,7 +111,7 @@
 		 (space-function . ,default-beam-space-function)
 		 (damping . 1)
 		 (auto-knee-gap . 7)
-		 (meta . ,(grob-description "Beam" beam-interface))
+		 (meta . ,(grob-description beam-interface))
 		 ))
 	 
 	(BreakAlignment . (
@@ -88,7 +119,7 @@
 		(stacking-dir . 1)
 		(axes 0)
 		(space-alist . ,default-break-align-space-alist) 
-		(meta . ,(grob-description "BreakAlignment"
+		(meta . ,(grob-description
 			axis-group-interface align-interface
 			)
 		)
@@ -98,7 +129,7 @@
 		(axes  . (0))
 		(X-offset-callbacks . (,Break_align_interface::alignment_callback))
 		
-		(meta . ,(grob-description "BreakAlignGroup" axis-group-interface))
+		(meta . ,(grob-description axis-group-interface))
 	))
 
 	(BreathingSign . (
@@ -107,7 +138,7 @@
 		(molecule-callback . ,Breathing_sign::brew_molecule)
 		(Y-offset-callbacks . (,Breathing_sign::offset_callback))
 		(visibility-lambda . ,begin-of-line-invisible)
-		(meta . ,(grob-description "BreathingSign"  break-aligned-interface))
+		(meta . ,(grob-description  break-aligned-interface))
 	))
 
 	(Clef . (
@@ -118,7 +149,7 @@
 	   (break-align-symbol . Clef_item)
 	   (visibility-lambda . ,begin-of-line-visible)
 	   (Y-offset-callbacks  . (,Staff_symbol_referencer::callback)) 
-	   (meta . ,(grob-description "Clef" clef-interface font-interface break-aligned-interface ))
+	   (meta . ,(grob-description clef-interface font-interface break-aligned-interface ))
 	))
 
 	(ChordName . (
@@ -126,7 +157,7 @@
 		(after-line-breaking-callback . ,Chord_name::after_line_breaking)
 		(chord-name-function . ,default-chord-name-function)
 		(font-family . roman)
-		(meta . ,(grob-description "ChordName"  font-interface text-interface chord-name-interface))
+		(meta . ,(grob-description  font-interface text-interface chord-name-interface))
 	))
 
        (Custos . (
@@ -136,27 +167,17 @@
                (visibility-lambda . ,end-of-line-visible)
 	       (style .  vaticana)
 	       (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
-               (meta . ,(grob-description "Custos" custos-interface staff-symbol-interface break-aligned-interface) )
+               (meta . ,(grob-description custos-interface staff-symbol-referencer-interface break-aligned-interface) )
        ))
 	
-	(Hairpin . (
-		(molecule-callback . ,Hairpin::brew_molecule)
-		(thickness . 1.0)
-		(height . 0.6666)
-
-		(if-text-padding . 1.0)
-		(width-correct . -1.0)
-		
-		(dash-thickness . 1.2)
-		(dash-length . 4.0)
-		(self-alignment-Y . 0)
-		(Y-offset-callbacks . (,Side_position::aligned_on_self))
-		(meta . ,(grob-description "Hairpin" hairpin-interface))
-	))
 
 	(DotColumn . (
-		(axes 0 )
-		(meta . ,(grob-description "DotColumn" dot-column-interface  axis-group-interface))
+		(axes 0)
+		(direction . 1)
+		(X-extent-callback . ,Axis_group_interface::group_extent_callback)
+		
+		(X-offset-callbacks . (,Dot_column::side_position))
+		(meta . ,(grob-description dot-column-interface axis-group-interface))
 	))
 
 	(Dots . (
@@ -164,80 +185,98 @@
 		(dot-count . 1)
 		(staff-position . 0.0)
 		(Y-offset-callbacks  . (,Dots::quantised_position_callback ,Staff_symbol_referencer::callback))
-		(meta . ,(grob-description "Dots"  font-interface dot-interface ))
-	))
+		(meta . ,(grob-description  font-interface dots-interface ))
+	))
+	(DoublePercentRepeat
+	 . ((molecule-callback . ,Percent_repeat_item_interface::double_percent)
+	    (breakable . #t)
+	    (slope . 1.0)
+	    (font-family . music)
+	    (width . 2.0)
+	    (thickness . 0.48)
+	    (break-align-symbol . Staff_bar)
+	    (visibility-lambda . ,begin-of-line-invisible)
+	    (meta . ,(grob-description font-interface percent-repeat-interface))
+	    ))
 	
 	(DynamicText . (
-		(Y-offset-callbacks . (,Side_position::aligned_on_self))
+		(Y-offset-callbacks . (,Side_position_interface::aligned_on_self))
 		(molecule-callback . ,Text_item::brew_molecule)
+(X-offset-callbacks . (,Side_position_interface::aligned_on_self))
+		(self-alignment-X . 0)
+		
+		(no-spacing-rods . #t)
 		(script-priority . 100)
 		(font-series . bold)
 		(font-family . dynamic)
 		(font-shape . italic)
 		(self-alignment-Y . 0)
-		(meta . ,(grob-description "DynamicText" font-interface  text-interface ))
+		(meta . ,(grob-description font-interface text-interface dynamic-interface))
 	))
 	
 	(DynamicLineSpanner . (
 		(axes . ( 1))
 		(padding . 0.6)
 		(minimum-space . 1.2)
-		(meta . ,(grob-description "DynamicLineSpanner" dynamic-interface axis-group-interface side-position-interface))
+		(direction . -1)
+		(meta . ,(grob-description dynamic-interface axis-group-interface side-position-interface))
 	))
 	
 	(LeftEdge . (
 		(break-align-symbol . Left_edge_item)
 		(X-offset-callbacks . (,Break_align_interface::alignment_callback))
 		(breakable . #t)
-		(meta . ,(grob-description "LeftEdge" break-aligned-interface))
+		(meta . ,(grob-description break-aligned-interface))
 	))
 	
 	(Fingering . (
 		(molecule-callback . ,Text_item::brew_molecule)
-		(X-offset-callbacks . (,Side_position::centered_on_parent ,Side_position::aligned_on_self))
+		(X-offset-callbacks . (,Side_position_interface::centered_on_parent ,Side_position_interface::aligned_on_self))
 		(padding . 0.6)
+		(direction . -1)
 		(self-alignment-X . 0)
 		(font-family . number)
 		(font-relative-size . -3)
 		(font-shape . upright)
-		(meta . ,(grob-description "Fingering" finger-interface  font-interface text-script-interface text-interface side-position-interface))
+		(meta . ,(grob-description finger-interface  font-interface text-script-interface text-interface side-position-interface))
 	))
 
-	(GraceAlignment . (
-		(axes . (0))
-		(horizontal-space . 1.2)
-		(padding . 1.0)
-		(before-line-breaking-callback . ,Grace_align_item::before_line_breaking)
-		(meta . ,(grob-description "GraceAlignment" axis-group-interface align-interface grace-alignment-interface))
-	))
 	
 	(HaraKiriVerticalGroup . (
 		(Y-offset-callbacks . (,Hara_kiri_group_spanner::force_hara_kiri_callback))
 		(Y-extent-callback . ,Hara_kiri_group_spanner::y_extent)
 		(axes 1)
-		(meta . ,(grob-description "HaraKiriVerticalGroup" axis-group-interface hara-kiri-group-interface))
+		(meta . ,(grob-description axis-group-interface hara-kiri-group-interface))
 	))
-
-	(LyricHyphen . (
+	(Hairpin . (
+		(molecule-callback . ,Hairpin::brew_molecule)
 		(thickness . 1.0)
-		(height . 0.4)
-		(minimum-length .  0.5) 
-		(molecule-callback . ,Hyphen_spanner::brew_molecule)
-		(Y-extent-callback . ,Grob::point_dimension_callback)
-		(meta . ,(grob-description "LyricHyphen" lyric-hyphen-interface ))
+		(height . 0.6666)
+		(spacing-procedure . ,Spanner::set_spacing_rods)
+		(minimum-length . 2.0)
+		(if-text-padding . 1.0)
+		(width-correct . -1.0)
+		
+		(dash-thickness . 1.2)
+		(dash-length . 4.0)
+		(self-alignment-Y . 0)
+		(Y-offset-callbacks . (,Side_position_interface::aligned_on_self))
+		(meta . ,(grob-description hairpin-interface dynamic-interface))
 	))
 	
 	(InstrumentName . (
 		(breakable . #t)
-		(Y-offset-callbacks . (,Side_position::centered_on_parent
-				       ,Side_position::aligned_on_self))
+		(Y-offset-callbacks . (,Side_position_interface::aligned_on_self
+				       ,Side_position_interface::aligned_on_support_refpoints
+))
+		(direction . 0)
 		(self-alignment-Y . 0)
 		(molecule-callback . ,Text_item::brew_molecule)		
 		(break-align-symbol . Instrument_name)
 		(visibility-lambda . ,begin-of-line-visible)
 		(baseline-skip . 2)
  		(font-family . roman)
-		(meta . ,(grob-description "InstrumentName"  font-interface  text-interface break-aligned-interface))
+		(meta . ,(grob-description  font-interface  text-interface break-aligned-interface))
 	))
 	
 	(KeySignature . (
@@ -245,22 +284,23 @@
 	  (break-align-symbol . Key_item)
 	  (visibility-lambda . ,begin-of-line-visible)
 	  (breakable . #t)
-	  (meta . ,(grob-description "KeySignature" key-signature-interface  font-interface  break-aligned-interface))
+	  (meta . ,(grob-description key-signature-interface  font-interface  break-aligned-interface))
 	))
 	
-	(Accidentals . (
-		(molecule-callback . ,Local_key_item::brew_molecule)
-		(X-offset-callbacks . (,Side_position::aligned_side))
-		(after-line-breaking-callback . ,Local_key_item::after_line_breaking)
-		(direction . -1)
-		(left-padding . 0.2)
-		(right-padding . 0.4)
-		(meta . ,(grob-description "Accidentals"  accidentals-interface font-interface side-position-interface))
+
+	(LyricHyphen . (
+		(thickness . 1.0)
+		(height . 0.4)
+		(minimum-length .  0.5) 
+		(maximum-length .  100)
+		(molecule-callback . ,Hyphen_spanner::brew_molecule)
+		(Y-extent-callback . ,Grob::point_dimension_callback)
+		(meta . ,(grob-description lyric-hyphen-interface ))
 	))
 	
 	(LineOfScore . (
 		(axes . (0 1))
-		(meta . ,(grob-description "LineOfScore"  line-of-score-interface axis-group-interface))
+		(meta . ,(grob-description  line-of-score-interface axis-group-interface))
 	))
 	
 	(LyricExtender . (
@@ -268,67 +308,80 @@
 		(height . 0.8) ; stafflinethickness;
 		(right-trim-amount . 0.5)
 		(Y-extent-callback . ,Grob::point_dimension_callback)
-		(meta . ,(grob-description "LyricExtender"  lyric-extender-interface))
+		(meta . ,(grob-description  lyric-extender-interface))
 	))
 	
 	(LyricText . (
 		(molecule-callback . ,Text_item::brew_molecule)
-		(X-offset-callbacks . (,Side_position::aligned_on_self))
+		(X-offset-callbacks . (,Side_position_interface::aligned_on_self))
 		(self-alignment-X . 0)
 		(non-rhythmic . #t)
 		(word-space . 0.6)
+               (end-alignment . 5)
 		(font-family . roman)
 		(font-shape . upright)
-		(meta . ,(grob-description "LyricText" lyric-syllable-interface text-interface font-interface ))
+		(meta . ,(grob-description lyric-syllable-interface text-interface font-interface ))
 	))
 	
+	(Porrectus . (
+		(style . mensural)
+		(auto-properties . #f)
+		(solid . #f)
+		(porrectus-width . 2.4)
+		(line-thickness . 1.0)
+		(add-stem . #t)
+		(stem-direction . 1)
+		(molecule-callback . ,Porrectus::brew_molecule)
+		(meta . ,(grob-description porrectus-interface))
+	))
+
 	(RehearsalMark . (
 		(molecule-callback . ,Text_item::brew_molecule)
-		(X-offset-callbacks . (,Side_position::aligned_on_self))
+		(X-offset-callbacks . (,Side_position_interface::aligned_on_self))
 		(self-alignment-X . 0)
 
 		(direction . 1)
 		(breakable . #t)
-		(font-family . number)
+		(font-family . roman)
 		(font-shape . upright)
 		(font-relative-size . 1)
 		(visibility-lambda . ,end-of-line-invisible)
 		(padding . 0.8)
-		(meta . ,(grob-description "RehearsalMark"  mark-interface side-position-interface))
+		(meta . ,(grob-description  mark-interface side-position-interface))
 	))
 	
 	(MultiMeasureRest . (
 		(spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
 		(molecule-callback . ,Multi_measure_rest::brew_molecule)
+		(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 		(staff-position . 0)
 		(expand-limit . 10)
 		(padding . 2.0) ; staffspace
 		(minimum-width . 12.5) ; staffspace
 		(font-family . number)
 		(font-relative-size . 1)
-		(meta . ,(grob-description "MultiMeasureRest" multi-measure-rest-interface  font-interface ))
+		(meta . ,(grob-description multi-measure-rest-interface rest-interface font-interface ))
 	))
 	(NoteCollision . (
 		(axes 0 1)
-		(note-width . 1.65)
-		(meta . ,(grob-description "NoteCollision"
+		;; Ugh, should not be hard-coded. 
+		(note-width . 1.321)
+		(meta . ,(grob-description
 		   note-collision-interface axis-group-interface
 		))
 	))
 	
 	(NoteColumn . (
 		(axes . (0 1))
-		(meta . ,(grob-description "NoteColumn"  axis-group-interface note-column-interface))
+		(meta . ,(grob-description axis-group-interface note-column-interface))
 	))
 
 	(NoteHead . (
 		(style . default)
 		(molecule-callback . ,Note_head::brew_molecule)
 		(Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
-		(attachment-angle . ,(* 20/360 3.14159))
-		(meta . ,(grob-description  "NoteHead"
-			rhythmic-head-interface font-interface 
-			note-head-interface ))
+		(stem-attachment-function . ,note-head-style->attachment-coordinates)
+		(meta . ,(grob-description rhythmic-head-interface font-interface note-head-interface))
 	))
 	(Glissando . (
 			 (type . line)
@@ -337,50 +390,46 @@
 			 (X-extent-callback . #f)
 			 (Y-extent-callback . #f)			 
 			 (molecule-callback . ,Line_spanner::brew_molecule)
-			 (meta . ,(grob-description "Glissando"
-						       line-spanner-interface))
+			 (meta . ,(grob-description line-spanner-interface))
 			 ))
-	(FollowThread . (
+	(VoiceFollower . (
 			 (type . line)
 			 (gap . 0.5)
 			 (breakable . #t)
 			 (X-extent-callback . #f)
 			 (Y-extent-callback . #f)			 
 			 (molecule-callback . ,Line_spanner::brew_molecule)
-			 (meta . ,(grob-description "FollowThread"
-						       line-spanner-interface))
+			 (meta . ,(grob-description line-spanner-interface))
 			 ))
 
 	(NoteName . (
 		(molecule-callback . ,Text_item::brew_molecule)
 		(font-family . roman)
-		(meta . ,(grob-description  "NoteName"
-					       note-name-interface font-interface
-					       ))
+		(meta . ,(grob-description note-name-interface font-interface))
 		))
 
 	(OctavateEight . (
 		(self-alignment-X . 0)
 		(text . "8")
 		(visibility-lambda . ,begin-of-line-visible)
-		(X-offset-callbacks . (,Side_position::centered_on_parent ,Side_position::aligned_on_self))
-		(Y-offset-callbacks . (,Side_position::aligned_side))
+		(X-offset-callbacks . (,Side_position_interface::centered_on_parent ,Side_position_interface::aligned_on_self))
+		(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 		(molecule-callback . ,Text_item::brew_molecule)
                 (font-shape . italic)
 		(font-family . roman)
-		(meta . ,(grob-description "OctavateEight" text-interface font-interface ))
+		(meta . ,(grob-description text-interface font-interface ))
 	))
 	
 	(PaperColumn . (
 		(axes 0)
 		(before-grace-spacing-factor . 1.2)
                 (before-musical-spacing-factor . 0.4)
- 		(meta . ,(grob-description "PaperColumn" paper-column-interface axis-group-interface spaceable-element-interface))
+ 		(meta . ,(grob-description paper-column-interface axis-group-interface spaceable-element-interface))
 	))
 	(PhrasingSlur . (
 		 (molecule-callback . ,Slur::brew_molecule)
 		 (thickness . 1.2)		
-		 (spacing-procedure . ,Slur::set_spacing_rods)		
+		 (spacing-procedure . ,Spanner::set_spacing_rods)		
 		 (minimum-length . 1.5)
 		 (after-line-breaking-callback . ,Slur::after_line_breaking)
 		 (extremity-rules . ,default-slur-extremity-rules)
@@ -396,46 +445,68 @@
 		 (attachment . (#f . #f))
 		 (attachment-offset . ((0 . 0) . (0 . 0)))
 		 (slope-limit . 0.8)
-		 (meta . ,(grob-description "PhrasingSlur" slur-interface))
+		 (meta . ,(grob-description slur-interface))
 		 ))
+	
 	(NonMusicalPaperColumn . (
                 (axes 0)
                 (before-musical-spacing-factor . 1.0)
 		(column-space-strength . 2.0)
- 		(meta . ,(grob-description "NonMusicalPaperColumn" paper-column-interface axis-group-interface spaceable-element-interface))
+ 		(meta . ,(grob-description paper-column-interface axis-group-interface spaceable-element-interface))
         ))
+
+	(PercentRepeat . (
+		(spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
+		(molecule-callback . ,Multi_measure_rest::percent)
+		(slope . 1.0)
+		(thickness . 0.48)
+		(minimum-width . 12.5) ; staffspace
+		(font-family . music)
+		(meta . ,(grob-description multi-measure-rest-interface  font-interface percent-repeat-interface))
+	))
+
 	
+	(RepeatSlash . (
+			(molecule-callback . , Percent_repeat_item_interface::beat_slash)
+			(thickness . 0.48)
+			(slope . 1.7)
+			(meta . ,(grob-description percent-repeat-interface))
+			))
 	(Rest . (
 		(after-line-breaking-callback . ,Rest::after_line_breaking)
 		(X-extent-callback . ,Rest::extent_callback)
 		(Y-extent-callback . ,Rest::extent_callback)		
 		(molecule-callback . ,Rest::brew_molecule)
+		(Y-offset-callbacks . (,Staff_symbol_referencer::callback)) 
 		(minimum-beam-collision-distance . 1.5)
-		(meta . ,(grob-description  "Rest"
+		(meta . ,(grob-description  
 			rhythmic-head-interface
+			staff-symbol-referencer-interface
 			rest-interface))
 	))
 	(RestCollision . (
 		(minimum-distance . 0.75)
-		(meta . ,(grob-description "RestCollision" rest-collision-interface ))
+		(meta . ,(grob-description rest-collision-interface ))
 	))
 
 	(Script . (
+		;; don't set direction here: it breaks staccato.
 		(molecule-callback . ,Script::brew_molecule)
-		(X-offset-callbacks . (,Side_position::centered_on_parent))
-		(after-line-breaking-callback . ,Script::after_line_breaking)
-		(meta . ,(grob-description "Script" script-interface side-position-interface font-interface))
+		(padding . 0.29) 
+		(X-offset-callbacks . (,Side_position_interface::centered_on_parent))
+		(before-line-breaking-callback . ,Script::before_line_breaking)
+		(meta . ,(grob-description script-interface side-position-interface font-interface))
 	))
 	
 	(ScriptColumn . (
 		(before-line-breaking-callback . ,Script_column::before_line_breaking)
-		(meta . ,(grob-description "ScriptColumn" script-column-interface))
+		(meta . ,(grob-description script-column-interface))
 	))
 	
 	(Slur . (
 		 (molecule-callback . ,Slur::brew_molecule)
 		 (thickness . 1.2)		
-		 (spacing-procedure . ,Slur::set_spacing_rods)		
+		 (spacing-procedure . ,Spanner::set_spacing_rods)		
 		 (minimum-length . 1.5)
 		 (after-line-breaking-callback . ,Slur::after_line_breaking)
 		 (extremity-rules . ,default-slur-extremity-rules)
@@ -451,26 +522,27 @@
 		 (attachment . (#f . #f))
 		 (attachment-offset . ((0 . 0) . (0 . 0)))
 		 (slope-limit . 0.8)
-		 (meta . ,(grob-description "Slur" slur-interface))
+		 (meta . ,(grob-description slur-interface))
 		 ))
 	      
 	(SpacingSpanner . (
-		(spacing-procedure . ,Spacing_spanner::set_springs)
+		(spacing-procedure . ,New_spacing_spanner::set_springs)
 		(stem-spacing-correction . 0.5)
+		(grace-space-factor . 0.8)
+
+		;; TODO: change naming -- unintuitive
 		(arithmetic-basicspace . 2.0)
 		(arithmetic-multiplier . ,(* 0.9 1.32))
 		;; assume that notes at least this long are present.
 		(maximum-duration-for-spacing . ,(make-moment 1 8))
-		(meta . ,(grob-description "SpacingSpanner"  spacing-spanner-interface))
+		(meta . ,(grob-description  spacing-spanner-interface))
 	))
 	(SpanBar . (
 		(break-align-symbol . Staff_bar)
-		(barsize-procedure . ,Span_bar::get_bar_size) 
-		(molecule-callback . ,Bar::brew_molecule)
+		(bar-size-procedure . ,Span_bar::get_bar_size) 
+		(molecule-callback . ,Span_bar::brew_molecule)
 		(visibility-lambda . ,begin-of-line-invisible)
 		(X-extent-callback . ,Span_bar::width_callback)
-		(Y-offset-callbacks . (,Span_bar::center_on_spanned_callback))
-		
 		(breakable . #t)
 		(glyph . "|")
 		(before-line-breaking-callback . ,Span_bar::before_line_breaking)
@@ -483,7 +555,7 @@
 		(thin-kern . 3.0)
 		(hair-thickness . 1.6)
 		(thick-thickness . 6.0)
-		(meta . ,(grob-description "SpanBar" span-bar-interface bar-line-interface ))
+		(meta . ,(grob-description span-bar-interface bar-line-interface ))
 	))
 
 	(StanzaNumber . (
@@ -492,7 +564,7 @@
 		(break-align-symbol . Clef_item)
 		(visibility-lambda . ,begin-of-line-visible)
 		(font-family . roman)
-		(meta . ,(grob-description "StanzaNumber" break-aligned-interface text-interface font-interface))
+		(meta . ,(grob-description break-aligned-interface text-interface font-interface))
 	))
 
 	(StaffSymbol . (
@@ -500,18 +572,19 @@
 		(staff-space . 1.0)
 		(line-count . 5)
 		(layer . 0)
-		(meta . ,(grob-description "StaffSymbol" staff-symbol-interface ))
+		(meta . ,(grob-description staff-symbol-interface ))
 	))
 	(SostenutoPedal . (
 		(molecule-callback . ,Text_item::brew_molecule)
-		(X-offset-callbacks . (,Side_position::aligned_on_self))
+		(direction . -1)
+		(X-offset-callbacks . (,Side_position_interface::aligned_on_self))
 		(Y-offset-callbacks .
-		 (,Side_position::aligned_side
-		  ,Side_position::centered_on_parent))
+		 (,Side_position_interface::aligned_side
+		  ,Side_position_interface::centered_on_parent))
 		(no-spacing-rods . #t)
                 (font-shape . italic)
 		(self-alignment-X . 0)
-		(meta . ,(grob-description "SostenutoPedal" text-interface  font-interface))
+		(meta . ,(grob-description text-interface  font-interface))
 	))
 
 	(Stem . (
@@ -528,11 +601,11 @@
 		(lengths . (3.5 3.5 3.5 4.5 5.0))
 		(stem-shorten . (0.5))
 		; if stem is on middle line, choose this direction.
-		(default-neutral-direction . 1)
+		(neutral-direction . -1)
 		(X-offset-callbacks . (,Stem::off_callback))
 		(X-extent-callback . ,Stem::dim_callback)	
 		(Y-extent-callback . ,Stem::height)
-		(meta . ,(grob-description  "Stem" stem-interface  font-interface))
+		(meta . ,(grob-description stem-interface  font-interface))
 	))
 
 	(StemTremolo . (
@@ -543,65 +616,72 @@
 		(beam-width . 2.0) ; staff-space
 		(beam-thickness . 0.42) ; staff-space
 		(beam-space-function . ,default-beam-space-function)
-		(meta . ,(grob-description "StemTremolo" stem-tremolo-interface ))
+		(meta . ,(grob-description stem-tremolo-interface ))
 	))
 
 	(SeparationItem . (
-		(meta . ,(grob-description "SeparationItem" separation-item-interface ))
+		(meta . ,(grob-description separation-item-interface ))
 	))
 	(SeparatingGroupSpanner . (
 		(spacing-procedure . ,Separating_group_spanner::set_spacing_rods)
-		(meta . ,(grob-description "SeparatingGroupSpanner" separation-spanner-interface))
+		(meta . ,(grob-description separation-spanner-interface))
 	))
 
 	(SustainPedal . (
 		(no-spacing-rods . #t)
 		(molecule-callback . ,Sustain_pedal::brew_molecule)
 		(self-alignment-X . 0)
-		(X-offset-callbacks . (,Side_position::aligned_on_self))
+		(direction . -1)
+		(X-offset-callbacks . (,Side_position_interface::aligned_on_self))
 		(Y-offset-callbacks .
-				    (,Side_position::aligned_side
-				     ,Side_position::centered_on_parent))
+				    (,Side_position_interface::aligned_side
+				     ,Side_position_interface::centered_on_parent))
 
-		(meta . ,(grob-description "SustainPedal" sustain-pedal-interface side-position-interface font-interface))
+		(meta . ,(grob-description sustain-pedal-interface side-position-interface font-interface))
 	))
 
-	; should split in 3
-	(SystemStartDelimiter . (
+	;; TODO: should split in 3
+	(SystemStartBrace . (
+		(glyph . brace)
 		(molecule-callback . ,System_start_delimiter::brew_molecule)
-		(after-line-breaking-callback . ,System_start_delimiter::after_line_breaking)
-		;; ugh, in practice, brace has height of 4.1 staff-spaces
-		(brace-collapse-height . 4.1)
-		(bracket-collapse-height . 1)
-		(thickness . 1.6)
+		(collapse-height . 5.0)
+		(font-family . braces)
+		(Y-extent-callback . #f)
+		(meta . ,(grob-description system-start-delimiter-interface font-interface))
+		))
+	(SystemStartBracket . (
+		(Y-extent-callback . #f)
+		(molecule-callback . ,System_start_delimiter::brew_molecule)
+		(glyph . bracket)
 		(arch-height . 1.5)
 		(arch-angle . 50.0)
 		(arch-thick . 0.25)
-		(glyph . bar-line)
 		(arch-width . 1.5)
-		(bracket-thick . 0.25)
+		(bracket-collapse-height . 1)
+		(thickness . 0.25)
+		(meta . ,(grob-description system-start-delimiter-interface ))
+	))
+	(SystemStartBar . (
 		(Y-extent-callback . #f)
-		(font-family . braces)
-		;; if you want to set point-size, you cannot set
-		;; relative-size, as no font will be found for other
-		;; sheets than 20
-		;;(font-point-size . 20)
-		;;(font-relative-size . #f)
-		(meta . ,(grob-description "SystemStartDelimiter" system-start-delimiter-interface font-interface))
-		))
+		(molecule-callback . ,System_start_delimiter::brew_molecule)
+		(glyph . bar-line)
+		(thickness . 1.6)
+		(after-line-breaking-callback . ,System_start_delimiter::after_line_breaking)
+		(meta . ,(grob-description system-start-delimiter-interface ))
+	))
 
 	(TextScript . (
 		(molecule-callback . ,Text_item::brew_molecule)
 		(no-spacing-rods . #t)
+		(direction . -1)
 		(padding . 0.5)
+;; todo: add X self alignment?
 		(baseline-skip . 2)
 		(font-family . roman)
-		(font-shape . italic)
-		(meta . ,(grob-description "TextScript" text-script-interface text-interface side-position-interface font-interface ))
+		(meta . ,(grob-description text-script-interface text-interface side-position-interface font-interface ))
 	))
 	(TextSpanner . (
 		(molecule-callback . ,Text_spanner::brew_molecule)
-                (font-shape . italic)
 		(font-family . roman)
 		(type . "line")
 		
@@ -610,22 +690,23 @@
 		(width-correct . -1)
 		
 		(direction . 1)
-		(meta . ,(grob-description "TextSpanner" text-spanner-interface  font-interface))		
+		(meta . ,(grob-description text-spanner-interface  font-interface))		
 	))
 	(Tie . (
 		(molecule-callback . ,Tie::brew_molecule)
-		(spacing-procedure . ,Tie::set_spacing_rods)
+		(spacing-procedure . ,Spanner::set_spacing_rods)
 		(staffline-clearance . 0.35)
 		(details . ((ratio . 0.333) (height-limit . 1.0)))
 		(thickness . 1.2)
 		(x-gap . 0.2)
+		(y-offset . 0.6)
 		(minimum-length  . 2.5)
-		(meta . ,(grob-description "Tie" tie-interface ))
+		(meta . ,(grob-description tie-interface ))
 	))
 
 	(TieColumn . (
 		(after-line-breaking-callback . ,Tie_column::after_line_breaking)
-		(meta . ,(grob-description "TieColumn" tie-column-interface ))
+		(meta . ,(grob-description tie-column-interface ))
 	))
 
 	(TimeSignature . (
@@ -633,33 +714,35 @@
 		(break-align-symbol . Time_signature)
 		(visibility-lambda . ,all-visible)
 		(breakable . #t)
+		(style . C)
                 (font-family . number)
-                (meta . ,(grob-description "TimeSignature" time-signature-interface  font-interface))
+                (meta . ,(grob-description time-signature-interface  font-interface))
 	))
 
 	(TupletBracket . (
 		(number-gap . 2.0)   
-		(delta-y . 0)
 		(thick . 1.0)
 		(after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking)
 		(molecule-callback . ,Tuplet_bracket::brew_molecule)
 		(font-family . roman)
 		(font-shape . italic)
 		(font-relative-size . -1)
-		(meta .  ,(grob-description "TupletBracket" text-interface
+		(meta .  ,(grob-description text-interface
 			   tuplet-bracket-interface font-interface))
 	))
 
-	(UnaChordaPedal . (
+	(UnaCordaPedal . (
 		(molecule-callback . ,Text_item::brew_molecule)
+                (font-family . roman)
                 (font-shape . italic)
 		(no-spacing-rods . #t)
 		(self-alignment-X . 0)
-		(X-offset-callbacks . (,Side_position::aligned_on_self))
+		(direction . -1)
+		(X-offset-callbacks . (,Side_position_interface::aligned_on_self))
 		(Y-offset-callbacks .
-		 (,Side_position::aligned_side
-		  ,Side_position::centered_on_parent))
-		(meta . ,(grob-description "UnaChordaPedal" text-interface font-interface))
+		 (,Side_position_interface::aligned_side
+		  ,Side_position_interface::centered_on_parent))
+		(meta . ,(grob-description text-interface font-interface))
 	))
 
 	(VoltaBracket . (
@@ -668,30 +751,44 @@
 		(direction . 1)
 		(padding . 1)
                 (font-style . volta)
-		(Y-offset-callbacks . (,Side_position::aligned_side))
+		(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 		(thickness . 1.6)  ;  stafflinethickness
 		(height . 2.0) ; staffspace;
 		(minimum-space . 5)
  		(font-family . number)
  		(font-relative-size . -2)
-		(meta . ,(grob-description "VoltaBracket" volta-bracket-interface side-position-interface font-interface))
+		(meta . ,(grob-description volta-bracket-interface side-position-interface font-interface))
 	))
-
 	(VerticalAlignment . (
 		(axes 1)
 		(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
 		(X-extent-callback . #f)
+
 		(stacking-dir . -1)
-		(meta . ,(grob-description "VerticalAlignment" align-interface axis-group-interface))
+		(meta . ,(grob-description align-interface axis-group-interface))
 	))
-
 	(VerticalAxisGroup . (
 		(axes 1)
-		(meta . ,(grob-description "VerticalAxisGroup" axis-group-interface))
+		(meta . ,(grob-description axis-group-interface))
 	))
 ))
 
 
 
+
+(define (completize-grob-entry x)
+  "transplant assoc key into 'name entry of 'meta of X
+"
+  (let* ((name-sym  (car x))
+	 (entry (cdr x))
+	 (metaentry (cdr (assoc 'meta entry)))
+	 (new-metaentry (assoc-set! metaentry 'name name-sym))
+	 )
+
+    (cons name-sym (assoc-set! entry 'meta new-metaentry))
+    ))
+
+(set! all-grob-descriptions (map completize-grob-entry all-grob-descriptions))
+
 ;  (display  (map pair? all-grob-descriptions))