release: 1.3.141

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

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index c7fd1745b03b582aa2179d0b434733b35b66e827..d12715908cc50f8e577317c8a7bff11880242c8e 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -14,7 +14,7 @@
               (Y-extent-callback . #f)        
               (molecule-callback . ,Arpeggio::brew_molecule)
               (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
-              (X-offset-callbacks . (,Side_position::aligned_side))
+              (X-offset-callbacks . (,Side_position_interface::aligned_side))
               (direction . -1)
               (staff-position . 0.0)
               (meta . ,(grob-description "Arpeggio" arpeggio-interface side-position-interface font-interface))
@@ -49,7 +49,7 @@
                (direction . 1)
                 (font-family . roman)
                (font-relative-size . -1)
-               (Y-offset-callbacks . (,Side_position::aligned_side))
+               (Y-offset-callbacks . (,Side_position_interface::aligned_side))
                (meta . ,(grob-description "BarNumber"
                                           side-position-interface
                        text-interface  font-interface break-aligned-interface))
@@ -136,22 +136,23 @@
                (visibility-lambda . ,end-of-line-visible)
               (style .  vaticana)
               (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
-               (meta . ,(grob-description "Custos" custos-interface staff-symbol-interface break-aligned-interface) )
+               (meta . ,(grob-description "Custos" custos-interface staff-symbol-referencer-interface break-aligned-interface) )
        ))
        
        (Hairpin . (
                (molecule-callback . ,Hairpin::brew_molecule)
                (thickness . 1.0)
                (height . 0.6666)
-
+               (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 . (,Side_position::aligned_on_self))
-               (meta . ,(grob-description "Hairpin" hairpin-interface))
+               (Y-offset-callbacks . (,Side_position_interface::aligned_on_self))
+               (meta . ,(grob-description "Hairpin" hairpin-interface dynamic-interface))
        ))
 
        (DotColumn . (
@@ -164,24 +165,25 @@
                (dot-count . 1)
                (staff-position . 0.0)
                (Y-offset-callbacks  . (,Dots::quantised_position_callback ,Staff_symbol_referencer::callback))
-               (meta . ,(grob-description "Dots"  font-interface dot-interface ))
+               (meta . ,(grob-description "Dots"  font-interface dots-interface ))
        ))
        
        (DynamicText . (
-               (Y-offset-callbacks . (,Side_position::aligned_on_self))
+               (Y-offset-callbacks . (,Side_position_interface::aligned_on_self))
                (molecule-callback . ,Text_item::brew_molecule)
                (script-priority . 100)
                (font-series . bold)
                (font-family . dynamic)
                (font-shape . italic)
                (self-alignment-Y . 0)
-               (meta . ,(grob-description "DynamicText" font-interface  text-interface ))
+               (meta . ,(grob-description "DynamicText" font-interface text-interface dynamic-interface))
        ))
        
        (DynamicLineSpanner . (
                (axes . ( 1))
                (padding . 0.6)
                (minimum-space . 1.2)
+               (direction . -1)
                (meta . ,(grob-description "DynamicLineSpanner" dynamic-interface axis-group-interface side-position-interface))
        ))
        
@@ -194,8 +196,9 @@
        
        (Fingering . (
                (molecule-callback . ,Text_item::brew_molecule)
-               (X-offset-callbacks . (,Side_position::centered_on_parent ,Side_position::aligned_on_self))
+               (X-offset-callbacks . (,Side_position_interface::centered_on_parent ,Side_position_interface::aligned_on_self))
                (padding . 0.6)
+               (direction . -1)
                (self-alignment-X . 0)
                (font-family . number)
                (font-relative-size . -3)
@@ -229,8 +232,10 @@
        
        (InstrumentName . (
                (breakable . #t)
-               (Y-offset-callbacks . (,Side_position::centered_on_parent
-                                      ,Side_position::aligned_on_self))
+               (Y-offset-callbacks . (,Side_position_interface::aligned_on_self
+                                      ,Side_position_interface::aligned_on_support_refpoints
+))
+               (direction . 0)
                (self-alignment-Y . 0)
                (molecule-callback . ,Text_item::brew_molecule)         
                (break-align-symbol . Instrument_name)
@@ -250,7 +255,7 @@
        
        (Accidentals . (
                (molecule-callback . ,Local_key_item::brew_molecule)
-               (X-offset-callbacks . (,Side_position::aligned_side))
+               (X-offset-callbacks . (,Side_position_interface::aligned_side))
                (after-line-breaking-callback . ,Local_key_item::after_line_breaking)
                (direction . -1)
                (left-padding . 0.2)
@@ -273,7 +278,7 @@
        
        (LyricText . (
                (molecule-callback . ,Text_item::brew_molecule)
-               (X-offset-callbacks . (,Side_position::aligned_on_self))
+               (X-offset-callbacks . (,Side_position_interface::aligned_on_self))
                (self-alignment-X . 0)
                (non-rhythmic . #t)
                (word-space . 0.6)
@@ -284,7 +289,7 @@
        
        (RehearsalMark . (
                (molecule-callback . ,Text_item::brew_molecule)
-               (X-offset-callbacks . (,Side_position::aligned_on_self))
+               (X-offset-callbacks . (,Side_position_interface::aligned_on_self))
                (self-alignment-X . 0)
 
                (direction . 1)
@@ -300,13 +305,14 @@
        (MultiMeasureRest . (
                (spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
                (molecule-callback . ,Multi_measure_rest::brew_molecule)
+               (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
                (staff-position . 0)
                (expand-limit . 10)
                (padding . 2.0) ; staffspace
                (minimum-width . 12.5) ; staffspace
                (font-family . number)
                (font-relative-size . 1)
-               (meta . ,(grob-description "MultiMeasureRest" multi-measure-rest-interface  font-interface ))
+               (meta . ,(grob-description "MultiMeasureRest" multi-measure-rest-interface rest-interface font-interface ))
        ))
        (NoteCollision . (
                (axes 0 1)
@@ -340,14 +346,14 @@
                         (meta . ,(grob-description "Glissando"
                                                       line-spanner-interface))
                         ))
-       (FollowThread . (
+       (VoiceFollower . (
                         (type . line)
                         (gap . 0.5)
                         (breakable . #t)
                         (X-extent-callback . #f)
                         (Y-extent-callback . #f)                        
                         (molecule-callback . ,Line_spanner::brew_molecule)
-                        (meta . ,(grob-description "FollowThread"
+                        (meta . ,(grob-description "VoiceFollower"
                                                       line-spanner-interface))
                         ))
 
@@ -363,8 +369,8 @@
                (self-alignment-X . 0)
                (text . "8")
                (visibility-lambda . ,begin-of-line-visible)
-               (X-offset-callbacks . (,Side_position::centered_on_parent ,Side_position::aligned_on_self))
-               (Y-offset-callbacks . (,Side_position::aligned_side))
+               (X-offset-callbacks . (,Side_position_interface::centered_on_parent ,Side_position_interface::aligned_on_self))
+               (Y-offset-callbacks . (,Side_position_interface::aligned_side))
                (molecule-callback . ,Text_item::brew_molecule)
                 (font-shape . italic)
                (font-family . roman)
@@ -380,7 +386,7 @@
        (PhrasingSlur . (
                 (molecule-callback . ,Slur::brew_molecule)
                 (thickness . 1.2)              
-                (spacing-procedure . ,Slur::set_spacing_rods)          
+                (spacing-procedure . ,Spanner::set_spacing_rods)               
                 (minimum-length . 1.5)
                 (after-line-breaking-callback . ,Slur::after_line_breaking)
                 (extremity-rules . ,default-slur-extremity-rules)
@@ -398,21 +404,36 @@
                 (slope-limit . 0.8)
                 (meta . ,(grob-description "PhrasingSlur" slur-interface))
                 ))
+       
        (NonMusicalPaperColumn . (
                 (axes 0)
                 (before-musical-spacing-factor . 1.0)
                (column-space-strength . 2.0)
                (meta . ,(grob-description "NonMusicalPaperColumn" paper-column-interface axis-group-interface spaceable-element-interface))
         ))
+
+       (PercentRepeat . (
+               (spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
+               (molecule-callback . ,Multi_measure_rest::percent)
+               (staff-position . 0)
+               (expand-limit . 10)
+               (padding . 2.0) ; staffspace
+               (minimum-width . 12.5) ; staffspace
+               (font-family . music)
+               (meta . ,(grob-description "PercentRepeat" multi-measure-rest-interface  font-interface))
+       ))
+
        
        (Rest . (
                (after-line-breaking-callback . ,Rest::after_line_breaking)
                (X-extent-callback . ,Rest::extent_callback)
                (Y-extent-callback . ,Rest::extent_callback)            
                (molecule-callback . ,Rest::brew_molecule)
+               (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) 
                (minimum-beam-collision-distance . 1.5)
                (meta . ,(grob-description  "Rest"
                        rhythmic-head-interface
+                       staff-symbol-referencer-interface
                        rest-interface))
        ))
        (RestCollision . (
@@ -421,9 +442,10 @@
        ))
 
        (Script . (
+               ;; don't set direction here: it breaks staccato.
                (molecule-callback . ,Script::brew_molecule)
-               (X-offset-callbacks . (,Side_position::centered_on_parent))
-               (after-line-breaking-callback . ,Script::after_line_breaking)
+               (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))
        ))
        
@@ -435,7 +457,7 @@
        (Slur . (
                 (molecule-callback . ,Slur::brew_molecule)
                 (thickness . 1.2)              
-                (spacing-procedure . ,Slur::set_spacing_rods)          
+                (spacing-procedure . ,Spanner::set_spacing_rods)               
                 (minimum-length . 1.5)
                 (after-line-breaking-callback . ,Slur::after_line_breaking)
                 (extremity-rules . ,default-slur-extremity-rules)
@@ -504,10 +526,11 @@
        ))
        (SostenutoPedal . (
                (molecule-callback . ,Text_item::brew_molecule)
-               (X-offset-callbacks . (,Side_position::aligned_on_self))
+               (direction . -1)
+               (X-offset-callbacks . (,Side_position_interface::aligned_on_self))
                (Y-offset-callbacks .
-                (,Side_position::aligned_side
-                 ,Side_position::centered_on_parent))
+                (,Side_position_interface::aligned_side
+                 ,Side_position_interface::centered_on_parent))
                (no-spacing-rods . #t)
                 (font-shape . italic)
                (self-alignment-X . 0)
@@ -558,10 +581,11 @@
                (no-spacing-rods . #t)
                (molecule-callback . ,Sustain_pedal::brew_molecule)
                (self-alignment-X . 0)
-               (X-offset-callbacks . (,Side_position::aligned_on_self))
+               (direction . -1)
+               (X-offset-callbacks . (,Side_position_interface::aligned_on_self))
                (Y-offset-callbacks .
-                                   (,Side_position::aligned_side
-                                    ,Side_position::centered_on_parent))
+                                   (,Side_position_interface::aligned_side
+                                    ,Side_position_interface::centered_on_parent))
 
                (meta . ,(grob-description "SustainPedal" sustain-pedal-interface side-position-interface font-interface))
        ))
@@ -585,7 +609,7 @@
                ;; if you want to set point-size, you cannot set
                ;; relative-size, as no font will be found for other
                ;; sheets than 20
-               ;;(font-point-size . 20)
+               ;;(font-design-size . 20)
                ;;(font-relative-size . #f)
                (meta . ,(grob-description "SystemStartDelimiter" system-start-delimiter-interface font-interface))
                ))
@@ -593,15 +617,14 @@
        (TextScript . (
                (molecule-callback . ,Text_item::brew_molecule)
                (no-spacing-rods . #t)
+               (direction . -1)
                (padding . 0.5)
                (baseline-skip . 2)
                (font-family . roman)
-               (font-shape . italic)
                (meta . ,(grob-description "TextScript" text-script-interface text-interface side-position-interface font-interface ))
        ))
        (TextSpanner . (
                (molecule-callback . ,Text_spanner::brew_molecule)
-                (font-shape . italic)
                (font-family . roman)
                (type . "line")
                
@@ -614,7 +637,7 @@
        ))
        (Tie . (
                (molecule-callback . ,Tie::brew_molecule)
-               (spacing-procedure . ,Tie::set_spacing_rods)
+               (spacing-procedure . ,Spanner::set_spacing_rods)
                (staffline-clearance . 0.35)
                (details . ((ratio . 0.333) (height-limit . 1.0)))
                (thickness . 1.2)
@@ -655,10 +678,11 @@
                 (font-shape . italic)
                (no-spacing-rods . #t)
                (self-alignment-X . 0)
-               (X-offset-callbacks . (,Side_position::aligned_on_self))
+               (direction . -1)
+               (X-offset-callbacks . (,Side_position_interface::aligned_on_self))
                (Y-offset-callbacks .
-                (,Side_position::aligned_side
-                 ,Side_position::centered_on_parent))
+                (,Side_position_interface::aligned_side
+                 ,Side_position_interface::centered_on_parent))
                (meta . ,(grob-description "UnaChordaPedal" text-interface font-interface))
        ))
 
@@ -668,7 +692,7 @@
                (direction . 1)
                (padding . 1)
                 (font-style . volta)
-               (Y-offset-callbacks . (,Side_position::aligned_side))
+               (Y-offset-callbacks . (,Side_position_interface::aligned_side))
                (thickness . 1.6)  ;  stafflinethickness
                (height . 2.0) ; staffspace;
                (minimum-space . 5)