patch::: 1.3.99.jcn1

[lilypond.git] / scm / element-descriptions.scm

diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm
index 5914a5a9a1e6a4d6ffac2e8c04d9240e75635108..da872eb5677a5ec6bbbde92e78fa59f13de5dbd5 100644 (file)
--- a/scm/element-descriptions.scm
+++ b/scm/element-descriptions.scm
@@ -42,7 +42,7 @@
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)
                 (font-family . roman)
-               (font-size . "-1")
+               (font-relative-size . -1)
                (meta . ,(element-description "BarNumber"
                        text-interface  break-aligned-interface))
        ))
@@ -94,8 +94,9 @@
                (properties-to-font-name . ,properties-to-font-name)
                (style-to-font-name . ,style-to-font-name)
                (markup-to-properties . ,markup-to-properties)
-               (font-size . "0") ;; Hmm, 0 should be the default, maybe??
-               (font-family . "roman")
+               (font-relative-size . 0)
+               (font-family . roman)
+               (font-shape . upright)
                (meta . ,(element-description "ChordNames" chord-name-interface))
        ))
 
@@ -153,19 +154,20 @@
        
        (LeftEdge . (
                (break-align-symbol . Left_edge_item)
+               (X-offset-callbacks . (,Break_align_interface::alignment_callback))
                (breakable . #t)
                (meta . ,(element-description "LeftEdge" break-aligned-interface))
        ))
        
        (Fingering . (
                (molecule-callback . ,Text_item::brew_molecule)
+               (X-offset-callbacks . (,Side_position::centered_on_parent ,Side_position::aligned_on_self))
                (padding .      3.0)
                (self-alignment-X . 0)
-               (font-style . dynamic)
+               (font-style . finger)
                 (properties-to-font-name . ,properties-to-font-name)
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)
-               
                (meta . ,(element-description "Fingering" finger-interface text-script-interface text-interface side-position-interface))
        ))
 
@@ -204,7 +206,7 @@
                (properties-to-font-name . ,properties-to-font-name)
                (style-to-font-name . ,style-to-font-name)
                (markup-to-properties . ,markup-to-properties)
-               (font-family . "roman")
+               (font-family . roman)
                (meta . ,(element-description "InstrumentName"  text-interface break-aligned-interface))
        ))
        
@@ -248,7 +250,9 @@
                (properties-to-font-name . ,properties-to-font-name)
                (style-to-font-name . ,style-to-font-name)
                (markup-to-properties . ,markup-to-properties)
-               (font-family . "roman")
+               (font-family . roman)
+               (font-shape . upright)
+               (font-relative-size . 0)
                 
                (meta . ,(element-description "LyricText" lyric-syllable-interface text-interface))
        ))
@@ -299,12 +303,13 @@
                 (properties-to-font-name . ,properties-to-font-name)
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)
-               (font-family . "roman")
-               (font-size . "0")
+               (font-family . roman)
+               (font-shape . upright)
+               (font-relative-size . 0)
                (meta . ,(element-description  "NoteName"
-                       note-name-interface
-                       general-element-interface))
-       ))
+                                              note-name-interface
+                                              general-element-interface))
+               ))
 
        (OctavateEight . (
                (self-alignment-X . 0)
@@ -313,7 +318,7 @@
                (X-offset-callbacks . (,Side_position::centered_on_parent ,Side_position::aligned_on_self))
                (Y-offset-callbacks . (,Side_position::aligned_side))
                (molecule-callback . ,Text_item::brew_molecule)
-                (font-shape . "italic")
+                (font-shape . italic)
                 (properties-to-font-name . ,properties-to-font-name)
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)
@@ -323,12 +328,14 @@
        
        (PaperColumn . (
                (axes 0)
+               (before-grace-spacing-factor . 1.2)
                 (before-musical-spacing-factor . 0.4)
                (meta . ,(element-description "PaperColumn" paper-column-interface axis-group-interface spaceable-element-interface))
        ))
        (NonMusicalPaperColumn . (
                 (axes 0)
                 (before-musical-spacing-factor . 1.0)
+               (column-space-strength . 2.0)
                (meta . ,(element-description "NonMusicalPaperColumn" paper-column-interface axis-group-interface spaceable-element-interface))
         ))
        
@@ -359,7 +366,9 @@
        (Slur . ,default-basic-slur-properties)
        (SpacingSpanner . (
                (spacing-procedure . ,Spacing_spanner::set_springs)
-
+               (stem-spacing-correction . 0.5)
+               (arithmetic-basicspace . 2.0)
+               (arithmetic-multiplier . ,(* 0.9 1.32))
                ;; assume that notes at least this long are present.
                (maximum-duration-for-spacing . ,(make-moment 1 8))
                (meta . ,(element-description "SpacingSpanner"  spacing-spanner-interface))
@@ -396,7 +405,7 @@
                (properties-to-font-name . ,properties-to-font-name)
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)
-               (font-family . "roman")
+               (font-family . roman)
 (meta . ,(element-description "StanzaNumber" break-aligned-interface text-interface))
        ))
 
@@ -413,7 +422,7 @@
                 (,Side_position::aligned_side
                  ,Side_position::centered_on_parent))
                (no-spacing-rods . #t)
-                (font-shape . "italic")
+                (font-shape . italic)
                 (properties-to-font-name . ,properties-to-font-name)
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)
@@ -492,12 +501,14 @@
                (properties-to-font-name . ,properties-to-font-name)
                (style-to-font-name . ,style-to-font-name)
                (markup-to-properties . ,markup-to-properties)
-               (font-family . "roman")
+               (font-family . roman)
+               (font-shape . italic)
+               (font-relative-size . 0)
                (meta . ,(element-description "TextScript" text-script-interface text-interface side-position-interface ))
        ))
        (TextSpanner . (
                (molecule-callback . ,Text_spanner::brew_molecule)
-                (font-shape . "italic")
+                (font-shape . italic)
                 (properties-to-font-name . ,properties-to-font-name)
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)
@@ -543,14 +554,14 @@
                 (properties-to-font-name . ,properties-to-font-name)
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)
-                (font-shape . "italic")
-               (meta .  ,(element-description "TupletBracket"
+                (font-style . tuplet)
+               (meta .  ,(element-description "TupletBracket" text-interface
                           tuplet-bracket-interface))
        ))
 
-       (UnaChordaPdeal . (
+       (UnaChordaPedal . (
                (molecule-callback . ,Text_item::brew_molecule)
-                (font-shape . "italic")
+                (font-shape . italic)
                 (properties-to-font-name . ,properties-to-font-name)
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)