X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fslur-script.ly;h=8eb12d5ab96f13f60c3e6c3fa443a0f67522864c;hb=d1698636c7f40a07047656ca04f70a55c62a9d37;hp=04f0b3f64788962c61679e52f691645b85bf422a;hpb=2ff0a47772ff208caa5694127ecf522e9feb26af;p=lilypond.git

diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index 04f0b3f647..8eb12d5ab9 100644
--- a/input/regression/slur-script.ly
+++ b/input/regression/slur-script.ly
@@ -1,31 +1,41 @@
 
 \header {
 
-    texidoc = "A slur avoids collisions with scripts.  Only articulations
-    go inside the slur, dynamic markings, fingerings texts etc. go outside
-    of slur.
+  texidoc = "A slur avoids collisions with scripts.  Articulations
+    go inside the slur, dynamic markings go outside the slur.
+    Fingerings and texts are placed either inside or outside.
 
-    For different configurations, the scripts can be moved manually."
-    }
+    For different configurations, the defaults can be changed, and
+    scripts can be moved manually."
+}
 
 \version "2.6.0"
 \layout {
-    raggedright = ##t
+  indent = 0\mm
+  raggedright = ##t
 }
 \relative
 {
-    b4-.( b-. b-.)
-    b(-.  d-.)
+  b4-.( b-. b-.)
+  b(-.  d-.)
+
+  b_1( f'_1_2_3 c_3_4_5 a)
 
-    b_1( b b_1_2_3)
-    %% Allow Fingering to go inside slur.
-    \override Fingering #'inside-slur = ##t
-    b( d_1 b)
-    c_\markup { \italic {"cresc."}}( f c)
-    c( c\f c)
-    \once \override Script #'padding = #1.2
-    b-.( b-.
-    \once \override Script #'padding = #1.2
-    b-.)
-    e='16[-.( f-.)]
+  \override DynamicLineSpanner #'avoid-slur = #'outside
+  b(^"dyn outside" b f'\p b,)
+  
+  %% Do not force dynamics outside slur, only avoid collisions.
+  \override DynamicLineSpanner #'avoid-slur = #'around
+  b(^"dyn around" e\p e\f b)
+  
+  %% Do not avoid collisions.
+  \override DynamicLineSpanner #'avoid-slur = #'()
+  b(^"no avoid" d\p d\f b)
+  
+  c_\markup { \italic {"cresc."}}( c c)
+  \once \override Script #'padding = #1.2
+  b-.( b-.
+  \once \override Script #'padding = #1.2
+  b-.)
+  e='16[-.( f-.)]
 }