Merge branch 'master' into lilypond/translation

[lilypond.git] / scm / script.scm

diff --git a/scm/script.scm b/scm/script.scm
index 71bc666a91b4ff1e0bfb210c0e03775a30719c0c..4d6dc05a8ea6eb5bcbe8f346cca4470c5b3fe6c1 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -63,7 +63,8 @@
        (script-stencil . (feta . ("downbow" . "downbow")))
        (padding . 0.20)
        (avoid-slur . around)
-       (direction . ,UP)))
+       (direction . ,UP)
+       (script-priority . 150)))
     ("downmordent"
      . (
        (script-stencil . (feta . ("downmordent" . "downmordent")))
@@ -174,7 +175,6 @@
      . (
        (script-stencil . (feta . ("uportato" . "dportato")))
        (avoid-slur . around)
-       (slur-padding . 0.3)
        (padding . 0.45)
        (side-relative-direction . ,DOWN)))
     ("prall"
@@ -296,9 +296,10 @@
     ("thumb"
      . (
        (script-stencil . (feta . ("thumb"  . "thumb")))
-       (avoid-slur . inside)
-       (padding . 0.20)
-       (direction . ,UP)))
+       (avoid-slur . around)
+       (padding . 0.50)
+       (direction . ,UP)
+       (staff-padding . 0.5)))
     ("trill"
      . (
        (script-stencil . (feta . ("trill" . "trill")))
@@ -319,7 +320,8 @@
        (script-stencil . (feta . ("upbow" . "upbow")))
        (avoid-slur . around)
        (padding . 0.20)
-       (direction . ,UP)))
+       (direction . ,UP)
+       (script-priority . 150)))
     ("upmordent"
      . (
        (script-stencil . (feta . ("upmordent" . "upmordent")))