* Documentation/user/advanced-notation.itely (Instrument names):

[lilypond.git] / scm / script.scm

diff --git a/scm/script.scm b/scm/script.scm
index 5b24e0455e837313962aabc5a97f90922c27cecd..6044f61a1881cfaf88fa79c566258724e3410296 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -2,12 +2,13 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (set! default-script-alist
       (append 
        '(("thumb" .
          ((script-stencil . (feta . ("thumb"  . "thumb")))
+          (avoid-slur . inside)
           (padding . 0.20)        
           (direction . 1)))
          ("accent" .
@@ -24,7 +25,8 @@
           (side-relative-direction . -1)))      
         ("marcato" .
          ((script-stencil . (feta . ("dmarcato" . "umarcato")))
-          (padding . 0.20)        
+          (padding . 0.20)
+          (avoid-slur . inside)
 ;         (staff-padding . ())
           (quantize-position . #t)
           (side-relative-direction .  -1)))
@@ -94,6 +96,7 @@
           (direction .  1)))
         ("stopped" .
          ((script-stencil . (feta . ("stopped" . "stopped")))
+          (avoid-slur . inside)
           (padding . 0.20)        
           (direction  . 1)))
         ("staccato" .
@@ -148,6 +151,7 @@
           (direction  . 1)))
         ("turn" .
          ((script-stencil . (feta . ("turn" . "turn")))
+          (avoid-slur . inside)
           (padding . 0.20)        
           (direction  . 1)))
         ("open" .