X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=9c141f4d1bf1dc526d6d954f5cbf4040a34b23e5;hb=fe1eb832e9e1e92e2bf98c33011465658192f033;hp=09707316d8b381ed6e1c28c080bd27f3b2bcd5b3;hpb=33f2e59ea0b2a1ba41e943b5afa29e5fee97ba94;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 09707316d8..9c141f4d1b 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  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 linethickness (thicknesses) and
@@ -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.2)
+	(right-padding . 0.25)
 	(meta . ((interfaces . (item-interface accidental-placement-interface))))
 	))
 
@@ -36,7 +37,7 @@
      . (
        (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)
@@ -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)
@@ -96,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)
@@ -117,7 +118,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)
@@ -135,7 +136,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)
@@ -213,7 +214,7 @@
 			(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)
@@ -222,7 +223,7 @@
 
     (Clef
      . (
-	(molecule-callback . ,Clef::brew_molecule)
+	(print-function . ,Clef::print)
 	(before-line-breaking-callback . ,Clef::before_line_breaking)
 	(breakable . #t)
 	(font-family . music)	   
@@ -242,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)
@@ -258,7 +259,7 @@
 
     (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)
@@ -271,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)
@@ -300,14 +301,14 @@
 
     (Dots
      . (
-	(molecule-callback . ,Dots::brew_molecule)
+	(print-function . ,Dots::print)
 	(dot-count . 1)
 	(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)
@@ -323,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)
@@ -351,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))
@@ -369,7 +370,7 @@
 
     (Fingering
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(padding . 0.6)
 	(staff-padding . 0.6)
 	(self-alignment-X . 0)
@@ -393,7 +394,7 @@
 
     (Hairpin
      . (
-	(molecule-callback . ,Hairpin::brew_molecule)
+	(print-function . ,Hairpin::print)
 	(thickness . 1.0)
 	(height . 0.6666)
 	(spacing-procedure . ,Spanner::set_spacing_rods)
@@ -408,7 +409,7 @@
     (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,17 +428,35 @@
 			))
 
 	(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))
@@ -453,7 +472,7 @@
 
     (LigatureBracket
      . (
-	(ligature-primitive-callback . ,Note_head::brew_molecule)
+	(ligature-primitive-callback . ,Note_head::print)
 	(direction . 1)
 	(gap . 0.0)
 	(padding . 2.0)
@@ -462,7 +481,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)
 	(meta .  ((interfaces . (tuplet-bracket-interface spanner-interface))))
 	))
 
@@ -472,23 +491,25 @@
 	(height . 0.42)
 	(dash-period . 10.0)
 	(length . 0.66)
-	(minimum-length .  0.5) 
-	(molecule-callback . ,Hyphen_spanner::brew_molecule)
-	(Y-extent-callback . ,Grob::point_dimension_callback)
-	(meta . ((interfaces . (lyric-hyphen-interface spanner-interface))))
+	(spacing-procedure . ,Hyphen_spanner::set_spacing_rods)
+	(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)
+	(print-function . ,Lyric_extender::print)
 	(thickness . 0.8) ; linethickness
 	(minimum-length . 1.5)
-	(Y-extent-callback . ,Grob::point_dimension_callback)
-	(meta . ((interfaces . (lyric-extender-interface spanner-interface))))
+	(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)
@@ -504,13 +525,13 @@
 	(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))
 	(after-line-breaking-callback . ,shift-right-at-line-begin)
@@ -526,7 +547,7 @@
 	))
      (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,7 +559,7 @@
     (MeasureGrouping
      . (
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-	(molecule-callback . ,Measure_grouping::brew_molecule)
+	(print-function . ,Measure_grouping::print)
 	(padding . 2)
 	(direction . 1)
 	(thickness . 1)
@@ -549,19 +570,19 @@
     (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))
@@ -570,11 +591,11 @@
 	(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))
@@ -583,7 +604,7 @@
 	(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
      . (
@@ -606,8 +627,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 +646,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,14 +657,14 @@
 	(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 ))))
 	))
@@ -654,7 +675,7 @@
 	(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)
@@ -669,13 +690,13 @@
 	(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)
@@ -704,7 +725,7 @@
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(before-line-breaking-callback . ,Paper_column::before_line_breaking)
 	;; 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 ))))
@@ -713,7 +734,7 @@
     (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
@@ -723,7 +744,7 @@
 
     (PianoPedalBracket   ;; an example of a text spanner
      . (
-	(molecule-callback . ,Piano_pedal_bracket::brew_molecule)
+	(print-function . ,Piano_pedal_bracket::print)
 	(font-family . roman)
 	(style . line)
 	(if-text-padding . 1.0)
@@ -737,7 +758,7 @@
 
     (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 ))))
@@ -747,8 +768,10 @@
 	(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)) 
+	(print-function . ,Rest::print)
+	(Y-offset-callbacks . (,Staff_symbol_referencer::callback
+			       ,Rest::polyphonic_offset_callback
+			       ))
 	(minimum-distance . 0.25)
 	(meta . (
 		 (interfaces . (font-interface
@@ -768,7 +791,7 @@
     (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.
@@ -789,7 +812,7 @@
 
     (Slur
      . (
-	(molecule-callback . ,Slur::brew_molecule)
+	(print-function . ,Slur::print)
 	(thickness . 1.2)		
 	(spacing-procedure . ,Spanner::set_spacing_rods)		
 	(minimum-length . 1.5)
@@ -826,7 +849,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 . ())
@@ -847,7 +870,7 @@
 	))
 
     (StanzaNumber
-     . ((molecule-callback . ,Text_item::brew_molecule)		
+     . ((print-function . ,Text_item::print)		
 	(font-family . roman)
 	(font-series . bold)
 	(padding . 1.0)
@@ -876,7 +899,7 @@
 
     (StaffSymbol
      . (
-	(molecule-callback . ,Staff_symbol::brew_molecule)
+	(print-function . ,Staff_symbol::print)
 	(line-count . 5)
 	(ledger-line-thickness  . (1.0 . 0.1))
 	(layer . 0)
@@ -885,7 +908,7 @@
 
     (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 +937,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
@@ -961,7 +984,7 @@
 
     (StemTremolo
      . (
-	(molecule-callback . ,Stem_tremolo::brew_molecule)
+	(print-function . ,Stem_tremolo::print)
 	(Y-extent-callback . ,Stem_tremolo::height)
 	(X-extent-callback . #f)
 
@@ -986,7 +1009,7 @@
     (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
@@ -1018,7 +1041,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)
@@ -1028,7 +1051,7 @@
     (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)
@@ -1042,7 +1065,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)
@@ -1051,7 +1074,7 @@
 
     (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)
@@ -1063,10 +1086,26 @@
 	(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)
@@ -1082,7 +1121,7 @@
     (OttavaBracket
      . (
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
-	(molecule-callback . ,Ottava_bracket::brew_molecule)
+	(print-function . ,Ottava_bracket::print)
 	(font-shape . italic)
 	(font-family . roman)
 	(text-repeat-if-broken . #t)
@@ -1102,7 +1141,7 @@
      . (
 	(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)
@@ -1116,7 +1155,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)))
@@ -1137,8 +1176,8 @@
 
     (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 . (
@@ -1155,14 +1194,14 @@
 
     (TupletBracket
      . (
-	(gap . 2.0)
+	(gap . 1.0)
 	(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)
@@ -1173,7 +1212,7 @@
 
     (UnaCordaPedal
      . (
-	(molecule-callback . ,Text_item::brew_molecule)
+	(print-function . ,Text_item::print)
 	(font-family . roman)
 	(font-shape . italic)
 	(no-spacing-rods . #t)
@@ -1201,13 +1240,13 @@
 	(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)