X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Fscript.scm;h=905a9f5a623b70079193d6fdb7b70c4a2ad7d37f;hb=78a723022056dd2b3e09edcbee76d0a49ced4d6c;hp=f43a144857a3ea89b5c6101061e9e6af049684bc;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/scm/script.scm b/scm/script.scm
index f43a144857..905a9f5a62 100644
--- 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2000--2012 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")))