patch::: 1.4.1.jcn1

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

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index a1fdc784cf8f95a6ff418405c76c343fb053b63f..291566e75b0bde4590fb62619c4ee42133bb0c1c 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -37,7 +37,7 @@
                (break-align-symbol . Staff_bar)
                (glyph . "|")
                (break-glyph-function . ,default-break-barline)
-               (barsize-procedure . ,Bar::get_staff_bar_size)
+               (bar-size-procedure . ,Bar::get_staff_bar_size)
                (molecule-callback . ,Bar::brew_molecule)          
                (visibility-lambda . ,all-visible)
                (breakable . #t)
@@ -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)
-                (default-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)
@@ -178,6 +178,10 @@
        (DynamicText . (
                (Y-offset-callbacks . (,Side_position_interface::aligned_on_self))
                (molecule-callback . ,Text_item::brew_molecule)
+(X-offset-callbacks . (,Side_position_interface::aligned_on_self))
+               (self-alignment-X . 0)
+               
+               (no-spacing-rods . #t)
                (script-priority . 100)
                (font-series . bold)
                (font-family . dynamic)
@@ -271,6 +275,7 @@
                (thickness . 1.0)
                (height . 0.4)
                (minimum-length .  0.5) 
+               (maximum-length .  100)
                (molecule-callback . ,Hyphen_spanner::brew_molecule)
                (Y-extent-callback . ,Grob::point_dimension_callback)
                (meta . ,(grob-description "LyricHyphen" lyric-hyphen-interface ))
@@ -329,7 +334,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
                ))
@@ -344,7 +350,8 @@
                (style . default)
                (molecule-callback . ,Note_head::brew_molecule)
                (Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
-               (attachment-angle . ,(* 20/360 3.14159))
+               (stem-attachment-function
+                . ,note-head-style->attachment-coordinates)
                (meta . ,(grob-description  "NoteHead"
                        rhythmic-head-interface font-interface 
                        note-head-interface ))
@@ -462,6 +469,7 @@
        (Script . (
                ;; don't set direction here: it breaks staccato.
                (molecule-callback . ,Script::brew_molecule)
+               (padding . 0.3) 
                (X-offset-callbacks . (,Side_position_interface::centered_on_parent))
                (before-line-breaking-callback . ,Script::before_line_breaking)
                (meta . ,(grob-description "Script" script-interface side-position-interface font-interface))
@@ -505,7 +513,7 @@
        ))
        (SpanBar . (
                (break-align-symbol . Staff_bar)
-               (barsize-procedure . ,Span_bar::get_bar_size) 
+               (bar-size-procedure . ,Span_bar::get_bar_size) 
                (molecule-callback . ,Bar::brew_molecule)
                (visibility-lambda . ,begin-of-line-invisible)
                (X-extent-callback . ,Span_bar::width_callback)
@@ -569,7 +577,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.
-               (default-neutral-direction . 1)
+               (neutral-direction . 1)
                (X-offset-callbacks . (,Stem::off_callback))
                (X-extent-callback . ,Stem::dim_callback)       
                (Y-extent-callback . ,Stem::height)
@@ -608,12 +616,12 @@
                (meta . ,(grob-description "SustainPedal" sustain-pedal-interface side-position-interface font-interface))
        ))
 
-       ; should split in 3
+       ;; TODO: should split in 3
        (SystemStartDelimiter . (
                (molecule-callback . ,System_start_delimiter::brew_molecule)
                (after-line-breaking-callback . ,System_start_delimiter::after_line_breaking)
-               ;; ugh, in practice, brace has height of 4.1 staff-spaces
-               (brace-collapse-height . 4.1)
+               ;; really 4.0, but 5 to be on safe side.
+               (brace-collapse-height . 5.0)
                (bracket-collapse-height . 1)
                (thickness . 1.6)
                (arch-height . 1.5)
@@ -637,6 +645,7 @@
                (no-spacing-rods . #t)
                (direction . -1)
                (padding . 0.5)
+;; todo: add X self alignment?
                (baseline-skip . 2)
                (font-family . roman)
                (meta . ,(grob-description "TextScript" text-script-interface text-interface side-position-interface font-interface ))
@@ -674,6 +683,7 @@
                (break-align-symbol . Time_signature)
                (visibility-lambda . ,all-visible)
                (breakable . #t)
+               (style . C)
                 (font-family . number)
                 (meta . ,(grob-description "TimeSignature" time-signature-interface  font-interface))
        ))
@@ -691,8 +701,9 @@
                           tuplet-bracket-interface font-interface))
        ))
 
-       (UnaChordaPedal . (
+       (UnaCordaPedal . (
                (molecule-callback . ,Text_item::brew_molecule)
+                (font-family . roman)
                 (font-shape . italic)
                (no-spacing-rods . #t)
                (self-alignment-X . 0)
@@ -701,7 +712,7 @@
                (Y-offset-callbacks .
                 (,Side_position_interface::aligned_side
                  ,Side_position_interface::centered_on_parent))
-               (meta . ,(grob-description "UnaChordaPedal" text-interface font-interface))
+               (meta . ,(grob-description "UnaCordaPedal" text-interface font-interface))
        ))
 
        (VoltaBracket . (
@@ -723,6 +734,7 @@
                (axes 1)
                (Y-extent-callback . ,Axis_group_interface::group_extent_callback)
                (X-extent-callback . #f)
+
                (stacking-dir . -1)
                (meta . ,(grob-description "VerticalAlignment" align-interface axis-group-interface))
        ))