*** empty log message ***

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index bdec00c635dba3f7b54c0a751b561fce2d806768..26143927d4e4927793e592a091feba3a09640459 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -17,7 +17,6 @@
     (Accidental
      . (
        (print-function . ,Accidental_interface::print)
-       (font-family . music)
        (cautionary-style . parentheses)
        (after-line-breaking-callback . ,Accidental_interface::after_line_breaking)             (meta . ((interfaces . (item-interface accidental-interface font-interface))))
        ))
@@ -32,46 +31,53 @@
        (right-padding . 0.15)
        (meta . ((interfaces . (item-interface accidental-placement-interface))))
        ))
+    (Ambitus
+     . (
+       (axes . (0 1))
+       (X-extent-callback . ,Axis_group_interface::group_extent_callback)
+       (Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+       (space-alist . (
+                       (clef . (extra-space . 0.5))
+                       (key-signature . (extra-space . 0.0))
+                       (staff-bar . (extra-space . 0.0))
+                       (time-signature . (extra-space . 0.0)) 
+                       (first-note . (fixed-space . 0.0))
+                       ))
+       (breakable . #t)
+       (break-align-symbol . ambitus)
+       (break-visibility . ,begin-of-line-visible)
+       (meta . ((interfaces . (axis-group-interface break-aligned-interface ambitus-interface item-interface ))))
+       ))
 
     (AmbitusLine
      . (
-       (breakable . #t)
-       (break-align-symbol . ambitus)
        (print-function . ,Ambitus::print)
        (join-heads . #t)
-       (X-offset-callbacks (,Self_alignment_interface::centered_on_parent))
-       (break-visibility . ,begin-of-line-visible)
-       (space-alist . (
-                      (clef . (extra-space . 0.0))
-                      (key-signature . (extra-space . 0.0))
-                      (staff-bar . (extra-space . 0.0))
-                      (time-signature . (extra-space . 0.0)) 
-                      (first-note . (fixed-space . 0.0))
-                      ))
-       (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface break-aligned-interface item-interface  font-interface))))
+       (thickness . 2)
+       (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent))
+    
+       (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface item-interface  font-interface))))
        ))
     (AmbitusAccidental
      . (
        (print-function . ,Accidental_interface::print)
        (font-family . music)
+       (padding . 0.5)
        (X-offset-callbacks . (,Side_position_interface::aligned_side))
        (direction . -1) 
        (cautionary-style . parentheses)
-       (after-line-breaking-callback . ,Accidental_interface::after_line_breaking)             (meta . ((interfaces . (item-interface accidental-interface font-interface))))
+       (after-line-breaking-callback . ,Accidental_interface::after_line_breaking)             (meta . ((interfaces . (item-interface accidental-interface break-aligned-interface side-position-interface font-interface))))
        ))
     (AmbitusNoteHead
      . (
        (duration-log . 2)
        (style . default)
-       (breakable . #t)
        (print-function . ,Note_head::print)
-       (break-align-symbol . ambitus)
-        (break-visibility . ,begin-of-line-visible)
        (glyph-name-procedure . ,find-notehead-symbol)
        (X-extent-callback . ,Note_head::extent)
        (Y-extent-callback . ,Note_head::extent)
        (Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
-       (meta . ((interfaces . (font-interface note-head-interface ambitus-interface staff-symbol-referencer-interface item-interface ))))
+       (meta . ((interfaces . (font-interface note-head-interface ambitus-interface staff-symbol-referencer-interface rhythmic-head-interface item-interface ))))
        ))
     
     (Arpeggio
@@ -109,10 +115,12 @@
 
        ;;
        ;; Ross. page 151 lists other values, we opt for a leaner look
-       ;; 
+       ;;
+       ;; TODO:
+       ;; kern should scale with linethickness too. 
        (kern . 3.0)
        (thin-kern . 3.0)
-       (hair-thickness . 1.6)
+       (hair-thickness . 1.9)
        (thick-thickness . 6.0)
        (meta . ((interfaces . (bar-line-interface item-interface   break-aligned-interface font-interface))))
        ))
@@ -344,21 +352,20 @@
        (meta . ((interfaces . (font-interface staff-symbol-referencer-interface dots-interface item-interface ))))
        ))
 
-    (DoublePercentRepeat .
-                        (
-                         (print-function . ,Percent_repeat_item_interface::double_percent)
-                         (breakable . #t)
-                         (slope . 1.0)
-                         (font-encoding . fetaMusic)
-                         (width . 2.0)
-                         (thickness . 0.48)
-                         (break-align-symbol . staff-bar)
-                         (break-visibility . ,begin-of-line-invisible)
-                         (meta . ((interfaces . (font-interface
-                                                 break-aligned-interface
-                                                 percent-repeat-interface item-interface ))))
-                        ))
-
+    (DoublePercentRepeat
+     . (
+       (print-function . ,Percent_repeat_item_interface::double_percent)
+       (breakable . #t)
+       (slope . 1.0)
+       (font-encoding . fetaMusic)
+       (width . 2.0)
+       (thickness . 0.48)
+       (break-align-symbol . staff-bar)
+       (break-visibility . ,begin-of-line-invisible)
+       (meta . ((interfaces . (font-interface
+                               break-aligned-interface
+                               percent-repeat-interface item-interface ))))
+       ))
     (DynamicText
      . (
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
@@ -372,9 +379,26 @@
        (font-encoding . fetaDynamic)
        (font-shape . italic)
        (self-alignment-Y . 0)
-       (meta . ((interfaces . (font-interface text-interface self-alignment-interface  dynamic-interface script-interface item-interface))))
+       (meta . ((interfaces . (font-interface text-interface self-alignment-interface
+                                              dynamic-interface script-interface item-interface))))
        ))
+    (DynamicTextSpanner
+     . ((print-function . ,Dynamic_text_spanner::print)
+       (font-series . bold) 
+       (font-shape . italic)
+       (style . dashed-line)
 
+       ; need to blend with dynamic texts.
+       (font-size . 2)
+       (bound-padding . 0.75) 
+       (dash-fraction . 0.2)
+       (dash-period . 3.0)
+       (meta . ((interfaces . (font-interface
+                               text-interface 
+                               dynamic-interface dynamic-text-spanner-interface
+                               item-interface))))
+        ))
+    
     (DynamicLineSpanner
      . (
        (axes . (1))
@@ -439,7 +463,7 @@
        (height . 0.6666)
        (spacing-procedure . ,Spanner::set_spacing_rods)
        (minimum-length . 2.0)
-       (if-text-padding . 1.0)
+       (bound-padding . 1.0)
        (self-alignment-Y . 0)
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (meta . ((interfaces . (hairpin-interface line-interface self-alignment-interface dynamic-interface spanner-interface))))
@@ -617,7 +641,6 @@
        (thick-thickness . 6.6)
        (hair-thickness . 2.0)
        (padding . 1)
-       (font-encoding . fetaMusic)
        (meta . ((interfaces . (multi-measure-rest-interface multi-measure-interface rest-interface font-interface staff-symbol-referencer-interface))))
        ))
     
@@ -695,7 +718,7 @@
        (Y-extent-callback . #f)                         
        (print-function . ,Line_spanner::print)
        (after-line-breaking-callback . ,Line_spanner::after_line_breaking)
-       (meta . ((interfaces . (line-spanner-interface spanner-interface))))
+       (meta . ((interfaces . (line-spanner-interface line-interface spanner-interface))))
        ))
 
     (NoteName
@@ -742,7 +765,7 @@
        (Y-extent-callback . ,New_slur::height)
        (height-limit . 2.0)
        (ratio . 0.333)
-       (meta . ((interfaces . (slur-interface spanner-interface))))
+       (meta . ((interfaces . (slur-interface new-slur-interface spanner-interface))))
        ))
 
     (NonMusicalPaperColumn
@@ -772,7 +795,7 @@
      . (
        (print-function . ,Piano_pedal_bracket::print)
        (style . line)
-       (if-text-padding . 1.0)
+       (bound-padding . 1.0)
        (direction . -1)
        (bracket-flare . (0.5 . 0.5))
        (edge-height . (1.0 . 1.0))
@@ -855,7 +878,7 @@
                                        ; Slur::height)
        (height-limit . 2.0)
        (ratio . 0.25)
-       (meta . ((interfaces . (slur-interface spanner-interface))))
+       (meta . ((interfaces . (slur-interface new-slur-interface spanner-interface))))
        ))
 
     (SpacingSpanner
@@ -864,6 +887,7 @@
        (grace-space-factor . 0.6)
        (shortest-duration-space . 2.0)
        (spacing-increment . 1.2)
+;      (base-shortest-duration . ,(ly:make-moment 1 8 3 2))
        (base-shortest-duration . ,(ly:make-moment 1 8))
        (meta . ((interfaces . (spacing-interface spacing-spanner-interface spanner-interface))))
        ))
@@ -970,7 +994,6 @@
        ;; FIXME this should come from 'lengths
 
        (beamed-lengths . (3.26 3.26 1.5))
-;      (beamed-lengths . (3.5 3.5 3.5 4.5 5.0))
        
        ;; We use the normal minima as minimum for the ideal lengths,
        ;; and the extreme minima as abolute minimum length.
@@ -1112,14 +1135,23 @@
        (font-shape . italic)
        (style . dashed-line)
        (staff-padding . 0.1)
-       
-       ;; urg, only for (de)cresc. text spanners
-       (if-text-padding . 1.0)
        (dash-fraction . 0.2)
        (dash-period . 3.0)
        (direction . 1)
        (meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface))))             
        ))
+    (TrillSpanner
+     . (
+       (print-function . ,Dynamic_text_spanner::print)
+       (edge-text . ,(cons (make-musicglyph-markup "scripts-trill")
+                           ""))
+       (style . trill)
+       (staff-padding . 1.0)
+       (padding . 0.5)
+       (direction . 1)
+       (Y-offset-callbacks . (,Side_position_interface::aligned_side))
+       (meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface))))             
+       ))
     
     (OttavaBracket
      . (