*** empty log message ***

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index eba1fe7d4a884681275ceeac0e15fe54dd4e1858..26143927d4e4927793e592a091feba3a09640459 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -115,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))))
        ))
@@ -377,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))
@@ -444,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))))
@@ -746,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
@@ -776,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))
@@ -859,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
@@ -868,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))))
        ))
@@ -1115,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
      . (