Merge branch 'lilypond/translation'

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 7c459a0bca6ed52c278723bd15c5e65fa0ff8b01..b1cfb63becec318a08b5f48732e75e193c800f04 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
@@ -533,6 +533,7 @@
        (direction . ,UP)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (font-series . bold)
+       (outside-staff-priority . 450)
        (padding . 0.5)
        (script-priority . 200)
        (side-axis . ,Y)
@@ -660,6 +661,7 @@
        (font-shape . italic)
        (outside-staff-priority . 250)
        (positioning-done . ,ly:script-interface::calc-positioning-done)
+       (right-padding . 0.5)
        (self-alignment-X . ,CENTER)
        (self-alignment-Y . ,CENTER)
        (stencil . ,ly:text-interface::print)
@@ -667,6 +669,7 @@
        (Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
        (meta . ((class . Item)
                 (interfaces . (dynamic-interface
+                               dynamic-text-interface
                                font-interface
                                script-interface
                                self-alignment-interface
@@ -674,6 +677,7 @@
 
     (DynamicTextSpanner
      . (
+       (before-line-breaking . ,dynamic-text-spanner::before-line-breaking)
        (bound-details . ((right . ((attach-dir .  ,LEFT)
                                    (Y . 0)
                                    (padding . 0.75)
@@ -684,8 +688,8 @@
 
                          (left . ((attach-dir .  ,LEFT)
                                   (Y . 0)
-                                  (stencil-offset . (0 . -0.5))
-                                  (padding . 0.5)
+                                  (stencil-offset . (-0.75 . -0.5))
+                                  (padding . 0.75)
                                   ))
                          (left-broken . ((attach-dir .  ,RIGHT)
                                   ))
@@ -2073,17 +2077,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)))