* tex/GNUmakefile (TEX_FILES): add texinfo.cnf

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 5ee2eece9dd28d8db5097edcceb3d28cdfa459aa..eca4ce72a11d18939a5a6c1fc8d0113492e96aea 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -76,8 +76,6 @@
        (style . default)
        (print-function . ,Note_head::print)
        (glyph-name-procedure . ,find-notehead-symbol)
-       (X-extent-callback . ,Note_head::extent)
-       (Y-extent-callback . ,Note_head::extent)
        (Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
        (meta . ((interfaces . (font-interface note-head-interface
                                               ambitus-interface
@@ -115,6 +113,7 @@
                        (custos . (minimum-space . 2.0))
                        (clef .   (minimum-space . 1.0))
                        (key-signature . (extra-space . 1.0))
+                       (key-cancellation . (extra-space . 1.0))
                        (first-note . (fixed-space . 1.3))
                        (next-note . (semi-fixed-space . 1.3))
                        (right-edge . (extra-space . 0.0))
@@ -135,7 +134,7 @@
     
     (BarNumber
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (breakable . #t)
        (break-visibility . ,begin-of-line-visible)
        (padding . 1.0)
@@ -158,13 +157,13 @@
 
     (BassFigure
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (direction . 1)
        (font-family . number)
 
        ;; We must do this, other BFs in
-       ;; paper16 become too small.
+       ;; layout16 become too small.
        (font-size . -4)
        (kern . 0.2)
        (meta . ((interfaces . (text-interface                                                  rhythmic-grob-interface
@@ -266,7 +265,7 @@
                        (first-note . (fixed-space . 1.0)) ;huh? 
                        (right-edge . (extra-space . 0.1))
                        ))
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (text . ,(make-musicglyph-markup "scripts-rcomma"))
        (Y-offset-callbacks . (,Breathing_sign::offset_callback))
        (break-visibility . ,begin-of-line-invisible)
@@ -313,7 +312,7 @@
 
     (ChordName
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (after-line-breaking-callback . ,Chord_name::after_line_breaking)
        (word-space . 0.0)
        (font-family . sans)
@@ -375,7 +374,7 @@
     (DynamicText
      . (
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_parent))
        (self-alignment-X . 0)
@@ -441,7 +440,7 @@
 
     (Fingering
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
 
        ; sync with TextScript (?)
        (padding . 0.5)
@@ -467,7 +466,7 @@
        (Y-extent-callback . #f)                         
        (after-line-breaking-callback . ,Line_spanner::after_line_breaking)
        (print-function . ,Line_spanner::print)
-       (meta . ((interfaces . (line-spanner-interface spanner-interface))))
+       (meta . ((interfaces . (line-interface line-spanner-interface spanner-interface))))
        ))
 
     (Hairpin
@@ -509,7 +508,7 @@
                        ))
 
        (self-alignment-Y . 0)
-       (print-function . ,Text_item::print)            
+       (print-function . ,Text_interface::print)               
        (break-align-symbol . instrument-name)
        (break-visibility . ,begin-of-line-visible)
        (baseline-skip . 2)
@@ -524,7 +523,7 @@
        (space-alist . ((left-edge . (extra-space . 1.0))
                        ))
        (break-align-symbol . instrument-name)
-       (print-function . ,Text_item::print)            
+       (print-function . ,Text_interface::print)               
        (break-align-symbol . clef)
        (break-visibility . ,begin-of-line-visible)
        (baseline-skip . 2)
@@ -539,6 +538,7 @@
        (space-alist . (
                        (time-signature . (extra-space . 1.25))
                        (staff-bar .  (extra-space . 0.6))
+                       (key-signature . (extra-space . 0.5))
                        (right-edge . (extra-space . 0.5))
                        (first-note . (fixed-space . 2.5))
                        ))
@@ -615,7 +615,7 @@
        ))
 
     (LyricText
-     . ((print-function . ,Text_item::print)
+     . ((print-function . ,Text_interface::print)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_parent))
        (self-alignment-X . 0)
        (word-space . 0.6)
@@ -635,7 +635,7 @@
 
     (RehearsalMark
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::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)
@@ -652,7 +652,7 @@
        ))
      (MetronomeMark
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (Y-offset-callbacks . (,Side_position_interface::aligned_side)) 
        (direction . 1)
        (padding . 0.8)
@@ -686,7 +686,7 @@
     
     (MultiMeasureRestNumber
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_other_axis_parent))
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
@@ -699,7 +699,7 @@
        ))
     (MultiMeasureRestText
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_other_axis_parent))
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
@@ -731,8 +731,6 @@
        (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)
        (Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
        (stem-attachment-function . ,note-head-style->attachment-coordinates)
        (meta . ((interfaces . (rhythmic-grob-interface
@@ -766,7 +764,7 @@
 
     (NoteName
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (meta . ((interfaces . (note-name-interface
                                text-interface font-interface item-interface ))))
        ))
@@ -777,7 +775,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))
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
 
        ;; no Y dimensions, because of lyrics under tenor clef.
        (Y-extent . (0 . 0))
@@ -957,7 +955,7 @@
        ))
 
     (StanzaNumber
-     . ((print-function . ,Text_item::print)           
+     . ((print-function . ,Text_interface::print)              
        (font-series . bold)
        (padding . 1.0)
        (X-offset-callbacks . (,Side_position_interface::aligned_side))
@@ -975,7 +973,7 @@
 
     (SostenutoPedal
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (direction . 1)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (no-spacing-rods . #t)
@@ -1146,7 +1144,7 @@
 
     (TextScript
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (no-spacing-rods . #t)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (direction . -1)
@@ -1160,7 +1158,7 @@
        ))
     (CombineTextScript
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (no-spacing-rods . #t)
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
@@ -1218,7 +1216,7 @@
     (TabNoteHead
      . (
        (style . default)
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::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)
@@ -1254,7 +1252,7 @@
     (TimeSignature
      . (
        (print-function . ,Time_signature::print)
-;      (print-function . ,Text_item::print)    
+;      (print-function . ,Text_interface::print)       
        (break-align-symbol . time-signature)
        (break-visibility . ,all-visible)
        (space-alist . (
@@ -1286,7 +1284,7 @@
 
     (UnaCordaPedal
      . (
-       (print-function . ,Text_item::print)
+       (print-function . ,Text_interface::print)
        (font-shape . italic)
        (no-spacing-rods . #t)
        (self-alignment-X . 0)