X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fslur-script.ly;h=60864a74832fd4c60d06d86a965ae83bb549a909;hb=b2d3e79a146de7cb2eb2be722a510c0e4fc90fa8;hp=e0399ba7c57da5ec979fd31331aa2fa816f8d6e9;hpb=93d8a78cb51e4440e7fd0c25d3c0cb66128d6190;p=lilypond.git

diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index e0399ba7c5..60864a7483 100644
--- a/input/regression/slur-script.ly
+++ b/input/regression/slur-script.ly
@@ -1,41 +1,22 @@
 
 \header {
 
-    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 defaults can be changed, and
-    scripts can be moved manually."
-  }
+  texidoc = "A slur avoids collisions with scripts, which are placed
+    either inside or outside the slur, depending on the script.  The
+    slur responds appropriately if a script is moved."
+}
 
-\version "2.6.0"
+\version "2.14.0"
 \layout {
-    indent = 0\mm
-    raggedright = ##t
+  indent = 0\mm
+  ragged-right = ##t
 }
 \relative
 {
-    b4-.( b-. b-.)
-    b(-.  d-.)
-
-    b_1( f'_1_2_3 c_3_4_5 a)
-    b( f'\p b,)
-    
-    %% Do not force dynamics outside slur, only avoid collisions.
-    \override DynamicLineSpanner #'avoid-slur = #'around
-    \override DynamicLineSpanner #'padding = #0.4
-    b( e\p e\f b)
-    
-    %% Do not avoid collisions.
-    \override DynamicLineSpanner #'avoid-slur = #'()
-    \revert DynamicLineSpanner #'padding
-    b( 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-.)]
+  b4-.( b-.)
+  \once \override Script #'padding = #1.5
+  b-.( b-.)
+  b_\downbow( b_\downbow)
+  \once \override Script #'padding = #1.5
+  b_\downbow( b_\downbow)
 }