Merge branch 'master' into lilypond/translation

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index b8857206845a02e1cac6b44f252bdffc5a72c410..efd310c1daaf6bf985e2b7dae363fd6a1822cd6a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -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
      . (
 
@@ -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)))