typos.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 683f28fc659ae6a37e40346e733d5f4339caf8a4..b7cdfff34b737c085a8d7d5e9db4e5f3f5a983a5 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -189,15 +189,19 @@
      . (
        (breakable . #t)
        (stacking-dir . 1)
-       (break-align-orders . #((instrument-name left-edge ambitus breathing-sign
-                                                clef key-signature staff-bar
+       (break-align-orders . #(; end-of-line:
+                               (instrument-name left-edge ambitus breathing-sign
+                                                clef  staff-bar key-signature
                                                 time-signature custos)
+
+                               ; unbroken
                                (instrument-name left-edge ambitus breathing-sign
                                                 clef  staff-bar key-signature
                                                 staff
                                                 time-signature custos)
+                               ; begin of line
                                (instrument-name left-edge ambitus breathing-sign
-                                                clef  staff-bar key-signature
+                                                clef key-signature staff-bar
                                                 time-signature custos)
 
                                ))
@@ -257,6 +261,7 @@
     (ClusterSpannerBeacon
      . (
        (print-function . #f)
+       (Y-extent-callback . ,Cluster_beacon::height)
        (meta . ((interfaces . (cluster-beacon-interface item-interface))))
        ))
     
@@ -322,7 +327,7 @@
                          (print-function . ,Percent_repeat_item_interface::double_percent)
                          (breakable . #t)
                          (slope . 1.0)
-                         (font-encoding . music)
+                         (font-encoding . fetaMusic)
                          (width . 2.0)
                          (thickness . 0.48)
                          (break-align-symbol . staff-bar)
@@ -342,7 +347,7 @@
        (no-spacing-rods . #t)
        (script-priority . 100)
        (font-series . bold)
-       (font-encoding . dynamic)
+       (font-encoding . fetaDynamic)
        (font-shape . italic)
        (self-alignment-Y . 0)
        (meta . ((interfaces . (font-interface text-interface self-alignment-interface  dynamic-interface script-interface item-interface))))
@@ -387,9 +392,8 @@
        (self-alignment-X . 0)
        (self-alignment-Y . 0)
        (script-priority . 100)
-       (font-encoding . number)
+       (font-encoding . fetaNumber)
        (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 ))))
        ))
 
@@ -455,6 +459,7 @@
        (direction . 0)
        (space-alist . ((left-edge . (extra-space . 1.0))
                        ))
+       (break-align-symbol . instrument-name)
        (print-function . ,Text_item::print)            
        (break-align-symbol . clef)
        (break-visibility . ,begin-of-line-visible)
@@ -584,7 +589,7 @@
        (thick-thickness . 6.6)
        (hair-thickness . 2.0)
        (padding . 1)
-       (font-encoding . music)
+       (font-encoding . fetaMusic)
        (meta . ((interfaces . (multi-measure-rest-interface multi-measure-interface rest-interface font-interface staff-symbol-referencer-interface))))
        ))
     
@@ -598,7 +603,7 @@
        (direction . 1)
        (padding . 1.3)
        (staff-padding . 1.3)
-       (font-encoding . number)
+       (font-encoding . fetaNumber)
        (meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
        ))
     (MultiMeasureRestText
@@ -679,8 +684,11 @@
        (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)
+
+       ;; no Y dimensions, because of lyrics under tenor clef.
+       (Y-extent-callback . #f)
        (font-shape . italic)
-       (padding . 0.4)
+       (padding . 0.6)
        (staff-padding . 0.2)
        (font-size . -4)
        (meta . ((interfaces . (text-interface self-alignment-interface side-position-interface font-interface item-interface ))))
@@ -692,7 +700,7 @@
        (before-line-breaking-callback . ,Paper_column::before_line_breaking)
        (X-extent-callback . ,Axis_group_interface::group_extent_callback)
 
-;              (print-function . ,Paper_column::print) (font-name . "cmr8") (Y-extent-callback . #f)
+;ppp           (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 ))))
        ))
 
@@ -740,7 +748,7 @@
        (print-function . ,Multi_measure_rest::percent)
        (slope . 1.0)
        (thickness . 0.48)
-       (font-encoding . music)
+       (font-encoding . fetaMusic)
        (meta . ((interfaces . (multi-measure-rest-interface  spanner-interface font-interface percent-repeat-interface))))
        ))
 
@@ -810,7 +818,7 @@
        ;; (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)
-       (font-encoding . music)
+       (font-encoding . fetaMusic)
        (meta . ((interfaces . (script-interface side-position-interface font-interface item-interface ))))
        ))
 
@@ -1037,7 +1045,7 @@
        (glyph . "brace")
        (print-function . ,System_start_delimiter::print)
        (collapse-height . 5.0)
-       (font-encoding . braces)
+       (font-encoding . fetaBraces)
        (Y-extent-callback . #f)
        (meta . ((interfaces . (system-start-delimiter-interface font-interface))))
        ))
@@ -1181,7 +1189,6 @@
 
     (TupletBracket
      . (
-       (gap . 1.5)
        (padding . 1.1)
        (thickness . 1.6)
        (edge-height . (0.7 . 0.7))
@@ -1234,7 +1241,7 @@
        (print-function . ,Volta_bracket_interface::print)
        (direction . 1)
        (padding . 1)
-       (font-encoding . number)
+       (font-encoding . fetaNumber)
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
        (thickness . 1.6)  ;  linethickness
        (height . 2.0) ; staffspace;