* 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 31fabdd98877666134f38d49b632a706f43b4515..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))))
        ))
 
@@ -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 ))))
        ))
@@ -396,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
@@ -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))
@@ -1068,29 +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::out_of_staff
                               ,Side_position_interface::aligned_side))
-       (molecule-callback . ,Text_spanner::brew_molecule)
+       (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.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
@@ -1125,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))))
        ))
 
@@ -1151,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))
@@ -1163,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
@@ -1212,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