X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=e72ee69694fdfda54eab19edc13363622d590a72;hb=a3d4c69504aaaa101150e15db1459aa976af7597;hp=875faf5b5a5f298de38ee09ecb33bdee6e7b7de2;hpb=366ac5a9c6dfb5a32111c8dd6ba40e49334402c3;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 875faf5b5a..e72ee69694 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,10 +2,10 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  1998--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c)  1998--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
-;;;; distances are given in stafflinethickness (thicknesses) and
+;;;; distances are given in linethickness (thicknesses) and
 ;;;; staffspace (distances)
 
 ;;;; WARNING: the meta field should be the last one.
@@ -16,11 +16,12 @@
   `(
     (Accidental
      . (
-	(molecule-callback . ,Accidental_interface::brew_molecule)
+	(print-function . ,Accidental_interface::print)
 	(font-family . music)
 	(cautionary-style . parentheses)
 	(after-line-breaking-callback . ,Accidental_interface::after_line_breaking)		(meta . ((interfaces . (item-interface accidental-interface font-interface))))
 	))
+    
     (AccidentalPlacement
      . (
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
@@ -28,7 +29,7 @@
 
 	;; this is quite small, but it is very ugly to have
 	;; accs closer to the previous note than to the next one.
-	(right-padding . 0.15)
+	(right-padding . 0.25)
 	(meta . ((interfaces . (item-interface accidental-placement-interface))))
 	))
 
@@ -36,17 +37,17 @@
      . (
        (breakable . #t)
        (break-align-symbol . ambitus)
-       (molecule-callback . ,Ambitus::brew_molecule)
+       (print-function . ,Ambitus::print)
        (font-family . music)
        (note-head-style . "noteheads-2")
-       (visibility-lambda . ,begin-of-line-visible)
+       (break-visibility . ,begin-of-line-visible)
        (join-heads . #t)
        (space-alist . (
 		       (clef . (extra-space . 0.0))
 		       (key-signature . (extra-space . 0.0))
 		       (staff-bar . (extra-space . 0.0))
 		       (time-signature . (extra-space . 0.0)) 
-		       (first-note . (extra-space . 0.0))
+		       (first-note . (fixed-space . 0.0))
 		       ))
        (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface break-aligned-interface item-interface  font-interface))))
        ))
@@ -55,7 +56,7 @@
      . (
 	(X-extent-callback . ,Arpeggio::width_callback)
 	(Y-extent-callback . #f)	       
-	(molecule-callback . ,Arpeggio::brew_molecule)
+	(print-function . ,Arpeggio::print)
 	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(X-offset-callbacks . (,Side_position_interface::aligned_side))
 	(direction . -1)
@@ -69,7 +70,7 @@
 	(glyph . "|")
 	(break-glyph-function . ,default-break-barline)
 	(bar-size-procedure . ,Bar_line::get_staff_bar_size)
-	(molecule-callback . ,Bar_line::brew_molecule)	   
+	(print-function . ,Bar_line::print)	   
 	(break-visibility . ,all-visible)
 	(breakable . #t)
 	(before-line-breaking-callback . ,Bar_line::before_line_breaking)
@@ -78,7 +79,8 @@
 			(custos . (minimum-space . 2.0))
 			(clef .   (minimum-space . 1.0))
 			(key-signature . (extra-space . 1.0))
-			(first-note . (extra-space . 1.3))
+			(first-note . (fixed-space . 1.3))
+			(next-note . (semi-fixed-space . 1.3))
 			(right-edge . (extra-space . 0.0))
 			))
 
@@ -95,7 +97,7 @@
     
     (BarNumber
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(breakable . #t)
 	(break-visibility . ,begin-of-line-visible)
 	(padding . 1.0)
@@ -105,6 +107,8 @@
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(self-alignment-X . 1)
+
+	;; hmm. why did we do this: ? 
 	(extra-offset . (1.3 . 0))
 	(meta .
 	      ((interfaces . (side-position-interface
@@ -116,7 +120,7 @@
 
     (BassFigure
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(direction . 1)
 	(font-family . number)
@@ -124,7 +128,6 @@
 	;; We must do this, other BFs in
 	;; paper16 become too small.
 	(font-size . -4)
-	(font-magnification . 0.8) 
 	(kern . 0.2)
 	(meta . ((interfaces . (text-interface 							rhythmic-grob-interface
 												bass-figure-interface item-interface
@@ -134,7 +137,7 @@
      . (
 	;; todo: clean this up a bit: the list is getting
 	;; rather long.
-	(molecule-callback . ,Beam::brew_molecule)
+	(print-function . ,Beam::print)
 	(concaveness-gap . 2.0)
 	(concaveness-threshold . 0.08)
 	(gap . 0.8)
@@ -169,14 +172,13 @@
 	;; sadly possibly breaking patterns with high order beams.
 	(beamed-stem-shorten . (1.0 0.5 0.25))
 	
-	(outer-stem-length-limit . 0.2)
 	(slope-limit . 0.2)
 	(flag-width-function . ,beam-flag-width-function)
 	(damping . 1)
 	(auto-knee-gap . 5.5)
 
 	;; only for debugging.
-;	(font-name . "cmr10")
+	(font-family . roman)
 	
 	(space-function . ,Beam::space_function)
 	(meta . ((interfaces . (staff-symbol-referencer-interface beam-interface spanner-interface))))
@@ -209,10 +211,10 @@
 			(key-signature . (minimum-space . 1.5))
 			(staff-bar . (minimum-space . 1.5))
 			(clef . (minimum-space . 2.0))
-			(first-note . (minimum-space . 1.0))
+			(first-note . (fixed-space . 1.0)) ;huh? 
 			(right-edge . (extra-space . 0.1))
 			))
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(text . ,(make-musicglyph-markup "scripts-rcomma"))
 	(Y-offset-callbacks . (,Breathing_sign::offset_callback))
 	(break-visibility . ,begin-of-line-invisible)
@@ -221,17 +223,17 @@
 
     (Clef
      . (
-	(molecule-callback . ,Clef::brew_molecule)
+	(print-function . ,Clef::print)
 	(before-line-breaking-callback . ,Clef::before_line_breaking)
 	(breakable . #t)
 	(font-family . music)	   
 	(break-align-symbol . clef)
 	(break-visibility . ,begin-of-line-visible)
 	(space-alist . ((ambitus . (extra-space . 2.0))
-			(staff-bar . (minimum-space .  3.7))
+			(staff-bar . (extra-space . 0.7))
 			(key-signature . (minimum-space . 4.0))
 			(time-signature . (minimum-space . 4.2))
-			(first-note . (minimum-space . 5.0))
+			(first-note . (minimum-fixed-space . 5.0))
 			(next-note . (extra-space . 0.5))
 			(right-edge . (extra-space . 0.5))
 			))
@@ -241,13 +243,13 @@
     
     (ClusterSpannerBeacon
      . (
-	(molecule-callback . #f)
+	(print-function . #f)
 	(meta . ((interfaces . (cluster-beacon-interface item-interface))))
 	))
     
     (ClusterSpanner
      . (
-	(molecule-callback . ,Cluster::brew_molecule)
+	(print-function . ,Cluster::print)
 	(spacing-procedure . ,Spanner::set_spacing_rods)		
 	(minimum-length . 0.0)
 	(padding . 0.25)
@@ -257,10 +259,11 @@
 
     (ChordName
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(after-line-breaking-callback . ,Chord_name::after_line_breaking)
 	(word-space . 0.0)
 	(font-family . sans)
+	(font-size . 1.5)
 	(meta . ((interfaces . (font-interface 							rhythmic-grob-interface
 												text-interface chord-name-interface item-interface ))))
 	))
@@ -269,7 +272,7 @@
      . (
 	(break-align-symbol . custos)
 	(breakable . #t)
-	(molecule-callback . ,Custos::brew_molecule)
+	(print-function . ,Custos::print)
 	(break-visibility . ,end-of-line-visible)
 	(style . vaticana)
 	(neutral-position . 0)
@@ -277,7 +280,7 @@
 	(adjust-if-on-staffline . #t)
 	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(space-alist . (
-			(first-note . (minimum-space . 0.0))
+			(first-note . (minimum-fixed-space . 0.0))
 			(right-edge . (extra-space . 0.1))
 			))
 	(meta . ((interfaces
@@ -290,7 +293,7 @@
     (DotColumn
      . (
 	(axes . (0))
-	(direction . 1)
+	(direction . ,RIGHT)
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(X-offset-callbacks . (,Dot_column::side_position))
 	(meta . ((interfaces . (dot-column-interface axis-group-interface item-interface ))))
@@ -298,15 +301,14 @@
 
     (Dots
      . (
-	(molecule-callback . ,Dots::brew_molecule)
+	(print-function . ,Dots::print)
 	(dot-count . 1)
-	(Y-offset-callbacks  . (,Dots::quantised_position_callback ,Staff_symbol_referencer::callback))
 	(meta . ((interfaces . (font-interface staff-symbol-referencer-interface dots-interface item-interface ))))
 	))
 
     (DoublePercentRepeat .
 			 (
-			  (molecule-callback . ,Percent_repeat_item_interface::double_percent)
+			  (print-function . ,Percent_repeat_item_interface::double_percent)
 			  (breakable . #t)
 			  (slope . 1.0)
 			  (font-family . music)
@@ -322,7 +324,7 @@
     (DynamicText
      . (
 	(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
 			       ,Self_alignment_interface::centered_on_parent))
 	(self-alignment-X . 0)
@@ -332,7 +334,7 @@
 	(font-family . dynamic)
 	(font-shape . italic)
 	(self-alignment-Y . 0)
-	(meta . ((interfaces . (font-interface text-interface self-alignment-interface  dynamic-interface script-interface item-interface ))))
+	(meta . ((interfaces . (font-interface text-interface self-alignment-interface  dynamic-interface script-interface item-interface))))
 	))
 
     (DynamicLineSpanner
@@ -340,6 +342,7 @@
 	(axes . (1))
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)	
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(staff-padding . 0.1)
 	(padding . 0.6)
 	(minimum-space . 1.2)
 	(direction . -1)
@@ -349,7 +352,7 @@
     (LeftEdge
      . (
 	(break-align-symbol . left-edge)
-	(X-extent-callback . ,Grob::point_dimension_callback)
+	(X-extent .  (0 . 0))
 	(breakable . #t)
 	(space-alist . (
 			(custos . (extra-space . 0.0))
@@ -358,7 +361,7 @@
 			(staff-bar . (extra-space . 0.0))
 			(breathing-sign . (minimum-space  . 0.0))
 			(clef . (extra-space . 0.85))
-			(first-note . (extra-space . 1.0))
+			(first-note . (fixed-space . 1.0))
 			(right-edge . (extra-space . 0.0))
 			(key-signature . (extra-space . 0.0))
 			))
@@ -367,13 +370,14 @@
 
     (Fingering
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(padding . 0.6)
+	(staff-padding . 0.6)
 	(self-alignment-X . 0)
 	(self-alignment-Y . 0)
 	(script-priority . 100)
 	(font-family . number)
-	(font-size . -4)
+	(font-size . -5) 		; don't overlap when next to heads.
 	(font-shape . upright)
 	(meta . ((interfaces . (finger-interface font-interface text-script-interface text-interface side-position-interface self-alignment-interface item-interface ))))
 	))
@@ -390,25 +394,21 @@
 
     (Hairpin
      . (
-	(molecule-callback . ,Hairpin::brew_molecule)
+	(print-function . ,Hairpin::print)
 	(thickness . 1.0)
 	(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 . (,Self_alignment_interface::aligned_on_self))
-	(meta . ((interfaces . (hairpin-interface self-alignment-interface dynamic-interface spanner-interface))))
+	(meta . ((interfaces . (hairpin-interface line-interface self-alignment-interface dynamic-interface spanner-interface))))
 	))
 
     (HorizontalBracket
      . (
 	(thickness . 1.0)
-	(molecule-callback . ,Horizontal_bracket::brew_molecule)
+	(print-function . ,Horizontal_bracket::print)
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(padding . 0.2)
 	(direction . -1)
@@ -427,22 +427,40 @@
 			))
 
 	(self-alignment-Y . 0)
-	(molecule-callback . ,Text_item::brew_molecule)		
+	(print-function . ,Text_item::print)		
 	(break-align-symbol . instrument-name)
 	(break-visibility . ,begin-of-line-visible)
 	(baseline-skip . 2)
 	(font-family . roman)
 	(meta . ((interfaces . (font-interface self-alignment-interface side-position-interface text-interface break-aligned-interface item-interface ))))
 	))
+    
+    (VocalName
+     . (
+	(breakable . #t)
+	(Y-offset-callbacks . (,Side_position_interface::aligned_on_support_refpoints))
+	(direction . 0)
+	(space-alist . ((left-edge . (extra-space . 1.0))
+			))
+	(print-function . ,Text_item::print)		
+	(break-align-symbol . clef)
+	(break-visibility . ,begin-of-line-visible)
+	(baseline-skip . 2)
+	(font-family . roman)
+	(meta . ((interfaces . (font-interface
+				self-alignment-interface
+				side-position-interface text-interface
+				break-aligned-interface item-interface ))))
+	))
 
     (KeySignature
      . (
-	(molecule-callback . ,Key_signature_interface::brew_molecule)
+	(print-function . ,Key_signature_interface::print)
 	(space-alist . (
 			(time-signature . (extra-space . 1.25))
 			(staff-bar .  (extra-space . 1.1))
 			(right-edge . (extra-space . 0.5))
-			(first-note . (extra-space . 2.5))
+			(first-note . (fixed-space . 2.5))
 			))
 	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(break-align-symbol . key-signature)
@@ -453,7 +471,7 @@
 
     (LigatureBracket
      . (
-	(ligature-primitive-callback . ,Note_head::brew_molecule)
+	(ligature-primitive-callback . ,Note_head::print)
 	(direction . 1)
 	(gap . 0.0)
 	(padding . 2.0)
@@ -462,42 +480,42 @@
 	(shorten-pair . (-0.2 . -0.2))
 	(before-line-breaking-callback . ,Tuplet_bracket::before_line_breaking)
 	(after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking)
-	(molecule-callback . ,Tuplet_bracket::brew_molecule)
+	(print-function . ,Tuplet_bracket::print)
 	(meta .  ((interfaces . (tuplet-bracket-interface spanner-interface))))
 	))
 
     (LyricHyphen
      . (
-	(thickness . 1.0)
-	(height . 0.4)
-	(minimum-length .  0.5) 
-	(maximum-length .  100)
+	(thickness . 1.3)
+	(height . 0.42)
+	(dash-period . 10.0)
+	(length . 0.66)
 	(spacing-procedure . ,Hyphen_spanner::set_spacing_rods)
-	(molecule-callback . ,Hyphen_spanner::brew_molecule)
-	(Y-extent-callback . ,Grob::point_dimension_callback)
-	(meta . ((interfaces . (lyric-hyphen-interface spanner-interface))))
+	(print-function . ,Hyphen_spanner::print)
+	(Y-extent  . (0 . 0))
+	(meta . ((interfaces . (lyric-interface lyric-hyphen-interface
+						spanner-interface))))
 	))
 
     (LyricExtender
      . (
-	(molecule-callback . ,Lyric_extender::brew_molecule)
-	(height . 0.8) ; stafflinethickness;
-	(right-trim-amount . 0.5)
-	(Y-extent-callback . ,Grob::point_dimension_callback)
-	(meta . ((interfaces . (lyric-extender-interface spanner-interface))))
+	(print-function . ,Lyric_extender::print)
+	(thickness . 0.8) ; linethickness
+	(minimum-length . 1.5)
+	(Y-extent . (0 . 0))
+	(meta . ((interfaces . (lyric-interface
+				lyric-extender-interface spanner-interface))))
 	))
 
     (LyricText
-     . ((molecule-callback . ,Text_item::brew_molecule)
+     . ((print-function . ,Text_item::print)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_parent))
 	(self-alignment-X . 0)
 	(word-space . 0.6)
-	(ignore-length-mismatch . #f)
-	(begin-alignment . 4)
-	(end-alignment . 2)
 	(font-family . roman)
+	(font-series . bold-narrow)
 	(font-shape . upright)
-	
+	(font-size . 1.0)
 	(meta . ((interfaces . (rhythmic-grob-interface lyric-syllable-interface self-alignment-interface text-interface font-interface item-interface ))))
 	))
 
@@ -506,15 +524,16 @@
 	(thickness . 1.4)
 	(flexa-width . 2.0)
 	(ligature-primitive-callback . ,Mensural_ligature::brew_ligature_primitive)
-	(molecule-callback . ,Mensural_ligature::brew_molecule)
+	(print-function . ,Mensural_ligature::print)
 	(meta . ((interfaces . (mensural-ligature-interface font-interface))))
 	))
 
     (RehearsalMark
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
-	(Y-offset-callbacks . (,Side_position_interface::aligned_side))	
+	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(after-line-breaking-callback . ,shift-right-at-line-begin)
 	(self-alignment-X . 0)
 	(direction . 1)
 	(breakable . #t)
@@ -523,11 +542,11 @@
 	(baseline-skip . 2)
 	(break-visibility . ,end-of-line-invisible)
 	(padding . 0.8)
-	(meta . ((interfaces . (break-aligned-interface text-interface side-position-interface font-interface mark-interface self-alignment-interface item-interface ))))
+	(meta . ((interfaces . (text-interface side-position-interface font-interface mark-interface self-alignment-interface item-interface ))))
 	))
      (MetronomeMark
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))	
 	(direction . 1)
 	(breakable . #t)
@@ -538,9 +557,8 @@
 	))
     (MeasureGrouping
      . (
-	(Y-offset-callbacks . (,Side_position_interface::out_of_staff 
-			       ,Side_position_interface::aligned_side))
-	(molecule-callback . ,Measure_grouping::brew_molecule)
+	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(print-function . ,Measure_grouping::print)
 	(padding . 2)
 	(direction . 1)
 	(thickness . 1)
@@ -551,45 +569,45 @@
     (MultiMeasureRest
      . (
 	(spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
-	(molecule-callback . ,Multi_measure_rest::brew_molecule)
+	(print-function . ,Multi_measure_rest::print)
 	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(staff-position . 0)
 	(expand-limit . 10)
 	(thick-thickness . 6.6)
 	(hair-thickness . 2.0)
 	(padding . 1)
-	(meta . ((interfaces . (multi-measure-rest-interface rest-interface font-interface staff-symbol-referencer-interface))))
+	(meta . ((interfaces . (multi-measure-rest-interface multi-measure-interface rest-interface font-interface staff-symbol-referencer-interface))))
 	))
     
     (MultiMeasureRestNumber
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
 			       ,Self_alignment_interface::centered_on_other_axis_parent))
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(self-alignment-X . 0)
 	(direction . 1)
 	(padding . 1.3)
+	(staff-padding . 1.3)
 	(font-family . number)
-	(meta . ((interfaces . (side-position-interface self-alignment-interface font-interface spanner-interface text-interface))))
+	(meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
 	))
     (MultiMeasureRestText
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
 			       ,Self_alignment_interface::centered_on_other_axis_parent))
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(self-alignment-X . 0)
 	(direction . 1)
 	(padding . 1.5)
+	(staff-padding . 1.5)
 	(font-family . roman)
-	(meta . ((interfaces . (side-position-interface self-alignment-interface font-interface spanner-interface text-interface))))
+	(meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
 	))
  (NoteCollision
      . (
 	(axes . (0 1))
-	;; Ugh, should not be hard-coded. 
-	(note-width . 1.321)
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)	
 	(meta . ((interfaces . (note-collision-interface axis-group-interface item-interface ))))
@@ -606,8 +624,8 @@
     (NoteHead
      . (
 	(style . default)
-	(molecule-callback . ,Note_head::brew_molecule)
-	(ligature-primitive-callback . ,Note_head::brew_molecule)
+	(print-function . ,Note_head::print)
+	(ligature-primitive-callback . ,Note_head::print)
 	(glyph-name-procedure . ,find-notehead-symbol)
 	(X-extent-callback . ,Note_head::extent)
 	(Y-extent-callback . ,Note_head::extent)
@@ -625,7 +643,7 @@
 	(X-extent-callback . #f)
 	(Y-extent-callback . #f)			 
 	(after-line-breaking-callback . ,Line_spanner::after_line_breaking)
-	(molecule-callback . ,Line_spanner::brew_molecule)
+	(print-function . ,Line_spanner::print)
 	(meta . ((interfaces . (line-spanner-interface spanner-interface))))
 	))
 
@@ -636,16 +654,17 @@
 	(breakable . #t)
 	(X-extent-callback . #f)
 	(Y-extent-callback . #f)			 
-	(molecule-callback . ,Line_spanner::brew_molecule)
+	(print-function . ,Line_spanner::print)
 	(after-line-breaking-callback . ,Line_spanner::after_line_breaking)
 	(meta . ((interfaces . (line-spanner-interface spanner-interface))))
 	))
 
     (NoteName
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(font-family . roman)
-	(meta . ((interfaces . (note-name-interface text-interface font-interface item-interface ))))
+	(meta . ((interfaces . (note-name-interface
+				text-interface font-interface item-interface ))))
 	))
 
     (OctavateEight
@@ -654,9 +673,10 @@
 	(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))
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(font-shape . italic)
 	(padding . 0.4)
+	(staff-padding . 0.2)
 	(font-size . -4)
 	(font-family . roman)
 	(meta . ((interfaces . (text-interface self-alignment-interface side-position-interface font-interface item-interface ))))
@@ -668,18 +688,18 @@
 	(before-line-breaking-callback . ,Paper_column::before_line_breaking)
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 
-;	        (molecule-callback . ,Paper_column::brew_molecule) (font-name . "cmr8") (Y-extent-callback . #f)
+;	        (print-function . ,Paper_column::print) (font-name . "cmr8") (Y-extent-callback . #f)
 	(meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface ))))
 	))
 
     (PhrasingSlur
      . (
-	(molecule-callback . ,Slur::brew_molecule)
+	(print-function . ,Slur::print)
 	(thickness . 1.2)		
 	(spacing-procedure . ,Spanner::set_spacing_rods)		
 	(minimum-length . 1.5)
 	(after-line-breaking-callback . ,Slur::after_line_breaking)
-	(extremity-rules . ,default-slur-extremity-rules)
+	(extremity-function . ,calc-slur-extremity)
 	(extremity-offset-alist . ,default-phrasing-slur-extremity-offset-alist)
 	(de-uglify-parameters . (1.5  0.8  -2.0))
 	(Y-extent-callback . ,Slur::height)
@@ -702,8 +722,9 @@
 	(axes . (0))
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(before-line-breaking-callback . ,Paper_column::before_line_breaking)
+	(breakable . #t)
 	;; debugging stuff: print column number.
-;	(molecule-callback . ,Paper_column::brew_molecule) (font-name . "cmr8")	(Y-extent-callback . #f)
+;	(print-function . ,Paper_column::print) (font-name . "cmr8")	(Y-extent-callback . #f)
 
 
 	(meta .  ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface ))))
@@ -712,34 +733,30 @@
     (PercentRepeat
      . (
 	(spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
-	(molecule-callback . ,Multi_measure_rest::percent)
+	(print-function . ,Multi_measure_rest::percent)
 	(slope . 1.0)
 	(thickness . 0.48)
-	(minimum-width . 12.5) ; staffspace
 	(font-family . music)
 	(meta . ((interfaces . (multi-measure-rest-interface  spanner-interface font-interface percent-repeat-interface))))
 	))
 
     (PianoPedalBracket   ;; an example of a text spanner
      . (
-	(molecule-callback . ,Text_spanner::brew_molecule)
-	(after-line-breaking-callback . ,Piano_pedal_bracket::after_line_breaking)
+	(print-function . ,Piano_pedal_bracket::print)
 	(font-family . roman)
 	(style . line)
 	(if-text-padding . 1.0)
-	(width-correct . 0)
-	(enclose-bounds . #t)
 	(direction . -1)
 	(bracket-flare . (0.5 . 0.5))
 	(edge-height . (1.0 . 1.0))
 	(shorten-pair . (0.0 . 0.0))
 	(thickness .  1.0)
-	(meta . ((interfaces . (text-spanner-interface piano-pedal-interface piano-pedal-bracket-interface spanner-interface))))
+	(meta . ((interfaces . (line-interface piano-pedal-interface piano-pedal-bracket-interface spanner-interface))))
 	))
 
     (RepeatSlash
      . (
-	(molecule-callback . ,Percent_repeat_item_interface::beat_slash)
+	(print-function . ,Percent_repeat_item_interface::beat_slash)
 	(thickness . 0.48)
 	(slope . 1.7)
 	(meta . ((interfaces . (percent-repeat-interface item-interface ))))
@@ -749,14 +766,15 @@
 	(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 . 0.75)
+	(print-function . ,Rest::print)
+	(Y-offset-callbacks . (,Staff_symbol_referencer::callback
+			       ,Rest::polyphonic_offset_callback
+			       ))
+	(minimum-distance . 0.25)
 	(meta . (
 		 (interfaces . (font-interface
 				rhythmic-head-interface
-											rhythmic-grob-interface
-
+				rhythmic-grob-interface
 				staff-symbol-referencer-interface
 				rest-interface item-interface ))
 		))))
@@ -770,11 +788,12 @@
     (Script
      . (
 	;; don't set direction here: it breaks staccato.
-	(molecule-callback . ,Script_interface::brew_molecule)
+	(print-function . ,Script_interface::print)
 
 	;; This value is sensitive: if too large, staccato dots will move a
 	;; space a away.
 	(padding . 0.25)
+	(staff-padding . 0.25)
 	;; (script-priority . 0) priorities for scripts, see script.scm
 	(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent))
 	(before-line-breaking-callback . ,Script_interface::before_line_breaking)
@@ -790,12 +809,12 @@
 
     (Slur
      . (
-	(molecule-callback . ,Slur::brew_molecule)
+	(print-function . ,Slur::print)
 	(thickness . 1.2)		
 	(spacing-procedure . ,Spanner::set_spacing_rods)		
 	(minimum-length . 1.5)
 	(after-line-breaking-callback . ,Slur::after_line_breaking)
-	(extremity-rules . ,default-slur-extremity-rules)
+	(extremity-function . ,calc-slur-extremity)
 	(extremity-offset-alist . ,default-slur-extremity-offset-alist)
 	(de-uglify-parameters . (1.5  0.8  -2.0))
 	(Y-extent-callback . ,Slur::height)
@@ -827,7 +846,7 @@
      . (
 	(break-align-symbol . staff-bar)
 	(bar-size-procedure . ,Span_bar::get_bar_size) 
-	(molecule-callback . ,Span_bar::brew_molecule)
+	(print-function . ,Span_bar::print)
 	(break-visibility . ,begin-of-line-invisible)
 	(X-extent-callback . ,Span_bar::width_callback)
 	(Y-extent-callback . ())
@@ -848,13 +867,13 @@
 	))
 
     (StanzaNumber
-     . ((molecule-callback . ,Text_item::brew_molecule)		
+     . ((print-function . ,Text_item::print)		
 	(font-family . roman)
 	(font-series . bold)
-	(padding . 1.5)
+	(padding . 1.0)
 	(X-offset-callbacks . (,Side_position_interface::aligned_side))
 	(direction . ,LEFT) 
-	(meta . ((interfaces . (text-interface font-interface item-interface ))))		
+	(meta . ((interfaces . (side-position-interface stanza-number-interface text-interface font-interface item-interface ))))		
 	))
 
     (StaffSpacing
@@ -877,15 +896,16 @@
 
     (StaffSymbol
      . (
-	(molecule-callback . ,Staff_symbol::brew_molecule)
+	(print-function . ,Staff_symbol::print)
 	(line-count . 5)
+	(ledger-line-thickness  . (1.0 . 0.1))
 	(layer . 0)
 	(meta . ((interfaces . (staff-symbol-interface spanner-interface))))
 	))
 
     (SostenutoPedal
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(direction . 1)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(no-spacing-rods . #t)
@@ -914,7 +934,7 @@
 
 	;; this list is rather long. Trim --hwn
 	(before-line-breaking-callback . ,Stem::before_line_breaking)
-	(molecule-callback . ,Stem::brew_molecule)
+	(print-function . ,Stem::print)
 	(thickness . 1.3)
 
 	;; 3.5 (or 3 measured from note head) is standar length
@@ -928,24 +948,18 @@
 
 	;; default stem direction for note on middle line
 	(neutral-direction . -1)
-	
-	;; [Wanske]: standard length (but no shorter than minimum).
-	;; (beamed-lengths . (3.5))
-	
+
+
+
 	;; FIXME.  3.5 yields too long beams (according to Ross and
 	;; looking at Baerenreiter examples) for a number of common
 	;; boundary cases.  Subtracting half a beam thickness fixes
 	;; this, but the bug may well be somewhere else.
-	(beamed-lengths . (3.26 3.26 1.5))
-	
-	;; [Wanske] lists three sets of minimum lengths.  One
-	;; set for the nomal case, and one set for beams with "der
-	;; Balkenendpunkt weiter uber bzw. unter die Systemgrenze
-	;; hinaus (bei Gruppen mit grossem Tonumfang)" and the extreme
-	;; case.
-
-	;; Note that Wanske lists numbers lengths starting from top of
-	;; head, so we must add half a staff space.
+
+	;; FIXME this should come from 'lengths
+
+;	(beamed-lengths . (3.26 3.26 1.5))
+	(beamed-lengths . (3.5 3.5 3.5 4.5 5.0))
 	
 	;; We use the normal minima as minimum for the ideal lengths,
 	;; and the extreme minima as abolute minimum length.
@@ -954,7 +968,7 @@
 	(beamed-minimum-free-lengths . (1.83 1.5 1.25))
 	
 	;; The 'extreme case' minima
-	(beamed-extreme-minimum-free-lengths . (2.5 2.0 1.0))
+	(beamed-extreme-minimum-free-lengths . (2.0 1.25))
 
 	(X-offset-callbacks . (,Stem::off_callback))
 	(X-extent-callback . ,Stem::dim_callback)	
@@ -967,7 +981,7 @@
 
     (StemTremolo
      . (
-	(molecule-callback . ,Stem_tremolo::brew_molecule)
+	(print-function . ,Stem_tremolo::print)
 	(Y-extent-callback . ,Stem_tremolo::height)
 	(X-extent-callback . #f)
 
@@ -978,19 +992,21 @@
 
     (SeparationItem
      . (
+	(X-extent-callback . #f)
+	(Y-extent-callback . #f)
 	(meta . ((interfaces . (spacing-interface separation-item-interface item-interface ))))
 	))
 
     (SeparatingGroupSpanner
      . (
 	(spacing-procedure . ,Separating_group_spanner::set_spacing_rods)
-	(meta . ((interfaces . (spacing-interface separation-spanner-interface spanner-interface))))
+	(meta . ((interfaces . (only-prebreak-interface spacing-interface separation-spanner-interface spanner-interface))))
 	))
 
     (SustainPedal
      . (
 	(no-spacing-rods . #t)
-	(molecule-callback . ,Sustain_pedal::brew_molecule)
+	(print-function . ,Sustain_pedal::print)
 	(self-alignment-X . 0)
 	(direction . 1)
 	(padding . 0.0)  ;; padding relative to SustainPedalLineSpanner
@@ -1005,6 +1021,7 @@
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	
 	(padding . 1.2)
+	(staff-padding . 1.2)
 	(minimum-space . 1.0)
 	(direction . -1)
 	(meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface))))
@@ -1021,7 +1038,7 @@
     (SystemStartBrace
      . (
 	(glyph . "brace")
-	(molecule-callback . ,System_start_delimiter::brew_molecule)
+	(print-function . ,System_start_delimiter::print)
 	(collapse-height . 5.0)
 	(font-family . braces)
 	(Y-extent-callback . #f)
@@ -1031,13 +1048,13 @@
     (SystemStartBracket
      . (
 	(Y-extent-callback . #f)
-	(molecule-callback . ,System_start_delimiter::brew_molecule)
+	(print-function . ,System_start_delimiter::print)
 	(glyph . "bracket")
 	(arch-height . 1.5)
 	(arch-angle . 50.0)
 	(arch-thick . 0.25)
 	(arch-width . 1.5)
-	(bracket-collapse-height . 1)
+	(collapse-height . 1)
 	(thickness . 0.25)
 	(meta . ((interfaces . (system-start-delimiter-interface spanner-interface))))
 	))
@@ -1045,7 +1062,7 @@
     (SystemStartBar
      . (
 	(Y-extent-callback . #f)
-	(molecule-callback . ,System_start_delimiter::brew_molecule)
+	(print-function . ,System_start_delimiter::print)
 	(glyph . "bar-line")
 	(thickness . 1.6)
 	(after-line-breaking-callback . ,System_start_delimiter::after_line_breaking)
@@ -1054,52 +1071,73 @@
 
     (TextScript
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(no-spacing-rods . #t)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(direction . -1)
 	(padding . 0.5)
+	(staff-padding . 0.5)
 	(script-priority . 200)
 	;; todo: add X self alignment?
 	(baseline-skip . 2)
 	(font-family . roman)
 	(meta . ((interfaces . (text-script-interface text-interface side-position-interface font-interface item-interface ))))
 	))
-
+    (CombineTextScript
+     . (
+	(print-function . ,Text_item::print)
+	(no-spacing-rods . #t)
+	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
+	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
+	(direction . 1)
+	(extra-offset . (-1 . 0)) 
+	(padding . 0.5)
+	(staff-padding . 0.5)
+	(script-priority . 200)
+	;; todo: add X self alignment?
+	(baseline-skip . 2)
+	(font-family . roman)
+	(font-series . bold)
+	(meta . ((interfaces . (text-script-interface text-interface  side-position-interface font-interface item-interface ))))
+	))
     (TextSpanner
      . (
-	(molecule-callback . ,Text_spanner::brew_molecule)
+	(print-function . ,Text_spanner::print)
 	(font-family . roman)
 	(style . dashed-line)
-
+	(staff-padding . 0.1)
+	
 	;; urg, only for (de)cresc. text spanners
 	(if-text-padding . 1.0)
-	(width-correct . -1)
 	(dash-fraction . 0.2)
 	(dash-period . 3.0)
 	(direction . 1)
 	(meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface))))		
 	))
     
-    (OttavaSpanner
+    (OttavaBracket
      . (
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-	(molecule-callback . ,Text_spanner::brew_molecule)
+	(print-function . ,Ottava_bracket::print)
+	(font-shape . italic)
 	(font-family . roman)
-	(enclose-bounds . #t)
-	(width-correct . 0.0)
-	(style . dashed-line)
+	(shorten-pair . (0.0 . -0.6))
+	(staff-padding . 1.0)
+	(padding  . 0.5)
+	(minimum-length . 1.0)
 	(dash-fraction . 0.3)
-	(edge-height . (0 . 1.5))
+	(edge-height . (0 . 1.2))
 	(direction . 1)
-	(meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface))))		
+	(meta . ((interfaces . (ottava-bracket-interface
+				line-interface side-position-interface
+				font-interface text-interface spanner-interface))))		
 	))
     
     (TabNoteHead
      . (
 	(font-family . roman)
 	(style . default)
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
 	(extra-offset . (0 . -0.65)) ;; UGH! TODO: Clean this up!
 	(stem-attachment-function . ,tablature-stem-attachment-function)
@@ -1113,7 +1151,7 @@
 
     (Tie
      . (
-	(molecule-callback . ,Tie::brew_molecule)
+	(print-function . ,Tie::print)
 	(spacing-procedure . ,Spanner::set_spacing_rods)
 	(staffline-clearance . 0.35)
 	(details . ((ratio . 0.333) (height-limit . 1.0)))
@@ -1127,19 +1165,19 @@
     (TieColumn
      . (
 	(after-line-breaking-callback . ,Tie_column::after_line_breaking)
-	(X-extent-callback . ())
-	(Yoo-extent-callback . ())	
+	(X-extent-callback . #f)
+	(Y-extent-callback . #f)	
 	(meta . ((interfaces . (tie-column-interface spanner-interface))))
 	))
 
     (TimeSignature
      . (
-	(molecule-callback . ,Time_signature::brew_molecule)
-;	(molecule-callback . ,Text_item::brew_molecule)	
+	(print-function . ,Time_signature::print)
+;	(print-function . ,Text_item::print)	
 	(break-align-symbol . time-signature)
 	(break-visibility . ,all-visible)
 	(space-alist . (
-			(first-note . (extra-space . 2.0))
+			(first-note . (fixed-space . 2.0))
 			(right-edge . (extra-space . 0.5))
 			(staff-bar .  (minimum-space . 2.0))
 			))
@@ -1152,25 +1190,25 @@
 
     (TupletBracket
      . (
-	(gap . 2.0)
-	(padding . 0.9)
+	(gap . 1.5)
+	(padding . 1.1)
 	(thickness . 1.6)
 	(edge-height . (0.7 . 0.7))
 	(shorten-pair . (-0.2 . -0.2))
 	(before-line-breaking-callback . ,Tuplet_bracket::before_line_breaking)
 	(after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking)
-	(molecule-callback . ,Tuplet_bracket::brew_molecule)
+	(print-function . ,Tuplet_bracket::print)
 	(font-family . roman)
 	(font-shape . italic)
 	(font-series . bold)
 
 	(font-size . -2)
-	(meta .  ((interfaces . (text-interface tuplet-bracket-interface font-interface spanner-interface))))
+	(meta .  ((interfaces . (text-interface line-interface tuplet-bracket-interface font-interface spanner-interface))))
 	))
 
     (UnaCordaPedal
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(font-family . roman)
 	(font-shape . italic)
 	(no-spacing-rods . #t)
@@ -1186,8 +1224,8 @@
 	(axes . (1))
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)	
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-	
 	(padding . 1.2)
+	(staff-padding . 1.2)
 	(minimum-space . 1.0)
 	(direction . -1)
 	(meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface))))
@@ -1198,23 +1236,23 @@
 	(thickness . 0.6)
 	(flexa-width . 2.0)
 	(ligature-primitive-callback . ,Vaticana_ligature::brew_ligature_primitive)
-	(molecule-callback . ,Vaticana_ligature::brew_molecule)
+	(print-function . ,Vaticana_ligature::print)
 	(meta . ((interfaces . (vaticana-ligature-interface font-interface))))
 	))
 
     (VoltaBracket
      . (
-	(molecule-callback . ,Volta_bracket_interface::brew_molecule)
+	(print-function . ,Volta_bracket_interface::print)
 	(direction . 1)
 	(padding . 1)
 	(font-family . number)
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-	(thickness . 1.6)  ;  stafflinethickness
+	(thickness . 1.6)  ;  linethickness
 	(height . 2.0) ; staffspace;
 	(minimum-space . 5)
 	(font-family . number)
 	(font-size . -4)
-	(meta . ((interfaces . (volta-bracket-interface text-interface side-position-interface font-interface spanner-interface))))
+	(meta . ((interfaces . (volta-bracket-interface line-interface text-interface side-position-interface font-interface spanner-interface))))
 	))
     
     (VerticalAlignment