Adding avoid-slur; patch by Maximilian.

diff --git a/THANKS b/THANKS
index 19ea30a79f0ca7027c213f2bbe67dfe79dd751e3..e3e5d8126f791fa1130530be46063c8f2ab2c349 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -45,6 +45,7 @@ Maarten Hijzelendoorn
 Matthijs Frankeno
 Martijn Vromans
 Marnen Laibow-Koser
+Maximilian Albert
 Mirosław Doroszewski
 Nicolas Sceaux
 Orm Finnendahl

diff --git a/scm/script.scm b/scm/script.scm
index e12cdd07dd65a9c49ee47ec1b5676cb395c88854..a31e201abab03290ecf773760b8ab89aeea4540c 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -45,6 +45,7 @@
     ("accentus" .
      ((script-stencil . (feta . ("uaccentus" . "uaccentus")))
       (side-relative-direction .  -1)
+      (avoid-slur . #f)
       (padding . 0.20)    
       (quantize-position . #t)
       (script-priority . -100)
@@ -53,6 +54,7 @@
      ((script-stencil . (feta . ("ictus" . "ictus")))
       (side-relative-direction .  -1)
       (quantize-position . #t)
+      (avoid-slur . #f)
       (padding . 0.20)    
       (script-priority . -100)
       (direction  . -1)))
@@ -60,12 +62,14 @@
      ((script-stencil . (feta . ("dsemicirculus" . "dsemicirculus")))
       (side-relative-direction .  -1)
       (quantize-position . #t)
+      (avoid-slur . #f)
       (padding . 0.20)    
       (script-priority . -100)
       (direction  . 1)))
     ("circulus" .
      ((script-stencil . (feta . ("circulus" . "circulus")))
       (side-relative-direction .  -1)
+      (avoid-slur . #f)
       (padding . 0.20)    
       (quantize-position . #t)
       (script-priority . -100)
@@ -74,6 +78,7 @@
     ("signumcongruentiae" .
      ((script-stencil . (feta . ("dsignumcongruentiae" . "usignumcongruentiae")))
       (padding . 0.20)    
+      (avoid-slur . outside)
       (direction .  1)))
     ("fermata" .
      ((script-stencil . (feta . ("dfermata" . "ufermata")))
@@ -84,14 +89,17 @@
     ("shortfermata" .
      ((script-stencil . (feta . ("dshortfermata" . "ushortfermata")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction .  1)))
     ("longfermata" .
      ((script-stencil . (feta . ("dlongfermata" . "ulongfermata")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction .  1)))
     ("verylongfermata" .
      ((script-stencil . (feta . ("dverylongfermata" . "uverylongfermata")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction .  1)))
     ("stopped" .
      ((script-stencil . (feta . ("stopped" . "stopped")))
@@ -115,11 +123,13 @@
      ((script-stencil . (feta . ("lcomma" . "rcomma")))
       (quantize-position . #t)
       (padding . 0.20)    
+      (avoid-slur . #f)
       (direction . 1)))
     ("varcomma" .
      ((script-stencil . (feta . ("lvarcomma" . "rvarcomma")))
       (quantize-position . #t)
       (padding . 0.20)    
+      (avoid-slur . #f)
       (direction . 1)))
     ("upbow" .
      ((script-stencil . (feta . ("upbow" . "upbow")))
@@ -134,19 +144,23 @@
     ("lheel" .
      ((script-stencil . (feta . ("upedalheel" . "upedalheel")))
       (padding . 0.20)    
+      (avoid-slur . around) ;guessing?
       (direction .  -1))
      )
     ("rheel" .
      ((script-stencil . (feta . ("dpedalheel" . "dpedalheel")))
       (padding . 0.20)    
+      (avoid-slur . around) ;guessing?
       (direction  . 1)))
     ("ltoe" .
      ((script-stencil . (feta . ("upedaltoe" . "upedaltoe")))
       (padding . 0.20)    
+      (avoid-slur . around) ;guessing?
       (direction  . -1)))
     ("rtoe" .
      ((script-stencil . (feta . ("dpedaltoe" . "dpedaltoe")))
       (padding . 0.20)    
+      (avoid-slur . around) ;guessing?
       (direction  . 1)))
     ("turn" .
      ((script-stencil . (feta . ("turn" . "turn")))
@@ -161,10 +175,12 @@
     ("flageolet" .
      ((script-stencil . (feta . ("flageolet" . "flageolet")))
       (padding . 0.20)    
+      (avoid-slur . around) ;guessing?
       (direction  . 1)))
     ("reverseturn" .
      ((script-stencil . (feta . ("reverseturn" . "reverseturn")))
       (padding . 0.20)    
+      (avoid-slur . inside)
       (direction  . 1)))
     ("trill" .
      ((script-stencil . (feta . ("trill" . "trill")))
@@ -175,56 +191,70 @@
     ("prall" .
      ((script-stencil . (feta . ("prall" . "prall")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction  . 1)))
     ("mordent" .
      ((script-stencil . (feta . ("mordent" . "mordent")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction  . 1)))
     ("prallprall" .
      ((script-stencil . (feta . ("prallprall" . "prallprall")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction  . 1)))
     ("prallmordent" .
      ((script-stencil . (feta . ("prallmordent" . "prallmordent")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction  . 1)))
     ("upprall" .
      ((script-stencil . (feta . ("upprall" . "upprall")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction  . 1)))
     ("downprall" .
      ((script-stencil . (feta . ("downprall" . "downprall")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction  . 1)))
     ("upmordent" .
      ((script-stencil . (feta . ("upmordent" . "upmordent")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction  . 1)))
     ("downmordent" .
      ((script-stencil . (feta . ("downmordent" . "downmordent")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction  . 1)))
     ("lineprall" .
      ((script-stencil . (feta . ("lineprall" . "lineprall")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction  . 1)))
     ("pralldown" .
      ((script-stencil . (feta . ("pralldown" . "pralldown")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction  . 1)))
     ("prallup" .
      ((script-stencil . (feta . ("prallup" . "prallup")))
       (padding . 0.20)    
+      (avoid-slur . around)
       (direction  . 1)))
     ("segno" .
      ((script-stencil . (feta . ("segno" . "segno")))
       (padding . 0.20)    
+      (avoid-slur . outside)
       (direction  . 1)))
     ("coda" .
      ((script-stencil . (feta . ("coda" . "coda")))
       (padding . 0.20)    
+      (avoid-slur . outside)
       (direction  . 1)))
     ("varcoda" .
      ((script-stencil . (feta . ("varcoda" . "varcoda")))
       (padding . 0.20)    
+      (avoid-slur . outside)
       (direction  . 1)))))