release: 1.4.10

[lilypond.git] / scm / grob-description.scm

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 09b8ea460af1d2d1424dbb7ff7e486d58de5f031..344fd3fc3a2f6bcc345f09e4401284f7f7872455 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -80,7 +80,7 @@
                 (thickness . 0.48) ; in staff-space
                 (before-line-breaking-callback . ,Beam::before_line_breaking)
                 (after-line-breaking-callback . ,Beam::after_line_breaking)
-                (neutral-direction . 1)
+                (neutral-direction . -1)
                 (dir-function . ,beam-dir-majority)
                 (height-quants .  ,default-beam-dy-quants)
                 (vertical-position-quant-function . ,default-beam-y-quants)
@@ -115,10 +115,13 @@
        (BreathingSign . (
                (break-align-symbol . Breathing_sign)
                (breakable . #t )
-               (molecule-callback . ,Breathing_sign::brew_molecule)
+               (molecule-callback . ,Text_item::brew_molecule)
+               (lookup . name)
+               (font-family . music)      
+               (text . "scripts-rcomma")
                (Y-offset-callbacks . (,Breathing_sign::offset_callback))
                (visibility-lambda . ,begin-of-line-invisible)
-               (meta . ,(grob-description "BreathingSign"  break-aligned-interface))
+               (meta . ,(grob-description "BreathingSign"  break-aligned-interface text-interface font-interface))
        ))
 
        (Clef . (
@@ -152,7 +155,11 @@
        
 
        (DotColumn . (
-               (axes 0 )
+               (axes 0)
+               (direction . 1)
+               (X-extent-callback . ,Axis_group_interface::group_extent_callback)
+               
+               (X-offset-callbacks . (,Dot_column::side_position))
                (meta . ,(grob-description "DotColumn" dot-column-interface  axis-group-interface))
        ))
 
@@ -300,6 +307,9 @@
                (self-alignment-X . 0)
                (non-rhythmic . #t)
                (word-space . 0.6)
+                (ignore-length-mismatch . #f)
+                (begin-alignment . 4)
+                (end-alignment . 2)
                (font-family . roman)
                (font-shape . upright)
                (meta . ,(grob-description "LyricText" lyric-syllable-interface text-interface font-interface ))
@@ -312,7 +322,7 @@
 
                (direction . 1)
                (breakable . #t)
-               (font-family . number)
+               (font-family . roman)
                (font-shape . upright)
                (font-relative-size . 1)
                (visibility-lambda . ,end-of-line-invisible)
@@ -334,7 +344,8 @@
        ))
        (NoteCollision . (
                (axes 0 1)
-               (note-width . 1.65)
+               ;; Ugh, should not be hard-coded. 
+               (note-width . 1.321)
                (meta . ,(grob-description "NoteCollision"
                   note-collision-interface axis-group-interface
                ))
@@ -576,7 +587,7 @@
                (lengths . (3.5 3.5 3.5 4.5 5.0))
                (stem-shorten . (0.5))
                ; if stem is on middle line, choose this direction.
-               (neutral-direction . 1)
+               (neutral-direction . -1)
                (X-offset-callbacks . (,Stem::off_callback))
                (X-extent-callback . ,Stem::dim_callback)       
                (Y-extent-callback . ,Stem::height)
@@ -668,6 +679,7 @@
                (details . ((ratio . 0.333) (height-limit . 1.0)))
                (thickness . 1.2)
                (x-gap . 0.2)
+               (y-offset . 0.6)
                (minimum-length  . 2.5)
                (meta . ,(grob-description "Tie" tie-interface ))
        ))
@@ -702,6 +714,7 @@
 
        (UnaCordaPedal . (
                (molecule-callback . ,Text_item::brew_molecule)
+                (font-family . roman)
                 (font-shape . italic)
                (no-spacing-rods . #t)
                (self-alignment-X . 0)