* Unify fetaDynamic and fetaNumber into one fetaText encoding

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 791cee2c248af7ac50ef1d21db1f3cde2dc88681..8251fec8192086a91a9bd347105376c4de17856f 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -607,7 +607,7 @@
     (DoublePercentRepeatCounter
      . (
        (direction . ,UP)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -2)
        (padding . 0.2)
        (self-alignment-X . ,CENTER)
@@ -656,7 +656,7 @@
 
        (direction . ,ly:script-interface::calc-direction)
        (extra-spacing-width . (+inf.0 . -inf.0))
-       (font-encoding . fetaDynamic)
+       (font-encoding . fetaText)
        (font-series . bold)
        (font-shape . italic)
        (outside-staff-priority . 250)
@@ -722,6 +722,33 @@
                                text-interface))))))
 
 
+    (Episema
+     . (
+       (bound-details . ((left . ((Y . 0)
+                                  (padding . 0)
+                                  (attach-dir . ,LEFT)
+                                  ))
+                         (right . ((Y . 0)
+                                   (padding . 0)
+                                   (attach-dir . ,RIGHT)
+                                   ))
+                         ))
+       (direction . ,UP)
+       (left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+       (quantize-position . #t)
+       (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
+       (side-axis . ,Y)
+       (stencil . ,ly:line-spanner::print)
+       (style . line)
+       (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (meta . ((class . Spanner)
+                (interfaces . (episema-interface
+                               font-interface
+                               line-interface
+                               line-spanner-interface
+                               side-position-interface))))))
+
+
     (Fingering
      . (
 
@@ -730,7 +757,7 @@
        (avoid-slur . around)
        (cross-staff . ,ly:side-position-interface::calc-cross-staff)
        (direction . ,ly:script-interface::calc-direction)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -5)                ; don't overlap when next to heads.
        (padding . 0.5)
        (positioning-done . ,ly:script-interface::calc-positioning-done)
@@ -1140,7 +1167,7 @@
      . (
        (bound-padding  . 2.0)
        (direction . ,UP)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (padding . 0.4)
        (self-alignment-X . ,CENTER)
        (side-axis . ,Y)
@@ -1358,7 +1385,7 @@
     (PercentRepeatCounter
      . (
        (direction . ,UP)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -2)
        (padding . 0.2)
        (self-alignment-X . ,CENTER)
@@ -1741,7 +1768,7 @@
     (StringNumber
      . (
        (avoid-slur . around)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -5)                ; don't overlap when next to heads.
        (padding . 0.5)
        (script-priority . 100)
@@ -2077,17 +2104,11 @@
     (TrillSpanner
      . (
        (after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
-       (bound-details . ((left . ((text . ,(make-translate-scaled-markup
-                                            '(0.0 . -1.0)
-                                            (make-musicglyph-markup "scripts.trill")))
+       (bound-details . ((left . ((text . ,(make-musicglyph-markup "scripts.trill"))
                                   (Y . 0)
-                                  (stencil-offset . (-0.5 . 0))
-                                  (padding . 1.5)
+                                  (stencil-offset . (-0.5 . -1))
+                                  (padding . 0.5)
                                   (attach-dir . ,CENTER)
-                                  ;; this isn't CENTER because the trill glyph's origin
-                                  ;; is not centered in its extent; to have the trill
-                                  ;; spanner aligned the same as a trill, we need a slight offset
-                                  (anchor-alignment . 0.15)
                                   ))
                          (left-broken . ((end-on-note . #t)))
                          (right . ((Y . 0)))
@@ -2243,7 +2264,7 @@
      . (
        (direction . ,UP)
        (edge-height . (2.0 . 2.0)) ;; staff-space;
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -4)
        (stencil . ,ly:volta-bracket-interface::print)
        (thickness . 1.6) ;; line-thickness