* scm/output-lib.scm (shift-right-at-line-begin): new function:

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 2392ee9ee3d70e259601f19b753552fcaa75cfbe..e1f168011f562814753bce2244e232b885cb48de 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -28,7 +28,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.2)
        (meta . ((interfaces . (item-interface accidental-placement-interface))))
        ))
 
@@ -177,7 +177,7 @@
        (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))))
@@ -262,6 +262,7 @@
        (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 ))))
        ))
@@ -291,7 +292,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 ))))
@@ -301,7 +302,6 @@
      . (
        (molecule-callback . ,Dots::brew_molecule)
        (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 ))))
        ))
 
@@ -397,13 +397,10 @@
        (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
@@ -469,12 +466,11 @@
 
     (LyricHyphen
      . (
-       (thickness . 1.0)
+       (thickness . 1.3)
        (height . 0.42)
        (dash-period . 10.0)
        (length . 0.66)
        (minimum-length .  0.5) 
-       (maximum-length .  100)
        (molecule-callback . ,Hyphen_spanner::brew_molecule)
        (Y-extent-callback . ,Grob::point_dimension_callback)
        (meta . ((interfaces . (lyric-hyphen-interface spanner-interface))))
@@ -484,6 +480,7 @@
      . (
        (molecule-callback . ,Lyric_extender::brew_molecule)
        (thickness . 0.8) ; stafflinethickness;
+       (minimum-length . 1.5)
        (Y-extent-callback . ,Grob::point_dimension_callback)
        (meta . ((interfaces . (lyric-extender-interface spanner-interface))))
        ))
@@ -494,8 +491,9 @@
        (self-alignment-X . 0)
        (word-space . 0.6)
        (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 ))))
        ))
 
@@ -512,7 +510,8 @@
      . (
        (molecule-callback . ,Text_item::brew_molecule)
        (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)
@@ -521,7 +520,7 @@
        (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
      . (
@@ -725,7 +724,6 @@
        (font-family . roman)
        (style . line)
        (if-text-padding . 1.0)
-       (width-correct . 0)
        (enclose-bounds . #t)
        (direction . -1)
        (bracket-flare . (0.5 . 0.5))
@@ -936,8 +934,8 @@
 
        ;; 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))
+;      (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.
@@ -946,7 +944,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)       
@@ -970,13 +968,15 @@
 
     (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
@@ -1066,25 +1066,31 @@
 
        ;; 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)
+       (Y-offset-callbacks . (,Side_position_interface::out_of_staff
+                              ,Side_position_interface::aligned_side))
+       (molecule-callback . ,Ottava_bracket::brew_molecule)
+       (font-shape . italic)
        (font-family . roman)
+       (text-repeat-if-broken . #t)
+       (shorten-pair . (0.0 . -0.6))
+       (staff-padding . 1.0)
+       (padding  . 1.0)
        (enclose-bounds . #t)
-       (width-correct . 0.0)
-       (style . dashed-line)
+       (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
@@ -1119,8 +1125,8 @@
     (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))))
        ))
 
@@ -1145,7 +1151,7 @@
     (TupletBracket
      . (
        (gap . 2.0)
-       (padding . 0.9)
+       (padding . 1.1)
        (thickness . 1.6)
        (edge-height . (0.7 . 0.7))
        (shorten-pair . (-0.2 . -0.2))
@@ -1157,7 +1163,7 @@
        (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
@@ -1206,7 +1212,7 @@
        (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