X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fgrob-description.scm;h=4ee94ca8516230b3d64f939cc5b50d999a224d79;hb=4995fea559cd5399b4f462de546a15195d76f4c3;hp=ea40dd0cf78df9a5af9f514b2daf545f86ddf3c5;hpb=4eb6f42fc6ca20d65c788a73eb78dfcc22ea0453;p=lilypond.git

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index ea40dd0cf7..4ee94ca851 100644
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -37,7 +37,7 @@
 		(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)
@@ -80,7 +80,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)
@@ -152,7 +152,11 @@
 	
 
 	(DotColumn . (
-		(axes 0 )
+		(axes 0)
+		(direction . 1)
+		(X-extent-callback . ,Axis_group_interface::group_extent_callback)
+		
+		(X-offset-callbacks . (,Dot_column::side_position))
 		(meta . ,(grob-description "DotColumn" dot-column-interface  axis-group-interface))
 	))
 
@@ -275,6 +279,7 @@
 		(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 "LyricHyphen" lyric-hyphen-interface ))
@@ -311,7 +316,7 @@
 
 		(direction . 1)
 		(breakable . #t)
-		(font-family . number)
+		(font-family . roman)
 		(font-shape . upright)
 		(font-relative-size . 1)
 		(visibility-lambda . ,end-of-line-invisible)
@@ -333,7 +338,8 @@
 	))
 	(NoteCollision . (
 		(axes 0 1)
-		(note-width . 1.65)
+		;; Ugh, should not be hard-coded. 
+		(note-width . 1.321)
 		(meta . ,(grob-description "NoteCollision"
 		   note-collision-interface axis-group-interface
 		))
@@ -467,6 +473,7 @@
 	(Script . (
 		;; don't set direction here: it breaks staccato.
 		(molecule-callback . ,Script::brew_molecule)
+		(padding . 0.3) 
 		(X-offset-callbacks . (,Side_position_interface::centered_on_parent))
 		(before-line-breaking-callback . ,Script::before_line_breaking)
 		(meta . ,(grob-description "Script" script-interface side-position-interface font-interface))
@@ -510,12 +517,10 @@
 	))
 	(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)
@@ -574,7 +579,7 @@
 		(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)
@@ -666,6 +671,7 @@
 		(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 ))
 	))
@@ -700,6 +706,7 @@
 
 	(UnaCordaPedal . (
 		(molecule-callback . ,Text_item::brew_molecule)
+                (font-family . roman)
                 (font-shape . italic)
 		(no-spacing-rods . #t)
 		(self-alignment-X . 0)
@@ -730,6 +737,7 @@
 		(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))
 	))